Skip to content

Commit bc03dea

Browse files
authored
feat: Resources authorization (#3183)
1 parent 596dbed commit bc03dea

File tree

133 files changed

+462
-216
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+462
-216
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

apps/chat/chat_pipeline/step/chat_step/__init__.py renamed to apps/application/chat_pipeline/step/chat_step/__init__.py

File renamed without changes.

apps/chat/chat_pipeline/step/chat_step/i_chat_step.py renamed to apps/application/chat_pipeline/step/chat_step/i_chat_step.py

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616

1717
from application.chat_pipeline.I_base_chat_pipeline import IBaseChatPipelineStep, ParagraphPipelineModel
1818
from application.chat_pipeline.pipeline_manage import PipelineManage
19-
from application.serializers.application_serializers import NoReferencesSetting
19+
from application.serializers.application import NoReferencesSetting
2020
from common.field.common import InstanceField
21-
from common.util.field_message import ErrMessage
2221

2322

2423
class ModelField(serializers.Field):
@@ -53,35 +52,35 @@ class IChatStep(IBaseChatPipelineStep):
5352
class InstanceSerializer(serializers.Serializer):
5453
# 对话列表
5554
message_list = serializers.ListField(required=True, child=MessageField(required=True),
56-
error_messages=ErrMessage.list(_("Conversation list")))
57-
model_id = serializers.UUIDField(required=False, allow_null=True, error_messages=ErrMessage.uuid(_("Model id")))
55+
label=_("Conversation list"))
56+
model_id = serializers.UUIDField(required=False, allow_null=True, label=_("Model id"))
5857
# 段落列表
59-
paragraph_list = serializers.ListField(error_messages=ErrMessage.list(_("Paragraph List")))
58+
paragraph_list = serializers.ListField(label=_("Paragraph List"))
6059
# 对话id
61-
chat_id = serializers.UUIDField(required=True, error_messages=ErrMessage.uuid(_("Conversation ID")))
60+
chat_id = serializers.UUIDField(required=True, label=_("Conversation ID"))
6261
# 用户问题
63-
problem_text = serializers.CharField(required=True, error_messages=ErrMessage.uuid(_("User Questions")))
62+
problem_text = serializers.CharField(required=True, label=_("User Questions"))
6463
# 后置处理器
6564
post_response_handler = InstanceField(model_type=PostResponseHandler,
66-
error_messages=ErrMessage.base(_("Post-processor")))
65+
label=_("Post-processor"))
6766
# 补全问题
6867
padding_problem_text = serializers.CharField(required=False,
69-
error_messages=ErrMessage.base(_("Completion Question")))
68+
label=_("Completion Question"))
7069
# 是否使用流的形式输出
71-
stream = serializers.BooleanField(required=False, error_messages=ErrMessage.base(_("Streaming Output")))
72-
client_id = serializers.CharField(required=True, error_messages=ErrMessage.char(_("Client id")))
73-
client_type = serializers.CharField(required=True, error_messages=ErrMessage.char(_("Client Type")))
70+
stream = serializers.BooleanField(required=False, label=_("Streaming Output"))
71+
client_id = serializers.CharField(required=True, label=_("Client id"))
72+
client_type = serializers.CharField(required=True, label=_("Client Type"))
7473
# 未查询到引用分段
7574
no_references_setting = NoReferencesSetting(required=True,
76-
error_messages=ErrMessage.base(_("No reference segment settings")))
75+
label=_("No reference segment settings"))
7776

78-
user_id = serializers.UUIDField(required=True, error_messages=ErrMessage.uuid(_("User ID")))
77+
user_id = serializers.UUIDField(required=True, label=_("User ID"))
7978

8079
model_setting = serializers.DictField(required=True, allow_null=True,
81-
error_messages=ErrMessage.dict(_("Model settings")))
80+
label=_("Model settings"))
8281

8382
model_params_setting = serializers.DictField(required=False, allow_null=True,
84-
error_messages=ErrMessage.dict(_("Model parameter settings")))
83+
label=_("Model parameter settings"))
8584

