jarvis-ai-assistant 0.1.171__tar.gz → 0.1.172__tar.gz

{jarvis_ai_assistant-0.1.171/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.172}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.171
+Version: 0.1.172
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -333,7 +333,7 @@ MCP(模型上下文协议)。在`~/.jarvis/tools/mcp/`中创建YAML配置文件
 
 #### 本地MCP配置（`stdio`模式）
 ```yaml
-type: local
+type: stdio
 name: MCP名称
 command: 可执行命令
 args: [参数列表]  # 可选
@@ -343,7 +343,7 @@ env:  # 可选环境变量
 
 #### 远程MCP配置（`sse`模式）
 ```yaml
-type: remote
+type: sse
 name: MCP名称
 base_url: http://example.com/api
 auth_token: 认证令牌  # 可选

{jarvis_ai_assistant-0.1.171 → jarvis_ai_assistant-0.1.172}/README.md

@@ -263,7 +263,7 @@ MCP(模型上下文协议)。在`~/.jarvis/tools/mcp/`中创建YAML配置文件
 
 #### 本地MCP配置（`stdio`模式）
 ```yaml
-type: local
+type: stdio
 name: MCP名称
 command: 可执行命令
 args: [参数列表]  # 可选
@@ -273,7 +273,7 @@ env:  # 可选环境变量
 
 #### 远程MCP配置（`sse`模式）
 ```yaml
-type: remote
+type: sse
 name: MCP名称
 base_url: http://example.com/api
 auth_token: 认证令牌  # 可选

{jarvis_ai_assistant-0.1.171 → jarvis_ai_assistant-0.1.172}/pyproject.toml

@@ -8,7 +8,7 @@ default = true
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.171"
+version = "0.1.172"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]
@@ -65,7 +65,7 @@ jarvis-dev = "jarvis.jarvis_dev.main:main"
 jarvis-git-squash = "jarvis.jarvis_git_squash.main:main"
 jarvis-multi-agent = "jarvis.jarvis_multi_agent.main:main"
 jarvis-agent = "jarvis.jarvis_agent.main:main"
-jarvis-tool = "jarvis.jarvis_tools.registry:main"
+jarvis-tool = "jarvis.jarvis_tools.cli.main:main"
 jarvis-ask-codebase = "jarvis.jarvis_tools.ask_codebase:main"
 jac = "jarvis.jarvis_tools.ask_codebase:main"
 jarvis-git-details = "jarvis.jarvis_git_details.main:main"

{jarvis_ai_assistant-0.1.171 → jarvis_ai_assistant-0.1.172}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.171",
+    version="0.1.172",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -52,7 +52,7 @@ setup(
             "jarvis-git-squash=jarvis.jarvis_git_squash.main:main",
             "jarvis-multi-agent=jarvis.jarvis_multi_agent.main:main",
             "jarvis-agent=jarvis.jarvis_agent.main:main",
-            "jarvis-tool=jarvis.jarvis_tools.registry:main",
+            "jarvis-tool=jarvis.jarvis_tools.cli.main:main",
             "jarvis-ask-codebase=jarvis.jarvis_tools.ask_codebase:main",
             "jac=jarvis.jarvis_tools.ask_codebase:main",
             "jarvis-git-details=jarvis.jarvis_git_details.main:main",

{jarvis_ai_assistant-0.1.171 → jarvis_ai_assistant-0.1.172}/src/jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.171"
+__version__ = "0.1.172"

{jarvis_ai_assistant-0.1.171 → jarvis_ai_assistant-0.1.172}/src/jarvis/jarvis_agent/__init__.py

@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
 import datetime
 import platform
-from typing import Any, Callable, List, Optional, Tuple, Union
+from typing import Any, Callable, List, Optional, Tuple, Union, Protocol
 
-from jarvis.jarvis_tools.registry import ToolRegistry
 from yaspin import yaspin # type: ignore
 
 from jarvis.jarvis_agent.output_handler import OutputHandler
@@ -105,6 +104,13 @@ origin_agent_system_prompt = f"""
 """
 
 
+class OutputHandlerProtocol(Protocol):
+    def name(self) -> str: ...
+    def can_handle(self, response: str) -> bool: ...
+    def prompt(self) -> str: ...
+    def handle(self, response: str, agent: Any) -> Tuple[bool, Any]: ...
+
+
 class Agent:
 
     def set_summary_prompt(self, summary_prompt: str):
@@ -139,7 +145,7 @@ class Agent:
                  model_name: Optional[str] = None,
                  summary_prompt: Optional[str] = None,
                  auto_complete: Optional[bool] = None,
-                 output_handler: List[OutputHandler] = [],
+                 output_handler: List[OutputHandlerProtocol] = [],
                  use_tools: List[str] = [],
                  input_handler: Optional[List[Callable[[str, Any], Tuple[str, bool]]]] = None,
                  execute_tool_confirm: Optional[bool] = None,
@@ -287,6 +293,8 @@ class Agent:
         self.first = True
 
     def set_use_tools(self, use_tools):
+        """设置要使用的工具列表"""
+        from jarvis.jarvis_tools.registry import ToolRegistry
         for handler in self.output_handler:
             if isinstance(handler, ToolRegistry):
                 if use_tools:
@@ -310,12 +318,9 @@ class Agent:
         """
         self.after_tool_call_cb = cb
 
-    def get_tool_registry(self) -> Optional[ToolRegistry]:
-        """获取工具注册器。
-
-        返回:
-            ToolRegistry: 工具注册器实例
-        """
+    def get_tool_registry(self) -> Optional[Any]:
+        """获取工具注册表实例"""
+        from jarvis.jarvis_tools.registry import ToolRegistry
         for handler in self.output_handler:
             if isinstance(handler, ToolRegistry):
                 return handler
@@ -505,6 +510,8 @@ class Agent:
                 self.reset_tool_call_count()
             else:
                 return False, ""
+        if self.execute_tool_confirm:
+            self.reset_tool_call_count()
         if not self.execute_tool_confirm or user_confirm(f"需要执行{tool_list[0].name()}确认执行？", True):
             with yaspin(text=f"正在执行{tool_list[0].name()}...", color="cyan") as spinner:
                 with spinner.hidden():
@@ -834,6 +841,7 @@ arguments:
                 self.prompt = f"{user_input}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(msg, self.get_tool_registry())}"
                 self.first = False
 
+            self.conversation_length = get_context_token_count(self.prompt)
             while True:
                 try:
                     # 如果对话历史长度超过限制，在提示中添加提醒

{jarvis_ai_assistant-0.1.171 → jarvis_ai_assistant-0.1.172}/src/jarvis/jarvis_agent/file_input_handler.py

@@ -13,6 +13,20 @@ from jarvis.jarvis_utils.utils import is_context_overflow
 
 
 def file_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
+    """Process user input containing file references and read file contents.
+    
+    Args:
+        user_input: Input string that may contain file references in format:
+            - 'file_path' (whole file)
+            - 'file_path:start_line,end_line' (line range)
+            - 'file_path:start_line:end_line' (alternative range format)
+        agent: Agent object for further processing (currently unused)
+        
+    Returns:
+        Tuple[str, bool]: 
+            - Processed prompt string with file contents prepended
+            - Boolean indicating if context overflow occurred
+    """
     prompt = user_input
     files = []
 
@@ -37,7 +51,7 @@ def file_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
                     except FileNotFoundError:
                         PrettyOutput.print(f"文件不存在: {file_path}", OutputType.WARNING)
                         continue
-                    # Process start line
+                    # Process start line (0 means whole file, negative means from end)
                     if raw_start == 0:  # 0表示整个文件
                         start_line = 1
                         end_line = total_lines
@@ -85,6 +99,7 @@ def file_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
             if result["success"]:
                 spinner.text = "文件读取完成"
                 spinner.ok("✅")
+                # Prepend file contents to prompt and check for overflow
                 prompt = result["stdout"] + "\n" + prompt
                 if is_context_overflow(prompt):
                     return old_prompt, False

{jarvis_ai_assistant-0.1.171 → jarvis_ai_assistant-0.1.172}/src/jarvis/jarvis_platform/base.py

@@ -133,4 +133,4 @@ class BasePlatform(ABC):
     @abstractmethod
     def support_web(self) -> bool:
         """Check if platform supports web functionality"""
-        raise NotImplementedError("support_web is not implemented")
+        return False

{jarvis_ai_assistant-0.1.171 → jarvis_ai_assistant-0.1.172}/src/jarvis/jarvis_platform/human.py

@@ -65,3 +65,6 @@ class HumanPlatform(BasePlatform):
     def name(self) -> str:
         """平台名称"""
         return self.model_name
+
+    def support_web(self) -> bool:
+        return False

{jarvis_ai_assistant-0.1.171 → jarvis_ai_assistant-0.1.172}/src/jarvis/jarvis_platform/openai.py

@@ -115,3 +115,6 @@ class OpenAIModel(BasePlatform):
         else:
             self.messages = []
         return True
+
+    def support_web(self) -> bool:
+        return False

jarvis_ai_assistant-0.1.172/src/jarvis/jarvis_tools/cli/main.py

@@ -0,0 +1,127 @@
+
+import sys
+from jarvis.jarvis_tools.registry import ToolRegistry
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.utils import init_env
+
+
+def main() -> int:
+    """命令行工具入口，提供工具列表查看和工具调用功能"""
+    import argparse
+    import json
+
+    init_env()
+
+    parser = argparse.ArgumentParser(description="Jarvis 工具系统命令行界面")
+    subparsers = parser.add_subparsers(dest="command", help="命令")
+
+    # 列出工具子命令
+    list_parser = subparsers.add_parser("list", help="列出所有可用工具")
+    list_parser.add_argument("--json", action="store_true", help="以JSON格式输出")
+    list_parser.add_argument("--detailed", action="store_true", help="显示详细信息")
+
+    # 调用工具子命令
+    call_parser = subparsers.add_parser("call", help="调用指定工具")
+    call_parser.add_argument("tool_name", help="要调用的工具名称")
+    call_parser.add_argument("--args", type=str, help="工具参数 (JSON格式)")
+    call_parser.add_argument(
+        "--args-file", type=str, help="从文件加载工具参数 (JSON格式)"
+    )
+
+    args = parser.parse_args()
+
+    # 初始化工具注册表
+    registry = ToolRegistry()
+
+    if args.command == "list":
+        tools = registry.get_all_tools()
+
+        if args.json:
+            if args.detailed:
+                print(json.dumps(tools, indent=2, ensure_ascii=False))
+            else:
+                simple_tools = [
+                    {"name": t["name"], "description": t["description"]} for t in tools
+                ]
+                print(json.dumps(simple_tools, indent=2, ensure_ascii=False))
+        else:
+            PrettyOutput.section("可用工具列表", OutputType.SYSTEM)
+            for tool in tools:
+                print(f"\n✅ {tool['name']}")
+                print(f"   描述: {tool['description']}")
+                if args.detailed:
+                    print(f"   参数:")
+                    print(tool["parameters"])
+
+    elif args.command == "call":
+        tool_name = args.tool_name
+        tool_obj = registry.get_tool(tool_name)
+
+        if not tool_obj:
+            PrettyOutput.print(f"错误: 工具 '{tool_name}' 不存在", OutputType.ERROR)
+            available_tools = ", ".join([t["name"] for t in registry.get_all_tools()])
+            print(f"可用工具: {available_tools}")
+            return 1
+
+        # 获取参数
+        tool_args = {}
+        if args.args:
+            try:
+                tool_args = json.loads(args.args)
+            except json.JSONDecodeError:
+                PrettyOutput.print("错误: 参数必须是有效的JSON格式", OutputType.ERROR)
+                return 1
+
+        elif args.args_file:
+            try:
+                with open(args.args_file, "r", encoding="utf-8") as f:
+                    tool_args = json.load(f)
+            except (json.JSONDecodeError, FileNotFoundError) as e:
+                PrettyOutput.print(
+                    f"错误: 无法从文件加载参数: {str(e)}", OutputType.ERROR
+                )
+                return 1
+
+        # 检查必需参数
+        required_params = tool_obj.parameters.get("required", [])
+        missing_params = [p for p in required_params if p not in tool_args]
+
+        if missing_params:
+            PrettyOutput.print(
+                f"错误: 缺少必需参数: {', '.join(missing_params)}", OutputType.ERROR
+            )
+            print("\n参数说明:")
+            params = tool_obj.parameters.get("properties", {})
+            for param_name in required_params:
+                param_info = params.get(param_name, {})
+                desc = param_info.get("description", "无描述")
+                print(f"  - {param_name}: {desc}")
+            return 1
+
+        # 执行工具
+        result = registry.execute_tool(tool_name, tool_args)
+
+        # 显示结果
+        if result["success"]:
+            PrettyOutput.section(f"工具 {tool_name} 执行成功", OutputType.SUCCESS)
+        else:
+            PrettyOutput.section(f"工具 {tool_name} 执行失败", OutputType.ERROR)
+
+        if result.get("stdout"):
+            print("\n输出:")
+            print(result["stdout"])
+
+        if result.get("stderr"):
+            PrettyOutput.print("\n错误:", OutputType.ERROR)
+            print(result["stderr"])
+
+        return 0 if result["success"] else 1
+
+    else:
+        parser.print_help()
+
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

{jarvis_ai_assistant-0.1.171 → jarvis_ai_assistant-0.1.172}/src/jarvis/jarvis_tools/registry.py

@@ -5,11 +5,10 @@ import re
 import sys
 import tempfile
 import os
-from typing import Any, Callable, Dict, List, Optional, Tuple
+from typing import Any, Callable, Dict, List, Optional, Tuple, Protocol
 
 import yaml
 
-from jarvis.jarvis_agent.output_handler import OutputHandler
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.base import Tool
 from jarvis.jarvis_utils.config import get_data_dir
@@ -106,7 +105,13 @@ arguments:
 """
 
 
-class ToolRegistry(OutputHandler):
+class OutputHandlerProtocol(Protocol):
+    def name(self) -> str: ...
+    def can_handle(self, response: str) -> bool: ...
+    def prompt(self) -> str: ...
+    def handle(self, response: str, agent: Any) -> Tuple[bool, Any]: ...
+
+class ToolRegistry(OutputHandlerProtocol):
 
     def name(self) -> str:
         return "TOOL_CALL"
@@ -654,124 +659,3 @@ class ToolRegistry(OutputHandler):
             PrettyOutput.print(f"工具执行失败：{str(e)}", OutputType.ERROR)
             return f"工具调用失败: {str(e)}"
 
-
-def main() -> int:
-    """命令行工具入口，提供工具列表查看和工具调用功能"""
-    import argparse
-    import json
-
-    init_env()
-
-    parser = argparse.ArgumentParser(description="Jarvis 工具系统命令行界面")
-    subparsers = parser.add_subparsers(dest="command", help="命令")
-
-    # 列出工具子命令
-    list_parser = subparsers.add_parser("list", help="列出所有可用工具")
-    list_parser.add_argument("--json", action="store_true", help="以JSON格式输出")
-    list_parser.add_argument("--detailed", action="store_true", help="显示详细信息")
-
-    # 调用工具子命令
-    call_parser = subparsers.add_parser("call", help="调用指定工具")
-    call_parser.add_argument("tool_name", help="要调用的工具名称")
-    call_parser.add_argument("--args", type=str, help="工具参数 (JSON格式)")
-    call_parser.add_argument(
-        "--args-file", type=str, help="从文件加载工具参数 (JSON格式)"
-    )
-
-    args = parser.parse_args()
-
-    # 初始化工具注册表
-    registry = ToolRegistry()
-
-    if args.command == "list":
-        tools = registry.get_all_tools()
-
-        if args.json:
-            if args.detailed:
-                print(json.dumps(tools, indent=2, ensure_ascii=False))
-            else:
-                simple_tools = [
-                    {"name": t["name"], "description": t["description"]} for t in tools
-                ]
-                print(json.dumps(simple_tools, indent=2, ensure_ascii=False))
-        else:
-            PrettyOutput.section("可用工具列表", OutputType.SYSTEM)
-            for tool in tools:
-                print(f"\n✅ {tool['name']}")
-                print(f"   描述: {tool['description']}")
-                if args.detailed:
-                    print(f"   参数:")
-                    print(tool["parameters"])
-
-    elif args.command == "call":
-        tool_name = args.tool_name
-        tool_obj = registry.get_tool(tool_name)
-
-        if not tool_obj:
-            PrettyOutput.print(f"错误: 工具 '{tool_name}' 不存在", OutputType.ERROR)
-            available_tools = ", ".join([t["name"] for t in registry.get_all_tools()])
-            print(f"可用工具: {available_tools}")
-            return 1
-
-        # 获取参数
-        tool_args = {}
-        if args.args:
-            try:
-                tool_args = json.loads(args.args)
-            except json.JSONDecodeError:
-                PrettyOutput.print("错误: 参数必须是有效的JSON格式", OutputType.ERROR)
-                return 1
-
-        elif args.args_file:
-            try:
-                with open(args.args_file, "r", encoding="utf-8") as f:
-                    tool_args = json.load(f)
-            except (json.JSONDecodeError, FileNotFoundError) as e:
-                PrettyOutput.print(
-                    f"错误: 无法从文件加载参数: {str(e)}", OutputType.ERROR
-                )
-                return 1
-
-        # 检查必需参数
-        required_params = tool_obj.parameters.get("required", [])
-        missing_params = [p for p in required_params if p not in tool_args]
-
-        if missing_params:
-            PrettyOutput.print(
-                f"错误: 缺少必需参数: {', '.join(missing_params)}", OutputType.ERROR
-            )
-            print("\n参数说明:")
-            params = tool_obj.parameters.get("properties", {})
-            for param_name in required_params:
-                param_info = params.get(param_name, {})
-                desc = param_info.get("description", "无描述")
-                print(f"  - {param_name}: {desc}")
-            return 1
-
-        # 执行工具
-        result = registry.execute_tool(tool_name, tool_args)
-
-        # 显示结果
-        if result["success"]:
-            PrettyOutput.section(f"工具 {tool_name} 执行成功", OutputType.SUCCESS)
-        else:
-            PrettyOutput.section(f"工具 {tool_name} 执行失败", OutputType.ERROR)
-
-        if result.get("stdout"):
-            print("\n输出:")
-            print(result["stdout"])
-
-        if result.get("stderr"):
-            PrettyOutput.print("\n错误:", OutputType.ERROR)
-            print(result["stderr"])
-
-        return 0 if result["success"] else 1
-
-    else:
-        parser.print_help()
-
-    return 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())

