jarvis-ai-assistant 0.1.112__py3-none-any.whl → 0.1.114__py3-none-any.whl

jarvis/__init__.py

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

jarvis/agent.py

@@ -1,4 +1,5 @@
 import argparse
+import re
 import time
 from typing import Callable, Dict, List, Optional
 
@@ -7,8 +8,8 @@ import yaml
 
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_tools.registry import ToolRegistry, tool_call_help
-from jarvis.utils import PrettyOutput, OutputType, get_context_token_count, is_auto_complete, is_execute_tool_confirm, is_need_summary, is_record_methodology, load_methodology, add_agent, delete_current_agent, get_max_token_count, get_multiline_input, init_env, is_use_methodology, user_confirm
+from jarvis.jarvis_tools.registry import ToolRegistry
+from jarvis.utils import PrettyOutput, OutputType, get_context_token_count, is_auto_complete, is_execute_tool_confirm, is_need_summary, is_record_methodology, load_methodology, set_agent, delete_agent, get_max_token_count, get_multiline_input, init_env, is_use_methodology, make_agent_name,  user_confirm
 import os
 
 class Agent:
@@ -21,6 +22,9 @@ class Agent:
         """
         self.summary_prompt = summary_prompt
 
+    def __del__(self):
+        delete_agent(self.name)
+
     def set_output_handler_before_tool(self, handler: List[Callable]):
         """Set handlers to process output before tool execution.
         
@@ -32,9 +36,11 @@ class Agent:
     def __init__(self, 
                  system_prompt: str, 
                  name: str = "Jarvis", 
+                 description: str = "",
                  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,
@@ -44,12 +50,14 @@ class Agent:
                  record_methodology: Optional[bool] = None,
                  need_summary: Optional[bool] = None,
                  max_context_length: Optional[int] = None,
+                 support_send_msg: bool = False,
                  execute_tool_confirm: Optional[bool] = None):
         """Initialize an Agent instance.
         
         Args:
             system_prompt: The system prompt defining agent behavior
             name: Agent name, defaults to "Jarvis"
+            description: Agent description, defaults to ""
             is_sub_agent: Whether this is a sub-agent
             tool_registry: Registry of available tools
             platform: AI platform to use
@@ -61,16 +69,41 @@ class Agent:
             record_methodology: Whether to record methodology
             need_summary: Whether to generate summaries
             max_context_length: Maximum context length
+            support_send_msg: Whether to support sending messages
+            execute_tool_confirm: Whether to confirm tool execution
         """
-        PrettyOutput.print(f"欢迎使用Jarvis，你的AI助手，正在初始化...", OutputType.SYSTEM)
+
+        self.name = make_agent_name(name)
+        self.description = description
+        # 初始化平台和模型
         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
         self.is_sub_agent = is_sub_agent
         self.prompt = ""
         self.conversation_length = 0  # Use length counter instead
@@ -81,6 +114,8 @@ class Agent:
         self.output_handler_before_tool = output_handler_before_tool if output_handler_before_tool else []
         self.output_handler_after_tool = output_handler_after_tool if output_handler_after_tool else []
 
+        self.support_send_msg = support_send_msg
+
         self.execute_tool_confirm = execute_tool_confirm if execute_tool_confirm is not None else is_execute_tool_confirm()
 
         self.summary_prompt = summary_prompt if summary_prompt else f"""Please generate a concise summary report of the task execution, including:
@@ -95,18 +130,52 @@ Please describe in concise bullet points, highlighting important information.
 """
         
         self.max_token_count = max_context_length if max_context_length is not None else get_max_token_count()
-
         self.auto_complete = auto_complete if auto_complete is not None else is_auto_complete()
-
-        PrettyOutput.section(f"Jarvis 初始化完成 - 使用 {self.model.name()} 模型", OutputType.SYSTEM)
-
+        welcome_message = f"{name} 初始化完成 - 使用 {self.model.name()} 模型"
         tools = self.tool_registry.get_all_tools()
         if tools:
-            PrettyOutput.section(f"可用工具: {', '.join([tool['name'] for tool in tools])}", OutputType.SYSTEM)
-
+            welcome_message += f"\n可用工具: \n{','.join([f'{tool['name']}' for tool in tools])}"
+        PrettyOutput.print(welcome_message, OutputType.SYSTEM)
         
         tools_prompt = self.tool_registry.load_tools()