8685
def is_valid(self, *, raise_exception=False):
8786
super().is_valid(raise_exception=True)

apps/chat/chat_pipeline/step/chat_step/impl/base_chat_step.py renamed to apps/application/chat_pipeline/step/chat_step/impl/base_chat_step.py

File renamed without changes.

apps/chat/chat_pipeline/step/generate_human_message_step/__init__.py renamed to apps/application/chat_pipeline/step/generate_human_message_step/__init__.py

File renamed without changes.

apps/chat/chat_pipeline/step/generate_human_message_step/i_generate_human_message_step.py renamed to apps/application/chat_pipeline/step/generate_human_message_step/i_generate_human_message_step.py

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,34 +16,35 @@
1616
from application.chat_pipeline.I_base_chat_pipeline import IBaseChatPipelineStep, ParagraphPipelineModel
1717
from application.chat_pipeline.pipeline_manage import PipelineManage
1818
from application.models import ChatRecord
19-
from application.serializers.application_serializers import NoReferencesSetting
19+
from application.serializers.application import NoReferencesSetting
2020
from common.field.common import InstanceField
21-
from common.util.field_message import ErrMessage
2221

2322

2423
class IGenerateHumanMessageStep(IBaseChatPipelineStep):
2524
class InstanceSerializer(serializers.Serializer):
2625
# 问题
27-
problem_text = serializers.CharField(required=True, error_messages=ErrMessage.char(_("question")))
26+
problem_text = serializers.CharField(required=True, label=_("question"))
2827
# 段落列表
2928
paragraph_list = serializers.ListField(child=InstanceField(model_type=ParagraphPipelineModel, required=True),
30-
error_messages=ErrMessage.list(_("Paragraph List")))
29+
label=_("Paragraph List"))
3130
# 历史对答
3231
history_chat_record = serializers.ListField(child=InstanceField(model_type=ChatRecord, required=True),
33-
error_messages=ErrMessage.list(_("History Questions")))
32+
label=_("History Questions"))
3433
# 多轮对话数量
35-
dialogue_number = serializers.IntegerField(required=True, error_messages=ErrMessage.integer(_("Number of multi-round conversations")))
34+
dialogue_number = serializers.IntegerField(required=True, label=_("Number of multi-round conversations"))
3635
# 最大携带知识库段落长度
37-
max_paragraph_char_number = serializers.IntegerField(required=True, error_messages=ErrMessage.integer(
38-
_("Maximum length of the knowledge base paragraph")))
36+
max_paragraph_char_number = serializers.IntegerField(required=True,
37+
label=_("Maximum length of the knowledge base paragraph"))
3938
# 模板
40-
prompt = serializers.CharField(required=True, error_messages=ErrMessage.char(_("Prompt word")))
39+
prompt = serializers.CharField(required=True, label=_("Prompt word"))
4140
system = serializers.CharField(required=False, allow_null=True, allow_blank=True,
42-
error_messages=ErrMessage.char(_("System prompt words (role)")))
41+
label=_("System prompt words (role)"))
4342
# 补齐问题
44-
padding_problem_text = serializers.CharField(required=False, error_messages=ErrMessage.char(_("Completion problem")))
43+
padding_problem_text = serializers.CharField(required=False,
44+
label=_("Completion problem"))
4545
# 未查询到引用分段
46-
no_references_setting = NoReferencesSetting(required=True, error_messages=ErrMessage.base(_("No reference segment settings")))
46+
no_references_setting = NoReferencesSetting(required=True,
47+
label=_("No reference segment settings"))
4748

4849
def get_step_serializer(self, manage: PipelineManage) -> Type[serializers.Serializer]:
4950
return self.InstanceSerializer

apps/chat/chat_pipeline/step/generate_human_message_step/impl/base_generate_human_message_step.py renamed to apps/application/chat_pipeline/step/generate_human_message_step/impl/base_generate_human_message_step.py

File renamed without changes.

0 commit comments

Comments
 (0)