jarvis-ai-assistant 0.7.8__py3-none-any.whl → 1.0.2__py3-none-any.whl

jarvis/jarvis_tools/retrieve_memory.py

@@ -1,11 +1,16 @@
 # -*- coding: utf-8 -*-
 import json
 from pathlib import Path
-from typing import Any, Dict, List, Optional
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Optional
 
-from jarvis.jarvis_utils.config import get_data_dir, get_max_input_token_count
-from jarvis.jarvis_utils.globals import get_short_term_memories
+from jarvis.jarvis_utils.config import get_data_dir
+from jarvis.jarvis_utils.config import get_max_input_token_count
 from jarvis.jarvis_utils.embedding import get_context_token_count
+from jarvis.jarvis_utils.globals import get_short_term_memories
+from jarvis.jarvis_utils.output import PrettyOutput
 
 
 class RetrieveMemoryTool:
@@ -52,9 +57,9 @@ class RetrieveMemoryTool:
     def _get_memory_dir(self, memory_type: str) -> Path:
         """根据记忆类型获取存储目录"""
         if memory_type == "project_long_term":
-            return self.project_memory_dir
+            return Path(self.project_memory_dir)
         elif memory_type in ["global_long_term", "short_term"]:
-            return self.global_memory_dir / memory_type
+            return Path(self.global_memory_dir) / memory_type
         else:
             raise ValueError(f"未知的记忆类型: {memory_type}")
 
@@ -88,7 +93,9 @@ class RetrieveMemoryTool:
 
                     memories.append(memory_data)
                 except Exception as e:
-                    print(f"⚠️ 读取记忆文件 {memory_file} 失败: {str(e)}")
+                    PrettyOutput.auto_print(
+                        f"⚠️ 读取记忆文件 {memory_file} 失败: {str(e)}"
+                    )
 
         return memories
 
@@ -130,7 +137,7 @@ class RetrieveMemoryTool:
                         memory_token_limit = None
                 except Exception:
                     pass
-            
+
             # 回退方案：使用输入窗口的2/3
             if memory_token_limit is None:
                 max_input_tokens = get_max_input_token_count()
@@ -147,12 +154,10 @@ class RetrieveMemoryTool:
 
                 # 检查是否超过token限制
                 if total_tokens + memory_tokens > memory_token_limit:
-
                     break
 
                 # 检查是否超过50条限制
                 if len(filtered_memories) >= 50:
-
                     break
 
                 filtered_memories.append(memory)
@@ -182,7 +187,7 @@ class RetrieveMemoryTool:
 
             # 输出所有记忆
             for i, memory in enumerate(all_memories):
