jarvis-ai-assistant 0.1.17__tar.gz → 0.1.19__tar.gz

{jarvis_ai_assistant-0.1.17/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.17
+Version: 0.1.19
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -87,6 +87,9 @@ Dynamic: requires-python
 - File operations (read/write/append)
 - Task automation
 - Predefined task support
+- Dynamic tool system with auto-loading
+- AI-powered tool generation
+- Custom tool development
 
 🔄 **Interactive Experience**
 - Natural language understanding
@@ -95,6 +98,139 @@ Dynamic: requires-python
 - Multi-line input support
 - Colored output with progress indicators
 
+## 🛠️ Custom Tools
+
+### Tool Locations
+- Built-in tools: `src/jarvis/tools/`
+- User tools: `~/.jarvis_tools/` (automatically created)
+
+### Creating Tools
+
+#### 1. Using AI Generator (Recommended)
+```yaml
+<START_TOOL_CALL>
+name: generate_tool
+arguments:
+    tool_name: calculator
+    class_name: CalculatorTool
+    description: Basic math calculations
+    parameters:
+        type: object
+        properties:
+            operation:
+                type: string
+                enum: ["add", "subtract", "multiply", "divide"]
+            numbers:
+                type: array
+                items:
+                    type: number
+        required: ["operation", "numbers"]
+<END_TOOL_CALL>
+```
+
+#### 2. Manual Creation
+Create a new Python file in `~/.jarvis_tools/`:
+
+```python
+from typing import Dict, Any, Protocol, Optional
+from enum import Enum
+
+class OutputType(Enum):
+    INFO = "info"
+    ERROR = "error"
+
+class OutputHandler(Protocol):
+    def print(self, text: str, output_type: OutputType) -> None: ...
+
+class ModelHandler(Protocol):
+    def chat(self, message: str) -> str: ...
+
+class CustomTool:
+    name = "tool_name"              # Tool name for invocation
+    description = "Tool description" # Tool purpose
+    parameters = {                  # JSON Schema for parameters
+        "type": "object",
+        "properties": {
+            "param1": {"type": "string"}
+        },
+        "required": ["param1"]
+    }
+
+    def __init__(self, **kwargs):
+        """Initialize tool with optional dependencies
+        
+        Args:
+            model: AI model for advanced features
+            output_handler: For consistent output formatting
+            register: Access to tool registry
+        """
+        self.model = kwargs.get('model')
+        self.output = kwargs.get('output_handler')
+        self.register = kwargs.get('register')
+        
+    def _print(self, text: str, output_type: OutputType = OutputType.INFO):
+        """Print formatted output"""
+        if self.output:
+            self.output.print(text, output_type)
+
+    def execute(self, args: Dict) -> Dict[str, Any]:
+        """Execute tool functionality
+        
+        Args:
+            args: Parameters passed to the tool
+            
+        Returns:
+            Dict with execution results:
+            {
+                "success": bool,
+                "stdout": str,  # On success
+                "stderr": str,  # Optional error details
+                "error": str    # On failure
+            }
+        """
+        try:
+            # Implement tool logic here
+            result = "Tool execution result"
+            
+            return {
+                "success": True,
+                "stdout": result,
+                "stderr": ""
+            }
+        except Exception as e:
+            self._print(str(e), OutputType.ERROR)
+            return {
+                "success": False,
+                "error": str(e)
+            }
+```
+
+### Development Guidelines
+
+1. **Tool Structure**
+   - Clear name and description
+   - Well-defined parameters schema
+   - Proper error handling
+   - Consistent output format
+
+2. **Best Practices**
+   - Use `_print` for output
+   - Handle all required parameters
+   - Document functionality
+   - Return standardized results
+   - Keep tools focused and simple
+
+3. **Testing**
+   - Verify parameter validation
+   - Test error handling
+   - Check output format
+   - Ensure proper cleanup
+
+4. **Integration**
+   - Tools are auto-loaded on startup
+   - No manual registration needed
+   - Hot-reload supported
+   - Dependencies injected automatically
 
 ## ⚙️ Environment Setup
 

{jarvis_ai_assistant-0.1.17 → jarvis_ai_assistant-0.1.19}/README.md

@@ -34,6 +34,9 @@
 - File operations (read/write/append)
 - Task automation
 - Predefined task support
+- Dynamic tool system with auto-loading
+- AI-powered tool generation
+- Custom tool development
 
 🔄 **Interactive Experience**
 - Natural language understanding
@@ -42,6 +45,139 @@
 - Multi-line input support
 - Colored output with progress indicators
 
+## 🛠️ Custom Tools
+
+### Tool Locations
+- Built-in tools: `src/jarvis/tools/`
+- User tools: `~/.jarvis_tools/` (automatically created)
+
+### Creating Tools
+
+#### 1. Using AI Generator (Recommended)
+```yaml
+<START_TOOL_CALL>
+name: generate_tool
+arguments:
+    tool_name: calculator
+    class_name: CalculatorTool
+    description: Basic math calculations
+    parameters:
+        type: object
+        properties:
+            operation:
+                type: string
+                enum: ["add", "subtract", "multiply", "divide"]
+            numbers:
+                type: array
+                items:
+                    type: number
+        required: ["operation", "numbers"]
+<END_TOOL_CALL>
+```
+
+#### 2. Manual Creation
+Create a new Python file in `~/.jarvis_tools/`:
+
+```python
+from typing import Dict, Any, Protocol, Optional
+from enum import Enum
+
+class OutputType(Enum):
+    INFO = "info"
+    ERROR = "error"
+
+class OutputHandler(Protocol):
+    def print(self, text: str, output_type: OutputType) -> None: ...
+
+class ModelHandler(Protocol):
+    def chat(self, message: str) -> str: ...
+
+class CustomTool:
+    name = "tool_name"              # Tool name for invocation
+    description = "Tool description" # Tool purpose
+    parameters = {                  # JSON Schema for parameters
+        "type": "object",
+        "properties": {
+            "param1": {"type": "string"}
+        },
+        "required": ["param1"]
+    }
+
+    def __init__(self, **kwargs):
+        """Initialize tool with optional dependencies
+        
+        Args:
+            model: AI model for advanced features
+            output_handler: For consistent output formatting
+            register: Access to tool registry
+        """
+        self.model = kwargs.get('model')
+        self.output = kwargs.get('output_handler')
+        self.register = kwargs.get('register')
+        
+    def _print(self, text: str, output_type: OutputType = OutputType.INFO):
+        """Print formatted output"""
+        if self.output:
+            self.output.print(text, output_type)
+
+    def execute(self, args: Dict) -> Dict[str, Any]:
+        """Execute tool functionality
+        
+        Args:
+            args: Parameters passed to the tool
+            
+        Returns:
+            Dict with execution results:
+            {
+                "success": bool,
+                "stdout": str,  # On success
+                "stderr": str,  # Optional error details
+                "error": str    # On failure
+            }
+        """
+        try:
+            # Implement tool logic here
+            result = "Tool execution result"
+            
+            return {
+                "success": True,
+                "stdout": result,
+                "stderr": ""
+            }
+        except Exception as e:
+            self._print(str(e), OutputType.ERROR)
+            return {
+                "success": False,
+                "error": str(e)
+            }
+```
+
+### Development Guidelines
+
+1. **Tool Structure**
+   - Clear name and description
+   - Well-defined parameters schema
+   - Proper error handling
+   - Consistent output format
+
+2. **Best Practices**
+   - Use `_print` for output
+   - Handle all required parameters
+   - Document functionality
+   - Return standardized results
+   - Keep tools focused and simple
+
+3. **Testing**
+   - Verify parameter validation
+   - Test error handling
+   - Check output format
+   - Ensure proper cleanup
+
+4. **Integration**
+   - Tools are auto-loaded on startup
+   - No manual registration needed
+   - Hot-reload supported
+   - Dependencies injected automatically
 
 ## ⚙️ Environment Setup
 

{jarvis_ai_assistant-0.1.17 → jarvis_ai_assistant-0.1.19}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.17"
+version = "0.1.19"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "Your Name", email = "your.email@example.com" }]