-        complete_prompt = """"""
+
+        send_msg_prompt = ""
+        if self.support_send_msg:
+            send_msg_prompt = """
+            ## Send Message Rules
+            
+            !!! CRITICAL ACTION RULES !!!
+            You can ONLY perform ONE action per turn:
+            - ENSURE USE ONLY ONE TOOL EVERY TURN (file_operation, ask_user, etc.)
+            - OR SEND ONE MESSAGE TO ANOTHER AGENT
+            - NEVER DO BOTH IN THE SAME TURN
+            
+            2. Message Format:
+            <SEND_MESSAGE>
+            to: agent_name  # Target agent name
+            content: |
+              message_content  # Message content, multi-line must be separated by newlines
+            </SEND_MESSAGE>
+            
+            3. Message Handling:
+               - After sending a message, WAIT for response
+               - Process response before next action
+               - Never send multiple messages at once
+               - Never combine message with tool calls
+            
+            4. If Multiple Actions Needed:
+               a. Choose most important action first
+               b. Wait for response/result
+               c. Plan next action based on response
+               d. Execute next action in new turn
+            
+            Remember:
+            - First action will be executed
+            - Additional actions will be IGNORED
+            - Always process responses before new actions
+            """
+
+        complete_prompt = ""
         if self.auto_complete:
             complete_prompt = """
             ## Task Completion
@@ -114,15 +183,45 @@ Please describe in concise bullet points, highlighting important information.
             <!!!COMPLETE!!!>
             """
 
+        additional_prompt = ""
+        if not tools_prompt and send_msg_prompt:
+            additional_prompt = """YOU MUST CALL ONE TOOL EVERY TURN, UNLESS YOU THINK THE TASK IS COMPLETED!!!"""
+        if not send_msg_prompt and tools_prompt:
+            additional_prompt = """YOU MUST SEND ONE MESSAGE EVERY TURN, UNLESS YOU THINK THE TASK IS COMPLETED!!!"""
+        if send_msg_prompt and tools_prompt:
+            additional_prompt = """YOU MUST CALL ONE TOOL OR SEND ONE MESSAGE EVERY TURN, UNLESS YOU THINK THE TASK IS COMPLETED!!!"""
+
         self.model.set_system_message(f"""
 {self.system_prompt}
 
 {tools_prompt}
 
+{send_msg_prompt}
+
 {complete_prompt}
+
+{additional_prompt}
 """)
         self.first = True
 
+    @staticmethod
+    def _extract_send_msg(content: str) -> List[Dict]:
+        """Extract send message from content.
+        
+        Args:
+            content: The content containing send message
+        """
+        data = re.findall(r'<SEND_MESSAGE>(.*?)</SEND_MESSAGE>', content, re.DOTALL)
+        ret = []
+        for item in data:
+            try:
+                msg = yaml.safe_load(item)
+                if 'to' in msg and 'content' in msg:
+                    ret.append(msg)
+            except Exception as e:
+                continue
+        return ret
+
     @staticmethod
     def _extract_tool_calls(content: str) -> List[Dict]:
         """Extract tool calls from content.
@@ -137,39 +236,17 @@ Please describe in concise bullet points, highlighting important information.
             Exception: If tool call is missing necessary fields
         """
         # Split content into lines
-        lines = content.split('\n')
-        tool_call_lines = []
-        in_tool_call = False
-
-
-        # Process line by line
-        for line in lines:
-            if '<TOOL_CALL>' in line:
-                in_tool_call = True
-                continue
-            elif '</TOOL_CALL>' in line:
-                if in_tool_call and tool_call_lines:
-                    # Parse YAML directly
-                    tool_call_text = '\n'.join(tool_call_lines)
-                    tool_call_data = yaml.safe_load(tool_call_text)
-                    
-                    # Validate necessary fields
-                    if "name" in tool_call_data and "arguments" in tool_call_data:
-                        # Return content before tool call and tool call
-                        return [{
-                            "name": tool_call_data["name"],
-                            "arguments": tool_call_data["arguments"]
-                        }]
-                    else:
-                        raise Exception("Tool call missing necessary fields")
-                in_tool_call = False
+        data = re.findall(r'<TOOL_CALL>(.*?)</TOOL_CALL>', content, re.DOTALL)
+        ret = []
+        for item in data:
+            try:
+                msg = yaml.safe_load(item)
+                if 'name' in msg and 'arguments' in msg:
+                    ret.append(msg)
+            except Exception as e:
                 continue
-            
-            if in_tool_call:
-                tool_call_lines.append(line)
-        
-        return []
-
+        return ret
+    
     def _call_model(self, message: str) -> str:
         """Call the AI model with retry logic.
         
@@ -188,7 +265,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:
@@ -276,7 +353,7 @@ Please continue the task based on the above information.
                     try:
                         tool_calls = Agent._extract_tool_calls(response)
                         if tool_calls:
-                            self.tool_registry.handle_tool_calls(tool_calls)
+                            self.tool_registry.handle_tool_calls(tool_calls[0])
                     except Exception as e:
                         PrettyOutput.print(f"处理方法论生成失败: {str(e)}", OutputType.ERROR)
                     
@@ -292,7 +369,7 @@ Please continue the task based on the above information.
         return "任务完成"
 
 
-    def run(self, user_input: str, file_list: Optional[List[str]] = None) -> str:
+    def run(self, user_input: str, file_list: Optional[List[str]] = None) -> str|Dict:
         """Process user input and execute the task.
         
         Args:
@@ -300,30 +377,23 @@ Please continue the task based on the above information.
             file_list: Optional list of files to process
             
         Returns:
-            str: Task summary report
-            
-        Note:
-            - Handles context management
-            - Processes tool calls
-            - Manages conversation flow
-            - Supports interactive mode
+            str|Dict: Task summary report or message to send
         """
-
-        add_agent(self.name)
-
         try:
+            set_agent(self.name, self)
             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)
 
-            if self.first and self.use_methodology:
-                self.prompt = f"{user_input}\n\n{load_methodology(user_input)}"
+            self.prompt = f"{user_input}"
+
+            if self.first:
+                if self.use_methodology:
+                    self.prompt = f"{user_input}\n\n{load_methodology(user_input)}"
                 self.first = False
-            else:
-                self.prompt = f"{user_input}"
 
             while True:
                 try:
@@ -342,22 +412,36 @@ Please continue the task based on the above information.
                         self.prompt = ""
                         self.conversation_length += get_context_token_count(current_response)
 
-                    for handler in self.output_handler_before_tool:
-                        self.prompt += handler(current_response)
+                    # Check for message first
+                    send_msg = Agent._extract_send_msg(current_response)
+                    tool_calls = Agent._extract_tool_calls(current_response)
 
-                    try:
-                        result = Agent._extract_tool_calls(current_response)
-                    except Exception as e:
-                        PrettyOutput.print(f"工具调用错误: {str(e)}", OutputType.ERROR)
-                        self.prompt += f"Tool call error: {str(e)}"
+                    if len(send_msg) > 1:
+                        PrettyOutput.print(f"收到多个消息，违反规则，重试...", OutputType.WARNING)
+                        self.prompt += f"Only one message can be sent, but {len(send_msg)} messages were received. Please retry."
+                        continue
+                    if len(tool_calls) > 1:
+                        PrettyOutput.print(f"收到多个工具调用，违反规则，重试...", OutputType.WARNING)
+                        self.prompt += f"Only one tool call can be executed, but {len(tool_calls)} tool calls were received. Please retry."
                         continue
+                    if send_msg and tool_calls:
+                        PrettyOutput.print(f"收到消息和工具调用，违反规则，重试...", OutputType.WARNING)
+                        self.prompt += f"Only one action can be performed, but both a message and a tool call were received. Please retry."
+                        continue
+
+                    if send_msg:
+                        return send_msg[0]  # Return the first message
+
+                    # If no message, process tool calls
+                    for handler in self.output_handler_before_tool:
+                        self.prompt += handler(current_response)
                     
-                    if len(result) > 0:
-                        if not self.execute_tool_confirm or user_confirm(f"执行工具调用: {result[0]['name']}?"):
+                    if tool_calls:
+                        if not self.execute_tool_confirm or user_confirm(f"执行工具调用: {tool_calls[0]['name']}?"):
                             PrettyOutput.print("正在执行工具调用...", OutputType.PROGRESS)
-                            tool_result = self.tool_registry.handle_tool_calls(result)
+                            tool_result = self.tool_registry.handle_tool_calls(tool_calls[0])
                             self.prompt += tool_result
-                            
+
                     for handler in self.output_handler_after_tool:
                         self.prompt += handler(current_response)
                     
@@ -384,9 +468,6 @@ Please continue the task based on the above information.
         except Exception as e:
             PrettyOutput.print(f"任务失败: {str(e)}", OutputType.ERROR)
             return f"Task failed: {str(e)}"
-        
-        finally:
-            delete_current_agent()
 
     def _clear_history(self):
         """Clear conversation history while preserving system prompt.
@@ -397,7 +478,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 +565,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/jarvis_code_agent/code_agent.py

@@ -51,7 +51,7 @@ class CodeAgent:
 
 # Patch Format
 <PATCH>
-> path/file start,end
+path/file start,end
 new_content
 </PATCH>
 

jarvis/jarvis_code_agent/patch.py

@@ -8,7 +8,7 @@ from jarvis.utils import OutputType, PrettyOutput, get_multiline_input, has_unco
 def _parse_patch(patch_str: str) -> Dict[str, List[Dict[str, Any]]]:
     """Parse patches from string with format:
     <PATCH>
-    > path/to/file start_line,end_line
+    path/to/file start_line,end_line
     content_line1
     content_line2
     ...
@@ -24,11 +24,9 @@ def _parse_patch(patch_str: str) -> Dict[str, List[Dict[str, Any]]]:
             
         # Parse file path and line range
         file_info = lines[0].strip()
-        if not file_info.startswith('>'):
-            continue
             
         # Extract file path and line range
-        match = re.match(r'>\s*([^\s]+)\s+(\d+),(\d+)', file_info)
+        match = re.match(r'([^\s]+)\s+(\d+),(\d+)', file_info)
         if not match:
             continue
             

jarvis/jarvis_codebase/main.py

@@ -686,6 +686,8 @@ Please provide 10 search-optimized expressions in the specified format.
         if question_match:
             try:
                 variants = yaml.safe_load(question_match.group(1))
+                if not isinstance(variants, list):
+                    variants = [str(variants)]
             except Exception as e:
                 PrettyOutput.print(f"解析变体失败: {str(e)}", OutputType.ERROR)