{jarvis_ai_assistant-0.1.171 → jarvis_ai_assistant-0.1.172/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.171
+Version: 0.1.172
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -333,7 +333,7 @@ MCP(模型上下文协议)。在`~/.jarvis/tools/mcp/`中创建YAML配置文件
 
 #### 本地MCP配置（`stdio`模式）
 ```yaml
-type: local
+type: stdio
 name: MCP名称
 command: 可执行命令
 args: [参数列表]  # 可选
@@ -343,7 +343,7 @@ env:  # 可选环境变量
 
 #### 远程MCP配置（`sse`模式）
 ```yaml
-type: remote
+type: sse
 name: MCP名称
 base_url: http://example.com/api
 auth_token: 认证令牌  # 可选

{jarvis_ai_assistant-0.1.171 → jarvis_ai_assistant-0.1.172}/src/jarvis_ai_assistant.egg-info/SOURCES.txt

@@ -86,6 +86,8 @@ src/jarvis/jarvis_tools/registry.py
 src/jarvis/jarvis_tools/rewrite_file.py
 src/jarvis/jarvis_tools/search_web.py
 src/jarvis/jarvis_tools/virtual_tty.py
+src/jarvis/jarvis_tools/cli/__init__.py
+src/jarvis/jarvis_tools/cli/main.py
 src/jarvis/jarvis_utils/__init__.py
 src/jarvis/jarvis_utils/builtin_replace_map.py
 src/jarvis/jarvis_utils/config.py

{jarvis_ai_assistant-0.1.171 → jarvis_ai_assistant-0.1.172}/src/jarvis_ai_assistant.egg-info/entry_points.txt

@@ -13,7 +13,7 @@ jarvis-methodology = jarvis.jarvis_methodology.main:main
 jarvis-multi-agent = jarvis.jarvis_multi_agent.main:main
 jarvis-platform-manager = jarvis.jarvis_platform_manager.main:main
 jarvis-smart-shell = jarvis.jarvis_smart_shell.main:main
-jarvis-tool = jarvis.jarvis_tools.registry:main
+jarvis-tool = jarvis.jarvis_tools.cli.main:main
 jca = jarvis.jarvis_code_agent.code_agent:main
 jgc = jarvis.jarvis_git_utils.git_commiter:main
 jss = jarvis.jarvis_smart_shell.main:main