目录调整

.gitignore

@@ -6,8 +6,8 @@ __pycache__
 .vscode
 .DS_Store
 
-qwen_agent/llm/gpt.py
-qwen_agent/llm/tools.py
+agent/llm/gpt.py
+agent/llm/tools.py
 #workspace/*
 Qwen-Agent
 

{qwen_agent → agent}/actions/base.py

@@ -1,8 +1,8 @@
 from abc import ABC, abstractmethod
 from typing import Dict, Iterator, List, Optional, Union
 
-from qwen_agent.llm.base import BaseChatModel
-from qwen_agent.utils.utils import has_chinese_chars
+from agent.llm.base import BaseChatModel
+from agent.utils.utils import has_chinese_chars
 
 # TODO: Should *planning* just be another action that uses other actions?
 

{qwen_agent → agent}/actions/continue_writing.py

@@ -1,4 +1,4 @@
-from qwen_agent.actions.base import Action
+from agent.actions.base import Action
 
 PROMPT_TEMPLATE_ZH = """你是一个写作助手，请依据参考资料，根据给定的前置文本续写合适的内容。
 #参考资料：

{qwen_agent → agent}/actions/expand_writing.py

@@ -1,4 +1,4 @@
-from qwen_agent.actions.base import Action
+from agent.actions.base import Action
 
 PROMPT_TEMPLATE_ZH = """
 你是一个写作助手，任务是依据参考资料，完成写作任务。

{qwen_agent → agent}/actions/function_calling.py

@@ -1,8 +1,8 @@
 from typing import Dict, Iterator, List
 
-from qwen_agent.actions.base import Action
-from qwen_agent.actions.react import ReAct
-from qwen_agent.tools import call_plugin
+from agent.actions.base import Action
+from agent.actions.react import ReAct
+from agent.tools import call_plugin
 
 
 class FunctionCalling(Action):

{qwen_agent → agent}/actions/gen_keyword.py

@@ -1,4 +1,4 @@
-from qwen_agent.actions.base import Action
+from agent.actions.base import Action
 
 PROMPT_TEMPLATE_ZH = """请提取问题中的关键词，需要中英文均有，可以适量补充不在问题中但相关的关键词。关键词尽量切分为动词/名词/形容词等类型，不要长词组。关键词以JSON的格式给出，比如{{"keywords_zh": ["关键词1", "关键词2"], "keywords_en": ["keyword 1", "keyword 2"]}}
 

{qwen_agent → agent}/actions/outline_writing.py

@@ -1,4 +1,4 @@
-from qwen_agent.actions.base import Action
+from agent.actions.base import Action
 
 PROMPT_TEMPLATE_ZH = """
 你是一个写作助手，任务是充分理解参考资料，从而完成写作。

{qwen_agent → agent}/actions/react.py

@@ -1,8 +1,8 @@
 import json
 from typing import Dict, Iterator, List, Optional
 
-from qwen_agent.actions.base import Action
-from qwen_agent.tools import call_plugin
+from agent.actions.base import Action
+from agent.tools import call_plugin
 
 TOOL_DESC = """{name_for_model}: Call this tool to interact with the {name_for_human} API. What is the {name_for_human} API useful for? {description_for_model} Parameters: {parameters}"""
 

{qwen_agent → agent}/actions/retrieval_qa.py

@@ -1,4 +1,4 @@
-from qwen_agent.actions.base import Action
+from agent.actions.base import Action
 
 PROMPT_TEMPLATE_ZH = """请充分理解以下参考资料内容，组织出满足用户提问的条理清晰的回复。
 #参考资料：

{qwen_agent → agent}/actions/summarize.py

@@ -1,4 +1,4 @@
-from qwen_agent.actions.retrieval_qa import RetrievalQA
+from agent.actions.retrieval_qa import RetrievalQA
 
 
 class Summarize(RetrievalQA):

{qwen_agent → agent}/actions/write_from_scratch.py

@@ -2,10 +2,10 @@ import re
 
 import json5
 
-from qwen_agent.actions.base import Action
-from qwen_agent.actions.expand_writing import ExpandWriting
-from qwen_agent.actions.outline_writing import OutlineWriting
-from qwen_agent.actions.summarize import Summarize
+from agent.actions.base import Action
+from agent.actions.expand_writing import ExpandWriting
+from agent.actions.outline_writing import OutlineWriting
+from agent.actions.summarize import Summarize
 
 default_plan = """{"action1": "summarize", "action2": "outline", "action3": "expand"}"""
 

{qwen_agent → agent}/llm/base.py

@@ -1,8 +1,8 @@
 from abc import ABC, abstractmethod
 from typing import Dict, Iterator, List, Optional, Union
 
-from qwen_agent.log import logger
-from qwen_agent.utils.utils import print_traceback
+from agent.log import logger
+from agent.utils.utils import print_traceback
 
 
 class FnCallNotImplError(NotImplementedError):

{qwen_agent → agent}/llm/qwen_dashscope.py

@@ -4,7 +4,7 @@ from typing import Dict, Iterator, List, Optional
 
 import dashscope
 
-from qwen_agent.llm.base import BaseChatModel
+from agent.llm.base import BaseChatModel
 
 
 class QwenChatAtDS(BaseChatModel):

{qwen_agent → agent}/llm/qwen_oai.py

@@ -1,7 +1,7 @@
 import os
 from typing import Dict, Iterator, List, Optional
 import openai
-from qwen_agent.llm.base import BaseChatModel
+from agent.llm.base import BaseChatModel
 from typing import Dict, List, Literal, Optional, Union
 
 

{qwen_agent → agent}/llm/qwen_oai_bak.py

@@ -3,7 +3,7 @@ from typing import Dict, Iterator, List, Optional
 
 import openai
 
-from qwen_agent.llm.base import BaseChatModel
+from agent.llm.base import BaseChatModel
 
 import re
 import copy

{qwen_agent → agent}/memory/memory.py

@@ -1,9 +1,9 @@
 import copy
 from typing import Dict, List
 
-from qwen_agent.actions import GenKeyword
-from qwen_agent.memory.similarity_search import SimilaritySearch
-from qwen_agent.utils.tokenization_qwen import count_tokens
+from agent.actions import GenKeyword
+from agent.memory.similarity_search import SimilaritySearch
+from agent.utils.tokenization_qwen import count_tokens
 
 
 # TODO: Design the interface.

{qwen_agent → agent}/memory/similarity_search.py

@@ -1,5 +1,5 @@
-from qwen_agent.schema import RefMaterial
-from qwen_agent.utils.utils import get_keyword_by_llm, get_split_word
+from agent.schema import RefMaterial
+from agent.utils.utils import get_keyword_by_llm, get_split_word
 
 
 class SimilaritySearch:

{qwen_agent → agent}/tools/code_interpreter.py

@@ -22,8 +22,8 @@ from jupyter_client import BlockingKernelClient
 
 sys.path.insert(0, str(Path(__file__).absolute().parent.parent.parent))  # NOQA
 
-from qwen_agent.log import logger  # NOQA
-from qwen_agent.utils.utils import extract_code, print_traceback  # NOQA
+from agent.log import logger  # NOQA
+from agent.utils.utils import extract_code, print_traceback  # NOQA
 
 WORK_DIR = os.getenv('M6_CODE_INTERPRETER_WORK_DIR', '/tmp/m6_ci_workspace')
 

{qwen_agent → agent}/utils/doc_parser.py

@@ -1,6 +1,6 @@
 import re
 
-from qwen_agent.utils.tokenization_qwen import count_tokens
+from agent.utils.tokenization_qwen import count_tokens
 
 
 def rm_newlines(text):

{qwen_agent → agent}/utils/utils.py

@@ -9,7 +9,7 @@ import jieba
 import json5
 from jieba import analyse
 
-from qwen_agent.log import logger
+from agent.log import logger
 
 
 def get_local_ip():

assistant_server.py

@@ -3,9 +3,9 @@ import os
 from pathlib import Path
 import gradio as gr
 import jsonlines
-from qwen_agent.actions import RetrievalQA
-from qwen_agent.llm import QwenChatAsOAI
-from qwen_agent.memory import Memory
+from agent.actions import RetrievalQA
+from agent.llm import QwenChatAsOAI
+from agent.memory import Memory
 from utils import service, cache_file, max_ref_token
 
 llm = QwenChatAsOAI(model="gpt-3.5-turbo")

utils.py

@@ -4,9 +4,9 @@ import stat
 import sys
 from urllib.parse import unquote, urlparse
 import jsonlines
-from qwen_agent.log import logger
-from qwen_agent.utils.doc_parser import parse_doc, parse_html_bs
-from qwen_agent.utils.utils import print_traceback, save_text_to_file
+from agent.log import logger
+from agent.utils.doc_parser import parse_doc, parse_html_bs
+from agent.utils.utils import print_traceback, save_text_to_file
 from schema import Record
 from b2sdk.v2 import B2Api
 from b2sdk.v2 import InMemoryAccountInfo

workstation_server.py

@@ -5,14 +5,14 @@ import shutil
 from pathlib import Path
 import gradio as gr
 import jsonlines
-from qwen_agent.actions import (ContinueWriting, ReAct, RetrievalQA, WriteFromScratch)
-from qwen_agent.actions.function_calling import FunctionCalling
-from qwen_agent.llm import QwenChatAsOAI
-from qwen_agent.log import logger
-from qwen_agent.memory import Memory
-from qwen_agent.tools import call_plugin, list_of_all_functions
-from qwen_agent.utils.utils import (format_answer, get_last_one_line_context,
-                                    has_chinese_chars, save_text_to_file)
+from agent.actions import (ContinueWriting, ReAct, RetrievalQA, WriteFromScratch)
+from agent.actions.function_calling import FunctionCalling
+from agent.llm import QwenChatAsOAI
+from agent.log import logger
+from agent.memory import Memory
+from agent.tools import call_plugin, list_of_all_functions
+from agent.utils.utils import (format_answer, get_last_one_line_context,
+                               has_chinese_chars, save_text_to_file)
 from utils import service, extract_and_cache_document, code_interpreter_ws, cache_root, max_ref_token, max_days, download_root
 
 llm = QwenChatAsOAI(model="gpt-3.5-turbo")