-                markdown_output += f"## {i+1}. {memory.get('id', '未知ID')}\n\n"
+                markdown_output += f"## {i + 1}. {memory.get('id', '未知ID')}\n\n"
                 markdown_output += f"**类型**: {memory.get('type', '未知类型')}\n\n"
                 markdown_output += f"**标签**: {', '.join(memory.get('tags', []))}\n\n"
                 markdown_output += (
@@ -224,5 +229,5 @@ class RetrieveMemoryTool:
 
         except Exception as e:
             error_msg = f"检索记忆失败: {str(e)}"
-            print(f"❌ {error_msg}")
+            PrettyOutput.auto_print(f"❌ {error_msg}")
             return {"success": False, "stdout": "", "stderr": error_msg}

jarvis/jarvis_tools/save_memory.py

@@ -3,10 +3,12 @@ import json
 import time
 from datetime import datetime
 from pathlib import Path
-from typing import Any, Dict
+from typing import Any
+from typing import Dict
 
 from jarvis.jarvis_utils.config import get_data_dir
 from jarvis.jarvis_utils.globals import add_short_term_memory
+from jarvis.jarvis_utils.output import PrettyOutput
 
 
 class SaveMemoryTool:
@@ -58,9 +60,9 @@ class SaveMemoryTool:
     def _get_memory_dir(self, memory_type: str) -> Path:
         """根据记忆类型获取存储目录"""
         if memory_type == "project_long_term":
-            return self.project_memory_dir
+            return Path(self.project_memory_dir)
         elif memory_type in ["global_long_term", "short_term"]:
-            return self.global_memory_dir / memory_type
+            return Path(self.global_memory_dir) / memory_type
         else:
             raise ValueError(f"未知的记忆类型: {memory_type}")
 
@@ -150,8 +152,8 @@ class SaveMemoryTool:
 
                 except Exception as e:
                     failed_count += 1
-                    error_msg = f"保存第 {i+1} 条记忆失败: {str(e)}"
-                    print(f"❌ {error_msg}")
+                    error_msg = f"保存第 {i + 1} 条记忆失败: {str(e)}"
+                    PrettyOutput.auto_print(f"❌ {error_msg}")
                     results.append(
                         {
                             "error": error_msg,
@@ -178,5 +180,5 @@ class SaveMemoryTool:
 
         except Exception as e:
             error_msg = f"保存记忆失败: {str(e)}"
-            print(f"❌ {error_msg}")
+            PrettyOutput.auto_print(f"❌ {error_msg}")
             return {"success": False, "stdout": "", "stderr": error_msg}

jarvis/jarvis_tools/search_web.py

@@ -1,23 +1,28 @@
-# -*- coding: utf-8 -*-
 """网络搜索工具。"""
-from typing import Any, Dict
 
-import requests  # type: ignore[import-untyped]
-from markdownify import markdownify as md  # type: ignore
+from typing import Any
+from typing import Dict
+from jarvis.jarvis_utils.output import PrettyOutput
+
+# -*- coding: utf-8 -*-
+
+import requests
 
 # pylint: disable=import-error,missing-module-docstring
 # fmt: off
-from ddgs import DDGS  # type: ignore[import-not-found]
-# fmt: on
+from ddgs import DDGS
+from markdownify import markdownify as md
 
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_utils.config import (
-    get_web_search_platform_name,
-    get_web_search_model_name,
-)
+from jarvis.jarvis_utils.config import get_normal_model_name
+from jarvis.jarvis_utils.config import get_normal_platform_name
+from jarvis.jarvis_utils.config import get_web_search_model_name
+from jarvis.jarvis_utils.config import get_web_search_platform_name
 from jarvis.jarvis_utils.http import get as http_get
 
+# fmt: on
+
 
 class SearchWebTool:
     """处理网络搜索的类。"""
@@ -33,7 +38,6 @@ class SearchWebTool:
         # pylint: disable=too-many-locals, broad-except
         """执行网络搜索、抓取内容并总结结果。"""
         try:
-
             results = list(DDGS().text(query, max_results=50, page=3))
 
             if not results:
@@ -49,14 +53,12 @@ class SearchWebTool:
 
             for r in results:
                 if visited_count >= 10:
-
                     break
 
                 url = r["href"]
                 r.get("title", url)
 
                 try:
-
                     response = http_get(url, timeout=10.0, allow_redirects=True)
                     content = md(response.text, strip=["script", "style"])
                     if content:
@@ -64,9 +66,11 @@ class SearchWebTool:
                         visited_urls.append(url)
                         visited_count += 1
                 except requests.exceptions.HTTPError as e:
-                    print(f"⚠️ HTTP错误 {e.response.status_code} 访问 {url}")
+                    PrettyOutput.auto_print(
+                        f"⚠️ HTTP错误 {e.response.status_code} 访问 {url}"
+                    )
                 except requests.exceptions.RequestException as e:
-                    print(f"⚠️ 请求错误: {e}")
+                    PrettyOutput.auto_print(f"⚠️ 请求错误: {e}")
 
             if not full_content.strip():
                 return {
@@ -79,15 +83,9 @@ class SearchWebTool:
 
             summary_prompt = f"请为查询“{query}”总结以下内容：\n\n{full_content}"
 
-            if not agent.model:
-                return {
-                    "stdout": "",
-                    "stderr": "用于总结的Agent模型未找到。",
-                    "success": False,
-                }
-
-            platform_name = agent.model.platform_name()
-            model_name = agent.model.name()
+            # 使用normal模型进行总结
+            platform_name = get_normal_platform_name(None)
+            model_name = get_normal_model_name(None)
 
             model = PlatformRegistry().create_platform(platform_name)
             if not model:
@@ -104,7 +102,7 @@ class SearchWebTool:
             return {"stdout": summary, "stderr": "", "success": True}
 
         except Exception as e:
-            print(f"❌ 网页搜索过程中发生错误: {e}")
+            PrettyOutput.auto_print(f"❌ 网页搜索过程中发生错误: {e}")
             return {
                 "stdout": "",
                 "stderr": f"网页搜索过程中发生错误: {e}",
@@ -151,12 +149,14 @@ class SearchWebTool:
                             "success": True,
                         }
 
-        # 否则使用现有的模型选择流程
-        if agent.model.support_web():
-            model = PlatformRegistry().create_platform(agent.model.platform_name())
-            if not model:
-                return {"stdout": "", "stderr": "无法创建模型。", "success": False}
-            model.set_model_name(agent.model.name())
+        # 否则使用normal模型进行web搜索（正常操作）
+        normal_platform = get_normal_platform_name(None)
+        normal_model = get_normal_model_name(None)
+        model = PlatformRegistry().create_platform(normal_platform)
+        if not model:
+            return {"stdout": "", "stderr": "无法创建模型。", "success": False}
+        model.set_model_name(normal_model)
+        if model.support_web():
             model.set_web(True)
             model.set_suppress_output(False)
             response = model.chat_until_success(query)

jarvis/jarvis_tools/sub_agent.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 sub_agent 工具
 将子任务交给通用 Agent 执行，并返回执行结果。
@@ -10,11 +9,17 @@ sub_agent 工具
 - 继承父 Agent 的部分配置：model_group、input_handler、execute_tool_confirm、multiline_inputer、non_interactive、use_methodology、use_analysis；其他参数需显式提供
 - 子Agent必须自动完成(auto_complete=True)且需要summary(need_summary=True)
 """
-from typing import Any, Dict
+
 import json
+from typing import Any
+
+from jarvis.jarvis_utils.output import PrettyOutput
+
+# -*- coding: utf-8 -*-
+from typing import Dict
 
 from jarvis.jarvis_agent import Agent
-from jarvis.jarvis_utils.globals import delete_agent
+from jarvis.jarvis_utils.globals import get_global_model_group
 
 
 class SubAgentTool:
@@ -89,7 +94,6 @@ class SubAgentTool:
 
             # 不继承父Agent，所有关键参数必须由调用方显式提供
             need_summary = True
-            auto_complete = True
 
             # 读取并校验必填参数
             system_prompt = str(args.get("system_prompt", "")).strip()
@@ -115,37 +119,35 @@ class SubAgentTool:
 
             # 基于父Agent（如有）继承部分配置后创建子Agent
             parent_agent = args.get("agent", None)
-            parent_model_group = None
+            # 使用全局模型组（不再从 parent_agent 继承）
+            parent_model_group = get_global_model_group()
             parent_execute_tool_confirm = None
             parent_multiline_inputer = None
-            parent_non_interactive = None
             parent_use_methodology = None
             parent_use_analysis = None
             try:
                 if parent_agent is not None:
-                    if getattr(parent_agent, "model", None):
-                        parent_model_group = getattr(parent_agent.model, "model_group", None)
-                    parent_execute_tool_confirm = getattr(parent_agent, "execute_tool_confirm", None)
-                    parent_multiline_inputer = getattr(parent_agent, "multiline_inputer", None)
-                    parent_non_interactive = getattr(parent_agent, "non_interactive", None)
-                    parent_use_methodology = getattr(parent_agent, "use_methodology", None)
+                    parent_execute_tool_confirm = getattr(
+                        parent_agent, "execute_tool_confirm", None
+                    )
+                    parent_multiline_inputer = getattr(
+                        parent_agent, "multiline_inputer", None
+                    )
+                    parent_use_methodology = getattr(
+                        parent_agent, "use_methodology", None
+                    )
                     parent_use_analysis = getattr(parent_agent, "use_analysis", None)
             except Exception:
                 # 安全兜底：无法从父Agent获取配置则保持为None，使用系统默认
                 pass
 
-            # 可选参数：允许显式覆盖无交互模式
-            explicit_non_interactive = args.get("non_interactive", None)
-            if explicit_non_interactive is not None:
-                parent_non_interactive = bool(explicit_non_interactive)
-
             agent = Agent(
                 system_prompt=system_prompt,
                 name=agent_name,
                 description="Temporary sub agent for executing a subtask",
                 model_group=parent_model_group,
                 summary_prompt=summary_prompt,
-                auto_complete=auto_complete,
+                auto_complete=True,
                 use_tools=None,
                 execute_tool_confirm=parent_execute_tool_confirm,
                 need_summary=need_summary,
@@ -154,7 +156,7 @@ class SubAgentTool:
                 use_analysis=parent_use_analysis,
                 force_save_memory=None,
                 files=None,
-                non_interactive=parent_non_interactive,
+                non_interactive=True,
             )
 
             # 禁用 sub_agent 和 sub_code_agent，避免无限递归
@@ -162,10 +164,16 @@ class SubAgentTool:
                 # 获取当前启用的工具列表
                 tool_registry = agent.get_tool_registry()
                 if tool_registry:
-                    current_tools = [t.get("name") for t in tool_registry.get_all_tools() if isinstance(t, dict) and t.get("name")]
+                    current_tools = [
+                        t.get("name")
+                        for t in tool_registry.get_all_tools()
+                        if isinstance(t, dict) and t.get("name")
+                    ]
                     # 过滤掉禁止的工具
                     forbidden_tools = {"sub_agent", "sub_code_agent"}
-                    filtered_tools = [t for t in current_tools if t not in forbidden_tools]
+                    filtered_tools = [
+                        t for t in current_tools if t not in forbidden_tools
+                    ]
                     if filtered_tools:
                         agent.set_use_tools(filtered_tools)
             except Exception:
@@ -181,7 +189,9 @@ class SubAgentTool:
                         available_names = [m for m, _ in available_models]
                         current_model_name = platform.name()
                         if current_model_name not in available_names:
-                            print(f"⚠️ 检测到子Agent模型 {current_model_name} 不存在于平台 {platform.platform_name()} 的可用模型列表，将回退到 {available_names[0]}")
+                            PrettyOutput.auto_print(
+                                f"⚠️ 检测到子Agent模型 {current_model_name} 不存在于平台 {platform.platform_name()} 的可用模型列表，将回退到 {available_names[0]}"
+                            )
                             platform.set_model_name(available_names[0])
             except Exception:
                 # 获取模型列表或设置模型失败时，保持原设置并继续，交由底层报错处理
@@ -190,12 +200,6 @@ class SubAgentTool:
             # 执行任务
             result = agent.run(enhanced_task)
 
-            # 主动清理，避免污染父 Agent 的全局状态
-            try:
-                delete_agent(agent.name)
-            except Exception:
-                pass
-
             # 规范化输出
             if isinstance(result, (dict, list)):
                 stdout = json.dumps(result, ensure_ascii=False, indent=2)

jarvis/jarvis_tools/sub_code_agent.py

@@ -9,11 +9,13 @@ sub_code_agent 工具
 - 不依赖父 Agent，所有配置使用系统默认与全局变量
 - 子Agent必须自动完成(auto_complete=True)且需要summary(need_summary=True)
 """
-from typing import Any, Dict, List
+
+from typing import Any
+from typing import Dict
+from typing import List
 
 from jarvis.jarvis_code_agent.code_agent import CodeAgent
-from jarvis.jarvis_utils.globals import delete_agent
-from jarvis.jarvis_utils.config import set_config, get_git_check_mode
+from jarvis.jarvis_utils.globals import get_global_model_group
 
 
 class SubCodeAgentTool:
@@ -38,6 +40,10 @@ class SubCodeAgentTool:
                 "type": "string",
                 "description": "任务背景与已知信息（可选，将与任务一并提供给子Agent）",
             },
+            "name": {
+                "type": "string",
+                "description": "子Agent的名称（可选，用于标识和区分不同的子Agent）",
+            },
         },
         "required": ["task"],
     }
@@ -59,13 +65,15 @@ class SubCodeAgentTool:
                     "stderr": "task 不能为空",
                 }
 