{jarvis_ai_assistant-0.1.17 → jarvis_ai_assistant-0.1.19}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.17",
+    version="0.1.19",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.1.17 → jarvis_ai_assistant-0.1.19}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.17" 
+__version__ = "0.1.19" 

{jarvis_ai_assistant-0.1.17 → jarvis_ai_assistant-0.1.19}/src/jarvis/agent.py

@@ -103,55 +103,32 @@ class Agent:
                 tools_prompt += f"  描述: {tool['description']}\n"
                 tools_prompt += f"  参数: {tool['parameters']}\n"
 
-            self.prompt = f"""你是 {self.name}，一个严格遵循 ReAct 框架进行逐步推理和行动的 AI 助手。
+            self.prompt = f"""你是 {self.name}，一个严格遵循 ReAct 框架的 AI 助手。
 
 {tools_prompt}
 
-关键规则：
-‼️ 禁止创建虚假对话
-‼️ 禁止假设用户回应
-‼️ 禁止在没有实际用户输入时继续
-‼️ 只回应用户实际说的内容
-‼️ 每个动作后停止并等待
+核心能力：
+1. 使用现有工具完成任务
+2. 通过 generate_tool 创建新工具扩展功能
+3. 遵循 ReAct (思考-行动-观察) 框架
 
-ReAct 框架：
+工作流程：
 1. 思考
