jarvis-ai-assistant 0.1.129__py3-none-any.whl → 0.1.131__py3-none-any.whl

jarvis/jarvis_git_squash/main.py

@@ -18,7 +18,7 @@ class GitSquashTool:
         """Perform soft reset to specified commit hash"""
         try:
             subprocess.Popen(
-                ["git", "reset", "--soft", commit_hash],
+                ["git", "reset", "--mixed", commit_hash],
                 stdout=subprocess.DEVNULL,
                 stderr=subprocess.DEVNULL
             ).wait()

jarvis/jarvis_lsp/base.py

@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from typing import List, Dict, Optional, Tuple, Any
+from typing import List, Dict, Optional, Tuple, Any, Union
 
 class BaseLSP(ABC):
     """Base class for Language Server Protocol integration.
@@ -11,7 +11,7 @@ class BaseLSP(ABC):
     4. Symbol analysis
     """
     
-    language: str = ""  # Language identifier, should be overridden by subclasses
+    language: Union[str, List[str]] = ""  # Language identifier, should be overridden by subclasses
     
     @abstractmethod
     def initialize(self, workspace_path: str) -> bool:
@@ -67,17 +67,6 @@ class BaseLSP(ABC):
         """
         return None
     
-    @abstractmethod
-    def get_document_symbols(self, file_path: str) -> List[Dict[str, Any]]:
-        """Get all symbols in document.
-        
-        Args:
-            file_path: Path to the file
-            
-        Returns:
-            List of symbols with their locations and types
-        """
-        return []
     
     @abstractmethod
     def get_diagnostics(self, file_path: str) -> List[Dict[str, Any]]:
@@ -112,19 +101,6 @@ class BaseLSP(ABC):
         """
         return []
     
-    @abstractmethod
-    def prepare_rename(self, file_path: str, position: Tuple[int, int]) -> Optional[Dict[str, Any]]:
-        """Check if symbol at position can be renamed.
-        
-        Args:
-            file_path: Path to the file
-            position: Symbol position
-            
-        Returns:
-            Range that would be renamed or None if rename not allowed
-        """
-        return None
-    
     
     def shutdown(self):
         """Shutdown LSP server cleanly."""

jarvis/jarvis_lsp/cpp.py

@@ -9,7 +9,7 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 class CPPLSP(BaseLSP):
     """C++ LSP implementation using clangd."""
     
-    language = "cpp"
+    language = ["cpp", "c"]
 
     @staticmethod
     def check() -> bool:
@@ -80,12 +80,7 @@ class CPPLSP(BaseLSP):
             "position": {"line": position[0], "character": position[1]}
         })
         return result[0] if result else None
-    
-    def get_document_symbols(self, file_path: str) -> List[Dict[str, Any]]:
-        result = self._send_request("textDocument/documentSymbol", {
-            "textDocument": {"uri": f"file://{file_path}"}
-        })
-        return result or [] # type: ignore
+
     
     def get_diagnostics(self, file_path: str) -> List[Dict[str, Any]]:
         # Send didOpen notification to trigger diagnostics
@@ -107,13 +102,6 @@ class CPPLSP(BaseLSP):
             pass
         return []
     
-    def prepare_rename(self, file_path: str, position: Tuple[int, int]) -> Optional[Dict[str, Any]]:
-        result = self._send_request("textDocument/prepareRename", {
-            "textDocument": {"uri": f"file://{file_path}"},
-            "position": {"line": position[0], "character": position[1]}
-        })
-        return result
-    
     
     def shutdown(self):
         if self.clangd_process:

jarvis/jarvis_lsp/go.py

@@ -87,12 +87,6 @@ class GoLSP(BaseLSP):
         })
         return result[0] if result else None
     
