jarvis-ai-assistant 0.1.40__tar.gz → 0.1.42__tar.gz

{jarvis_ai_assistant-0.1.40/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.40
+Version: 0.1.42
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -134,8 +134,8 @@ jarvis
 
 ### With Specific Model
 ```bash
-jarvis -m kimi  # Use Kimi model
-jarvis -m openai  # Use OpenAI model
+jarvis -p kimi  # Use Kimi platform
+jarvis -p openai  # Use OpenAI platform
 ```
 
 ### Process Files
@@ -154,10 +154,11 @@ jarvis --keep-history  # Don't delete chat session after completion
 
 | Tool | Description |
 |------|-------------|
-| shell | Execute shell commands |
-| file | File operations (read/write/append) |
-| git | Git operations |
-| methodology | Manage problem-solving methodologies |
+| execute_shell | Execute system commands and capture output |
+| file_operation | File operations (read/write/append/delete) |
+| generate_tool | AI-powered tool generation and integration |
+| methodology | Experience accumulation and methodology management |
+| create_sub_agent | Create specialized sub-agents for specific tasks |
 
 ### Tool Locations
 - Built-in tools: `src/jarvis/tools/`
@@ -166,21 +167,21 @@ jarvis --keep-history  # Don't delete chat session after completion
 ### Key Features
 
 #### 1. Self-Extending Capabilities
-- AI-powered tool generation
-- Automatic integration of new tools
-- Dynamic capability expansion
+- Tool generation through natural language description
+- Automatic code generation and integration
+- Dynamic capability expansion through sub-agents
 
 #### 2. Methodology Learning
-- Automatic extraction of problem-solving patterns
-- Continuous methodology refinement
-- Experience-based improvement
+- Automatic experience accumulation from interactions
+- Pattern recognition and methodology extraction
+- Continuous refinement through usage
 
 #### 3. Adaptive Problem Solving
-- Context-aware tool selection
-- Dynamic strategy adjustment
-- Learning from execution results
+- Context-aware sub-agent creation
+- Dynamic tool composition
+- Learning from execution feedback
 
-## �� Extending Jarvis
+## 🎯 Extending Jarvis
 
 ### Adding New Tools
 

{jarvis_ai_assistant-0.1.40 → jarvis_ai_assistant-0.1.42}/README.md

@@ -80,8 +80,8 @@ jarvis
 
 ### With Specific Model
 ```bash
-jarvis -m kimi  # Use Kimi model
-jarvis -m openai  # Use OpenAI model
+jarvis -p kimi  # Use Kimi platform
+jarvis -p openai  # Use OpenAI platform
 ```
 
 ### Process Files
@@ -100,10 +100,11 @@ jarvis --keep-history  # Don't delete chat session after completion
 
 | Tool | Description |
 |------|-------------|
-| shell | Execute shell commands |
-| file | File operations (read/write/append) |
-| git | Git operations |
-| methodology | Manage problem-solving methodologies |
+| execute_shell | Execute system commands and capture output |
+| file_operation | File operations (read/write/append/delete) |
+| generate_tool | AI-powered tool generation and integration |
+| methodology | Experience accumulation and methodology management |
+| create_sub_agent | Create specialized sub-agents for specific tasks |
 
 ### Tool Locations
 - Built-in tools: `src/jarvis/tools/`
@@ -112,21 +113,21 @@ jarvis --keep-history  # Don't delete chat session after completion
 ### Key Features
 
 #### 1. Self-Extending Capabilities
-- AI-powered tool generation
-- Automatic integration of new tools
-- Dynamic capability expansion
+- Tool generation through natural language description
+- Automatic code generation and integration
+- Dynamic capability expansion through sub-agents
 
 #### 2. Methodology Learning
-- Automatic extraction of problem-solving patterns
-- Continuous methodology refinement
-- Experience-based improvement
+- Automatic experience accumulation from interactions
+- Pattern recognition and methodology extraction
+- Continuous refinement through usage
 
 #### 3. Adaptive Problem Solving
-- Context-aware tool selection
-- Dynamic strategy adjustment
-- Learning from execution results
+- Context-aware sub-agent creation
+- Dynamic tool composition
+- Learning from execution feedback
 
-## �� Extending Jarvis
+## 🎯 Extending Jarvis
 
 ### Adding New Tools
 

{jarvis_ai_assistant-0.1.40 → jarvis_ai_assistant-0.1.42}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.40"
+version = "0.1.42"
 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.40 → jarvis_ai_assistant-0.1.42}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.40",