-
             # 读取背景信息并组合任务
             background: str = str(args.get("background", "")).strip()
             enhanced_task = (
                 f"背景信息:\n{background}\n\n任务:\n{task}" if background else task
             )
 
+            # 读取子Agent名称（可选）
+            agent_name: str = str(args.get("name", "")).strip()
+
             # 继承父Agent的模型组与工具使用集（用于覆盖默认值）
             parent_agent = args.get("agent")
             # 如未注入父Agent，尝试从全局获取当前或任一已注册Agent
@@ -73,7 +81,7 @@ class SubCodeAgentTool:
                 try:
                     from jarvis.jarvis_utils import globals as G  # 延迟导入避免循环
 
-                    curr = getattr(G, "current_agent_name", "")
+                    curr = G.get_current_agent_name()
                     if curr:
                         parent_agent = getattr(G, "global_agents", {}).get(curr)
                     if parent_agent is None and getattr(G, "global_agents", {}):
@@ -83,13 +91,16 @@ class SubCodeAgentTool:
                             parent_agent = None
                 except Exception:
                     parent_agent = None
-            parent_non_interactive = getattr(parent_agent, "non_interactive", None) if parent_agent is not None else None
-            model_group = None
+            (
+                getattr(parent_agent, "non_interactive", None)
+                if parent_agent is not None
+                else None
+            )
+            # 使用全局模型组（不再从 parent_agent 继承）
+            model_group = get_global_model_group()
             use_tools: List[str] = []
             try:
                 if parent_agent is not None:
