jarvis-ai-assistant 0.1.193__py3-none-any.whl → 0.1.195__py3-none-any.whl

jarvis/jarvis_tools/read_webpage.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import os
 from typing import Any, Dict
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
@@ -12,26 +11,22 @@ class WebpageTool:
     parameters = {
         "type": "object",
         "properties": {
-            "url": {
-                "type": "string",
-                "description": "要读取的网页URL"
-            },
+            "url": {"type": "string", "description": "要读取的网页URL"},
             "want": {
                 "type": "string",
                 "description": "具体想要从网页获取的信息或回答的问题",
-                "default": "请总结这个网页的主要内容"
-            }
+                "default": "请总结这个网页的主要内容",
+            },
         },
-        "required": ["url"]
+        "required": ["url"],
     }
 
-
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
         """Read webpage content using Yuanbao model"""
         try:
             url = args["url"].strip()
             want = args.get("want", "请总结这个网页的主要内容")
-            
+
             # Create Yuanbao model instance
             model = PlatformRegistry().get_normal_platform()
             model.set_web(True)
@@ -48,18 +43,14 @@ class WebpageTool:
             # Get response from Yuanbao model
             response = model.chat_until_success(prompt)  # type: ignore
 
-            return {
-                "success": True,
-                "stdout": response,
-                "stderr": ""
-            }
+            return {"success": True, "stdout": response, "stderr": ""}
 
         except Exception as e:
             PrettyOutput.print(f"读取网页失败: {str(e)}", OutputType.ERROR)
             return {
                 "success": False,
                 "stdout": "",
-                "stderr": f"Failed to parse webpage: {str(e)}"
+                "stderr": f"Failed to parse webpage: {str(e)}",
             }
 
     @staticmethod

jarvis/jarvis_tools/registry.py

@@ -7,14 +7,12 @@ import tempfile
 from pathlib import Path
 from typing import Any, Callable, Dict, List, Optional, Protocol, Tuple
 
-from numpy import place
 import yaml
 
 from jarvis.jarvis_mcp import McpClient
 from jarvis.jarvis_mcp.sse_mcp_client import SSEMcpClient
 from jarvis.jarvis_mcp.stdio_mcp_client import StdioMcpClient
 from jarvis.jarvis_mcp.streamable_mcp_client import StreamableMcpClient
-from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.base import Tool
 from jarvis.jarvis_utils.config import get_data_dir
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
@@ -113,6 +111,7 @@ class OutputHandlerProtocol(Protocol):
     def prompt(self) -> str: ...
     def handle(self, response: str, agent: Any) -> Tuple[bool, Any]: ...
 
+
 class ToolRegistry(OutputHandlerProtocol):
 
     def name(self) -> str:
@@ -202,9 +201,7 @@ class ToolRegistry(OutputHandlerProtocol):
             with open(stats_file, "w", encoding="utf-8") as f:
                 yaml.safe_dump(stats, f, allow_unicode=True)
         except Exception as e:
-            PrettyOutput.print(
-                f"保存工具调用统计失败: {str(e)}", OutputType.WARNING
-            )
+            PrettyOutput.print(f"保存工具调用统计失败: {str(e)}", OutputType.WARNING)
 
     def use_tools(self, name: List[str]) -> None:
         """使用指定工具
@@ -218,7 +215,11 @@ class ToolRegistry(OutputHandlerProtocol):
                 f"工具 {missing_tools} 不存在，可用的工具有: {', '.join(self.tools.keys())}",
                 OutputType.WARNING,
             )
-        self.tools = {tool_name: self.tools[tool_name] for tool_name in name if tool_name in self.tools}
+        self.tools = {
+            tool_name: self.tools[tool_name]
+            for tool_name in name
+            if tool_name in self.tools
+        }
 
     def dont_use_tools(self, names: List[str]) -> None:
         """从注册表中移除指定工具
@@ -233,7 +234,7 @@ class ToolRegistry(OutputHandlerProtocol):
     def _load_mcp_tools(self) -> None:
         """加载MCP工具，优先从配置获取，其次从目录扫描"""
         from jarvis.jarvis_utils.config import get_mcp_config
-        
+
         # 优先从配置获取MCP工具配置
         mcp_configs = get_mcp_config()
         if mcp_configs:
@@ -249,7 +250,7 @@ class ToolRegistry(OutputHandlerProtocol):
         # 添加警告信息
         PrettyOutput.print(
             "警告: 从文件目录加载MCP工具的方式将在未来版本中废弃，请尽快迁移到JARVIS_MCP配置方式",
-            OutputType.WARNING
+            OutputType.WARNING,
         )
 
         # 遍历目录中的所有.yaml文件
@@ -299,12 +300,17 @@ class ToolRegistry(OutputHandlerProtocol):
         """
         try:
             if "type" not in config:
-                PrettyOutput.print(f"配置{config.get('name', '')}缺少type字段", OutputType.WARNING)
+                PrettyOutput.print(
+                    f"配置{config.get('name', '')}缺少type字段", OutputType.WARNING
+                )
                 return False
 
             # 检查enable标志
             if not config.get("enable", True):
-                PrettyOutput.print(f"MCP配置{config.get('name', '')}已禁用(enable=false)，跳过注册", OutputType.INFO)
+                PrettyOutput.print(
+                    f"MCP配置{config.get('name', '')}已禁用(enable=false)，跳过注册",
+                    OutputType.INFO,
+                )
                 return False
 
             name = config.get("name", "mcp")
@@ -317,7 +323,8 @@ class ToolRegistry(OutputHandlerProtocol):
                     args.pop("want", None)
                     ret = client.get_resource_list()
                     PrettyOutput.print(
-                        f"MCP {name} 资源列表:\n{yaml.safe_dump(ret, allow_unicode=True)}", OutputType.TOOL
+                        f"MCP {name} 资源列表:\n{yaml.safe_dump(ret, allow_unicode=True)}",
+                        OutputType.TOOL,
                     )
                     return {
                         "success": True,
@@ -340,7 +347,8 @@ class ToolRegistry(OutputHandlerProtocol):
                         }
                     ret = client.get_resource(args["uri"])
                     PrettyOutput.print(
-                        f"MCP {name} 获取资源:\n{yaml.safe_dump(ret, allow_unicode=True)}", OutputType.TOOL
+                        f"MCP {name} 获取资源:\n{yaml.safe_dump(ret, allow_unicode=True)}",
+                        OutputType.TOOL,
                     )
                     return ret
 
@@ -362,18 +370,29 @@ class ToolRegistry(OutputHandlerProtocol):
 
             if config["type"] == "stdio":
                 if "command" not in config:
-                    PrettyOutput.print(f"配置{config.get('name', '')}缺少command字段", OutputType.WARNING)
+                    PrettyOutput.print(
+                        f"配置{config.get('name', '')}缺少command字段",
+                        OutputType.WARNING,
+                    )
                     return False
             elif config["type"] == "sse":
                 if "base_url" not in config:
-                    PrettyOutput.print(f"配置{config.get('name', '')}缺少base_url字段", OutputType.WARNING)
+                    PrettyOutput.print(
+                        f"配置{config.get('name', '')}缺少base_url字段",
+                        OutputType.WARNING,
+                    )
                     return False
             elif config["type"] == "streamable":
                 if "base_url" not in config:
-                    PrettyOutput.print(f"配置{config.get('name', '')}缺少base_url字段", OutputType.WARNING)
+                    PrettyOutput.print(
+                        f"配置{config.get('name', '')}缺少base_url字段",
+                        OutputType.WARNING,
+                    )
                     return False
             else:
-                PrettyOutput.print(f"不支持的MCP客户端类型: {config['type']}", OutputType.WARNING)
+                PrettyOutput.print(
+                    f"不支持的MCP客户端类型: {config['type']}", OutputType.WARNING
+                )
                 return False
 
             # 创建MCP客户端
@@ -389,7 +408,10 @@ class ToolRegistry(OutputHandlerProtocol):
             # 获取工具信息
             tools = mcp_client.get_tool_list()
             if not tools:
-                PrettyOutput.print(f"从配置{config.get('name', '')}获取工具列表失败", OutputType.WARNING)
+                PrettyOutput.print(
+                    f"从配置{config.get('name', '')}获取工具列表失败",
+                    OutputType.WARNING,
+                )
                 return False
 
             # 注册每个工具
@@ -427,7 +449,9 @@ class ToolRegistry(OutputHandlerProtocol):
             return True
 
         except Exception as e:
-            PrettyOutput.print(f"MCP配置{config.get('name', '')}加载失败: {str(e)}", OutputType.WARNING)
+            PrettyOutput.print(
+                f"MCP配置{config.get('name', '')}加载失败: {str(e)}", OutputType.WARNING
+            )
             return False
 
     def register_tool_by_file(self, file_path: str) -> bool:
@@ -604,10 +628,10 @@ class ToolRegistry(OutputHandlerProtocol):
                 "stderr": f"工具 {name} 不存在，可用的工具有: {', '.join(self.tools.keys())}",
                 "stdout": "",
             }
-        
+
         # 更新工具调用统计
         self._update_tool_stats(name)
-        
+
         return tool.execute(arguments)
 
     def _format_tool_output(self, stdout: str, stderr: str) -> str:
@@ -630,16 +654,18 @@ class ToolRegistry(OutputHandlerProtocol):
 
     def _truncate_output(self, output: str) -> str:
         """截断过长的输出内容
