zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/maxkb-dev/maxkb

Browse Source
This commit is contained in:
liqiang-fit2cloud 2025-02-27 15:00:51 +08:00
commit b988d5abee
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/application/flow/step_node/image_generate_step_node/impl/base_image_generate_node.py
View File

@ -47,7 +47,7 @@ class BaseImageGenerateNode(IImageGenerateNode):
file_url = FileSerializer(data={'file': file, 'meta': meta}).upload() file_url = FileSerializer(data={'file': file, 'meta': meta}).upload()
file_urls.append(file_url) file_urls.append(file_url)
self.context['image_list'] = [{'file_id': path.split('/')[-1], 'url': path} for path in file_urls] self.context['image_list'] = [{'file_id': path.split('/')[-1], 'url': path} for path in file_urls]
answer = '\n'.join([f"![Image]({path})" for path in file_urls]) answer = ' '.join([f"![Image]({path})" for path in file_urls])
return NodeResult({'answer': answer, 'chat_model': tti_model, 'message_list': message_list, return NodeResult({'answer': answer, 'chat_model': tti_model, 'message_list': message_list,
'image': [{'file_id': path.split('/')[-1], 'url': path} for path in file_urls], 'image': [{'file_id': path.split('/')[-1], 'url': path} for path in file_urls],
'history_message': history_message, 'question': question}, {}) 'history_message': history_message, 'question': question}, {})

6
apps/application/flow/step_node/variable_assign_node/impl/base_variable_assign_node.py
View File

@ -30,11 +30,15 @@ class BaseVariableAssignNode(IVariableAssignNode):
val = json.loads(variable['value']) val = json.loads(variable['value'])
self.workflow_manage.context[variable['fields'][1]] = val self.workflow_manage.context[variable['fields'][1]] = val
result['output_value'] = variable['value'] = val result['output_value'] = variable['value'] = val
else: elif variable['type'] == 'string':
# 变量解析 例如：{{global.xxx}} # 变量解析 例如：{{global.xxx}}
val = self.workflow_manage.generate_prompt(variable['value']) val = self.workflow_manage.generate_prompt(variable['value'])
self.workflow_manage.context[variable['fields'][1]] = val self.workflow_manage.context[variable['fields'][1]] = val
result['output_value'] = val result['output_value'] = val
else:
val = variable['value']
self.workflow_manage.context[variable['fields'][1]] = val
result['output_value'] = val
else: else:
reference = self.get_reference_content(variable['reference']) reference = self.get_reference_content(variable['reference'])
self.workflow_manage.context[variable['fields'][1]] = reference self.workflow_manage.context[variable['fields'][1]] = reference

2
apps/application/flow/workflow_manage.py
View File

@ -382,6 +382,8 @@ class WorkflowManage:
break break
yield chunk yield chunk
finally: finally:
while self.is_run():
pass
details = self.get_runtime_details() details = self.get_runtime_details()
message_tokens = sum([row.get('message_tokens') for row in details.values() if message_tokens = sum([row.get('message_tokens') for row in details.values() if
'message_tokens' in row and row.get('message_tokens') is not None]) 'message_tokens' in row and row.get('message_tokens') is not None])

4
apps/common/middleware/gzip.py
View File

@ -44,10 +44,10 @@ class GZipMiddleware(MiddlewareMixin):
if response.is_async: if response.is_async:
# pull to lexical scope to capture fixed reference in case # pull to lexical scope to capture fixed reference in case
# streaming_content is set again later. # streaming_content is set again later.
orignal_iterator = response.streaming_content original_iterator = response.streaming_content
async def gzip_wrapper(): async def gzip_wrapper():
async for chunk in orignal_iterator: async for chunk in original_iterator:
yield compress_string( yield compress_string(
chunk, chunk,
max_random_bytes=self.max_random_bytes, max_random_bytes=self.max_random_bytes,