diff --git a/apps/application/flow/compare/is_not_null_compare.py b/apps/application/flow/compare/is_not_null_compare.py index b2182646da2..92306bed0b8 100644 --- a/apps/application/flow/compare/is_not_null_compare.py +++ b/apps/application/flow/compare/is_not_null_compare.py @@ -18,4 +18,7 @@ def support(self, node_id, fields: List[str], source_value, compare, target_valu return True def compare(self, source_value, compare, target_value): - return source_value is not None and len(source_value) > 0 + try: + return source_value is not None and len(source_value) > 0 + except Exception: + return True diff --git a/apps/common/handle/impl/qa/csv_parse_qa_handle.py b/apps/common/handle/impl/qa/csv_parse_qa_handle.py index e264ea391e0..e0a7da601f7 100644 --- a/apps/common/handle/impl/qa/csv_parse_qa_handle.py +++ b/apps/common/handle/impl/qa/csv_parse_qa_handle.py @@ -18,7 +18,7 @@ def read_csv_standard(file_path): data = [] - with open(file_path, 'r') as file: + with open(file_path, 'r', encoding='utf-8') as file: reader = csv.reader(file) for row in reader: data.append(row) diff --git a/apps/local_model/serializers/model_apply_serializers.py b/apps/local_model/serializers/model_apply_serializers.py index 5ecb2260c9d..76c8792bbfa 100644 --- a/apps/local_model/serializers/model_apply_serializers.py +++ b/apps/local_model/serializers/model_apply_serializers.py @@ -91,9 +91,9 @@ def get_embedding_model(model_id): class EmbedDocuments(serializers.Serializer): - texts = serializers.ListField(required=True, child=serializers.CharField(required=True, - label=_('vector text')), - label=_('vector text list')), + texts = serializers.ListField(required=True, + child=serializers.CharField(required=True, label=_('vector text')), + label=_('vector text list')) class EmbedQuery(serializers.Serializer): diff --git a/apps/models_provider/impl/openai_model_provider/model/tti.py b/apps/models_provider/impl/openai_model_provider/model/tti.py index 6b04d86a7a1..ee3aff6ed18 100644 --- a/apps/models_provider/impl/openai_model_provider/model/tti.py +++ b/apps/models_provider/impl/openai_model_provider/model/tti.py @@ -61,4 +61,4 @@ def generate_image(self, prompt: str, negative_prompt: str = None): return file_urls except Exception as e: - raise f"OpenAI generate image error: {e}" + raise RuntimeError(f"OpenAI generate image error: {e}") from e diff --git a/apps/models_provider/impl/regolo_model_provider/model/tti.py b/apps/models_provider/impl/regolo_model_provider/model/tti.py index 712c91c9d16..e80d6e44316 100644 --- a/apps/models_provider/impl/regolo_model_provider/model/tti.py +++ b/apps/models_provider/impl/regolo_model_provider/model/tti.py @@ -58,4 +58,4 @@ def generate_image(self, prompt: str, negative_prompt: str = None): file_urls.append(url) return file_urls except Exception as e: - raise f"RegoloTextToImage generate_image error: {e}" + raise RuntimeError(f"RegoloTextToImage generate_image error: {e}") from e diff --git a/apps/models_provider/impl/tencent_model_provider/model/tti.py b/apps/models_provider/impl/tencent_model_provider/model/tti.py index c2bf6bd75fe..4e2c080d830 100644 --- a/apps/models_provider/impl/tencent_model_provider/model/tti.py +++ b/apps/models_provider/impl/tencent_model_provider/model/tti.py @@ -90,4 +90,4 @@ def generate_image(self, prompt: str, negative_prompt: str = None): return file_urls except TencentCloudSDKException as err: maxkb_logger.error(f"Tencent Text to Image API call failed: {err}") - raise f"Tencent Text to Image API call failed: {err}" + raise RuntimeError(f"Tencent Text to Image API call failed: {err}") from err diff --git a/apps/models_provider/serializers/model_apply_serializers.py b/apps/models_provider/serializers/model_apply_serializers.py index 8db59faf9b2..30c33147f1e 100644 --- a/apps/models_provider/serializers/model_apply_serializers.py +++ b/apps/models_provider/serializers/model_apply_serializers.py @@ -28,9 +28,9 @@ def get_embedding_model(model_id): class EmbedDocuments(serializers.Serializer): - texts = serializers.ListField(required=True, child=serializers.CharField(required=True, - label=_('vector text')), - label=_('vector text list')), + texts = serializers.ListField(required=True, + child=serializers.CharField(required=True, label=_('vector text')), + label=_('vector text list')) class EmbedQuery(serializers.Serializer): diff --git a/apps/oss/serializers/file.py b/apps/oss/serializers/file.py index 4e5b7b1f7b2..63ae28eedaa 100644 --- a/apps/oss/serializers/file.py +++ b/apps/oss/serializers/file.py @@ -219,9 +219,9 @@ def _is_unsafe_ip(self, ip: str) -> bool: def get_url_content(url, application_id: str): application = Application.objects.filter(id=application_id).first() if application is None: - return AppApiException(500, _('Application does not exist')) + raise AppApiException(500, _('Application does not exist')) if not application.file_upload_enable: - return AppApiException(500, _('File upload is not enabled')) + raise AppApiException(500, _('File upload is not enabled')) file_limit = 50 * 1024 * 1024 if application.file_upload_setting and application.file_upload_setting.get('fileLimit'): file_limit = application.file_upload_setting.get('fileLimit') * 1024 * 1024 diff --git a/ui/src/workflow/nodes/intent-classify-node/index.ts b/ui/src/workflow/nodes/intent-classify-node/index.ts index c39167e9294..b88106a917b 100644 --- a/ui/src/workflow/nodes/intent-classify-node/index.ts +++ b/ui/src/workflow/nodes/intent-classify-node/index.ts @@ -47,12 +47,11 @@ class IntentModel extends AppNodeModel { }) if (branch_condition_list) { - const FORM_ITEMS_HEIGHT = 397 // 上方表单占用高度 - + for (let index = 0; index < branch_condition_list.length; index++) { const element = branch_condition_list[index] - + anchors.push({ x: x + width / 2 - 10, y: showNode