From 240450ea527ff810661fc87879f18ed11017494f Mon Sep 17 00:00:00 2001 From: lidp <43509927+guoyuhao2330@users.noreply.github.com> Date: Thu, 26 Sep 2024 17:27:53 +0800 Subject: [PATCH] Remove WenCai imageurl and update investment_advisor prompt (#2606) ### What problem does this PR solve? ### Type of change - [x] Refactoring --- agent/component/wencai.py | 6 ++++++ agent/templates/investment_advisor.json | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/agent/component/wencai.py b/agent/component/wencai.py index 019af713c..e518c54a2 100644 --- a/agent/component/wencai.py +++ b/agent/component/wencai.py @@ -64,6 +64,12 @@ class WenCai(ComponentBase, ABC): continue wencai_res.append({"content": pd.DataFrame.from_dict(item[1], orient='index').to_markdown()}) continue + if isinstance(item[1], pd.DataFrame): + if "image_url" in item[1].columns: + continue + wencai_res.append({"content": item[1].to_markdown()}) + continue + wencai_res.append({"content": item[0] + "\n" + str(item[1])}) except Exception as e: return WenCai.be_output("**ERROR**: " + str(e)) diff --git a/agent/templates/investment_advisor.json b/agent/templates/investment_advisor.json index cb98117fa..c919f3554 100644 --- a/agent/templates/investment_advisor.json +++ b/agent/templates/investment_advisor.json @@ -44,7 +44,7 @@ } ], "presence_penalty": 0.4, - "prompt": "Role: You are a professional financial counseling assistant.\n\nTasks\nStep 1: Organize and output the content provided by Man Finance in the form of a table based on the user's questions.\nStep 2: Organize and output the news information provided by AkShare, making sure that each news item has a corresponding URL link.\n\nNotice:\n- All data provided by WenCai needs to be collated and output, you cannot replace the output data with ellipses!\n- Output no more than 5 news items from AkShare.\n\nContent provided by Wencai: \n{wencai_input}\n\nContent provided by AkShare: \n{ak_input}", + "prompt": "Role: You are a professional financial counseling assistant.\n\nTask: Answer user's question based on content provided by Wencai and AkShare.\n\nNotice:\n- Output no more than 5 news items from AkShare if there's content provided by Wencai.\n- Items from AkShare MUST have a corresponding URL link.\n\n############\nContent provided by Wencai: \n{wencai_input}\n\n################\nContent provided by AkShare: \n{ak_input}", "temperature": 0.1, "top_p": 0.3 } @@ -369,7 +369,7 @@ ], "presencePenaltyEnabled": true, "presence_penalty": 0.4, - "prompt": "Role: You are a professional financial counseling assistant.\n\nTasks\nStep 1: Organize and output the content provided by Man Finance in the form of a table based on the user's questions.\nStep 2: Organize and output the news information provided by AkShare, making sure that each news item has a corresponding URL link.\n\nNotice:\n- All data provided by WenCai needs to be collated and output, you cannot replace the output data with ellipses!\n- Output no more than 5 news items from AkShare.\n\nContent provided by Wencai: \n{wencai_input}\n\nContent provided by AkShare: \n{ak_input}", + "prompt": "Role: You are a professional financial counseling assistant.\n\nTask: Answer user's question based on content provided by Wencai and AkShare.\n\nNotice:\n- Output no more than 5 news items from AkShare if there's content provided by Wencai.\n- Items from AkShare MUST have a corresponding URL link.\n\n############\nContent provided by Wencai: \n{wencai_input}\n\n################\nContent provided by AkShare: \n{ak_input}", "temperature": 0.1, "temperatureEnabled": true, "topPEnabled": true,