jarvis-ai-assistant 0.1.112__tar.gz → 0.1.113__tar.gz

{jarvis_ai_assistant-0.1.112/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.113}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.112
+Version: 0.1.113
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

{jarvis_ai_assistant-0.1.112 → jarvis_ai_assistant-0.1.113}/pyproject.toml

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

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

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.112" 
+__version__ = "0.1.113" 

{jarvis_ai_assistant-0.1.112 → jarvis_ai_assistant-0.1.113}/src/jarvis/agent.py

@@ -1,4 +1,5 @@
 import argparse
+from ast import Tuple
 import time
 from typing import Callable, Dict, List, Optional
 
@@ -33,8 +34,9 @@ class Agent:
                  system_prompt: str, 
                  name: str = "Jarvis", 
                  is_sub_agent: bool = False, 
-                 tool_registry: Optional[ToolRegistry] = None, 
-                 platform: Optional[BasePlatform] = None, 
+                 tool_registry: Optional[ToolRegistry|List[str]] = None, 
+                 platform: Optional[BasePlatform]|Optional[str] = None, 
+                 model_name: Optional[str] = None,
                  summary_prompt: Optional[str] = None, 
                  auto_complete: Optional[bool] = None, 
                  output_handler_before_tool: Optional[List[Callable]] = None,
@@ -63,11 +65,34 @@ class Agent:
             max_context_length: Maximum context length
         """
         PrettyOutput.print(f"欢迎使用Jarvis，你的AI助手，正在初始化...", OutputType.SYSTEM)
+
+        # 初始化平台和模型
         if platform is not None:
-            self.model = platform
+            if isinstance(platform, str):
+                self.model = PlatformRegistry().create_platform(platform)
+                if self.model is None:
+                    PrettyOutput.print(f"平台 {platform} 不存在，将使用普通模型", OutputType.WARNING)
+                    self.model = PlatformRegistry().get_normal_platform()
+            else:
+                self.model = platform
         else:
             self.model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
-        self.tool_registry = tool_registry if tool_registry else ToolRegistry()
+
+        if model_name is not None:
+            self.model.set_model_name(model_name)
+
+
+        # 初始化工具
+        if tool_registry is not None:
+            if isinstance(tool_registry, ToolRegistry):
+                self.tool_registry = tool_registry
+            elif isinstance(tool_registry, List):
+                self.tool_registry = ToolRegistry()
+                self.tool_registry.use_tools(tool_registry)
+        else:
+            self.tool_registry = ToolRegistry()
+
+        
         self.record_methodology = record_methodology if record_methodology is not None else is_record_methodology()
         self.use_methodology = use_methodology if use_methodology is not None else is_use_methodology()
         self.name = name
@@ -188,7 +213,7 @@ Please describe in concise bullet points, highlighting important information.
             message = handler(message)
 
         while True:
-            ret = self.model.chat_until_success(message)
+            ret = self.model.chat_until_success(message) # type: ignore
             if ret:
                 return ret
             else:
@@ -314,7 +339,7 @@ Please continue the task based on the above information.
         try:
             PrettyOutput.section("准备环境", OutputType.PLANNING)
             if file_list:
-                self.model.upload_files(file_list)
+                self.model.upload_files(file_list) # type: ignore
 
             # 显示任务开始
             PrettyOutput.section(f"开始新任务: {self.name}", OutputType.PLANNING)
@@ -397,7 +422,7 @@ Please continue the task based on the above information.
         3. Reset conversation length counter
         """
         self.prompt = "" 
-        self.model.reset()
+        self.model.reset() # type: ignore
         self.conversation_length = 0  # Reset conversation length
 
 
@@ -484,7 +509,7 @@ def _select_task(tasks: dict) -> str:
                 selected_name = task_names[choice - 1]
                 return tasks[selected_name]  # Return the task description
             else:
-                PrettyOutput.print("无效的选择。请选择列表中的一个号码。", OutputType.ERROR)
+                PrettyOutput.print("无效的选择。请选择列表中的一个号码。", OutputType.WARNING)
                 
         except KeyboardInterrupt:
             return ""  # Return empty on Ctrl+C

{jarvis_ai_assistant-0.1.112 → jarvis_ai_assistant-0.1.113}/src/jarvis/jarvis_tools/git_commiter.py

@@ -4,7 +4,7 @@ from typing import Dict, Any
 
 import yaml
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.utils import OutputType, PrettyOutput, init_env
+from jarvis.utils import OutputType, PrettyOutput, has_uncommitted_changes, init_env
 import sys
 
 
@@ -25,6 +25,9 @@ class GitCommitTool:
     def execute(self, args: Dict) -> Dict[str, Any]:
         """Execute automatic commit process"""
         try:
+            if not has_uncommitted_changes():
+                PrettyOutput.print("没有未提交的更改", OutputType.SUCCESS)
+                return {"success": True, "stdout": "No uncommitted changes", "stderr": ""}
             PrettyOutput.print("准备添加文件到提交...", OutputType.SYSTEM)
             os.system("git add .")
             PrettyOutput.print("Get diff...", OutputType.SYSTEM)

{jarvis_ai_assistant-0.1.112 → jarvis_ai_assistant-0.1.113}/src/jarvis/utils.py

@@ -165,18 +165,61 @@ class PrettyOutput:
 
     @staticmethod
     def print(text: str, output_type: OutputType, timestamp: bool = True, lang: Optional[str] = None, traceback: bool = False):
-        """Print formatted output using rich console"""
+        """Print formatted output using rich console with styling
+        
+        Args:
+            text: The text content to print
+            output_type: The type of output (affects styling)
+            timestamp: Whether to show timestamp
+            lang: Language for syntax highlighting
+            traceback: Whether to show traceback for errors
+        """
+        from rich.style import Style as RichStyle
+        
+        # Define styles for different output types
+        styles = {
+            OutputType.SYSTEM: RichStyle(color="cyan", bold=True),
+            OutputType.CODE: RichStyle(color="green"),
+            OutputType.RESULT: RichStyle(color="blue"),
+            OutputType.ERROR: RichStyle(color="red", bold=True),
+            OutputType.INFO: RichStyle(color="yellow"),
+            OutputType.PLANNING: RichStyle(color="magenta"),
+            OutputType.PROGRESS: RichStyle(color="white"),
+            OutputType.SUCCESS: RichStyle(color="green", bold=True),
+            OutputType.WARNING: RichStyle(color="yellow", bold=True),
+            OutputType.DEBUG: RichStyle(color="blue", dim=True),
+            OutputType.USER: RichStyle(color="green"),
+            OutputType.TOOL: RichStyle(color="yellow", italic=True)
+        }
+        
         # Get formatted header
         lang = lang if lang is not None else PrettyOutput._detect_language(text, default_lang='markdown')
         header = PrettyOutput._format("", output_type, timestamp)
-
-        content = Syntax(text, lang, theme="monokai")
-            
-        # Print panel with appropriate border style
-        border_style = "red" if output_type == OutputType.ERROR else output_type.value
-        console.print(Panel(content, border_style=border_style, title=header, title_align="left", highlight=True))
         
-        # Print stack trace for errors
+        # Create syntax highlighted content
+        content = Syntax(
+            text,
+            lang,
+            theme="monokai",
+            word_wrap=True,
+            background_color="default"
+        )
+        
+        # Create panel with styling
+        panel = Panel(
+            content,
+            style=styles[output_type],
+            border_style=styles[output_type],
+            title=header,
+            title_align="left",
+            padding=(1, 2),
+            highlight=True
+        )
+        
+        # Print panel
+        console.print(panel)
+        
+        # Print stack trace for errors if requested
         if traceback or output_type == OutputType.ERROR:
             console.print_exception()
 

{jarvis_ai_assistant-0.1.112 → jarvis_ai_assistant-0.1.113/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.112
+Version: 0.1.113
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire