Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: put agent_knowledge in agents #30

Merged
merged 2 commits into from
Feb 5, 2024
Merged

refactor: put agent_knowledge in agents #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b7d531
chore: update app-readme
jujimeizuo Feb 4, 2024
9a07ed0
refactor: put agent_knowledge in agents
jujimeizuo Feb 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions app.py
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion run/xlab/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

## 祝福模块

- 部署地址：
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

可以加一句，祝福模块当前部署在 xxxxx的 openxlab中

- 祝福模块部署地址：https://openxlab.org.cn/apps/detail/jujimeizuo/tianji-wish
8 changes: 3 additions & 5 deletions test/agents/metagpt/role_3_streamlit_prompt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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展示
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions test/knowledges/test_get_docs_list_query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
Expand All @@ -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,
)

Expand Down
0 tianji/knowledges/04-Wishes/knowledges.txt → ...gents/knowledges/04-Wishes/knowledges.txt
View file
Open in desktop
File renamed without changes.
0 tianji/knowledges/__init__.py → tianji/agents/knowledges/__init__.py
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions tianji/knowledges/config.py → tianji/agents/knowledges/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"):
Expand Down
6 changes: 3 additions & 3 deletions tianji/agents/metagpt_agents/ruyi/action.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)
Expand Down