+    version="0.1.42",
     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.40 → jarvis_ai_assistant-0.1.42}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.40" 
+__version__ = "0.1.42" 

{jarvis_ai_assistant-0.1.40 → jarvis_ai_assistant-0.1.42}/src/jarvis/agent.py

@@ -3,7 +3,7 @@ from typing import Dict, List, Optional
 
 import yaml
 
-from .models.registry import ModelRegistry
+from .models.registry import PlatformRegistry
 from .tools import ToolRegistry
 from .utils import PrettyOutput, OutputType, get_multiline_input, while_success
 import os
@@ -20,7 +20,7 @@ class Agent:
             name: Agent名称，默认为"Jarvis"
             is_sub_agent: 是否为子Agent，默认为False
         """
-        self.model = ModelRegistry.get_global_model()
+        self.model = PlatformRegistry.get_platform()
         self.tool_registry = ToolRegistry.get_global_tool_registry()
         self.name = name
         self.is_sub_agent = is_sub_agent

{jarvis_ai_assistant-0.1.40 → jarvis_ai_assistant-0.1.42}/src/jarvis/main.py

@@ -8,7 +8,7 @@ import sys
 from pathlib import Path
 from prompt_toolkit import prompt
 
-from jarvis.models.registry import ModelRegistry
+from jarvis.models.registry import PlatformRegistry
 
 # 添加父目录到Python路径以支持导入
 sys.path.insert(0, str(Path(__file__).parent.parent))
@@ -114,14 +114,14 @@ def main():
         PrettyOutput.print("未指定AI平台，请使用 -p 参数或者设置 JARVIS_PLATFORM 环境变量", OutputType.ERROR)
         return 1
 
-    ModelRegistry.get_model_registry().set_global_model(platform)
+    PlatformRegistry.get_platform_registry().set_global_platform(platform)
     
     try:
         # 获取全局模型实例
         agent = Agent()
 
         # 欢迎信息
-        PrettyOutput.print(f"Jarvis 已初始化 - With {platform} 平台", OutputType.SYSTEM)
+        PrettyOutput.print(f"Jarvis 已初始化 - With {platform} 平台，模型: {agent.model.name()}", OutputType.SYSTEM)
         if args.keep_history:
             PrettyOutput.print("已启用历史保留模式", OutputType.INFO)
         

jarvis_ai_assistant-0.1.42/src/jarvis/models/__init__.py

@@ -0,0 +1,3 @@
+from .base import BasePlatform
+
+__all__ = ['BasePlatform']     

{jarvis_ai_assistant-0.1.40 → jarvis_ai_assistant-0.1.42}/src/jarvis/models/ai8.py

@@ -1,15 +1,15 @@
 import os
 from typing import Dict, List
-from jarvis.models.base import BaseModel
+from jarvis.models.base import BasePlatform
 from jarvis.utils import PrettyOutput, OutputType
 import requests
 import json
 import base64
 
-class AI8Model(BaseModel):
+class AI8Model(BasePlatform):
     """AI8 model implementation"""
     
-    model_name = "ai8"
+    platform_name = "ai8"
     BASE_URL = "https://ai8.rcouyi.com"
     
     def __init__(self):
@@ -53,8 +53,6 @@ class AI8Model(BaseModel):
         PrettyOutput.print("Baichuan4-Air", OutputType.INFO)
         PrettyOutput.print("Baichuan4-Turbo", OutputType.INFO)
         PrettyOutput.print("moonshot-v1-8k", OutputType.INFO)
-        PrettyOutput.print("moonshot-v1-32k", OutputType.INFO)
-        PrettyOutput.print("moonshot-v1-128k", OutputType.INFO)
         PrettyOutput.print("ERNIE-Speed-128K", OutputType.INFO)
         PrettyOutput.print("ERNIE-3.5-128K", OutputType.INFO)
 
@@ -230,7 +228,7 @@ class AI8Model(BaseModel):
             
     def name(self) -> str:
         """Return model name"""
-        return self.model_name
+        return self.model
         
     def reset(self):
         """Reset model state"""

{jarvis_ai_assistant-0.1.40 → jarvis_ai_assistant-0.1.42}/src/jarvis/models/base.py

@@ -3,7 +3,7 @@ from typing import Dict, List
 from ..utils import OutputType, PrettyOutput
 
 
-class BaseModel(ABC):
+class BasePlatform(ABC):
     """大语言模型基类"""
     
     def __init__(self):

{jarvis_ai_assistant-0.1.40 → jarvis_ai_assistant-0.1.42}/src/jarvis/models/kimi.py

@@ -4,14 +4,14 @@ import json
 import os
 import mimetypes
 import time
-from jarvis.models.base import BaseModel
+from jarvis.models.base import BasePlatform
 from jarvis.utils import PrettyOutput, OutputType
 from jarvis.utils import while_success
 
-class KimiModel(BaseModel):
+class KimiModel(BasePlatform):
     """Kimi模型实现"""
 
-    model_name = "kimi"
+    platform_name = "kimi"
     
     def __init__(self):
         """
