diff --git a/agent/tools/memory/memory_get.py b/agent/tools/memory/memory_get.py index d828386..50ca639 100644 --- a/agent/tools/memory/memory_get.py +++ b/agent/tools/memory/memory_get.py @@ -22,7 +22,7 @@ class MemoryGetTool(BaseTool): "properties": { "path": { "type": "string", - "description": "Relative path to the memory file (e.g., 'MEMORY.md', 'memory/2024-01-29.md')" + "description": "Relative path to the memory file (e.g., 'MEMORY.md', 'memory/2026-01-01.md')" }, "start_line": { "type": "integer", diff --git a/bridge/agent_bridge.py b/bridge/agent_bridge.py index 34535bb..9054a64 100644 --- a/bridge/agent_bridge.py +++ b/bridge/agent_bridge.py @@ -5,7 +5,7 @@ Agent Bridge - Integrates Agent system with existing COW bridge from typing import Optional, List from agent.protocol import Agent, LLMModel, LLMRequest -from bot.openai_compatible_bot import OpenAICompatibleBot +from models.openai_compatible_bot import OpenAICompatibleBot from bridge.bridge import Bridge from bridge.context import Context from bridge.reply import Reply, ReplyType diff --git a/bridge/bridge.py b/bridge/bridge.py index a7b93c4..4c686f9 100644 --- a/bridge/bridge.py +++ b/bridge/bridge.py @@ -1,4 +1,4 @@ -from bot.bot_factory import create_bot +from models.bot_factory import create_bot from bridge.context import Context from bridge.reply import Reply from common import const diff --git a/bot/ali/ali_qwen_bot.py b/models/ali/ali_qwen_bot.py similarity index 98% rename from bot/ali/ali_qwen_bot.py rename to models/ali/ali_qwen_bot.py index ae9d767..5dbdc89 100644 --- a/bot/ali/ali_qwen_bot.py +++ b/models/ali/ali_qwen_bot.py @@ -9,9 +9,9 @@ import openai.error import broadscope_bailian from broadscope_bailian import ChatQaMessage -from bot.bot import Bot -from bot.ali.ali_qwen_session import AliQwenSession -from bot.session_manager import SessionManager +from models.bot import Bot +from models.ali.ali_qwen_session import AliQwenSession +from models.session_manager import SessionManager from bridge.context import ContextType from bridge.reply import Reply, ReplyType from common.log import logger diff --git a/bot/ali/ali_qwen_session.py b/models/ali/ali_qwen_session.py similarity index 98% rename from bot/ali/ali_qwen_session.py rename to models/ali/ali_qwen_session.py index 0eb1c4a..48c5eea 100644 --- a/bot/ali/ali_qwen_session.py +++ b/models/ali/ali_qwen_session.py @@ -1,4 +1,4 @@ -from bot.session_manager import Session +from models.session_manager import Session from common.log import logger """ diff --git a/bot/baidu/baidu_unit_bot.py b/models/baidu/baidu_unit_bot.py similarity index 98% rename from bot/baidu/baidu_unit_bot.py rename to models/baidu/baidu_unit_bot.py index f7714e4..35319e2 100644 --- a/bot/baidu/baidu_unit_bot.py +++ b/models/baidu/baidu_unit_bot.py @@ -2,7 +2,7 @@ import requests -from bot.bot import Bot +from models.bot import Bot from bridge.reply import Reply, ReplyType diff --git a/bot/baidu/baidu_wenxin.py b/models/baidu/baidu_wenxin.py similarity index 97% rename from bot/baidu/baidu_wenxin.py rename to models/baidu/baidu_wenxin.py index dd660af..341f482 100644 --- a/bot/baidu/baidu_wenxin.py +++ b/models/baidu/baidu_wenxin.py @@ -3,13 +3,13 @@ import requests import json from common import const -from bot.bot import Bot -from bot.session_manager import SessionManager +from models.bot import Bot +from models.session_manager import SessionManager from bridge.context import ContextType from bridge.reply import Reply, ReplyType from common.log import logger from config import conf -from bot.baidu.baidu_wenxin_session import BaiduWenxinSession +from models.baidu.baidu_wenxin_session import BaiduWenxinSession BAIDU_API_KEY = conf().get("baidu_wenxin_api_key") BAIDU_SECRET_KEY = conf().get("baidu_wenxin_secret_key") diff --git a/bot/baidu/baidu_wenxin_session.py b/models/baidu/baidu_wenxin_session.py similarity index 97% rename from bot/baidu/baidu_wenxin_session.py rename to models/baidu/baidu_wenxin_session.py index 5ba2f17..52b5c93 100644 --- a/bot/baidu/baidu_wenxin_session.py +++ b/models/baidu/baidu_wenxin_session.py @@ -1,4 +1,4 @@ -from bot.session_manager import Session +from models.session_manager import Session from common.log import logger """ diff --git a/bot/bot.py b/models/bot.py similarity index 100% rename from bot/bot.py rename to models/bot.py diff --git a/bot/bot_factory.py b/models/bot_factory.py similarity index 60% rename from bot/bot_factory.py rename to models/bot_factory.py index 05cf0ea..2fb56dd 100644 --- a/bot/bot_factory.py +++ b/models/bot_factory.py @@ -12,64 +12,64 @@ def create_bot(bot_type): """ if bot_type == const.BAIDU: # 替换Baidu Unit为Baidu文心千帆对话接口 - # from bot.baidu.baidu_unit_bot import BaiduUnitBot + # from models.baidu.baidu_unit_bot import BaiduUnitBot # return BaiduUnitBot() - from bot.baidu.baidu_wenxin import BaiduWenxinBot + from models.baidu.baidu_wenxin import BaiduWenxinBot return BaiduWenxinBot() elif bot_type == const.CHATGPT: # ChatGPT 网页端web接口 - from bot.chatgpt.chat_gpt_bot import ChatGPTBot + from models.chatgpt.chat_gpt_bot import ChatGPTBot return ChatGPTBot() elif bot_type == const.OPEN_AI: # OpenAI 官方对话模型API - from bot.openai.open_ai_bot import OpenAIBot + from models.openai.open_ai_bot import OpenAIBot return OpenAIBot() elif bot_type == const.CHATGPTONAZURE: # Azure chatgpt service https://azure.microsoft.com/en-in/products/cognitive-services/openai-service/ - from bot.chatgpt.chat_gpt_bot import AzureChatGPTBot + from models.chatgpt.chat_gpt_bot import AzureChatGPTBot return AzureChatGPTBot() elif bot_type == const.XUNFEI: - from bot.xunfei.xunfei_spark_bot import XunFeiBot + from models.xunfei.xunfei_spark_bot import XunFeiBot return XunFeiBot() elif bot_type == const.LINKAI: - from bot.linkai.link_ai_bot import LinkAIBot + from models.linkai.link_ai_bot import LinkAIBot return LinkAIBot() elif bot_type == const.CLAUDEAI: - from bot.claude.claude_ai_bot import ClaudeAIBot + from models.claude.claude_ai_bot import ClaudeAIBot return ClaudeAIBot() elif bot_type == const.CLAUDEAPI: - from bot.claudeapi.claude_api_bot import ClaudeAPIBot + from models.claudeapi.claude_api_bot import ClaudeAPIBot return ClaudeAPIBot() elif bot_type == const.QWEN: - from bot.ali.ali_qwen_bot import AliQwenBot + from models.ali.ali_qwen_bot import AliQwenBot return AliQwenBot() elif bot_type == const.QWEN_DASHSCOPE: - from bot.dashscope.dashscope_bot import DashscopeBot + from models.dashscope.dashscope_bot import DashscopeBot return DashscopeBot() elif bot_type == const.GEMINI: - from bot.gemini.google_gemini_bot import GoogleGeminiBot + from models.gemini.google_gemini_bot import GoogleGeminiBot return GoogleGeminiBot() elif bot_type == const.ZHIPU_AI: - from bot.zhipuai.zhipuai_bot import ZHIPUAIBot + from models.zhipuai.zhipuai_bot import ZHIPUAIBot return ZHIPUAIBot() elif bot_type == const.MOONSHOT: - from bot.moonshot.moonshot_bot import MoonshotBot + from models.moonshot.moonshot_bot import MoonshotBot return MoonshotBot() elif bot_type == const.MiniMax: - from bot.minimax.minimax_bot import MinimaxBot + from models.minimax.minimax_bot import MinimaxBot return MinimaxBot() elif bot_type == const.MODELSCOPE: - from bot.modelscope.modelscope_bot import ModelScopeBot + from models.modelscope.modelscope_bot import ModelScopeBot return ModelScopeBot() diff --git a/bot/chatgpt/chat_gpt_bot.py b/models/chatgpt/chat_gpt_bot.py similarity index 97% rename from bot/chatgpt/chat_gpt_bot.py rename to models/chatgpt/chat_gpt_bot.py index cfe3246..5907667 100644 --- a/bot/chatgpt/chat_gpt_bot.py +++ b/models/chatgpt/chat_gpt_bot.py @@ -7,17 +7,17 @@ import openai import openai.error import requests from common import const -from bot.bot import Bot -from bot.openai_compatible_bot import OpenAICompatibleBot -from bot.chatgpt.chat_gpt_session import ChatGPTSession -from bot.openai.open_ai_image import OpenAIImage -from bot.session_manager import SessionManager +from models.bot import Bot +from models.openai_compatible_bot import OpenAICompatibleBot +from models.chatgpt.chat_gpt_session import ChatGPTSession +from models.openai.open_ai_image import OpenAIImage +from models.session_manager import SessionManager from bridge.context import ContextType from bridge.reply import Reply, ReplyType from common.log import logger from common.token_bucket import TokenBucket from config import conf, load_config -from bot.baidu.baidu_wenxin_session import BaiduWenxinSession +from models.baidu.baidu_wenxin_session import BaiduWenxinSession # OpenAI对话模型API (可用) class ChatGPTBot(Bot, OpenAIImage, OpenAICompatibleBot): diff --git a/bot/chatgpt/chat_gpt_session.py b/models/chatgpt/chat_gpt_session.py similarity index 99% rename from bot/chatgpt/chat_gpt_session.py rename to models/chatgpt/chat_gpt_session.py index 5f524a3..d25b093 100644 --- a/bot/chatgpt/chat_gpt_session.py +++ b/models/chatgpt/chat_gpt_session.py @@ -1,4 +1,4 @@ -from bot.session_manager import Session +from models.session_manager import Session from common.log import logger from common import const diff --git a/bot/claudeapi/claude_api_bot.py b/models/claudeapi/claude_api_bot.py similarity index 98% rename from bot/claudeapi/claude_api_bot.py rename to models/claudeapi/claude_api_bot.py index 804ae4c..eaf08ae 100644 --- a/bot/claudeapi/claude_api_bot.py +++ b/models/claudeapi/claude_api_bot.py @@ -5,9 +5,9 @@ import time import requests -from bot.baidu.baidu_wenxin_session import BaiduWenxinSession -from bot.bot import Bot -from bot.session_manager import SessionManager +from models.baidu.baidu_wenxin_session import BaiduWenxinSession +from models.bot import Bot +from models.session_manager import SessionManager from bridge.context import ContextType from bridge.reply import Reply, ReplyType from common import const @@ -16,7 +16,7 @@ from config import conf # Optional OpenAI image support try: - from bot.openai.open_ai_image import OpenAIImage + from models.openai.open_ai_image import OpenAIImage _openai_image_available = True except Exception as e: logger.warning(f"OpenAI image support not available: {e}") diff --git a/bot/dashscope/dashscope_bot.py b/models/dashscope/dashscope_bot.py similarity index 98% rename from bot/dashscope/dashscope_bot.py rename to models/dashscope/dashscope_bot.py index 07554c4..75f4ea0 100644 --- a/bot/dashscope/dashscope_bot.py +++ b/models/dashscope/dashscope_bot.py @@ -1,7 +1,7 @@ # encoding:utf-8 -from bot.bot import Bot -from bot.session_manager import SessionManager +from models.bot import Bot +from models.session_manager import SessionManager from bridge.context import ContextType from bridge.reply import Reply, ReplyType from common.log import logger diff --git a/bot/dashscope/dashscope_session.py b/models/dashscope/dashscope_session.py similarity index 97% rename from bot/dashscope/dashscope_session.py rename to models/dashscope/dashscope_session.py index 0de57b9..042334e 100644 --- a/bot/dashscope/dashscope_session.py +++ b/models/dashscope/dashscope_session.py @@ -1,4 +1,4 @@ -from bot.session_manager import Session +from models.session_manager import Session from common.log import logger diff --git a/bot/gemini/google_gemini_bot.py b/models/gemini/google_gemini_bot.py similarity index 99% rename from bot/gemini/google_gemini_bot.py rename to models/gemini/google_gemini_bot.py index 422ec2e..cf46ef8 100644 --- a/bot/gemini/google_gemini_bot.py +++ b/models/gemini/google_gemini_bot.py @@ -9,15 +9,15 @@ Google gemini bot import json import time import requests -from bot.bot import Bot +from models.bot import Bot import google.generativeai as genai -from bot.session_manager import SessionManager +from models.session_manager import SessionManager from bridge.context import ContextType, Context from bridge.reply import Reply, ReplyType from common.log import logger from config import conf -from bot.chatgpt.chat_gpt_session import ChatGPTSession -from bot.baidu.baidu_wenxin_session import BaiduWenxinSession +from models.chatgpt.chat_gpt_session import ChatGPTSession +from models.baidu.baidu_wenxin_session import BaiduWenxinSession from google.generativeai.types import HarmCategory, HarmBlockThreshold diff --git a/bot/linkai/link_ai_bot.py b/models/linkai/link_ai_bot.py similarity index 99% rename from bot/linkai/link_ai_bot.py rename to models/linkai/link_ai_bot.py index 9410062..28be2d1 100644 --- a/bot/linkai/link_ai_bot.py +++ b/models/linkai/link_ai_bot.py @@ -6,10 +6,10 @@ import time import requests import json import config -from bot.bot import Bot -from bot.openai_compatible_bot import OpenAICompatibleBot -from bot.chatgpt.chat_gpt_session import ChatGPTSession -from bot.session_manager import SessionManager +from models.bot import Bot +from models.openai_compatible_bot import OpenAICompatibleBot +from models.chatgpt.chat_gpt_session import ChatGPTSession +from models.session_manager import SessionManager from bridge.context import Context, ContextType from bridge.reply import Reply, ReplyType from common.log import logger diff --git a/bot/minimax/minimax_bot.py b/models/minimax/minimax_bot.py similarity index 97% rename from bot/minimax/minimax_bot.py rename to models/minimax/minimax_bot.py index 40112d8..53265fb 100644 --- a/bot/minimax/minimax_bot.py +++ b/models/minimax/minimax_bot.py @@ -4,14 +4,14 @@ import time import openai import openai.error -from bot.bot import Bot -from bot.minimax.minimax_session import MinimaxSession -from bot.session_manager import SessionManager +from models.bot import Bot +from models.minimax.minimax_session import MinimaxSession +from models.session_manager import SessionManager from bridge.context import Context, ContextType from bridge.reply import Reply, ReplyType from common.log import logger from config import conf, load_config -from bot.chatgpt.chat_gpt_session import ChatGPTSession +from models.chatgpt.chat_gpt_session import ChatGPTSession import requests from common import const diff --git a/bot/minimax/minimax_session.py b/models/minimax/minimax_session.py similarity index 98% rename from bot/minimax/minimax_session.py rename to models/minimax/minimax_session.py index 1925b4b..7479170 100644 --- a/bot/minimax/minimax_session.py +++ b/models/minimax/minimax_session.py @@ -1,4 +1,4 @@ -from bot.session_manager import Session +from models.session_manager import Session from common.log import logger """ diff --git a/bot/modelscope/modelscope_bot.py b/models/modelscope/modelscope_bot.py similarity index 99% rename from bot/modelscope/modelscope_bot.py rename to models/modelscope/modelscope_bot.py index 238ac59..80e86cb 100644 --- a/bot/modelscope/modelscope_bot.py +++ b/models/modelscope/modelscope_bot.py @@ -4,8 +4,8 @@ import time import json import openai import openai.error -from bot.bot import Bot -from bot.session_manager import SessionManager +from models.bot import Bot +from models.session_manager import SessionManager from bridge.context import ContextType from bridge.reply import Reply, ReplyType from common.log import logger diff --git a/bot/modelscope/modelscope_session.py b/models/modelscope/modelscope_session.py similarity index 97% rename from bot/modelscope/modelscope_session.py rename to models/modelscope/modelscope_session.py index 726d683..fc349ed 100644 --- a/bot/modelscope/modelscope_session.py +++ b/models/modelscope/modelscope_session.py @@ -1,4 +1,4 @@ -from bot.session_manager import Session +from models.session_manager import Session from common.log import logger diff --git a/bot/moonshot/moonshot_bot.py b/models/moonshot/moonshot_bot.py similarity index 98% rename from bot/moonshot/moonshot_bot.py rename to models/moonshot/moonshot_bot.py index 61eb26d..8da05b7 100644 --- a/bot/moonshot/moonshot_bot.py +++ b/models/moonshot/moonshot_bot.py @@ -4,8 +4,8 @@ import time import openai import openai.error -from bot.bot import Bot -from bot.session_manager import SessionManager +from models.bot import Bot +from models.session_manager import SessionManager from bridge.context import ContextType from bridge.reply import Reply, ReplyType from common.log import logger diff --git a/bot/moonshot/moonshot_session.py b/models/moonshot/moonshot_session.py similarity index 97% rename from bot/moonshot/moonshot_session.py rename to models/moonshot/moonshot_session.py index 63e08f5..a5a1842 100644 --- a/bot/moonshot/moonshot_session.py +++ b/models/moonshot/moonshot_session.py @@ -1,4 +1,4 @@ -from bot.session_manager import Session +from models.session_manager import Session from common.log import logger diff --git a/bot/openai/open_ai_bot.py b/models/openai/open_ai_bot.py similarity index 97% rename from bot/openai/open_ai_bot.py rename to models/openai/open_ai_bot.py index e5501d0..5c8911e 100644 --- a/bot/openai/open_ai_bot.py +++ b/models/openai/open_ai_bot.py @@ -5,11 +5,11 @@ import time import openai import openai.error -from bot.bot import Bot -from bot.openai_compatible_bot import OpenAICompatibleBot -from bot.openai.open_ai_image import OpenAIImage -from bot.openai.open_ai_session import OpenAISession -from bot.session_manager import SessionManager +from models.bot import Bot +from models.openai_compatible_bot import OpenAICompatibleBot +from models.openai.open_ai_image import OpenAIImage +from models.openai.open_ai_session import OpenAISession +from models.session_manager import SessionManager from bridge.context import ContextType from bridge.reply import Reply, ReplyType from common.log import logger diff --git a/bot/openai/open_ai_image.py b/models/openai/open_ai_image.py similarity index 96% rename from bot/openai/open_ai_image.py rename to models/openai/open_ai_image.py index 07a8e47..fb113a0 100644 --- a/bot/openai/open_ai_image.py +++ b/models/openai/open_ai_image.py @@ -1,7 +1,7 @@ import time import openai -from bot.openai.openai_compat import RateLimitError +from models.openai.openai_compat import RateLimitError from common.log import logger from common.token_bucket import TokenBucket diff --git a/bot/openai/open_ai_session.py b/models/openai/open_ai_session.py similarity index 98% rename from bot/openai/open_ai_session.py rename to models/openai/open_ai_session.py index 8f6aa4f..76023f8 100644 --- a/bot/openai/open_ai_session.py +++ b/models/openai/open_ai_session.py @@ -1,4 +1,4 @@ -from bot.session_manager import Session +from models.session_manager import Session from common.log import logger diff --git a/bot/openai/openai_compat.py b/models/openai/openai_compat.py similarity index 100% rename from bot/openai/openai_compat.py rename to models/openai/openai_compat.py diff --git a/bot/openai_compatible_bot.py b/models/openai_compatible_bot.py similarity index 100% rename from bot/openai_compatible_bot.py rename to models/openai_compatible_bot.py diff --git a/bot/session_manager.py b/models/session_manager.py similarity index 100% rename from bot/session_manager.py rename to models/session_manager.py diff --git a/bot/xunfei/xunfei_spark_bot.py b/models/xunfei/xunfei_spark_bot.py similarity index 98% rename from bot/xunfei/xunfei_spark_bot.py rename to models/xunfei/xunfei_spark_bot.py index 06e5501..d2662f9 100644 --- a/bot/xunfei/xunfei_spark_bot.py +++ b/models/xunfei/xunfei_spark_bot.py @@ -1,9 +1,9 @@ # encoding:utf-8 import requests, json -from bot.bot import Bot -from bot.session_manager import SessionManager -from bot.chatgpt.chat_gpt_session import ChatGPTSession +from models.bot import Bot +from models.session_manager import SessionManager +from models.chatgpt.chat_gpt_session import ChatGPTSession from bridge.context import ContextType, Context from bridge.reply import Reply, ReplyType from common.log import logger diff --git a/bot/zhipuai/zhipu_ai_image.py b/models/zhipuai/zhipu_ai_image.py similarity index 100% rename from bot/zhipuai/zhipu_ai_image.py rename to models/zhipuai/zhipu_ai_image.py diff --git a/bot/zhipuai/zhipu_ai_session.py b/models/zhipuai/zhipu_ai_session.py similarity index 97% rename from bot/zhipuai/zhipu_ai_session.py rename to models/zhipuai/zhipu_ai_session.py index 846d36a..afb30cc 100644 --- a/bot/zhipuai/zhipu_ai_session.py +++ b/models/zhipuai/zhipu_ai_session.py @@ -1,4 +1,4 @@ -from bot.session_manager import Session +from models.session_manager import Session from common.log import logger diff --git a/bot/zhipuai/zhipuai_bot.py b/models/zhipuai/zhipuai_bot.py similarity index 97% rename from bot/zhipuai/zhipuai_bot.py rename to models/zhipuai/zhipuai_bot.py index d8eed4d..59adccc 100644 --- a/bot/zhipuai/zhipuai_bot.py +++ b/models/zhipuai/zhipuai_bot.py @@ -4,10 +4,10 @@ import time import openai import openai.error -from bot.bot import Bot -from bot.zhipuai.zhipu_ai_session import ZhipuAISession -from bot.zhipuai.zhipu_ai_image import ZhipuAIImage -from bot.session_manager import SessionManager +from models.bot import Bot +from models.zhipuai.zhipu_ai_session import ZhipuAISession +from models.zhipuai.zhipu_ai_image import ZhipuAIImage +from models.session_manager import SessionManager from bridge.context import ContextType from bridge.reply import Reply, ReplyType from common.log import logger