-    def get_document_symbols(self, file_path: str) -> List[Dict[str, Any]]:
-        result = self._send_request("textDocument/documentSymbol", {
-            "textDocument": {"uri": f"file://{file_path}"}
-        })
-        return result or [] # type: ignore
-    
     def get_diagnostics(self, file_path: str) -> List[Dict[str, Any]]:
         # Send didOpen notification to trigger diagnostics
         self._send_request("textDocument/didOpen", {
@@ -113,13 +107,6 @@ class GoLSP(BaseLSP):
             pass
         return []
     
-    def prepare_rename(self, file_path: str, position: Tuple[int, int]) -> Optional[Dict[str, Any]]:
-        result = self._send_request("textDocument/prepareRename", {
-            "textDocument": {"uri": f"file://{file_path}"},
-            "position": {"line": position[0], "character": position[1]}
-        })
-        return result
-    
     
     def shutdown(self):
         if self.gopls_process:

jarvis/jarvis_lsp/python.py

@@ -18,7 +18,7 @@ class PythonLSP(BaseLSP):
     def _get_script(self, file_path: str):
         if file_path not in self.script_cache:
             try:
-                with open(file_path, 'r') as f:
+                with open(file_path, 'r', errors="ignore") as f:
                     content = f.read()
                 self.script_cache[file_path] = jedi.Script(code=content, path=file_path)
             except Exception:
@@ -54,16 +54,6 @@ class PythonLSP(BaseLSP):
             }
         }
     
-    def get_document_symbols(self, file_path: str) -> List[Dict[str, Any]]:
-        script = self._get_script(file_path)
-        if not script:
-            return []
-        try:
-            names = script.get_names()
-            return [self._location_to_dict(name) for name in names]
-        except Exception:
-            return []
-    
     def get_diagnostics(self, file_path: str) -> List[Dict[str, Any]]:
         script = self._get_script(file_path)
         if not script:
@@ -82,24 +72,5 @@ class PythonLSP(BaseLSP):
         except Exception:
             return []
     
-    def prepare_rename(self, file_path: str, position: Tuple[int, int]) -> Optional[Dict[str, Any]]:
-        script = self._get_script(file_path)
-        if not script:
-            return None
-        try:
-            refs = script.get_references(line=position[0] + 1, column=position[1])
-            if refs:
-                ref = refs[0]
-                return {
-                    "range": {
-                        "start": {"line": ref.line - 1, "character": ref.column},
-                        "end": {"line": ref.line - 1, "character": ref.column + len(ref.name)}
-                    }
-                }
-        except Exception:
-            return None
-        return None
-    
-    
     def shutdown(self):
         self.script_cache.clear()

jarvis/jarvis_lsp/registry.py

@@ -11,9 +11,7 @@ REQUIRED_METHODS = [
     ('initialize', ['workspace_path']),
     ('find_references', ['file_path', 'position']),
     ('find_definition', ['file_path', 'position']),
-    ('get_document_symbols', ['file_path']),
     ('get_diagnostics', ['file_path']),
-    ('prepare_rename', ['file_path', 'position']),
     ('shutdown', [])
 ]
 
@@ -29,7 +27,7 @@ class LSPRegistry:
         if not os.path.exists(user_lsp_dir):
             try:
                 os.makedirs(user_lsp_dir)
-                with open(os.path.join(user_lsp_dir, "__init__.py"), "w") as f:
+                with open(os.path.join(user_lsp_dir, "__init__.py"), "w", errors="ignore") as f:
                     pass
             except Exception as e:
                 PrettyOutput.print(f"创建 LSP 目录失败: {str(e)}", OutputType.ERROR)
@@ -100,7 +98,11 @@ class LSPRegistry:
                             if hasattr(obj, 'check'):
                                 if not obj.check(): # type: ignore
                                     continue
-                            lsp_servers[obj.language] = obj
+                            if isinstance(obj.language, str):
+                                lsp_servers[obj.language] = obj
+                            elif isinstance(obj.language, list):
+                                for lang in obj.language: # type: ignore
+                                    lsp_servers[lang] = obj
                             break
                 except Exception as e:
                     PrettyOutput.print(f"加载 LSP {module_name} 失败: {str(e)}", OutputType.ERROR)
@@ -154,7 +156,7 @@ class LSPRegistry:
     @staticmethod
     def get_text_at_position(file_path: str, line: int, start_character: int) -> str:
         """Get text at position."""
-        with open(file_path, 'r') as file:
+        with open(file_path, 'r', errors="ignore") as file:
             lines = file.readlines()
             symbol = re.search(r'\b\w+\b', lines[line][start_character:])
             return symbol.group() if symbol else ""
@@ -162,7 +164,7 @@ class LSPRegistry:
     @staticmethod
     def get_line_at_position(file_path: str, line: int) -> str:
         """Get line at position."""
-        with open(file_path, 'r') as file:
+        with open(file_path, 'r', errors="ignore") as file:
             lines = file.readlines()
             return lines[line]
 