@@ -19,21 +19,21 @@ class KimiModel(BaseModel):
         """
         self.api_key = os.getenv("KIMI_API_KEY")
         if not self.api_key:
-            PrettyOutput.info("\n需要设置 KIMI_API_KEY 才能使用 Jarvis。请按以下步骤操作：")
-            PrettyOutput.info("\n1. 获取 Kimi API Key:")
-            PrettyOutput.info("   • 访问 Kimi AI 平台: https://kimi.moonshot.cn")
-            PrettyOutput.info("   • 登录您的账号")
-            PrettyOutput.info("   • 打开浏览器开发者工具 (F12 或右键 -> 检查)")
-            PrettyOutput.info("   • 切换到 Network 标签页")
-            PrettyOutput.info("   • 发送任意消息")
-            PrettyOutput.info("   • 在请求中找到 Authorization 头部")
-            PrettyOutput.info("   • 复制 token 值（去掉 'Bearer ' 前缀）")
-            PrettyOutput.info("\n2. 设置环境变量:")
-            PrettyOutput.info("   方法 1: 创建或编辑 ~/.jarvis_env 文件:")
-            PrettyOutput.info("   echo 'KIMI_API_KEY=your_key_here' > ~/.jarvis_env")
-            PrettyOutput.info("\n   方法 2: 直接设置环境变量:")
-            PrettyOutput.info("   export KIMI_API_KEY=your_key_here")
-            PrettyOutput.info("\n设置完成后重新运行 Jarvis。")
+            PrettyOutput.print("\n需要设置 KIMI_API_KEY 才能使用 Jarvis。请按以下步骤操作：", OutputType.INFO)
+            PrettyOutput.print("\n1. 获取 Kimi API Key:", OutputType.INFO)
+            PrettyOutput.print("   • 访问 Kimi AI 平台: https://kimi.moonshot.cn", OutputType.INFO)
+            PrettyOutput.print("   • 登录您的账号", OutputType.INFO)
+            PrettyOutput.print("   • 打开浏览器开发者工具 (F12 或右键 -> 检查)", OutputType.INFO)
+            PrettyOutput.print("   • 切换到 Network 标签页", OutputType.INFO)
+            PrettyOutput.print("   • 发送任意消息", OutputType.INFO)
+            PrettyOutput.print("   • 在请求中找到 Authorization 头部", OutputType.INFO)
+            PrettyOutput.print("   • 复制 token 值（去掉 'Bearer ' 前缀）", OutputType.INFO)
+            PrettyOutput.print("\n2. 设置环境变量:", OutputType.INFO)
+            PrettyOutput.print("   方法 1: 创建或编辑 ~/.jarvis_env 文件:", OutputType.INFO)
+            PrettyOutput.print("   echo 'KIMI_API_KEY=your_key_here' > ~/.jarvis_env", OutputType.INFO)
+            PrettyOutput.print("\n   方法 2: 直接设置环境变量:", OutputType.INFO)
+            PrettyOutput.print("   export KIMI_API_KEY=your_key_here", OutputType.INFO)
+            PrettyOutput.print("\n设置完成后重新运行 Jarvis。", OutputType.INFO)
             raise Exception("KIMI_API_KEY is not set")
         self.auth_header = f"Bearer {self.api_key}"
         self.chat_id = ""

{jarvis_ai_assistant-0.1.40 → jarvis_ai_assistant-0.1.42}/src/jarvis/models/openai.py

@@ -1,13 +1,13 @@
 from typing import Dict, List
 import os
 from openai import OpenAI
-from jarvis.models.base import BaseModel
+from jarvis.models.base import BasePlatform
 from jarvis.utils import PrettyOutput, OutputType
 
-class OpenAIModel(BaseModel):
+class OpenAIModel(BasePlatform):
     """DeepSeek模型实现"""
 
-    model_name = "openai"
+    platform_name = "openai"
     
     def __init__(self):
         """
@@ -30,9 +30,9 @@ class OpenAIModel(BaseModel):
             raise Exception("OPENAI_API_KEY is not set")
             
         self.base_url = os.getenv("OPENAI_API_BASE", "https://api.deepseek.com")
-        self.model_name = os.getenv("OPENAI_MODEL_NAME", "deepseek-chat")
+        self.model = os.getenv("OPENAI_MODEL_NAME", "deepseek-chat")
 
-        PrettyOutput.print(f"当前使用模型: {self.model_name}", OutputType.SYSTEM)
+        PrettyOutput.print(f"当前使用模型: {self.model}", OutputType.SYSTEM)
             
         self.client = OpenAI(
             api_key=self.api_key,
@@ -55,7 +55,7 @@ class OpenAIModel(BaseModel):
             self.messages.append({"role": "user", "content": message})
             
             response = self.client.chat.completions.create(
-                model=self.model_name,  # 使用配置的模型名称
+                model=self.model,  # 使用配置的模型名称
                 messages=self.messages,
                 stream=True
             )
@@ -82,7 +82,7 @@ class OpenAIModel(BaseModel):
 
     def name(self) -> str:
         """返回模型名称"""
-        return self.model_name
+        return self.model
 
     def reset(self):
         """重置模型状态"""

{jarvis_ai_assistant-0.1.40 → jarvis_ai_assistant-0.1.42}/src/jarvis/models/oyi.py

@@ -1,15 +1,15 @@
 import mimetypes
 import os
 from typing import Dict, List
-from jarvis.models.base import BaseModel
+from jarvis.models.base import BasePlatform
 from jarvis.utils import PrettyOutput, OutputType
 import requests
 import json
 
-class OyiModel(BaseModel):
+class OyiModel(BasePlatform):
     """Oyi model implementation"""
     
-    model_name = "oyi"
+    platform_name = "oyi"
     BASE_URL = "https://api-10086.rcouyi.com"
     
     def __init__(self):
@@ -71,7 +71,7 @@ class OyiModel(BaseModel):
                 "isLock": False,
                 "systemMessage": "",
                 "params": json.dumps({
-                    "model": "gpt-4o-mini",
+                    "model": self.model,
                     "is_webSearch": True,
                     "message": [],
                     "systemMessage": None,
@@ -202,7 +202,7 @@ class OyiModel(BaseModel):
             
     def name(self) -> str:
         """Return model name"""
-        return self.model_name
+        return self.model
         
     def reset(self):
         """Reset model state"""

jarvis_ai_assistant-0.1.42/src/jarvis/models/registry.py

@@ -0,0 +1,199 @@
+import importlib
+import inspect
+import os
+import sys
+from typing import Dict, Type, Optional, List
+from .base import BasePlatform
+from ..utils import PrettyOutput, OutputType
+
+REQUIRED_METHODS = [
+    ('chat', ['message']),           # 方法名和参数列表
+    ('name', []),
+    ('delete_chat', []),
+    ('reset', []),
+    ('set_system_message', ['message'])
+]
+
+class PlatformRegistry:
+    """平台注册器"""
+
+    global_platform_name = "kimi"
+    global_platform_registry = None
+
+    @staticmethod
+    def get_platform_dir() -> str:
+        user_platform_dir = os.path.expanduser("~/.jarvis_models")
+        if not os.path.exists(user_platform_dir):
+            try:
+                os.makedirs(user_platform_dir)
+                # 创建 __init__.py 使其成为 Python 包
+                with open(os.path.join(user_platform_dir, "__init__.py"), "w") as f:
+                    pass
+                PrettyOutput.print(f"已创建平台目录: {user_platform_dir}", OutputType.INFO)
+            except Exception as e:
+                PrettyOutput.print(f"创建平台目录失败: {str(e)}", OutputType.ERROR)
+                return ""
+        return user_platform_dir
+
+    @staticmethod
+    def check_platform_implementation(platform_class: Type[BasePlatform]) -> bool:
+        """检查平台类是否实现了所有必要的方法
+        
+        Args:
+            platform_class: 要检查的平台类
+            
+        Returns:
+            bool: 是否实现了所有必要的方法
+        """
+        missing_methods = []
+        
+        for method_name, params in REQUIRED_METHODS:
+            if not hasattr(platform_class, method_name):
+                missing_methods.append(method_name)
+                continue
+                
+            method = getattr(platform_class, method_name)
+            if not callable(method):
+                missing_methods.append(method_name)
+                continue
+                
+            # 检查方法参数
+            import inspect
+            sig = inspect.signature(method)
+            method_params = [p for p in sig.parameters if p != 'self']
+            if len(method_params) != len(params):
+                missing_methods.append(f"{method_name}(参数不匹配)")
+        
+        if missing_methods:
+            PrettyOutput.print(
+                f"平台 {platform_class.__name__} 缺少必要的方法: {', '.join(missing_methods)}", 
+                OutputType.ERROR
+            )
+            return False
+            
+        return True
+
+    @staticmethod
+    def load_platform_from_dir(directory: str) -> Dict[str, Type[BasePlatform]]:
+        """从指定目录加载平台
+        
+        Args:
+            directory: 平台目录路径
+            
+        Returns:
+            Dict[str, Type[BaseModel]]: 平台名称到平台类的映射
+        """
+        platforms = {}
+        
+        # 确保目录存在
+        if not os.path.exists(directory):
+            PrettyOutput.print(f"平台目录不存在: {directory}", OutputType.ERROR)
+            return platforms
+            
+        # 获取目录的包名
+        package_name = None
+        if directory == os.path.dirname(__file__):
+            package_name = "jarvis.models"
+            
+        # 添加目录到Python路径
+        if directory not in sys.path:
+            sys.path.append(directory)
+        
+        # 遍历目录下的所有.py文件
+        for filename in os.listdir(directory):
+            if filename.endswith('.py') and not filename.startswith('__'):
+                module_name = filename[:-3]  # 移除.py后缀
+                try:
+                    # 导入模块
+                    if package_name:
+                        module = importlib.import_module(f"{package_name}.{module_name}")
+                    else:
+                        module = importlib.import_module(module_name)
+                    
+                    # 遍历模块中的所有类
+                    for name, obj in inspect.getmembers(module):
+                        # 检查是否是BaseModel的子类，但不是BaseModel本身
+                        if (inspect.isclass(obj) and 
+                            issubclass(obj, BasePlatform) and 
+                            obj != BasePlatform and
+                            hasattr(obj, 'platform_name')):
+                            # 检查平台实现
+                            if not PlatformRegistry.check_platform_implementation(obj):
+                                continue
+                            platforms[obj.platform_name] = obj
+                            PrettyOutput.print(f"从 {directory} 加载平台: {obj.platform_name}", OutputType.INFO)
+                            break
+                except Exception as e:
+                    PrettyOutput.print(f"加载平台 {module_name} 失败: {str(e)}", OutputType.ERROR)
+        
+        return platforms
+
+
+    @staticmethod
+    def get_platform_registry():
+        """获取全局平台注册器"""
+        if PlatformRegistry.global_platform_registry is None:
+            PlatformRegistry.global_platform_registry = PlatformRegistry()
+            
+            # 从用户平台目录加载额外平台
+            platform_dir = PlatformRegistry.get_platform_dir()
+            if platform_dir and os.path.exists(platform_dir):
+                for platform_name, platform_class in PlatformRegistry.load_platform_from_dir(platform_dir).items():
+                    PlatformRegistry.global_platform_registry.register_platform(platform_name, platform_class)
+            platform_dir = os.path.dirname(__file__)
+            if platform_dir and os.path.exists(platform_dir):
+                for platform_name, platform_class in PlatformRegistry.load_platform_from_dir(platform_dir).items():
+                    PlatformRegistry.global_platform_registry.register_platform(platform_name, platform_class)
+        return PlatformRegistry.global_platform_registry
+    
+    def __init__(self):
+        """初始化平台注册器
+        """
+        self.platforms: Dict[str, Type[BasePlatform]] = {}
+
+    @staticmethod
+    def get_platform() -> BasePlatform:
+        """获取全局平台实例"""
+        platform = PlatformRegistry.get_platform_registry().create_platform(PlatformRegistry.global_platform_name)
+        if not platform:
+            raise Exception(f"Failed to create platform: {PlatformRegistry.global_platform_name}")
+        return platform
+        
+    def register_platform(self, name: str, platform_class: Type[BasePlatform]):
+        """注册平台类
+        
+        Args:
+            name: 平台名称
+            model_class: 平台类
+        """
+        self.platforms[name] = platform_class
+        PrettyOutput.print(f"已注册平台: {name}", OutputType.INFO)
+            
+    def create_platform(self, name: str) -> Optional[BasePlatform]:
+        """创建平台实例
+        
+        Args:
+            name: 平台名称
+            
+        Returns:
+            BaseModel: 平台实例
+        """
+        if name not in self.platforms:
+            PrettyOutput.print(f"未找到平台: {name}", OutputType.ERROR)
+            return None
+            
+        try:
+            platform = self.platforms[name]()
+            PrettyOutput.print(f"已创建平台实例: {name}", OutputType.INFO)
+            return platform
+        except Exception as e:
+            PrettyOutput.print(f"创建平台失败: {str(e)}", OutputType.ERROR)
+            return None
+            
+    def get_available_platforms(self) -> List[str]:
+        """获取可用平台列表"""
+        return list(self.platforms.keys()) 
+    
+    def set_global_platform(self, platform_name: str):
+        """设置全局平台"""
+        PlatformRegistry.global_platform_name = platform_name

{jarvis_ai_assistant-0.1.40 → jarvis_ai_assistant-0.1.42}/src/jarvis/tools/generator.py

@@ -1,6 +1,6 @@
 from typing import Dict, Any
 from pathlib import Path
-from jarvis.models.registry import ModelRegistry
+from jarvis.models.registry import PlatformRegistry
 from jarvis.tools.registry import ToolRegistry
 from jarvis.utils import OutputType, PrettyOutput
 
@@ -41,7 +41,7 @@ class ToolGeneratorTool:
 
     def _generate_tool_code(self, tool_name: str, class_name: str, description: str, parameters: Dict) -> str:
         """使用大模型生成工具代码"""
-        model = ModelRegistry.get_global_model()
+        model = PlatformRegistry.get_platform()
 
         prompt = f"""请生成一个Python工具类的代码，要求如下，除了代码，不要输出任何内容：
 

{jarvis_ai_assistant-0.1.40 → jarvis_ai_assistant-0.1.42}/src/jarvis/tools/registry.py

@@ -5,7 +5,7 @@ from pathlib import Path
 import sys
 from typing import Any, Callable, Dict, List, Optional
 
-from jarvis.models.registry import ModelRegistry
+from jarvis.models.registry import PlatformRegistry
 from jarvis.tools.base import Tool
 from jarvis.utils import OutputType, PrettyOutput
 

{jarvis_ai_assistant-0.1.40 → jarvis_ai_assistant-0.1.42/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.40
+Version: 0.1.42
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -134,8 +134,8 @@ jarvis
 
 ### With Specific Model
 ```bash
-jarvis -m kimi  # Use Kimi model
-jarvis -m openai  # Use OpenAI model
+jarvis -p kimi  # Use Kimi platform
+jarvis -p openai  # Use OpenAI platform
 ```
 
 ### Process Files
@@ -154,10 +154,11 @@ jarvis --keep-history  # Don't delete chat session after completion
 
 | Tool | Description |
 |------|-------------|
-| shell | Execute shell commands |
-| file | File operations (read/write/append) |
-| git | Git operations |
-| methodology | Manage problem-solving methodologies |
+| execute_shell | Execute system commands and capture output |
+| file_operation | File operations (read/write/append/delete) |
+| generate_tool | AI-powered tool generation and integration |
+| methodology | Experience accumulation and methodology management |
+| create_sub_agent | Create specialized sub-agents for specific tasks |
 
 ### Tool Locations
 - Built-in tools: `src/jarvis/tools/`
@@ -166,21 +167,21 @@ jarvis --keep-history  # Don't delete chat session after completion
 ### Key Features
 
 #### 1. Self-Extending Capabilities
-- AI-powered tool generation
-- Automatic integration of new tools
-- Dynamic capability expansion
+- Tool generation through natural language description
+- Automatic code generation and integration
+- Dynamic capability expansion through sub-agents
 
 #### 2. Methodology Learning
-- Automatic extraction of problem-solving patterns
-- Continuous methodology refinement
-- Experience-based improvement
+- Automatic experience accumulation from interactions
+- Pattern recognition and methodology extraction
+- Continuous refinement through usage
 
 #### 3. Adaptive Problem Solving
-- Context-aware tool selection
-- Dynamic strategy adjustment
-- Learning from execution results
+- Context-aware sub-agent creation
+- Dynamic tool composition
+- Learning from execution feedback
 
-## �� Extending Jarvis
+## 🎯 Extending Jarvis
 
 ### Adding New Tools
 

jarvis_ai_assistant-0.1.40/src/jarvis/models/__init__.py

@@ -1,3 +0,0 @@
-from .base import BaseModel
-
-__all__ = ['BaseModel']     

jarvis_ai_assistant-0.1.40/src/jarvis/models/registry.py

@@ -1,199 +0,0 @@
-import importlib
-import inspect
-import os
-import sys
-from typing import Dict, Type, Optional, List
-from .base import BaseModel
-from ..utils import PrettyOutput, OutputType
-
-REQUIRED_METHODS = [
-    ('chat', ['message']),           # 方法名和参数列表
-    ('name', []),
-    ('delete_chat', []),
-    ('reset', []),
-    ('set_system_message', ['message'])
-]
-
-class ModelRegistry:
-    """模型注册器"""
-
-    global_model_name = "kimi"
-    global_model_registry = None
-
-    @staticmethod
-    def get_models_dir() -> str:
-        user_models_dir = os.path.expanduser("~/.jarvis_models")
-        if not os.path.exists(user_models_dir):
-            try:
-                os.makedirs(user_models_dir)
-                # 创建 __init__.py 使其成为 Python 包
-                with open(os.path.join(user_models_dir, "__init__.py"), "w") as f:
-                    pass
-                PrettyOutput.print(f"已创建模型目录: {user_models_dir}", OutputType.INFO)
-            except Exception as e:
-                PrettyOutput.print(f"创建模型目录失败: {str(e)}", OutputType.ERROR)
-                return ""
-        return user_models_dir
-
-    @staticmethod
-    def check_model_implementation(model_class: Type[BaseModel]) -> bool:
-        """检查模型类是否实现了所有必要的方法
-        
-        Args:
-            model_class: 要检查的模型类
-            
-        Returns:
-            bool: 是否实现了所有必要的方法
-        """
-        missing_methods = []
-        
-        for method_name, params in REQUIRED_METHODS:
-            if not hasattr(model_class, method_name):
-                missing_methods.append(method_name)
-                continue
-                
-            method = getattr(model_class, method_name)
-            if not callable(method):
-                missing_methods.append(method_name)
-                continue
-                
-            # 检查方法参数
-            import inspect
-            sig = inspect.signature(method)
-            method_params = [p for p in sig.parameters if p != 'self']
-            if len(method_params) != len(params):
-                missing_methods.append(f"{method_name}(参数不匹配)")
-        
-        if missing_methods:
-            PrettyOutput.print(
-                f"模型 {model_class.__name__} 缺少必要的方法: {', '.join(missing_methods)}", 
-                OutputType.ERROR
-            )
-            return False
-            
-        return True
-
-    @staticmethod
-    def load_models_from_dir(directory: str) -> Dict[str, Type[BaseModel]]:
-        """从指定目录加载模型
-        
-        Args:
-            directory: 模型目录路径
-            
-        Returns:
-            Dict[str, Type[BaseModel]]: 模型名称到模型类的映射
-        """
-        models = {}
-        
-        # 确保目录存在
-        if not os.path.exists(directory):
-            PrettyOutput.print(f"模型目录不存在: {directory}", OutputType.ERROR)
-            return models
-            
-        # 获取目录的包名
-        package_name = None
-        if directory == os.path.dirname(__file__):
-            package_name = "jarvis.models"
-            
-        # 添加目录到Python路径
-        if directory not in sys.path:
-            sys.path.append(directory)
-        
-        # 遍历目录下的所有.py文件
-        for filename in os.listdir(directory):
-            if filename.endswith('.py') and not filename.startswith('__'):
-                module_name = filename[:-3]  # 移除.py后缀
-                try:
-                    # 导入模块
-                    if package_name:
-                        module = importlib.import_module(f"{package_name}.{module_name}")
-                    else:
-                        module = importlib.import_module(module_name)
-                    
-                    # 遍历模块中的所有类
-                    for name, obj in inspect.getmembers(module):
-                        # 检查是否是BaseModel的子类，但不是BaseModel本身
-                        if (inspect.isclass(obj) and 
-                            issubclass(obj, BaseModel) and 
-                            obj != BaseModel and
-                            hasattr(obj, 'model_name')):
-                            # 检查模型实现
-                            if not ModelRegistry.check_model_implementation(obj):
-                                continue
-                            models[obj.model_name] = obj
-                            PrettyOutput.print(f"从 {directory} 加载模型: {obj.model_name}", OutputType.INFO)
-                            break
-                except Exception as e:
-                    PrettyOutput.print(f"加载模型 {module_name} 失败: {str(e)}", OutputType.ERROR)
-        
-        return models
-
-
-    @staticmethod
-    def get_model_registry():
-        """获取全局模型注册器"""
-        if ModelRegistry.global_model_registry is None:
-            ModelRegistry.global_model_registry = ModelRegistry()
-            
-            # 从用户模型目录加载额外模型
-            models_dir = ModelRegistry.get_models_dir()
-            if models_dir and os.path.exists(models_dir):
-                for model_name, model_class in ModelRegistry.load_models_from_dir(models_dir).items():
-                    ModelRegistry.global_model_registry.register_model(model_name, model_class)
-            models_dir = os.path.dirname(__file__)
-            if models_dir and os.path.exists(models_dir):
-                for model_name, model_class in ModelRegistry.load_models_from_dir(models_dir).items():
-                    ModelRegistry.global_model_registry.register_model(model_name, model_class)
-        return ModelRegistry.global_model_registry
-    
-    def __init__(self):
-        """初始化模型注册器
-        """
-        self.models: Dict[str, Type[BaseModel]] = {}
-
-    @staticmethod
-    def get_global_model() -> BaseModel:
-        """获取全局模型实例"""
-        model = ModelRegistry.get_model_registry().create_model(ModelRegistry.global_model_name)
-        if not model:
-            raise Exception(f"Failed to create model: {ModelRegistry.global_model_name}")
-        return model
-        
-    def register_model(self, name: str, model_class: Type[BaseModel]):
-        """注册模型类
-        
-        Args:
-            name: 模型名称
-            model_class: 模型类
-        """
-        self.models[name] = model_class
-        PrettyOutput.print(f"已注册模型: {name}", OutputType.INFO)
-            
-    def create_model(self, name: str) -> Optional[BaseModel]:
-        """创建模型实例
-        
-        Args:
-            name: 模型名称
-            
-        Returns:
-            BaseModel: 模型实例
-        """
-        if name not in self.models:
-            PrettyOutput.print(f"未找到模型: {name}", OutputType.ERROR)
-            return None
-            
-        try:
-            model = self.models[name]()
-            PrettyOutput.print(f"已创建模型实例: {name}", OutputType.INFO)
-            return model
-        except Exception as e:
-            PrettyOutput.print(f"创建模型失败: {str(e)}", OutputType.ERROR)
-            return None
-            
-    def get_available_models(self) -> List[str]:
-        """获取可用模型列表"""
-        return list(self.models.keys()) 
-    
-    def set_global_model(self, model_name: str):
-        """设置全局模型"""
-        ModelRegistry.global_model_name = model_name