Skip to content

Commit 84cd71b

Browse files
fix: Fix null pointer exception (#5136)
1 parent 603f153 commit 84cd71b

7 files changed

Lines changed: 16 additions & 20 deletions

File tree

apps/application/flow/step_node/ai_chat_step_node/impl/base_chat_node.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ def handle_variables(self, tool_params):
365365
tool_params[k] = self.workflow_manage.generate_prompt(tool_params[k])
366366
elif type(v) == dict:
367367
self.handle_variables(v)
368-
elif (type(v) == list) and len(v) > 0 and type(v[0]) == str:
368+
elif (type(v) == list) and len(v) > 0 and (type(v[0]) == str):
369369
tool_params[k] = self.get_reference_content(v)
370370
return tool_params
371371

apps/application/flow/step_node/mcp_node/impl/base_mcp_node.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ def handle_variables(self, tool_params):
5151
for k, v in tool_params.items():
5252
if type(v) == str:
5353
tool_params[k] = self.workflow_manage.generate_prompt(tool_params[k])
54-
if type(v) == dict:
54+
elif type(v) == dict:
5555
self.handle_variables(v)
56-
if (type(v) == list) and (type(v[0]) == str):
56+
elif (type(v) == list) and len(v) > 0 and (type(v[0]) == str):
5757
tool_params[k] = self.get_reference_content(v)
5858
return tool_params
5959

apps/chat/serializers/chat_record.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ def vote(self, instance: Dict, with_valid=True):
7575
chat_record_details_model.vote_status = VoteChoices.STAR
7676
chat_record_details_model.vote_reason = vote_reason
7777
chat_record_details_model.vote_other_content = vote_other_content
78-
79-
if vote_status == VoteChoices.TRAMPLE:
78+
elif vote_status == VoteChoices.TRAMPLE:
8079
# 点踩
8180
chat_record_details_model.vote_status = VoteChoices.TRAMPLE
8281
chat_record_details_model.vote_reason = vote_reason

apps/common/auth/handle/impl/user_token.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,10 @@ def get_role_list(user,
258258
"""
259259
version = Cache_Version.ROLE_LIST.get_version()
260260
key = Cache_Version.ROLE_LIST.get_key(user_id=user.id)
261-
workspace_list = cache.get(key, version=version)
261+
role_list = cache.get(key, version=version)
262262
# 获取权限列表
263263
is_query_model = workspace_user_role_mapping_model is not None and workspace_model is not None and role_model is not None and role_permission_mapping_model is not None
264-
if workspace_list is None:
264+
if role_list is None:
265265
if is_query_model:
266266
# 获取工作空间 用户 角色映射数据
267267
workspace_user_role_mapping_list = QuerySet(workspace_user_role_mapping_model).filter(user_id=user.id)
@@ -274,16 +274,14 @@ def get_role_list(user,
274274
for
275275
workspace_user_role_mapping in
276276
workspace_user_role_mapping_list], [])))
277-
cache.set(key, workspace_list, version=version)
278-
return role_list
277+
cache.set(key, role_list, version=version)
279278
else:
280279
if user.role == RoleConstants.ADMIN.value.__str__():
281280
role_list = [user.role, get_role_permission(RoleConstants.WORKSPACE_MANAGE, 'default')]
282281
else:
283282
role_list = [user.role, get_role_permission(RoleConstants.USER, 'default')]
284283
cache.set(key, role_list, version=version)
285-
return role_list
286-
return workspace_list
284+
return role_list
287285

288286

289287
def get_auth(user):

apps/common/handle/base_parse_qa_handle.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def get_title_row_index_dict(title_row_list):
2222
title_row_index_dict = {}
2323
if len(title_row_list) == 1:
2424
title_row_index_dict['content'] = 0
25-
elif len(title_row_list) == 1:
25+
elif len(title_row_list) == 2:
2626
title_row_index_dict['title'] = 0
2727
title_row_index_dict['content'] = 1
2828
else:
@@ -33,11 +33,11 @@ def get_title_row_index_dict(title_row_list):
3333
title_row = title_row_list[index]
3434
if title_row is None:
3535
title_row = ''
36-
if title_row.startswith('分段标题'):
36+
elif title_row.startswith('分段标题'):
3737
title_row_index_dict['title'] = index
38-
if title_row.startswith('分段内容'):
38+
elif title_row.startswith('分段内容'):
3939
title_row_index_dict['content'] = index
40-
if title_row.startswith('问题'):
40+
elif title_row.startswith('问题'):
4141
title_row_index_dict['problem_list'] = index
4242
return title_row_index_dict
4343

apps/models_provider/impl/aliyun_bai_lian_model_provider/model/ttv.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,12 @@ def generate_video(self, prompt, negative_prompt=None, first_frame_url=None, las
108108
# --- 等待任务完成 ---
109109
rsp = self._safe_call(VideoSynthesis.wait, task=rsp, api_key=self.api_key)
110110
if rsp.status_code == HTTPStatus.OK:
111-
maxkb_logger.info("视频生成完成!视频 URL:", rsp.output.video_url)
112111
if rsp.output.task_status == "SUCCEEDED":
113-
maxkb_logger.info("视频生成完成!视频 URL:", rsp.output.video_url)
112+
maxkb_logger.info(f'视频生成完成!视频 URL: {rsp.output.video_url}')
114113
return rsp.output.video_url
115114
else:
116-
maxkb_logger.error("视频生成失败!")
117-
raise RuntimeError(f'生成失败, message: {rsp.output.message}')
115+
maxkb_logger.error(f'视频生成失败: {rsp.output.message}')
116+
raise RuntimeError(f'视频生成失败, message: {rsp.output.message}')
118117
else:
119118
maxkb_logger.error(f'生成失败,status_code: {rsp.status_code}, code: {rsp.code}, message: {rsp.message}')
120119
raise RuntimeError(f'生成失败,status_code: {rsp.status_code}, code: {rsp.code}, message: {rsp.message}')

ui/src/locales/lang/en-US/workflow.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ export default {
189189
result: 'Search Results',
190190
searchParam: 'Search Parameters',
191191
select_variable: 'Select Variable',
192-
valueMessage: `Value or name `,
192+
valueMessage: 'Value or name',
193193

194194
searchQuestion: {
195195
label: 'Search Question',

0 commit comments

Comments
 (0)