-                    if getattr(parent_agent, "model", None):
-                        model_group = getattr(parent_agent.model, "model_group", None)
                     parent_registry = parent_agent.get_tool_registry()
                     if parent_registry:
                         for t in parent_registry.get_all_tools():
@@ -116,29 +127,42 @@ class SubCodeAgentTool:
                     "execute_script",
                     "read_code",
                     "edit_file",
-                    "rewrite_file",
-                    "lsp_client",
                 ]
                 if use_tools:
                     # 过滤掉基础工具和禁止的工具
-                    extras = [t for t in use_tools if t not in base_tools and t not in forbidden_tools]
+                    extras = [
+                        t
+                        for t in use_tools
+                        if t not in base_tools and t not in forbidden_tools
+                    ]
                     append_tools = ",".join(extras) if extras else None
             except Exception:
                 append_tools = None
 
-            # 在子Agent中放宽 Git 配置校验，避免因严格校验导致进程退出
-            # 使用配置项将校验模式临时切换为 warn，构造完成后恢复原值
-            old_mode = None
+            # 获取父代理的规则名称列表用于继承
+            rule_names = None
+            try:
+                if parent_agent is not None and hasattr(
+                    parent_agent, "loaded_rule_names"
+                ):
+                    parent_rules = getattr(parent_agent, "loaded_rule_names", [])
+                    if parent_rules:
+                        rule_names = ",".join(parent_rules)
+            except Exception:
+                rule_names = None
+
+            # 创建 CodeAgent，捕获 SystemExit 异常（如 git 配置不完整）
             try:
-                old_mode = get_git_check_mode()
-                set_config("JARVIS_GIT_CHECK_MODE", "warn")
                 code_agent = CodeAgent(
+                    name=agent_name,
                     model_group=model_group,
                     need_summary=True,
                     append_tools=append_tools,
                     tool_group=tool_group,
-                    non_interactive=parent_non_interactive,
-                )
+                    non_interactive=True,
+                    rule_names=rule_names,
+                    auto_complete=True,
+                )  # type: ignore[arg-type]
             except SystemExit as se:
                 # 将底层 sys.exit 转换为工具错误，避免终止进程
                 return {
@@ -146,62 +170,22 @@ class SubCodeAgentTool:
                     "stdout": "",
                     "stderr": f"初始化 CodeAgent 失败（可能未配置 git 或当前非 git 仓库）: {se}",
                 }
-            finally:
-                if old_mode is not None:
-                    try:
-                        set_config("JARVIS_GIT_CHECK_MODE", old_mode)
-                    except Exception:
-                        pass
 
             # 子Agent需要自动完成
             try:
-                code_agent.auto_complete = True
                 # 同步父Agent工具使用集（如可用），但禁用 sub_agent 和 sub_code_agent 避免无限递归
                 if use_tools:
                     forbidden_tools = {"sub_agent", "sub_code_agent"}
                     filtered_tools = [t for t in use_tools if t not in forbidden_tools]
                     if filtered_tools:
                         code_agent.set_use_tools(filtered_tools)
-                # 同步父Agent的模型名称（如可用），以尽量保持平台与模型一致
-                if (
-                    parent_agent is not None
-                    and getattr(parent_agent, "model", None)
-                    and getattr(code_agent, "model", None)
-                ):
-                    try:
-                        parent_model_name = parent_agent.model.name()  # type: ignore[attr-defined]
-                        if parent_model_name:
-                            from typing import Any
-                            model_obj: Any = getattr(code_agent, "model", None)
-                            if model_obj is not None:
-                                model_obj.set_model_name(parent_model_name)
-                                # 模型有效性校验与回退，确保父Agent模型在子Agent平台上可用
-                                try:
-                                    available_models = model_obj.get_model_list()
-                                    if available_models:
-                                        available_names = [m for m, _ in available_models]
-                                        current_model_name = model_obj.name()
-                                        if current_model_name not in available_names:
-                                            print(f"⚠️ 检测到子CodeAgent模型 {current_model_name} 不存在于平台 {model_obj.platform_name()} 的可用模型列表，将回退到 {available_names[0]}")
-                                            model_obj.set_model_name(available_names[0])
-                                except Exception:
-                                    # 获取模型列表或设置模型失败时，保持原设置并继续，交由底层报错处理
-                                    pass
-                    except Exception:
-                        pass
+                # 不再从父Agent获取模型名，使用系统默认配置（符合"不依赖父 Agent"的约定）
             except Exception:
                 pass
 
             # 执行子任务（无提交信息前后缀）
             ret = code_agent.run(enhanced_task, prefix="", suffix="")
 
-            # 主动清理 CodeAgent 实例，避免污染父Agent的全局状态
-            try:
-                # CodeAgent 现在直接继承 Agent，所以直接使用 code_agent
-                delete_agent(code_agent.name)
-            except Exception:
-                pass
-
             return {
                 "success": True,
                 "stdout": ret,