jarvis-ai-assistant 0.1.115__py3-none-any.whl → 0.1.117__py3-none-any.whl

jarvis/jarvis_lsp/cpp.py

@@ -4,7 +4,7 @@ import subprocess
 from typing import List, Dict, Optional, Tuple, Any
 import json
 from jarvis.jarvis_lsp.base import BaseLSP
-from jarvis.utils import PrettyOutput, OutputType
+from jarvis.jarvis_utils import PrettyOutput, OutputType
 
 class CPPLSP(BaseLSP):
     """C++ LSP implementation using clangd."""

jarvis/jarvis_lsp/go.py

@@ -4,7 +4,7 @@ import subprocess
 from typing import List, Dict, Optional, Tuple, Any
 import json
 from jarvis.jarvis_lsp.base import BaseLSP
-from jarvis.utils import PrettyOutput, OutputType
+from jarvis.jarvis_utils import PrettyOutput, OutputType
 
 class GoLSP(BaseLSP):
     """Go LSP implementation using gopls."""

jarvis/jarvis_lsp/registry.py

@@ -5,7 +5,7 @@ import re
 import sys
 from typing import Dict, Type, Optional, List
 from jarvis.jarvis_lsp.base import BaseLSP
-from jarvis.utils import PrettyOutput, OutputType
+from jarvis.jarvis_utils import PrettyOutput, OutputType
 
 REQUIRED_METHODS = [
     ('initialize', ['workspace_path']),

jarvis/jarvis_lsp/rust.py

@@ -4,7 +4,7 @@ import subprocess
 from typing import List, Dict, Optional, Tuple, Any
 import json
 from jarvis.jarvis_lsp.base import BaseLSP
-from jarvis.utils import PrettyOutput, OutputType
+from jarvis.jarvis_utils import PrettyOutput, OutputType
 
 class RustLSP(BaseLSP):
     """Rust LSP implementation using rust-analyzer."""

jarvis/jarvis_multi_agent/__init__.py

@@ -0,0 +1,170 @@
+import re
+from typing import Any, Dict, List, Optional, Tuple
+
+import yaml
+
+from jarvis.jarvis_agent import Agent
+from jarvis.jarvis_agent.output_handler import OutputHandler
+from jarvis.jarvis_utils import OutputType, PrettyOutput
+
+
+class AgentConfig:
+    def __init__(self, **config):
+        self.system_prompt = config.get('system_prompt', '')
+        self.name = config.get('name', 'Jarvis')
+        self.description = config.get('description', '')
+        self.is_sub_agent = config.get('is_sub_agent', False)
+        self.output_handler = config.get('output_handler', [])
+        self.platform = config.get('platform')
+        self.model_name = config.get('model_name')
+        self.summary_prompt = config.get('summary_prompt')
+        self.auto_complete = config.get('auto_complete', False)
+        self.input_handler = config.get('input_handler')
+        self.max_context_length = config.get('max_context_length')
+        self.execute_tool_confirm = config.get('execute_tool_confirm')
+
+class MultiAgent(OutputHandler):
+    def __init__(self, configs: List[AgentConfig], main_agent_name: str):
+        self.agents_config = configs
+        self.agents = {}
+        self.init_agents()
+        self.main_agent_name = main_agent_name
+
+    def prompt(self) -> str:
+        return f"""
+# 🤖 Message Handling System
+You are part of a multi-agent system that communicates through structured messages.
+
+# 🎯 Core Rules
+## Critical Action Rules
+- Execute ONLY ONE action per turn:
+  - Either use ONE tool (file_operation, ask_user, etc.)
+  - OR send ONE message to another agent
+  - NEVER combine both in same turn
+
+## Message Flow Control
+- Wait for response after sending message
+- Process response before next action
+- Never send multiple messages at once
+- Never combine messages with tool calls
+
+# 📝 Message Format
+```
+<SEND_MESSAGE>
+to: agent_name    # Target agent name
+content: |
+    message_content    # Message content
+    use multiple lines    # If needed
+    with proper indentation
+</SEND_MESSAGE>
+```
+
+# 🔄 Action Sequence
+1. Choose Most Important Action
+   - Evaluate priority
+   - Select ONE action
+   - Execute action
+
+2. Wait for Response
+   - Process result/response
+   - Plan next action
+   - Wait for next turn
+
+3. Handle Responses
+   - Process incoming messages
+   - Reply to sender when needed
+   - Continue task based on response
+
+# 👥 Available Agents
+{chr(10).join([f"- {c.name}: {c.description}" for c in self.agents_config])}
+
+# ❗ Important Rules
+1. ONE action per turn only
+2. Wait for responses
+3. Process before next action
+4. Reply to messages
+5. Forward task if needed
+
+# 💡 Tips
+- First action will be executed
+- Additional actions will be ignored
+- Always process responses first
+- Send message to continue task if needed
+- Handle and reply to received messages
+"""
+
+    def can_handle(self, response: str) -> bool:
+        return len(self._extract_send_msg(response)) > 0
+
+
+    def handle(self, response: str) -> Tuple[bool, Any]:
+        send_messages = self._extract_send_msg(response)
+        if len(send_messages) > 1:
+            return False, f"Send multiple messages, please only send one message at a time."
+        if len(send_messages) == 0:
+            return False, ""
+        return True, send_messages[0]
+        
+    def name(self) -> str:
+        return "SEND_MESSAGE"
+        
+    
+    @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
+
+    def init_agents(self):
+        for agent_config in self.agents_config:
+            agent = Agent(system_prompt=agent_config.system_prompt,
+                          name=agent_config.name,
+                          description=agent_config.description,
+                          model_name=agent_config.model_name,
+                          platform=agent_config.platform,
+                          max_context_length=agent_config.max_context_length,
+                          execute_tool_confirm=agent_config.execute_tool_confirm,
+                          input_handler=agent_config.input_handler,
+                          use_methodology=False,
+                          record_methodology=False,
+                          need_summary=False,
+                          auto_complete=agent_config.auto_complete,
+                          summary_prompt=agent_config.summary_prompt,
+                          is_sub_agent=agent_config.is_sub_agent,
+                          output_handler=[*agent_config.output_handler, self],
+                          )
+            
+            self.agents[agent_config.name] = agent
+
+    def run(self, user_input: str, file_list: Optional[List[str]] = None) -> str:
+        last_agent = self.main_agent_name
+        msg = self.agents[self.main_agent_name].run(user_input, file_list)
+        while msg:
+            if isinstance(msg, str):
+                return msg
+            elif isinstance(msg, Dict):
+                prompt  = f"""
+Please handle this message:
+from: {last_agent}
+content: {msg['content']}
+"""
+                if msg['to'] not in self.agents:
+                    PrettyOutput.print(f"没有找到{msg['to']}，重试...", OutputType.WARNING)
+                    msg = self.agents[last_agent].run(f"The agent {msg['to']} is not found, agent list: {self.agents.keys()}")
+                    continue
+                PrettyOutput.print(f"{last_agent} 发送消息给 {msg['to']}...", OutputType.INFO)
+                last_agent = self.agents[msg['to']].name
+                msg = self.agents[msg['to']].run(prompt)
+        return ""

jarvis/jarvis_platform/ai8.py

@@ -1,7 +1,7 @@
 import os
 from typing import Dict, List, Tuple
 from jarvis.jarvis_platform.base import BasePlatform
-from jarvis.utils import PrettyOutput, OutputType
+from jarvis.jarvis_utils import PrettyOutput, OutputType
 import requests
 import json
 import base64
@@ -260,7 +260,7 @@ class AI8Model(BasePlatform):
             }
             
             response = requests.get(
-                f"{self.BASE_URL}/api/chat/template",
+                f"{self.BASE_URL}/api/chat/tmpl",
                 headers=headers
             )
             

jarvis/jarvis_platform/base.py

@@ -2,7 +2,9 @@ from abc import ABC, abstractmethod
 import re
 from typing import Dict, List, Tuple
 
-from jarvis.utils import while_success, while_true
+from jarvis.jarvis_utils import OutputType, PrettyOutput, while_success, while_true
+from yaspin import yaspin
+from yaspin.spinners import Spinners
 
 
 class BasePlatform(ABC):
@@ -28,9 +30,17 @@ class BasePlatform(ABC):
 
     def chat_until_success(self, message: str) -> str:
         def _chat():
-            response = self.chat(message)
-            response = re.sub(r'<think>(.*?)</think>', '', response, flags=re.DOTALL)
-            return response
+            if self.suppress_output:
+                with yaspin(Spinners.dots, text="Thinking", color="yellow") as spinner:
+                    response = self.chat(message)
+                    response = re.sub(r'<think>(.*?)</think>', '', response, flags=re.DOTALL)
+                    spinner.ok("✓")
+                    return response
+            else:
+                response = self.chat(message)
+                response = re.sub(r'<think>(.*?)</think>', '', response, flags=re.DOTALL)
+                return response
+                
         return while_true(lambda: while_success(lambda: _chat(), 5), 5)
 
     @abstractmethod

jarvis/jarvis_platform/kimi.py

@@ -5,8 +5,8 @@ import os
 import mimetypes
 import time
 from jarvis.jarvis_platform.base import BasePlatform
-from jarvis.utils import PrettyOutput, OutputType
-from jarvis.utils import while_success
+from jarvis.jarvis_utils import PrettyOutput, OutputType
+from jarvis.jarvis_utils import while_success
 
 class KimiModel(BasePlatform):
     """Kimi model implementation"""

jarvis/jarvis_platform/ollama.py

@@ -1,7 +1,7 @@
 import requests
 from typing import List, Dict, Tuple
 from jarvis.jarvis_platform.base import BasePlatform
-from jarvis.utils import OutputType, PrettyOutput, get_single_line_input
+from jarvis.jarvis_utils import OutputType, PrettyOutput, get_single_line_input
 import os
 import json
 

jarvis/jarvis_platform/openai.py

@@ -2,7 +2,7 @@ from typing import Dict, List, Tuple
 import os
 from openai import OpenAI
 from jarvis.jarvis_platform.base import BasePlatform
-from jarvis.utils import PrettyOutput, OutputType
+from jarvis.jarvis_utils import PrettyOutput, OutputType
 
 class OpenAIModel(BasePlatform):
     platform_name = "openai"

jarvis/jarvis_platform/oyi.py

@@ -2,7 +2,7 @@ import mimetypes
 import os
 from typing import Dict, List, Tuple
 from jarvis.jarvis_platform.base import BasePlatform
-from jarvis.utils import PrettyOutput, OutputType
+from jarvis.jarvis_utils import PrettyOutput, OutputType
 import requests
 import json
 

jarvis/jarvis_platform/registry.py

@@ -4,7 +4,7 @@ import os
 import sys
 from typing import Dict, Type, Optional, List
 from jarvis.jarvis_platform.base import BasePlatform
-from jarvis.utils import PrettyOutput, OutputType, get_cheap_model_name, get_cheap_platform_name, get_codegen_model_name, get_codegen_platform_name, get_normal_model_name, get_normal_platform_name, get_thinking_model_name, get_thinking_platform_name
+from jarvis.jarvis_utils import PrettyOutput, OutputType, get_cheap_model_name, get_cheap_platform_name, get_codegen_model_name, get_codegen_platform_name, get_normal_model_name, get_normal_platform_name, get_thinking_model_name, get_thinking_platform_name
 
 REQUIRED_METHODS = [
     ('chat', ['message']),           # 方法名和参数列表