Skip to content

Commit 3f6ffef

Browse files
fix: Fix the issues of raise exception (#5130)
* fix: Fix the keyword for `raise exception` * 小调整 * 修正错误的缓存值。 * fix: Fix the issues for `raise exception` * 重命名变量 * 小调整。 * optimize style * fix * fix * revert * 小调整 * revert
1 parent 322132e commit 3f6ffef

9 files changed

Lines changed: 18 additions & 16 deletions

File tree

apps/application/flow/compare/is_not_null_compare.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,7 @@ def support(self, node_id, fields: List[str], source_value, compare, target_valu
1818
return True
1919

2020
def compare(self, source_value, compare, target_value):
21-
return source_value is not None and len(source_value) > 0
21+
try:
22+
return source_value is not None and len(source_value) > 0
23+
except Exception:
24+
return True

apps/common/handle/impl/qa/csv_parse_qa_handle.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
def read_csv_standard(file_path):
2020
data = []
21-
with open(file_path, 'r') as file:
21+
with open(file_path, 'r', encoding='utf-8') as file:
2222
reader = csv.reader(file)
2323
for row in reader:
2424
data.append(row)

apps/local_model/serializers/model_apply_serializers.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ def get_embedding_model(model_id):
9191

9292

9393
class EmbedDocuments(serializers.Serializer):
94-
texts = serializers.ListField(required=True, child=serializers.CharField(required=True,
95-
label=_('vector text')),
96-
label=_('vector text list')),
94+
texts = serializers.ListField(required=True,
95+
child=serializers.CharField(required=True, label=_('vector text')),
96+
label=_('vector text list'))
9797

9898

9999
class EmbedQuery(serializers.Serializer):

apps/models_provider/impl/openai_model_provider/model/tti.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,4 @@ def generate_image(self, prompt: str, negative_prompt: str = None):
6161

6262
return file_urls
6363
except Exception as e:
64-
raise f"OpenAI generate image error: {e}"
64+
raise RuntimeError(f"OpenAI generate image error: {e}") from e

apps/models_provider/impl/regolo_model_provider/model/tti.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ def generate_image(self, prompt: str, negative_prompt: str = None):
5858
file_urls.append(url)
5959
return file_urls
6060
except Exception as e:
61-
raise f"RegoloTextToImage generate_image error: {e}"
61+
raise RuntimeError(f"RegoloTextToImage generate_image error: {e}") from e

apps/models_provider/impl/tencent_model_provider/model/tti.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,4 @@ def generate_image(self, prompt: str, negative_prompt: str = None):
9090
return file_urls
9191
except TencentCloudSDKException as err:
9292
maxkb_logger.error(f"Tencent Text to Image API call failed: {err}")
93-
raise f"Tencent Text to Image API call failed: {err}"
93+
raise RuntimeError(f"Tencent Text to Image API call failed: {err}") from err

apps/models_provider/serializers/model_apply_serializers.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ def get_embedding_model(model_id):
2828

2929

3030
class EmbedDocuments(serializers.Serializer):
31-
texts = serializers.ListField(required=True, child=serializers.CharField(required=True,
32-
label=_('vector text')),
33-
label=_('vector text list')),
31+
texts = serializers.ListField(required=True,
32+
child=serializers.CharField(required=True, label=_('vector text')),
33+
label=_('vector text list'))
3434

3535

3636
class EmbedQuery(serializers.Serializer):

apps/oss/serializers/file.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,9 @@ def _is_unsafe_ip(self, ip: str) -> bool:
219219
def get_url_content(url, application_id: str):
220220
application = Application.objects.filter(id=application_id).first()
221221
if application is None:
222-
return AppApiException(500, _('Application does not exist'))
222+
raise AppApiException(500, _('Application does not exist'))
223223
if not application.file_upload_enable:
224-
return AppApiException(500, _('File upload is not enabled'))
224+
raise AppApiException(500, _('File upload is not enabled'))
225225
file_limit = 50 * 1024 * 1024
226226
if application.file_upload_setting and application.file_upload_setting.get('fileLimit'):
227227
file_limit = application.file_upload_setting.get('fileLimit') * 1024 * 1024

ui/src/workflow/nodes/intent-classify-node/index.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,11 @@ class IntentModel extends AppNodeModel {
4747
})
4848

4949
if (branch_condition_list) {
50-
5150
const FORM_ITEMS_HEIGHT = 397 // 上方表单占用高度
52-
51+
5352
for (let index = 0; index < branch_condition_list.length; index++) {
5453
const element = branch_condition_list[index]
55-
54+
5655
anchors.push({
5756
x: x + width / 2 - 10,
5857
y: showNode

0 commit comments

Comments
 (0)