diff --git a/apps/application/chat_pipeline/step/search_dataset_step/i_search_dataset_step.py b/apps/application/chat_pipeline/step/search_dataset_step/i_search_dataset_step.py index 373dc33d44b..ed2b9d7ffa1 100644 --- a/apps/application/chat_pipeline/step/search_dataset_step/i_search_dataset_step.py +++ b/apps/application/chat_pipeline/step/search_dataset_step/i_search_dataset_step.py @@ -41,7 +41,7 @@ class InstanceSerializer(serializers.Serializer): similarity = serializers.FloatField(required=True, max_value=1, min_value=0, label=_("Similarity")) search_mode = serializers.CharField(required=True, validators=[ - validators.RegexValidator(regex=re.compile("^embedding|keywords|blend$"), + validators.RegexValidator(regex=re.compile("^(embedding|keywords|blend)$"), message=_("The type only supports embedding|keywords|blend"), code=500) ], label=_("Retrieval Mode")) workspace_id = serializers.CharField(required=True, label=_("Workspace ID")) diff --git a/apps/application/flow/step_node/search_knowledge_node/i_search_knowledge_node.py b/apps/application/flow/step_node/search_knowledge_node/i_search_knowledge_node.py index 0cf23cb5e5d..46e3763fda6 100644 --- a/apps/application/flow/step_node/search_knowledge_node/i_search_knowledge_node.py +++ b/apps/application/flow/step_node/search_knowledge_node/i_search_knowledge_node.py @@ -26,7 +26,7 @@ class DatasetSettingSerializer(serializers.Serializer): similarity = serializers.FloatField(required=True, max_value=2, min_value=0, label=_('similarity')) search_mode = serializers.CharField(required=True, validators=[ - validators.RegexValidator(regex=re.compile("^embedding|keywords|blend$"), + validators.RegexValidator(regex=re.compile("^(embedding|keywords|blend)$"), message=_("The type only supports embedding|keywords|blend"), code=500) ], label=_("Retrieval Mode")) max_paragraph_char_number = serializers.IntegerField(required=True, diff --git a/apps/application/flow/step_node/tool_node/i_tool_node.py b/apps/application/flow/step_node/tool_node/i_tool_node.py index 4f8343a67db..5ffa52084fe 100644 --- a/apps/application/flow/step_node/tool_node/i_tool_node.py +++ b/apps/application/flow/step_node/tool_node/i_tool_node.py @@ -24,11 +24,11 @@ class InputField(serializers.Serializer): name = serializers.CharField(required=True, label=_('Variable Name')) is_required = serializers.BooleanField(required=True, label=_("Is this field required")) type = serializers.CharField(required=True, label=_("type"), validators=[ - validators.RegexValidator(regex=re.compile("^string|int|dict|array|float|boolean$"), + validators.RegexValidator(regex=re.compile("^(string|int|dict|array|float|boolean)$"), message=_("The field only supports string|int|dict|array|float"), code=500) ]) source = serializers.CharField(required=True, label=_("source"), validators=[ - validators.RegexValidator(regex=re.compile("^custom|reference$"), + validators.RegexValidator(regex=re.compile("^(custom|reference)$"), message=_("The field only supports custom|reference"), code=500) ]) value = ObjectField(required=True, label=_("Variable Value"), model_type_list=[str, list]) diff --git a/apps/application/serializers/application.py b/apps/application/serializers/application.py index 1388333401f..1da8cd0ea59 100644 --- a/apps/application/serializers/application.py +++ b/apps/application/serializers/application.py @@ -478,7 +478,7 @@ class KnowledgeSettingSerializer(serializers.Serializer): required=True, validators=[ validators.RegexValidator( - regex=re.compile("^embedding|keywords|blend$"), + regex=re.compile("^(embedding|keywords|blend)$"), message=_("The type only supports embedding|keywords|blend"), code=500, ) @@ -641,7 +641,7 @@ class SimplateRequest(serializers.Serializer): label=_("Application Type"), validators=[ validators.RegexValidator( - regex=re.compile("^SIMPLE|WORK_FLOW$"), + regex=re.compile("^(SIMPLE|WORK_FLOW)$"), message=_("Application type only supports SIMPLE|WORK_FLOW"), code=500, ) diff --git a/apps/application/serializers/application_chat.py b/apps/application/serializers/application_chat.py index e9c087feede..b5fb753a352 100644 --- a/apps/application/serializers/application_chat.py +++ b/apps/application/serializers/application_chat.py @@ -61,7 +61,7 @@ class ApplicationChatQuerySerializers(serializers.Serializer): min_trample = serializers.IntegerField(required=False, min_value=0, label=_("Minimum number of clicks")) comparer = serializers.CharField(required=False, label=_("Comparator"), validators=[ - validators.RegexValidator(regex=re.compile("^and|or$"), + validators.RegexValidator(regex=re.compile("^(and|or)$"), message=_("Only supports and|or"), code=500) ]) diff --git a/apps/knowledge/serializers/document.py b/apps/knowledge/serializers/document.py index d869e6b208a..88a6e445922 100644 --- a/apps/knowledge/serializers/document.py +++ b/apps/knowledge/serializers/document.py @@ -163,7 +163,7 @@ class DocumentEditInstanceSerializer(serializers.Serializer): required=False, validators=[ validators.RegexValidator( - regex=re.compile("^optimization|directly_return$"), + regex=re.compile("^(optimization|directly_return)$"), message=_("The type only supports optimization|directly_return"), code=500, ) @@ -266,7 +266,7 @@ class Export(serializers.Serializer): required=True, validators=[ validators.RegexValidator( - regex=re.compile("^csv|excel$"), message=_("The template type only supports excel|csv"), code=500 + regex=re.compile("^(csv|excel)$"), message=_("The template type only supports excel|csv"), code=500 ) ], label=_("type"), diff --git a/apps/knowledge/serializers/knowledge.py b/apps/knowledge/serializers/knowledge.py index c204db41d70..05a695e8ffb 100644 --- a/apps/knowledge/serializers/knowledge.py +++ b/apps/knowledge/serializers/knowledge.py @@ -161,7 +161,7 @@ class HitTestSerializer(serializers.Serializer): label=_("search mode"), validators=[ validators.RegexValidator( - regex=re.compile("^embedding|keywords|blend$"), + regex=re.compile("^(embedding|keywords|blend)$"), message=_("The type only supports embedding|keywords|blend"), code=500, ) @@ -1257,7 +1257,7 @@ class SyncWeb(serializers.Serializer): label=_("sync type"), validators=[ validators.RegexValidator( - regex=re.compile("^replace|complete$"), + regex=re.compile("^(replace|complete)$"), message=_("The synchronization type only supports:replace|complete"), code=500, ) @@ -1364,7 +1364,7 @@ class HitTest(serializers.Serializer): label=_("search mode"), validators=[ validators.RegexValidator( - regex=re.compile("^embedding|keywords|blend$"), + regex=re.compile("^(embedding|keywords|blend)$"), message=_("The type only supports embedding|keywords|blend"), code=500, ) diff --git a/apps/system_manage/serializers/valid_serializers.py b/apps/system_manage/serializers/valid_serializers.py index 1b518f9adde..111a6522d6a 100644 --- a/apps/system_manage/serializers/valid_serializers.py +++ b/apps/system_manage/serializers/valid_serializers.py @@ -35,7 +35,7 @@ class ValidSerializer(serializers.Serializer): valid_type = serializers.CharField(required=True, label=_('type'), validators=[ - validators.RegexValidator(regex=re.compile("^application|knowledge|user$"), + validators.RegexValidator(regex=re.compile("^(application|knowledge|user)$"), message="类型只支持:application|knowledge|user", code=500) ]) valid_count = serializers.IntegerField(required=True, label=_('check quantity')) diff --git a/apps/trigger/serializers/trigger.py b/apps/trigger/serializers/trigger.py index 4fea97d732c..86789875e5d 100644 --- a/apps/trigger/serializers/trigger.py +++ b/apps/trigger/serializers/trigger.py @@ -46,7 +46,7 @@ def is_valid(self, *, model=None, raise_exception=False): class InputField(serializers.Serializer): source = serializers.CharField(required=True, label=_("source"), validators=[ - validators.RegexValidator(regex=re.compile("^custom|reference$"), + validators.RegexValidator(regex=re.compile("^(custom|reference)$"), message=_("The field only supports custom|reference"), code=500) ]) value = ObjectField(required=True, label=_("Variable Value"), model_type_list=[str, list]) diff --git a/apps/users/serializers/user.py b/apps/users/serializers/user.py index 71955f1e7ee..18cec669cc9 100644 --- a/apps/users/serializers/user.py +++ b/apps/users/serializers/user.py @@ -1145,7 +1145,7 @@ class SendEmailSerializer(serializers.Serializer): code=ExceptionCodeConstants.EMAIL_FORMAT_ERROR.value.code)]) type = serializers.CharField(required=True, label=_("Type"), validators=[ - validators.RegexValidator(regex=re.compile("^register|reset_password$"), + validators.RegexValidator(regex=re.compile("^(register|reset_password)$"), message=_("The type only supports register|reset_password"), code=500) ]) @@ -1231,7 +1231,7 @@ class CheckCodeSerializer(serializers.Serializer): type = serializers.CharField(required=True, label=_("Type"), validators=[ - validators.RegexValidator(regex=re.compile("^register|reset_password$"), + validators.RegexValidator(regex=re.compile("^(register|reset_password)$"), message=_( "The type only supports register|reset_password"), code=500)