youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-06 10:28:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: use AccountWithRole instead of account_with_role_fields

Browse Source
This commit is contained in:
hjlarry
2026-02-04 14:11:32 +08:00
parent 75d2148ef6
commit dee3e026a6
2 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
api/controllers/console/app/workflow_comment.py
View File

@ -1,12 +1,12 @@
import logging import logging
from flask_restx import Resource, fields, marshal_with from flask_restx import Resource, marshal_with
from pydantic import BaseModel, Field from pydantic import BaseModel, Field, TypeAdapter
from controllers.console import console_ns from controllers.console import console_ns
from controllers.console.app.wraps import get_app_model from controllers.console.app.wraps import get_app_model
from controllers.console.wraps import account_initialization_required, setup_required from controllers.console.wraps import account_initialization_required, setup_required
from fields.member_fields import account_with_role_fields from fields.member_fields import AccountWithRole
from fields.workflow_comment_fields import ( from fields.workflow_comment_fields import (
workflow_comment_basic_fields, workflow_comment_basic_fields,
workflow_comment_create_fields, workflow_comment_create_fields,
@ -49,6 +49,10 @@ class WorkflowCommentReplyUpdatePayload(BaseModel):
mentioned_user_ids: list[str] = Field(default_factory=list, description="Mentioned user IDs") mentioned_user_ids: list[str] = Field(default_factory=list, description="Mentioned user IDs")
class WorkflowCommentMentionUsersResponse(BaseModel):
users: list[AccountWithRole] = Field(description="Mentionable users")
for model in ( for model in (
WorkflowCommentCreatePayload, WorkflowCommentCreatePayload,
WorkflowCommentUpdatePayload, WorkflowCommentUpdatePayload,
@ -57,6 +61,9 @@ for model in (
): ):
console_ns.schema_model(model.__name__, model.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0)) console_ns.schema_model(model.__name__, model.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0))
for model in (AccountWithRole, WorkflowCommentMentionUsersResponse):
console_ns.schema_model(model.__name__, model.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0))
workflow_comment_basic_model = console_ns.model("WorkflowCommentBasic", workflow_comment_basic_fields) workflow_comment_basic_model = console_ns.model("WorkflowCommentBasic", workflow_comment_basic_fields)
workflow_comment_detail_model = console_ns.model("WorkflowCommentDetail", workflow_comment_detail_fields) workflow_comment_detail_model = console_ns.model("WorkflowCommentDetail", workflow_comment_detail_fields)
workflow_comment_create_model = console_ns.model("WorkflowCommentCreate", workflow_comment_create_fields) workflow_comment_create_model = console_ns.model("WorkflowCommentCreate", workflow_comment_create_fields)
@ -68,10 +75,7 @@ workflow_comment_reply_create_model = console_ns.model(
workflow_comment_reply_update_model = console_ns.model( workflow_comment_reply_update_model = console_ns.model(
"WorkflowCommentReplyUpdate", workflow_comment_reply_update_fields "WorkflowCommentReplyUpdate", workflow_comment_reply_update_fields
) )
workflow_comment_mention_users_model = console_ns.model( workflow_comment_mention_users_model = console_ns.models[WorkflowCommentMentionUsersResponse.__name__]
"WorkflowCommentMentionUsers",
{"users": fields.List(fields.Nested(account_with_role_fields))},
)
@console_ns.route("/apps/<uuid:app_id>/workflow/comments") @console_ns.route("/apps/<uuid:app_id>/workflow/comments")
@ -310,8 +314,9 @@ class WorkflowCommentMentionUsersApi(Resource):
@setup_required @setup_required
@account_initialization_required @account_initialization_required
@get_app_model() @get_app_model()
@marshal_with(workflow_comment_mention_users_model)
def get(self, app_model: App): def get(self, app_model: App):
"""Get all users in current tenant for mentions.""" """Get all users in current tenant for mentions."""
members = TenantService.get_tenant_members(current_user.current_tenant) members = TenantService.get_tenant_members(current_user.current_tenant)
return {"users": members} member_models = TypeAdapter(list[AccountWithRole]).validate_python(members, from_attributes=True)
response = WorkflowCommentMentionUsersResponse(users=member_models)
return response.model_dump(mode="json"), 200

13
api/fields/member_fields.py
View File

@ -13,19 +13,6 @@ simple_account_fields = {
"email": fields.String, "email": fields.String,
} }
account_with_role_fields = {
"id": fields.String,
"name": fields.String,
"email": fields.String,
"avatar": fields.String,
"avatar_url": fields.String,
"last_login_at": fields.Integer,
"last_active_at": fields.Integer,
"created_at": fields.Integer,
"role": fields.String,
"status": fields.String,
}
def _to_timestamp(value: datetime | int | None) -> int | None: def _to_timestamp(value: datetime | int | None) -> int | None:
if isinstance(value, datetime): if isinstance(value, datetime):