From 1b7d531bf598aa231a3383221c1df634d7fa0665 Mon Sep 17 00:00:00 2001 From: jujimeizuo Date: Sun, 4 Feb 2024 18:06:29 +0800 Subject: [PATCH 1/2] chore: update app-readme --- app.py | 5 ----- run/xlab/README.md | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 app.py diff --git a/app.py b/app.py deleted file mode 100644 index c25b0e6..0000000 --- a/app.py +++ /dev/null @@ -1,5 +0,0 @@ -import os - -os.system( - "streamlit run ./run/tianji_wish.py --server.address=0.0.0.0 --server.port 7860" -) diff --git a/run/xlab/README.md b/run/xlab/README.md index c219acf..ea157ee 100644 --- a/run/xlab/README.md +++ b/run/xlab/README.md @@ -4,4 +4,4 @@ ## 祝福模块 -- 部署地址： +- 部署地址：https://openxlab.org.cn/apps/detail/jujimeizuo/tianji-wish From 9a07ed04d95f91db725eef0d3b02d21b525dc642 Mon Sep 17 00:00:00 2001 From: jujimeizuo Date: Sun, 4 Feb 2024 18:15:01 +0800 Subject: [PATCH 2/2] refactor: put agent_knowledge in agents --- run/xlab/README.md | 2 +- test/agents/metagpt/role_3_streamlit_prompt.py | 8 +++----- test/knowledges/test_get_docs_list_query.py | 8 ++++---- tianji/{ => agents}/knowledges/04-Wishes/knowledges.txt | 0 tianji/{ => agents}/knowledges/__init__.py | 0 tianji/{ => agents}/knowledges/config.py | 6 +++--- tianji/agents/metagpt_agents/ruyi/action.py | 6 +++--- 7 files changed, 14 insertions(+), 16 deletions(-) rename tianji/{ => agents}/knowledges/04-Wishes/knowledges.txt (100%) rename tianji/{ => agents}/knowledges/__init__.py (100%) rename tianji/{ => agents}/knowledges/config.py (87%) diff --git a/run/xlab/README.md b/run/xlab/README.md index ea157ee..bd97eab 100644 --- a/run/xlab/README.md +++ b/run/xlab/README.md @@ -4,4 +4,4 @@ ## 祝福模块 -- 部署地址：https://openxlab.org.cn/apps/detail/jujimeizuo/tianji-wish +- 祝福模块部署地址：https://openxlab.org.cn/apps/detail/jujimeizuo/tianji-wish diff --git a/test/agents/metagpt/role_3_streamlit_prompt.py b/test/agents/metagpt/role_3_streamlit_prompt.py index fa01fad..fe1317c 100644 --- a/test/agents/metagpt/role_3_streamlit_prompt.py +++ b/test/agents/metagpt/role_3_streamlit_prompt.py @@ -20,9 +20,7 @@ from tianji.agents.metagpt_agents.ruyi import RuYi from tianji.agents.metagpt_agents.qianbianzhe import QianBianZhe from tianji.agents.metagpt_agents.wendao import WenDao - -KNOWLEDGE_PATH = r"/Users/fengzetao/Workspace/Github/SocialAI/Tianji/tianji/knowledges/04-Wishes/knowledges.txt" -SAVE_PATH = r"/Users/fengzetao/Workspace/Github/SocialAI/Tianji/temp" +from tianji.agents.knowledges.config import AGENT_KNOWLEDGE_PATH, AGENT_EMBEDDING_PATH # 给出针对回答的知识 并用md展示 @@ -51,8 +49,8 @@ async def run(self, instruction: str): knowledge_key = json_from_data["festival"] + json_from_data["requirement"] knowledge = get_docs_list_query_zhipuai( query_str=knowledge_key, - loader_file_path=KNOWLEDGE_PATH, - persist_directory=SAVE_PATH, + loader_file_path=AGENT_KNOWLEDGE_PATH.WISHES.path(), + persist_directory=AGENT_EMBEDDING_PATH.WISHES.path(filename="zhipuai"), k_num=5, ) print("knowledge:\n", knowledge) diff --git a/test/knowledges/test_get_docs_list_query.py b/test/knowledges/test_get_docs_list_query.py index 83b4f47..fe07133 100644 --- a/test/knowledges/test_get_docs_list_query.py +++ b/test/knowledges/test_get_docs_list_query.py @@ -1,5 +1,5 @@ import tianji.utils.knowledge_tool as knowledgetool -from tianji.knowledges.config import KNOWLEDGE_PATH, EMBEDDING_PATH +from tianji.agents.knowledges.config import AGENT_KNOWLEDGE_PATH, AGENT_EMBEDDING_PATH from dotenv import load_dotenv load_dotenv() @@ -10,10 +10,10 @@ # doclist = knowledgetool.get_docs_list_query_openai(query_str="春节",loader_file_path=KNOWLEDGE_PATH, \ # persist_directory = SAVE_PATH,k_num=5) -doclist = knowledgetool.get_docs_list_query_openai( +doclist = knowledgetool.get_docs_list_query_zhipuai( query_str="春节", - loader_file_path=KNOWLEDGE_PATH.WISHES.path(), - persist_directory=EMBEDDING_PATH.WISHES.path(filename="openai"), + loader_file_path=AGENT_KNOWLEDGE_PATH.WISHES.path(), + persist_directory=AGENT_EMBEDDING_PATH.WISHES.path(filename="zhipuai"), k_num=5, ) diff --git a/tianji/knowledges/04-Wishes/knowledges.txt b/tianji/agents/knowledges/04-Wishes/knowledges.txt similarity index 100% rename from tianji/knowledges/04-Wishes/knowledges.txt rename to tianji/agents/knowledges/04-Wishes/knowledges.txt diff --git a/tianji/knowledges/__init__.py b/tianji/agents/knowledges/__init__.py similarity index 100% rename from tianji/knowledges/__init__.py rename to tianji/agents/knowledges/__init__.py diff --git a/tianji/knowledges/config.py b/tianji/agents/knowledges/config.py similarity index 87% rename from tianji/knowledges/config.py rename to tianji/agents/knowledges/config.py index c352067..e4643ea 100644 --- a/tianji/knowledges/config.py +++ b/tianji/agents/knowledges/config.py @@ -18,8 +18,8 @@ def get_all_knowledge_paths(knowledge_path: str = METAGPT_ROOT, suffix: str = ". """ -class KNOWLEDGE_PATH(str, Enum): - WISHES = TIANJI_PATH / "tianji/knowledges/04-Wishes" +class AGENT_KNOWLEDGE_PATH(str, Enum): + WISHES = TIANJI_PATH / "tianji/agents/knowledges/04-Wishes" def path(self): load_path = self.value @@ -28,7 +28,7 @@ def path(self): return os.path.join(load_path, "knowledges.txt") -class EMBEDDING_PATH(str, Enum): +class AGENT_EMBEDDING_PATH(str, Enum): WISHES = TIANJI_PATH / "temp/embedding/04-Wishes" def path(self, filename="other"): diff --git a/tianji/agents/metagpt_agents/ruyi/action.py b/tianji/agents/metagpt_agents/ruyi/action.py index a447b72..1d214ea 100644 --- a/tianji/agents/metagpt_agents/ruyi/action.py +++ b/tianji/agents/metagpt_agents/ruyi/action.py @@ -9,7 +9,7 @@ from tianji.utils.common_llm_api import LLMApi from tianji.utils.json_from import SharedDataSingleton -from tianji.knowledges.config import KNOWLEDGE_PATH, EMBEDDING_PATH +from tianji.agents.knowledges.config import AGENT_KNOWLEDGE_PATH, AGENT_EMBEDDING_PATH from tianji.utils.knowledge_tool import ( get_docs_list_query_openai, get_docs_list_query_zhipuai, @@ -42,8 +42,8 @@ async def run(self, instruction: str): knowledge_key = json_from_data["festival"] + json_from_data["requirement"] knowledge = get_docs_list_query_zhipuai( query_str=knowledge_key, - loader_file_path=KNOWLEDGE_PATH.WISHES.path(), - persist_directory=EMBEDDING_PATH.WISHES.path(filename="zhipuai"), + loader_file_path=AGENT_KNOWLEDGE_PATH.WISHES.path(), + persist_directory=AGENT_EMBEDDING_PATH.WISHES.path(filename="zhipuai"), k_num=5, ) print("knowledge:\n", knowledge)