-   - 分析当前情况
-   - 考虑可用工具
-   - 规划下一步行动
-   - 仅基于事实
-   - 不做用户回应的假设
-   - 不想象对话内容
-
-2. 行动（可选）
-   - 不是每次回应都需要调用工具
-   - 如果需要更多信息，直接询问用户
-   - 使用工具时：
-     - 只使用下面列出的工具
-     - 每次只执行一个工具
-     - 工具由用户手动执行
-     - 必须使用有效合法的YAML格式：
-     <START_TOOL_CALL>
-     name: tool_name
-     arguments:
-         param1: value1       # 所有参数必须正确缩进
-         param2: |           # 使用YAML块样式表示多行字符串
-             line1
-             line2
-     <END_TOOL_CALL>
-
+   - 分析需求和可用工具
+   - 评估是否需要新工具
+   - 规划解决方案
+
+2. 行动 (如果需要)
+   - 使用现有工具
+   - 创建新工具
+   - 询问更多信息
+   
 3. 观察
-   - 等待工具执行结果或用户回应
-   - 工具执行结果由用户提供
-   - 不要假设或想象回应
-   - 不要创建虚假对话
-   - 停止并等待实际输入
+   - 等待执行结果
+   - 分析反馈
+   - 规划下一步
 
-回应格式：
-思考：我分析当前情况[具体情况]... 基于[事实]，我需要[目标]...
-
-[如果需要使用工具：]
-行动：我将使用[工具]来[具体目的]...
+工具使用格式：
 <START_TOOL_CALL>
 name: tool_name
 arguments:
@@ -161,37 +138,28 @@ arguments:
         value
 <END_TOOL_CALL>
 
-[如果需要更多信息：]
-我需要了解更多关于[具体细节]的信息。请提供[需要的信息]。
+创建新工具示例：
+<START_TOOL_CALL>
+name: generate_tool
+arguments:
+    tool_name: custom_tool_name
+    class_name: CustomToolName
+    description: 详细的工具描述
+    parameters:
+        type: object
+        properties:
+            param1: 
+                type: string
+                description: 参数1的描述
+        required: [param1]
+<END_TOOL_CALL>
 
 严格规则：