@@ -192,14 +194,8 @@ def main():
         PrettyOutput.print("LSP 初始化失败", OutputType.WARNING)
         return 1
     
-    try:
-        # Execute requested action
-        if args.action == 'symbols':
-            symbols = lsp.get_document_symbols(args.file)
-            for symbol in symbols:
-                print(f"Symbol {LSPRegistry.get_text_at_position(args.file, symbol['range']['start']['line'], symbol['range']['start']['character'])} at {symbol['range']['start']['line']}:{symbol['range']['start']['character']}: {symbol['uri']}")
-                
-        elif args.action == 'diagnostics':
+    try:        
+        if args.action == 'diagnostics':
             diagnostics = lsp.get_diagnostics(args.file)
             for diag in diagnostics:
                 severity = ['Error', 'Warning', 'Info', 'Hint'][diag['severity'] - 1]

jarvis/jarvis_lsp/rust.py

@@ -89,11 +89,6 @@ class RustLSP(BaseLSP):
         })
         return result[0] if result else None
     
-    def get_document_symbols(self, file_path: str) -> List[Dict[str, Any]]:
-        result = self._send_request("textDocument/documentSymbol", {
-            "textDocument": {"uri": f"file://{file_path}"}
-        })
-        return result or [] # type: ignore
     
     def get_diagnostics(self, file_path: str) -> List[Dict[str, Any]]:
         # Send didOpen notification to trigger diagnostics
@@ -115,13 +110,6 @@ class RustLSP(BaseLSP):
             pass
         return []
     
-    def prepare_rename(self, file_path: str, position: Tuple[int, int]) -> Optional[Dict[str, Any]]:
-        result = self._send_request("textDocument/prepareRename", {
-            "textDocument": {"uri": f"file://{file_path}"},
-            "position": {"line": position[0], "character": position[1]}
-        })
-        return result
-    
     
     def shutdown(self):
         if self.analyzer_process:

jarvis/jarvis_multi_agent/__init__.py

@@ -5,8 +5,10 @@ import yaml
 
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_agent.output_handler import OutputHandler
+from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.utils import init_env
 
 
 class MultiAgent(OutputHandler):
@@ -18,65 +20,63 @@ class MultiAgent(OutputHandler):
 
     def prompt(self) -> str:
         return f"""
-# 🤖 多智能体消息处理系统
-您是多智能体系统的一部分，通过结构化消息进行通信。
-
-# 🎯 核心规则
-## 关键操作规则
-- 每轮只能执行一个操作：
-  - 要么使用一个工具（文件操作、询问用户等）
-  - 要么发送一条消息给其他智能体
-  - 切勿在同一轮中同时进行这两种操作
-
-## 消息流控制
-- 发送消息后等待响应
-- 处理响应后再进行下一步操作
-- 切勿同时发送多条消息
-- 切勿将消息与工具调用混合使用
-
-# 📝 消息格式
+# 多智能体协作系统
+
+## 身份与角色定位
+- **核心职责**：作为多智能体系统的协调者，通过结构化消息实现高效协作
+- **关键能力**：消息路由、任务分发、结果整合、流程协调
+- **工作范围**：在多个专业智能体之间建立有效沟通渠道
+
+## 交互原则与策略
+### 消息处理规范
+- **单一操作原则**：每轮只执行一个操作（工具调用或消息发送）
+- **完整性原则**：确保消息包含所有必要信息，避免歧义
+- **明确性原则**：清晰表达意图、需求和期望结果
+- **上下文保留**：在消息中包含足够的背景信息
+
+### 消息格式标准
 ```
 <SEND_MESSAGE>
 to: 智能体名称    # 目标智能体名称
 content: |
-    消息内容    # 消息内容
-    可使用多行    # 如果需要
-    保持正确的缩进
+    # 消息主题
+    
+    ## 背景信息
+    [提供必要的上下文和背景]
+    
+    ## 具体需求
+    [明确表达期望完成的任务]
+    
+    ## 相关资源
+    [列出相关文档、数据或工具]
+    
+    ## 期望结果
+    [描述期望的输出格式和内容]
 </SEND_MESSAGE>
 ```
 
-# 🔄 操作顺序
-1. 选择最重要的操作
-   - 评估优先级
-   - 选择一个操作
-   - 执行该操作
-
-2. 等待响应
-   - 处理结果/响应
-   - 计划下一步操作
-   - 等待下一轮
-
-3. 处理响应
-   - 处理收到的消息
-   - 需要时回复发送者
-   - 根据响应继续任务
-
-# 👥 可用智能体
-{chr(10).join([f"- {c['name']}: {c.get('description', '')}" for c in self.agents_config])}
-
-# ❗ 重要规则
-1. 每轮只能执行一个操作
-2. 等待响应
-3. 处理后再进行下一步
-4. 回复消息
-5. 需要时转发任务
-
-# 💡 提示
-- 第一个操作将被执行
-- 额外的操作将被忽略
-- 总是先处理响应
-- 需要时发送消息以继续任务
-- 处理并回复收到的消息
+## 协作流程规范
+### 任务分发流程
+1. **需求分析**：理解用户需求并确定最适合的智能体
+2. **任务分解**：将复杂任务分解为可管理的子任务
+3. **精准分发**：根据专长将任务分配给合适的智能体
+4. **结果整合**：收集各智能体的输出并整合为连贯结果
+
+### 消息流控制
+1. **单向流动**：发送消息后等待响应，避免消息风暴
+2. **优先级管理**：处理紧急消息优先，保持任务顺序
+3. **状态跟踪**：记录每个任务的当前状态和处理进度
+4. **异常处理**：优雅处理超时、错误和意外响应
+
+## 可用智能体资源
+{chr(10).join([f"- **{c['name']}**: {c.get('description', '')}" for c in self.agents_config])}
+
+## 最佳实践指南
+1. **任务明确化**：每个消息专注于单一、明确的任务
+2. **信息充分性**：提供足够信息让接收者能独立完成任务
+3. **反馈循环**：建立清晰的反馈机制，及时调整方向
+4. **知识共享**：确保关键信息在相关智能体间共享
+5. **协作效率**：避免不必要的消息传递，减少协调开销
 """
 
     def can_handle(self, response: str) -> bool:
@@ -115,6 +115,15 @@ content: |
 
     def init_agents(self):
         for config in self.agents_config:
+            output_handler = config.get('output_handler', [])
+            if len(output_handler) == 0:
+                output_handler = [
+                    ToolRegistry(),
+                    self,
+                ]
+            else:
+                output_handler.append(self)
+            config['output_handler'] = output_handler
             agent = Agent(**config)
             self.agents[config['name']] = agent
 
@@ -146,6 +155,7 @@ def main():
     Returns:
         最终处理结果
     """
+    init_env()
     import argparse
     parser = argparse.ArgumentParser(description="多智能体系统启动器")
     parser.add_argument("--config", "-c", required=True, help="YAML配置文件路径")
@@ -153,7 +163,7 @@ def main():
     args = parser.parse_args()
         
     try:
-        with open(args.config, 'r') as f:
+        with open(args.config, 'r', errors="ignore") as f:
             config_data = yaml.safe_load(f)
             
         # 获取agents配置

jarvis/jarvis_platform/registry.py

@@ -16,7 +16,6 @@ REQUIRED_METHODS = [
     ('set_model_name', ['model_name']),
     ('get_model_list', []),
     ('set_suppress_output', ['suppress']),
-    ('upload_files', ['file_list'])
 ]
 
 class PlatformRegistry:
@@ -32,7 +31,7 @@ class PlatformRegistry:
             try:
                 os.makedirs(user_platform_dir)
                 # 创建 __init__.py 使其成为 Python 包
-                with open(os.path.join(user_platform_dir, "__init__.py"), "w") as f:
+                with open(os.path.join(user_platform_dir, "__init__.py"), "w", errors="ignore") as f:
                     pass
 
                 pass

jarvis/jarvis_platform_manager/main.py

@@ -219,7 +219,7 @@ def service_command(args):
         timestamp = datetime.now().strftime("%Y-%m-%d_%H-%M-%S")
         log_file = os.path.join(logs_dir, f"conversation_{conversation_id}_{timestamp}.txt")
 
-        with open(log_file, "w", encoding="utf-8") as f:
+        with open(log_file, "w", encoding="utf-8", errors="ignore") as f:
             f.write(f"Conversation ID: {conversation_id}\n")
             f.write(f"Timestamp: {timestamp}\n")
             f.write(f"Model: {model}\n\n")
@@ -464,7 +464,7 @@ def service_command(args):
                 "response": full_response
             }
             
-            with open(log_file, "w", encoding="utf-8") as f:
+            with open(log_file, "w", encoding="utf-8", errors="ignore") as f:
                 json.dump(log_data, f, ensure_ascii=False, indent=2)
             
             PrettyOutput.print(f"Stream conversation logged to {log_file}", OutputType.INFO)
@@ -501,7 +501,7 @@ def service_command(args):
                 "error": error_msg
             }
             
-            with open(log_file, "w", encoding="utf-8") as f:
+            with open(log_file, "w", encoding="utf-8", errors="ignore") as f:
                 json.dump(log_data, f, ensure_ascii=False, indent=2)
             
             PrettyOutput.print(f"Stream error logged to {log_file}", OutputType.ERROR)

jarvis/jarvis_rag/main.py

@@ -96,7 +96,7 @@ class TextFileProcessor(FileProcessor):
                 raise UnicodeDecodeError(f"Failed to decode file with supported encodings: {file_path}") # type: ignore
                 
             # Use the detected encoding to read the file
-            with open(file_path, 'r', encoding=detected_encoding, errors='replace') as f:
+            with open(file_path, 'r', encoding=detected_encoding, errors='ignore') as f:
                 content = f.read()
                 
             # Normalize Unicode characters

jarvis/jarvis_tools/ask_codebase.py

@@ -1,4 +1,5 @@
 from typing import Dict, Any
+import os
 
 from yaspin import yaspin
 from jarvis.jarvis_codebase.main import CodeBase
@@ -22,6 +23,11 @@ class AskCodebaseTool:
                 "type": "integer",
                 "description": "要分析的最相关文件数量（可选）",
                 "default": 20
+            },
+            "root_dir": {
+                "type": "string",
+                "description": "代码库根目录路径（可选）",
+                "default": "."
             }
         },
         "required": ["question"]
@@ -48,27 +54,39 @@ class AskCodebaseTool:
         try:
             question = args["question"]
             top_k = args.get("top_k", 20)
-            # Create new CodeBase instance
-            git_root = find_git_root()
-            codebase = CodeBase(git_root)
-
-            # Use ask_codebase method
+            root_dir = args.get("root_dir", ".")
             
-            files, response = codebase.ask_codebase(question, top_k)
+            # Store current directory
+            original_dir = os.getcwd()
             
-            
-            # Print found files
-            if files:
-                output = "找到的相关文件:\n"
-                for file in files:
-                    output += f"- {file['file']} ({file['reason']})\n"
-                PrettyOutput.print(output, OutputType.INFO, lang="markdown")
-            
-            return {
-                "success": True,
-                "stdout": response,
-                "stderr": ""
-            }
+            try:
+                # Change to root_dir
+                os.chdir(root_dir)
+                
+                # Create new CodeBase instance
+                git_root = find_git_root()
+                codebase = CodeBase(git_root)
+
+                # Use ask_codebase method
+                files, response = codebase.ask_codebase(question, top_k)
+                
+                # Print found files
+                if files:
+                    output = "找到的相关文件:\n"
+                    for file in files:
+                        output += f"- {file['file']} ({file['reason']})\n"
+                    PrettyOutput.print(output, OutputType.SUCCESS, lang="markdown")
+
+                PrettyOutput.print(response, OutputType.SUCCESS, lang="markdown")
+                
+                return {
+                    "success": True,
+                    "stdout": response,
+                    "stderr": ""
+                }
+            finally:
+                # Always restore original directory
+                os.chdir(original_dir)
         except Exception as e:
             error_msg = f"分析代码库失败: {str(e)}"
             PrettyOutput.print(error_msg, OutputType.WARNING)
@@ -84,12 +102,14 @@ def main():
     parser = argparse.ArgumentParser(description='Ask questions about the codebase')
     parser.add_argument('question', help='Question about the codebase')
     parser.add_argument('--top-k', type=int, help='Number of files to analyze', default=20)
+    parser.add_argument('--root-dir', type=str, help='Root directory of the codebase', default=".")
     
     args = parser.parse_args()
     tool = AskCodebaseTool()
     result = tool.execute({
         "question": args.question,
-        "top_k": args.top_k
+        "top_k": args.top_k,
+        "root_dir": args.root_dir
     })
     
     if result["success"]: