jarvis-ai-assistant 0.1.224__py3-none-any.whl → 0.2.0__py3-none-any.whl

jarvis/jarvis_platform/base.py

@@ -1,7 +1,10 @@
 # -*- coding: utf-8 -*-
 import re
 from abc import ABC, abstractmethod
-from typing import Generator, List, Tuple
+from types import TracebackType
+from typing import Generator, List, Optional, Tuple, Type
+
+from typing_extensions import Self
 
 from rich import box  # type: ignore
 from rich.live import Live  # type: ignore
@@ -28,9 +31,19 @@ class BasePlatform(ABC):
         self.suppress_output = True  # 添加输出控制标志
         self.web = False  # 添加web属性，默认false
         self._saved = False
-
-    def __del__(self):
-        """Destroy model"""
+        self.model_group: Optional[str] = None
+
+    def __enter__(self) -> Self:
+        """Enter context manager"""
+        return self
+
+    def __exit__(
+        self,
+        exc_type: Optional[Type[BaseException]],
+        exc_val: Optional[BaseException],
+        exc_tb: Optional[TracebackType],
+    ) -> None:
+        """Exit context manager"""
         if not self._saved:
             self.delete_chat()
 
@@ -64,9 +77,11 @@ class BasePlatform(ABC):
 
         input_token_count = get_context_token_count(message)
 
-        if input_token_count > get_max_input_token_count():
-            max_chunk_size = get_max_input_token_count() - 1024  # 留出一些余量
-            min_chunk_size = get_max_input_token_count() - 2048
+        if input_token_count > get_max_input_token_count(self.model_group):
+            max_chunk_size = (
+                get_max_input_token_count(self.model_group) - 1024
+            )  # 留出一些余量
+            min_chunk_size = get_max_input_token_count(self.model_group) - 2048
             inputs = split_text_into_chunks(message, max_chunk_size, min_chunk_size)
             print("📤 正在提交长上下文...")
             prefix_prompt = f"""
@@ -95,14 +110,10 @@ class BasePlatform(ABC):
                 ):
                     response += trunk
 
-                print(
-                    f"📤 提交第{submit_count}部分完成，当前进度：{length}/{len(message)}"
-                )
+                print(f"📤 提交第{submit_count}部分完成，当前进度：{length}/{len(message)}")
             print("✅ 提交完成")
             response += "\n" + while_true(
-                lambda: while_success(
-                    lambda: self._chat("内容已经全部提供完毕，请根据内容继续"), 5
-                ),
+                lambda: while_success(lambda: self._chat("内容已经全部提供完毕，请根据内容继续"), 5),
                 5,
             )
         else:
@@ -233,6 +244,10 @@ class BasePlatform(ABC):
         """Set whether to suppress output"""
         self.suppress_output = suppress
 
+    def set_model_group(self, model_group: Optional[str]):
+        """Set model group"""
+        self.model_group = model_group
+
     def set_web(self, web: bool):
         """Set web flag"""
         self.web = web

jarvis/jarvis_platform_manager/main.py

@@ -188,9 +188,13 @@ def chat_with_model(platform_name: str, model_name: str, system_prompt: str) ->
                         for entry in conversation_history:
                             file_obj.write(f"{entry['role']}: {entry['content']}\n\n")
 
-                    PrettyOutput.print(f"所有对话已保存到 {file_path}", OutputType.SUCCESS)
+                    PrettyOutput.print(
+                        f"所有对话已保存到 {file_path}", OutputType.SUCCESS
+                    )
                 except Exception as exc:
-                    PrettyOutput.print(f"保存所有对话失败: {str(exc)}", OutputType.ERROR)
+                    PrettyOutput.print(
+                        f"保存所有对话失败: {str(exc)}", OutputType.ERROR
+                    )
                 continue
 
             # Check if it is a save_session command
@@ -211,7 +215,9 @@ def chat_with_model(platform_name: str, model_name: str, system_prompt: str) ->
                         file_path = file_path[1:-1]
 
                     if platform.save(file_path):
-                        PrettyOutput.print(f"会话已保存到 {file_path}", OutputType.SUCCESS)
+                        PrettyOutput.print(
+                            f"会话已保存到 {file_path}", OutputType.SUCCESS
+                        )
                     else:
                         PrettyOutput.print("保存会话失败", OutputType.ERROR)
                 except Exception as exc:
@@ -237,7 +243,9 @@ def chat_with_model(platform_name: str, model_name: str, system_prompt: str) ->
 
                     if platform.restore(file_path):
                         conversation_history = []  # Clear local history after loading
-                        PrettyOutput.print(f"会话已从 {file_path} 加载", OutputType.SUCCESS)
+                        PrettyOutput.print(
+                            f"会话已从 {file_path} 加载", OutputType.SUCCESS
+                        )
                     else:
                         PrettyOutput.print("加载会话失败", OutputType.ERROR)
                 except Exception as exc:
@@ -433,8 +441,12 @@ def main() -> None:
     service_parser.add_argument(
         "--port", type=int, default=8000, help="服务端口 (默认: 8000)"
     )
-    service_parser.add_argument("--platform", "-p", help="指定默认平台，当客户端未指定平台时使用")
-    service_parser.add_argument("--model", "-m", help="指定默认模型，当客户端未指定平台时使用")
+    service_parser.add_argument(
+        "--platform", "-p", help="指定默认平台，当客户端未指定平台时使用"
+    )
+    service_parser.add_argument(
+        "--model", "-m", help="指定默认模型，当客户端未指定平台时使用"
+    )
     service_parser.set_defaults(func=service_command)
 
     # role subcommand

jarvis/jarvis_rag/llm_interface.py

@@ -101,9 +101,7 @@ class JarvisPlatform_LLM(LLMInterface):
         try:
             self.registry = PlatformRegistry.get_global_platform_registry()
             self.platform: BasePlatform = self.registry.get_normal_platform()
-            self.platform.set_suppress_output(
-                False
-            )  # 确保模型没有控制台输出
+            self.platform.set_suppress_output(False)  # 确保模型没有控制台输出
             print(f"🚀 已初始化 Jarvis 平台 LLM，模型: {self.platform.name()}")
         except Exception as e:
             print(f"❌ 初始化 Jarvis 平台 LLM 失败: {e}")

jarvis/jarvis_smart_shell/main.py

@@ -20,34 +20,37 @@ def execute_command(command: str, should_run: bool) -> None:
 
 def _check_fish_shell() -> bool:
     """Check if current shell is fish
-    
+
     Returns:
         bool: True if fish shell, False otherwise
     """
     return get_shell_name() == "fish"
 
+
 def _get_config_file() -> str:
     """Get fish config file path
-    
+
     Returns:
         str: Path to fish config file
     """
     return os.path.expanduser("~/.config/fish/config.fish")
 
+
 def _get_markers() -> Tuple[str, str]:
     """Get start and end markers for JSS completion
-    
+
     Returns:
         Tuple[str, str]: (start_marker, end_marker)
     """
     return (
         "# ===== JARVIS JSS FISH COMPLETION START =====",
-        "# ===== JARVIS JSS FISH COMPLETION END ====="
+        "# ===== JARVIS JSS FISH COMPLETION END =====",
     )
 
+
 def install_jss_completion() -> int:
     """Install JSS fish shell command completion
-    
+
     Returns:
         int: 0 if success, 1 if failed
     """
@@ -70,7 +73,8 @@ def install_jss_completion() -> int:
         return 0
 
     with open(config_file, "a") as f:
-        f.write(f"""
+        f.write(
+            f"""
 {start_marker}
 function fish_command_not_found
     if test (string length "$argv") -lt 10
@@ -83,13 +87,15 @@ function __fish_command_not_found_handler --on-event fish_command_not_found
     fish_command_not_found "$argv"
 end
 {end_marker}
-""")
+"""
+        )
     print("JSS fish completion已安装，请执行: source ~/.config/fish/config.fish")
     return 0
 
+
 def uninstall_jss_completion() -> int:
     """Uninstall JSS fish shell command completion
-    
+
     Returns:
         int: 0 if success, 1 if failed
     """
@@ -112,10 +118,10 @@ def uninstall_jss_completion() -> int:
         return 0
 
     new_content = content.split(start_marker)[0] + content.split(end_marker)[-1]
-    
+
     with open(config_file, "w") as f:
         f.write(new_content)
-    
+
     print("JSS fish completion已卸载，请执行: source ~/.config/fish/config.fish")
     return 0
 
@@ -205,7 +211,7 @@ Example:
     install_parser.add_argument(
         "--shell", choices=["fish"], default="fish", help="指定shell类型(仅支持fish)"
     )
-    
+
     # 添加uninstall子命令
     uninstall_parser = subparsers.add_parser(
         "uninstall", help="卸载JSS fish shell命令补全功能"
@@ -232,7 +238,7 @@ Example:
             print(f"错误: 不支持的shell类型: {args.shell}, 仅支持fish")
             return 1
         return uninstall_jss_completion()
-        
+
     # 处理request命令
     if not args.request:
         # 检查是否在交互式终端中运行

jarvis/jarvis_tools/ask_user.py

@@ -34,6 +34,7 @@ class AskUserTool:
 
             # 获取agent对象并重置工具调用计数
             agent = args["agent"]
+            agent.set_run_input_handlers_next_turn(True)
 
             # 显示问题给用户
             PrettyOutput.print(f"问题: {question}", OutputType.SYSTEM)

jarvis/jarvis_tools/generate_new_tool.py

@@ -12,6 +12,7 @@ class generate_new_tool:
     生成并注册新的Jarvis工具。该工具会在用户数据目录下创建新的工具文件，
     并自动注册到当前的工具注册表中。适用场景：1. 需要创建新的自定义工具；
     2. 扩展Jarvis功能；3. 自动化重复性操作；4. 封装特定领域的功能。
+    重要提示：在编写工具代码时，应尽量将工具执行的过程和结果打印出来，方便追踪工具的执行状态。
     """
 
     parameters = {

jarvis/jarvis_tools/registry.py

@@ -17,7 +17,7 @@ from jarvis.jarvis_tools.base import Tool
 from jarvis.jarvis_utils.config import get_data_dir, get_tool_load_dirs
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
-from jarvis.jarvis_utils.utils import is_context_overflow
+from jarvis.jarvis_utils.utils import is_context_overflow, daily_check_git_updates
 
 tool_call_help = f"""
 <tool_system_guide>
@@ -124,7 +124,7 @@ class ToolRegistry(OutputHandlerProtocol):
         """加载工具"""
         tools = self.get_all_tools()
         if tools:
-            tools_prompt = "<tools_section>\n"
+            tools_prompt = f"{tool_call_help}\n<tools_section>\n"
             tools_prompt += "  <header>## 可用工具:</header>\n"
             tools_prompt += "  <tools_list>\n"
             for tool in tools:
@@ -287,16 +287,18 @@ class ToolRegistry(OutputHandlerProtocol):
 
     def _load_external_tools(self) -> None:
         """从jarvis_data/tools和配置的目录加载外部工具"""
-        tool_dirs = [Path(get_data_dir()) / "tools"] + [
-            Path(p) for p in get_tool_load_dirs()
-        ]
+        tool_dirs = [str(Path(get_data_dir()) / "tools")] + get_tool_load_dirs()
+
+        # --- 全局每日更新检查 ---
+        daily_check_git_updates(tool_dirs, "tools")
 
         for tool_dir in tool_dirs:
-            if not tool_dir.exists():
+            p_tool_dir = Path(tool_dir)
+            if not p_tool_dir.exists() or not p_tool_dir.is_dir():
                 continue
 
             # 遍历目录中的所有.py文件
-            for file_path in tool_dir.glob("*.py"):
+            for file_path in p_tool_dir.glob("*.py"):
                 # 跳过__init__.py
                 if file_path.name == "__init__.py":
                     continue
@@ -565,7 +567,10 @@ class ToolRegistry(OutputHandlerProtocol):
             ot("TOOL_CALL") + r"(.*?)" + ct("TOOL_CALL"), content, re.DOTALL
         )
         if not data:
-            return {}, f"只有{ot('TOOL_CALL')}标签，未找到{ct('TOOL_CALL')}标签，调用格式错误，请检查工具调用格式。\n{tool_call_help}"
+            return (
+                {},
+                f"只有{ot('TOOL_CALL')}标签，未找到{ct('TOOL_CALL')}标签，调用格式错误，请检查工具调用格式。\n{tool_call_help}",
+            )
         ret = []
         for item in data:
             try:
@@ -714,7 +719,10 @@ class ToolRegistry(OutputHandlerProtocol):
             )
 
             # 检查内容是否过大
-            is_large_content = is_context_overflow(output)
+            model_group = None
+            if agent_instance.model:
+                model_group = agent_instance.model.model_group
+            is_large_content = is_context_overflow(output, model_group)
 
             if is_large_content:
                 # 创建临时文件

jarvis/jarvis_tools/search_web.py

@@ -3,7 +3,7 @@
 from typing import Any, Dict
 
 import httpx
-from bs4 import BeautifulSoup
+from markdownify import markdownify as md
 from ddgs import DDGS
 
 from jarvis.jarvis_agent import Agent
@@ -27,7 +27,7 @@ class SearchWebTool:
         """Performs a web search, scrapes content, and summarizes the results."""
         try:
             PrettyOutput.print("▶️ 使用 DuckDuckGo 开始网页搜索...", OutputType.INFO)
-            results = list(DDGS().text(query, max_results=5))
+            results = list(DDGS().text(query, max_results=50))
 
             if not results:
                 return {
@@ -36,19 +36,29 @@ class SearchWebTool:
                     "success": False,
                 }
 
-            urls = [r["href"] for r in results]
             full_content = ""
             visited_urls = []
+            visited_count = 0
+
+            for r in results:
+                if visited_count >= 10:
+                    PrettyOutput.print("ℹ️ 已成功获取10个网页，停止抓取。", OutputType.INFO)
+                    break
+
+                url = r["href"]
+                title = r.get("title", url)
 
-            for url in urls:
                 try:
-                    PrettyOutput.print(f"📄 正在抓取内容: {url}", OutputType.INFO)
+                    PrettyOutput.print(
+                        f"📄 ({visited_count + 1}/10) 正在抓取: {title} ({url})",
+                        OutputType.INFO,
+                    )
                     response = http_get(url, timeout=10.0, follow_redirects=True)
-                    soup = BeautifulSoup(response.text, "lxml")
-                    body = soup.find("body")
-                    if body:
-                        full_content += body.get_text(" ", strip=True) + "\n\n"
+                    content = md(response.text, strip=['script', 'style'])
+                    if content:
+                        full_content += content + "\n\n"
                         visited_urls.append(url)
+                        visited_count += 1
                 except httpx.HTTPStatusError as e:
                     PrettyOutput.print(
                         f"⚠️ HTTP错误 {e.response.status_code} 访问 {url}",

jarvis/jarvis_utils/builtin_replace_map.py

@@ -29,7 +29,6 @@ arguments:
 """,
         "description": "网页搜索",
     },
-    
     "FindRelatedFiles": {
         "append": False,
         "template": f"""

jarvis/jarvis_utils/config.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import os
 from functools import lru_cache
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Optional
 
 import yaml  # type: ignore
 
@@ -76,24 +76,26 @@ def get_replace_map() -> dict:
         return {**BUILTIN_REPLACE_MAP, **file_map}
 
 
-def get_max_token_count() -> int:
+def get_max_token_count(model_group_override: Optional[str] = None) -> int:
     """
     获取模型允许的最大token数量。
 
     返回:
         int: 模型能处理的最大token数量。
     """
-    return int(GLOBAL_CONFIG_DATA.get("JARVIS_MAX_TOKEN_COUNT", "960000"))
+    config = _get_resolved_model_config(model_group_override)
+    return int(config.get("JARVIS_MAX_TOKEN_COUNT", "960000"))
 
 
-def get_max_input_token_count() -> int:
+def get_max_input_token_count(model_group_override: Optional[str] = None) -> int:
     """
     获取模型允许的最大输入token数量。
 
     返回:
         int: 模型能处理的最大输入token数量。
     """
-    return int(GLOBAL_CONFIG_DATA.get("JARVIS_MAX_INPUT_TOKEN_COUNT", "32000"))
+    config = _get_resolved_model_config(model_group_override)
+    return int(config.get("JARVIS_MAX_INPUT_TOKEN_COUNT", "32000"))
 
 
 def get_shell_name() -> str:
@@ -113,48 +115,94 @@ def get_shell_name() -> str:
     return os.path.basename(shell_path).lower()
 
 
-def get_normal_platform_name() -> str:
+def _get_resolved_model_config(model_group_override: Optional[str] = None) -> Dict[str, Any]:
+    """
+    解析并合并模型配置，处理模型组。
+
+    优先级顺序:
+    1. 单独的环境变量 (JARVIS_PLATFORM, JARVIS_MODEL, etc.)
+    2. JARVIS_MODEL_GROUP 中定义的组配置
+    3. 代码中的默认值
+
+    返回:
+        Dict[str, Any]: 解析后的模型配置字典
+    """
+    group_config = {}
+    model_group_name = model_group_override or GLOBAL_CONFIG_DATA.get("JARVIS_MODEL_GROUP")
+    # The format is a list of single-key dicts: [{'group_name': {...}}, ...]
+    model_groups = GLOBAL_CONFIG_DATA.get("JARVIS_MODEL_GROUPS", [])
+
+    if model_group_name and isinstance(model_groups, list):
+        for group_item in model_groups:
+            if isinstance(group_item, dict) and model_group_name in group_item:
+                group_config = group_item[model_group_name]
+                break
+
+    # Start with group config
+    resolved_config = group_config.copy()
+
+    # Override with specific settings from GLOBAL_CONFIG_DATA
+    for key in [
+        "JARVIS_PLATFORM",
+        "JARVIS_MODEL",
+        "JARVIS_THINKING_PLATFORM",
+        "JARVIS_THINKING_MODEL",
+        "JARVIS_MAX_TOKEN_COUNT",
+        "JARVIS_MAX_INPUT_TOKEN_COUNT",
+        "JARVIS_MAX_BIG_CONTENT_SIZE",
+    ]:
+        if key in GLOBAL_CONFIG_DATA:
+            resolved_config[key] = GLOBAL_CONFIG_DATA[key]
+
+    return resolved_config
+
+
+def get_normal_platform_name(model_group_override: Optional[str] = None) -> str:
     """
     获取正常操作的平台名称。
 
     返回：
         str: 平台名称，默认为'yuanbao'
     """
-    return GLOBAL_CONFIG_DATA.get("JARVIS_PLATFORM", "yuanbao")
+    config = _get_resolved_model_config(model_group_override)
+    return config.get("JARVIS_PLATFORM", "yuanbao")
 
 
-def get_normal_model_name() -> str:
+def get_normal_model_name(model_group_override: Optional[str] = None) -> str:
     """
     获取正常操作的模型名称。
 
     返回：
-        str: 模型名称，默认为'deep_seek'
+        str: 模型名称，默认为'deep_seek_v3'
     """
-    return GLOBAL_CONFIG_DATA.get("JARVIS_MODEL", "deep_seek_v3")
+    config = _get_resolved_model_config(model_group_override)
+    return config.get("JARVIS_MODEL", "deep_seek_v3")
 
 
-def get_thinking_platform_name() -> str:
+def get_thinking_platform_name(model_group_override: Optional[str] = None) -> str:
     """
     获取思考操作的平台名称。
 
     返回：
-        str: 平台名称，默认为'yuanbao'
+        str: 平台名称，默认为正常操作平台
     """
-    return GLOBAL_CONFIG_DATA.get(
-        "JARVIS_THINKING_PLATFORM", GLOBAL_CONFIG_DATA.get("JARVIS_PLATFORM", "yuanbao")
+    config = _get_resolved_model_config(model_group_override)
+    # Fallback to normal platform if thinking platform is not specified
+    return config.get(
+        "JARVIS_THINKING_PLATFORM", get_normal_platform_name(model_group_override)
     )
 
 
-def get_thinking_model_name() -> str:
+def get_thinking_model_name(model_group_override: Optional[str] = None) -> str:
     """
     获取思考操作的模型名称。
 
     返回：
-        str: 模型名称，默认为'deep_seek'
+        str: 模型名称，默认为正常操作模型
     """
-    return GLOBAL_CONFIG_DATA.get(
-        "JARVIS_THINKING_MODEL", GLOBAL_CONFIG_DATA.get("JARVIS_MODEL", "deep_seek")
-    )
+    config = _get_resolved_model_config(model_group_override)
+    # Fallback to normal model if thinking model is not specified
+    return config.get("JARVIS_THINKING_MODEL", get_normal_model_name(model_group_override))
 
 
 def is_execute_tool_confirm() -> bool:
@@ -190,14 +238,15 @@ def get_data_dir() -> str:
     )
 
 
-def get_max_big_content_size() -> int:
+def get_max_big_content_size(model_group_override: Optional[str] = None) -> int:
     """
     获取最大大内容大小。
 
     返回：
         int: 最大大内容大小
     """
-    return int(GLOBAL_CONFIG_DATA.get("JARVIS_MAX_BIG_CONTENT_SIZE", "160000"))
+    config = _get_resolved_model_config(model_group_override)
+    return int(config.get("JARVIS_MAX_BIG_CONTENT_SIZE", "160000"))
 
 
 def get_pretty_output() -> bool:
@@ -240,6 +289,16 @@ def get_tool_load_dirs() -> List[str]:
     return GLOBAL_CONFIG_DATA.get("JARVIS_TOOL_LOAD_DIRS", [])
 
 
+def get_methodology_dirs() -> List[str]:
+    """
+    获取方法论加载目录。
+
+    返回:
+        List[str]: 方法论加载目录列表
+    """
+    return GLOBAL_CONFIG_DATA.get("JARVIS_METHODOLOGY_DIRS", [])
+
+
 def is_print_prompt() -> bool:
     """
     获取是否打印提示。

jarvis/jarvis_utils/git_utils.py

@@ -538,12 +538,12 @@ def get_recent_commits_with_files() -> List[Dict[str, Any]]:
             return []
 
         # 解析提交信息
-        commits = []
+        commits: List[Dict[str, Any]] = []
         lines = result.stdout.splitlines()
         for i in range(0, len(lines), 4):
             if i + 3 >= len(lines):
                 break
-            commit = {
+            commit: Dict[str, Any] = {
                 "hash": lines[i],
                 "message": lines[i + 1],
                 "author": lines[i + 2],

jarvis/jarvis_utils/globals.py

@@ -11,7 +11,7 @@ import os
 
 # 全局变量：保存最后一条消息
 last_message: str = ""
-from typing import Any, Set
+from typing import Any, Dict, Set
 
 import colorama
 from rich.console import Console
@@ -22,7 +22,7 @@ colorama.init()
 # 禁用tokenizers并行以避免多进程问题
 os.environ["TOKENIZERS_PARALLELISM"] = "false"
 # 全局代理管理
-global_agents: Set[str] = set()
+global_agents: Dict[str, Any] = {}
 current_agent_name: str = ""
 # 表示与大模型交互的深度(>0表示正在交互)
 g_in_chat: int = 0
@@ -66,6 +66,19 @@ def make_agent_name(agent_name: str) -> str:
     return agent_name
 
 
+def get_agent(agent_name: str) -> Any:
+    """
+    获取指定名称的代理实例。
+
+    参数：
+        agent_name: 代理名称
+
+    返回：
+        Any: 代理实例，如果不存在则返回None
+    """
+    return global_agents.get(agent_name)
+
+
 def set_agent(agent_name: str, agent: Any) -> None:
     """
     设置当前代理并将其添加到全局代理集合中。
@@ -74,7 +87,7 @@ def set_agent(agent_name: str, agent: Any) -> None:
         agent_name: 代理名称
         agent: 代理对象
     """
-    global_agents.add(agent_name)
+    global_agents[agent_name] = agent
     global current_agent_name
     current_agent_name = agent_name
 
@@ -101,7 +114,7 @@ def delete_agent(agent_name: str) -> None:
         agent_name: 要删除的代理名称
     """
     if agent_name in global_agents:
-        global_agents.remove(agent_name)
+        del global_agents[agent_name]
         global current_agent_name
         current_agent_name = ""
 
@@ -173,10 +186,3 @@ def get_last_message() -> str:
         str: 最后一条消息
     """
     return last_message
-    """
-    获取当前中断信号状态。
-
-    返回:
-        int: 当前中断计数
-    """
-    return g_interrupt