-        
+
         参数:
             output: 要截断的输出内容
-            
+
         返回:
             截断后的内容，如果内容不超过60行则返回原内容
         """
         if len(output.splitlines()) > 60:
             lines = output.splitlines()
-            return '\n'.join(lines[:30] + ['\n...内容太长，已截取前后30行...\n'] + lines[-30:])
+            return "\n".join(
+                lines[:30] + ["\n...内容太长，已截取前后30行...\n"] + lines[-30:]
+            )
         return output
 
     def handle_tool_calls(self, tool_call: Dict[str, Any], agent: Any) -> str:
@@ -650,7 +676,8 @@ class ToolRegistry(OutputHandlerProtocol):
             args["agent"] = agent
 
             from jarvis.jarvis_agent import Agent
-            agent_instance: Agent = agent 
+
+            agent_instance: Agent = agent
 
             if isinstance(args, str):
                 try:
@@ -671,19 +698,26 @@ class ToolRegistry(OutputHandlerProtocol):
 
             # 检查内容是否过大
             is_large_content = is_context_overflow(output)
-            
+
             if is_large_content:
                 # 创建临时文件
-                with tempfile.NamedTemporaryFile(mode="w", suffix=".txt", delete=False) as tmp_file:
+                with tempfile.NamedTemporaryFile(
+                    mode="w", suffix=".txt", delete=False
+                ) as tmp_file:
                     output_file = tmp_file.name
                     tmp_file.write(output)
                     tmp_file.flush()
-                
+
                 try:
-                    if agent_instance.model and agent_instance.model.support_upload_files():
+                    if (
+                        agent_instance.model
+                        and agent_instance.model.support_upload_files()
+                    ):
                         summary = agent_instance.generate_summary()
                         agent_instance.clear_history()
-                        upload_success = agent_instance.model.upload_files([output_file])
+                        upload_success = agent_instance.model.upload_files(
+                            [output_file]
+                        )
                         if upload_success:
                             # 删除args的agent键
                             args.pop("agent", None)
@@ -714,4 +748,3 @@ class ToolRegistry(OutputHandlerProtocol):
         except Exception as e:
             PrettyOutput.print(f"工具执行失败：{str(e)}", OutputType.ERROR)
             return f"工具调用失败: {str(e)}"
-

jarvis/jarvis_tools/rewrite_file.py

@@ -47,16 +47,13 @@ class FileRewriteTool:
     parameters = {
         "type": "object",
         "properties": {
-            "file": {
-                "type": "string",
-                "description": "需要重写的文件路径"
-            },
+            "file": {"type": "string", "description": "需要重写的文件路径"},
             "content": {
                 "type": "string",
-                "description": "新的文件内容，将完全替换原文件内容"
-            }
+                "description": "新的文件内容，将完全替换原文件内容",
+            },
         },
-        "required": ["file", "content"]
+        "required": ["file", "content"],
     }
 
     def __init__(self):
@@ -82,41 +79,41 @@ class FileRewriteTool:
         import os
 
         from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-        
+
         stdout_messages = []
         stderr_messages = []
         success = True
-        
+
         file_path = args["file"]
         new_content = args["content"]
-        
+
         # 创建已处理文件变量，用于失败时回滚
         original_content = None
         processed = False
 
         try:
             file_exists = os.path.exists(file_path)
-            
+
             try:
                 # 如果文件存在，则读取原内容用于回滚
                 if file_exists:
-                    with open(file_path, 'r', encoding='utf-8') as f:
+                    with open(file_path, "r", encoding="utf-8") as f:
                         original_content = f.read()
-                
+
                 # 确保目录存在
                 os.makedirs(os.path.dirname(os.path.abspath(file_path)), exist_ok=True)
-                
+
                 # 写入新内容
-                with open(file_path, 'w', encoding='utf-8') as f:
+                with open(file_path, "w", encoding="utf-8") as f:
                     f.write(new_content)
-                
+
                 processed = True
-                
+
                 action = "创建并写入" if not file_exists else "成功重写"
                 stdout_message = f"文件 {file_path} {action}"
                 stdout_messages.append(stdout_message)
                 PrettyOutput.print(stdout_message, OutputType.SUCCESS)
-                
+
             except Exception as e:
                 stderr_message = f"处理文件 {file_path} 时出错: {str(e)}"
                 stderr_messages.append(stderr_message)
@@ -128,7 +125,7 @@ class FileRewriteTool:
                 rollback_message = "操作失败，正在回滚修改..."
                 stderr_messages.append(rollback_message)
                 PrettyOutput.print(rollback_message, OutputType.WARNING)
-                
+
                 try:
                     if original_content is None:
                         # 如果是新创建的文件，则删除
@@ -137,10 +134,10 @@ class FileRewriteTool:
                         rollback_file_message = f"已删除新创建的文件: {file_path}"
                     else:
                         # 如果是修改的文件，则恢复原内容
-                        with open(file_path, 'w', encoding='utf-8') as f:
+                        with open(file_path, "w", encoding="utf-8") as f:
                             f.write(original_content)
                         rollback_file_message = f"已回滚文件: {file_path}"
-                        
+
                     stderr_messages.append(rollback_file_message)
                     PrettyOutput.print(rollback_file_message, OutputType.INFO)
                 except Exception as e:
@@ -151,19 +148,19 @@ class FileRewriteTool:
             return {
                 "success": success,
                 "stdout": "\n".join(stdout_messages),
-                "stderr": "\n".join(stderr_messages)
+                "stderr": "\n".join(stderr_messages),
             }
-            
+
         except Exception as e:
             error_msg = f"文件重写操作失败: {str(e)}"
             PrettyOutput.print(error_msg, OutputType.WARNING)
-            
+
             # 如果有已修改的文件，尝试回滚
             if processed:
                 rollback_message = "操作失败，正在回滚修改..."
                 stderr_messages.append(rollback_message)
                 PrettyOutput.print(rollback_message, OutputType.WARNING)
-                
+
                 try:
                     if original_content is None:
                         # 如果是新创建的文件，则删除
@@ -172,14 +169,14 @@ class FileRewriteTool:
                         stderr_messages.append(f"已删除新创建的文件: {file_path}")
                     else:
                         # 如果是修改的文件，则恢复原内容
-                        with open(file_path, 'w', encoding='utf-8') as f:
+                        with open(file_path, "w", encoding="utf-8") as f:
                             f.write(original_content)
                         stderr_messages.append(f"已回滚文件: {file_path}")
                 except:
                     stderr_messages.append(f"回滚文件失败: {file_path}")
-            
+
             return {
                 "success": False,
                 "stdout": "",
-                "stderr": error_msg + "\n" + "\n".join(stderr_messages)
-            } 
+                "stderr": error_msg + "\n" + "\n".join(stderr_messages),
+            }

jarvis/jarvis_tools/search_web.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import os
 from typing import Any, Dict
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
@@ -10,18 +9,16 @@ class SearchWebTool:
     description = "搜索互联网上的信息"
     parameters = {
         "type": "object",
-        "properties": {
-            "query": {"type": "string", "description": "具体的问题"}
-        }
+        "properties": {"query": {"type": "string", "description": "具体的问题"}},
     }
 
-    def execute(self, args: Dict[str, Any]) -> Dict[str, Any]: # type: ignore
+    def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:  # type: ignore
         query = args.get("query")
         model = PlatformRegistry().get_normal_platform()
         model.set_web(True)
-        model.set_suppress_output(False) # type: ignore
+        model.set_suppress_output(False)  # type: ignore
         return {
-            "stdout": model.chat_until_success(query), # type: ignore
+            "stdout": model.chat_until_success(query),  # type: ignore
             "stderr": "",
             "success": True,
         }
@@ -29,4 +26,4 @@ class SearchWebTool:
     @staticmethod
     def check() -> bool:
         """检查当前平台是否支持web功能"""
-        return PlatformRegistry().get_normal_platform().support_web()
+        return PlatformRegistry().get_normal_platform().support_web()