zensol
/
llm_hub
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加了一些日志

This commit is contained in:
Tiger Ren 2024-10-21 00:01:35 +08:00
parent e381e88ee2
commit 1875f5aa31
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/api/v1/zhipu_controller.py
View File

@ -51,9 +51,10 @@ def retrive_stream():
message = data.get('message', '') message = data.get('message', '')
knowledge_id = data.get('knowledge_id', '') knowledge_id = data.get('knowledge_id', '')
prompt_template = data.get('prompt_template', '') prompt_template = data.get('prompt_template', '')
logger.info(f'/zhipu/retrive/stream: {message}')
classification_result_str = zhipu_alltool_service.func_call_classify(message) classification_result_str = zhipu_alltool_service.func_call_classify(message)
print(f'classification_result: {classification_result_str}') logger.info(f'classification_result: {classification_result_str}')
classification_result = json.loads(classification_result_str) classification_result = json.loads(classification_result_str)
if classification_result.get('category') == 'web_search': if classification_result.get('category') == 'web_search':

11
app/api/v2/zhipu_controller_v2.py
View File

@ -26,7 +26,7 @@ def format_chunk(chunk, follow_up, follow_up_after):
@zhipu_controller_v2.route('/zhipu/retrive/stream', methods=['POST']) @zhipu_controller_v2.route('/zhipu/retrive/stream', methods=['POST'])
def retrive_stream(): def retrive_stream():
print(f'zhihu_v2_retrive_stream') logger.info(f'/zhipu/retrive/stream v2: {message}')
data = request.json data = request.json
message = data.get('message', '') message = data.get('message', '')
knowledge_id = data.get('knowledge_id', '') knowledge_id = data.get('knowledge_id', '')
@ -37,6 +37,7 @@ def retrive_stream():
classification_result = json.loads(classification_result_str) classification_result = json.loads(classification_result_str)
if classification_result.get('category') == 'web_search': if classification_result.get('category') == 'web_search':
logger.info(f'question classify: web_search')
def event_stream_websearch_sse(): def event_stream_websearch_sse():
for chunk in zhipu_alltool_service.web_search_sse(message): for chunk in zhipu_alltool_service.web_search_sse(message):
if chunk: if chunk:
@ -110,6 +111,7 @@ def analysis_stream():
data = request.json data = request.json
message = data.get('message', '') message = data.get('message', '')
knowledge_id = data.get('knowledge_id', '') knowledge_id = data.get('knowledge_id', '')
logger.info(f'/zhipu/analysis/stream v2: {message}')
intent_categories =["analyze_sales","provide_sales_update_info"] intent_categories =["analyze_sales","provide_sales_update_info"]
@ -120,11 +122,13 @@ def analysis_stream():
additional_business_info = "" additional_business_info = ""
if classification_result.get('category') == 'analyze_sales': if classification_result.get('category') == 'analyze_sales':
logger.info(f'question classify: analyze_sales')
# do analyze sales as before # do analyze sales as before
pass pass
elif classification_result.get('category') == 'provide_sales_update_info': elif classification_result.get('category') == 'provide_sales_update_info':
logger.info(f'question classify: provide_sales_update_info')
contain_project_info = zhipu_alltool_service.func_call_yes_or_no(message, "是否包含项目信息") contain_project_info = zhipu_alltool_service.func_call_yes_or_no(message, "是否包含项目信息")
print(f'contain_project_info: {contain_project_info}') logger.info(f'contain_project_info: {contain_project_info}')
contain_project_info = json.loads(contain_project_info) contain_project_info = json.loads(contain_project_info)
if contain_project_info.get('answer') == 'yes': if contain_project_info.get('answer') == 'yes':
additional_business_info = message additional_business_info = message
@ -152,6 +156,7 @@ def analysis_stream():
""" """
if additional_business_info and additional_business_info != "": if additional_business_info and additional_business_info != "":
logger.info(f'append additional business info: {additional_business_info}')
prompt_analysis += f""" prompt_analysis += f"""
同时，请考虑以下额外的销售进展信息 同时，请考虑以下额外的销售进展信息
{additional_business_info} {additional_business_info}
@ -180,7 +185,7 @@ def analysis_stream():
yield json.dumps(chunk_out) + '\n' yield json.dumps(chunk_out) + '\n'
yield json.dumps(format_chunk("", "如有新的销售进展，请补充相关信息，我会为您做进一步分析", "")) + '\n' yield json.dumps(format_chunk("", "如有新的销售进展，请补充相关信息，我会为您做进一步分析", "")) + '\n'
print(f'accumulated_result: {accumulated_result}') logger.info(f'accumulated_result: {accumulated_result}')
return Response(event_stream(), mimetype='text/event-stream', headers=response_headers) return Response(event_stream(), mimetype='text/event-stream', headers=response_headers)