-‼️ 只使用下面列出的工具
-‼️ 工具调用是可选的 - 需要时询问用户
-‼️ 每次只能调用一个工具
-‼️ 工具调用必须是有效的YAML格式
-‼️ 参数必须正确缩进
-‼️ 使用YAML块样式(|)表示多行值
-‼️ 工具由用户手动执行
-‼️ 等待用户提供工具执行结果
-‼️ 不要假设或想象用户回应
-‼️ 没有用户输入时不要继续对话
-‼️ 不要创建虚假对话
-‼️ 每个动作后停止
-‼️ 不要假设结果
-‼️ 不要假设行动
-
-注意事项：
-- 先思考再行动
-- 需要时询问用户
-- 只使用列出的工具
-- 一次一个工具
-- 严格遵循YAML格式
-- 等待用户回应
-- 工具结果来自用户
-- 不要假设回应
-- 不要虚构对话
-- 每个动作后停止
-- 只在有实际用户输入时继续
+1. 每次只能执行一个工具
+2. 等待用户提供执行结果
+3. 不要假设或想象结果
+4. 不要创建虚假对话
+5. 每个动作后停止等待
 
 任务:
 {user_input}

{jarvis_ai_assistant-0.1.17 → jarvis_ai_assistant-0.1.19}/src/jarvis/main.py

@@ -6,6 +6,9 @@ import yaml
 import os
 import sys
 from pathlib import Path
+from prompt_toolkit import prompt
+from prompt_toolkit.completion import WordCompleter
+from prompt_toolkit.validation import Validator, ValidationError
 
 # 添加父目录到Python路径以支持导入
 sys.path.insert(0, str(Path(__file__).parent.parent))
@@ -55,6 +58,19 @@ def load_tasks() -> dict:
     
     return tasks
 
+class NumberValidator(Validator):
+    def validate(self, document):
+        text = document.text.strip()
+        if not text:  # Allow empty input
+            return
+            
+        try:
+            number = int(text)
+            if number < 0:
+                raise ValidationError(message='Please enter a non-negative number')
+        except ValueError:
+            raise ValidationError(message='Please enter a valid number')
+
 def select_task(tasks: dict) -> str:
     """Let user select a task from the list or skip. Returns task description if selected."""
     if not tasks:
@@ -68,9 +84,20 @@ def select_task(tasks: dict) -> str:
         PrettyOutput.print(f"[{i}] {name}", OutputType.INFO)
     PrettyOutput.print("[0] Skip predefined tasks", OutputType.INFO)
     
+    # Create completer with valid numbers
+    valid_numbers = [str(i) for i in range(len(task_names) + 1)]
+    number_completer = WordCompleter(valid_numbers)
+    
     while True:
         try:
-            choice = input("\nSelect a task number (0 to skip): ").strip()
+            choice = prompt(
+                "\nSelect a task number (0 to skip): ",
+                completer=number_completer,
+                validator=NumberValidator(),
+                validate_while_typing=False,
+                enable_history_search=True,
+            ).strip()
+            
             if not choice:
                 return ""
             
@@ -81,9 +108,12 @@ def select_task(tasks: dict) -> str:
                 selected_name = task_names[choice - 1]
                 return tasks[selected_name]  # Return the task description
             else:
-                PrettyOutput.print("Invalid choice. Please try again.", OutputType.ERROR)
-        except ValueError:
-            PrettyOutput.print("Please enter a valid number.", OutputType.ERROR)
+                PrettyOutput.print("Invalid choice. Please select a number from the list.", OutputType.ERROR)
+                
+        except KeyboardInterrupt:
+            return ""  # Return empty on Ctrl+C
+        except EOFError:
+            return ""  # Return empty on Ctrl+D
 
 def main():
     """Main entry point for Jarvis."""
@@ -121,7 +151,7 @@ def main():
         
         model = KimiModel(kimi_api_key)
 
-        tool_registry = ToolRegistry(model)
+        tool_registry = ToolRegistry()
         agent = Agent(model, tool_registry)
 
         # 欢迎信息

{jarvis_ai_assistant-0.1.17 → jarvis_ai_assistant-0.1.19}/src/jarvis/tools/__init__.py

@@ -1,10 +1,12 @@
 from .base import Tool, ToolRegistry
 from .file_ops import FileOperationTool
 from .shell import ShellTool
+from .generator import ToolGeneratorTool
 
 __all__ = [
     'Tool',
     'ToolRegistry',
     'FileOperationTool',
     'ShellTool',
+    'ToolGeneratorTool',
 ]