jarvis-ai-assistant 0.1.130__py3-none-any.whl → 0.1.132__py3-none-any.whl

jarvis/jarvis_git_squash/main.py

@@ -1,3 +1,4 @@
+import re
 import sys
 import argparse
 from typing import Dict, Any
@@ -18,7 +19,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()
@@ -26,39 +27,23 @@ class GitSquashTool:
         except Exception:
             return False
     
-    def execute(self, args: Dict) -> Dict[str, Any]:
+    def execute(self, args: Dict):
         """Execute the squash operation"""
         try:
             if not self._confirm_squash():
-                return {
-                    "success": False,
-                    "stdout": "Operation cancelled",
-                    "stderr": ""
-                }
+                PrettyOutput.print("操作已取消", OutputType.WARNING)
+                return
             
             if not self._reset_to_commit(args['commit_hash']):
-                return {
-                    "success": False,
-                    "stdout": "",
-                    "stderr": "Failed to reset to specified commit"
-                }
+                PrettyOutput.print("重置到指定提交失败", OutputType.WARNING)
+                return
             
             # Use existing GitCommitTool for new commit
             commit_tool = GitCommitTool()
-            result = commit_tool.execute({"lang": args.get('lang', 'Chinese')})
-            
-            return {
-                "success": result['success'],
-                "stdout": result['stdout'],
-                "stderr": result['stderr']
-            }
-            
+            commit_tool.execute({"lang": args.get('lang', 'Chinese')})
         except Exception as e:
-            return {
-                "success": False,
-                "stdout": "",
-                "stderr": f"Squash failed: {str(e)}"
-            }
+            PrettyOutput.print(f"压缩提交失败: {str(e)}", OutputType.WARNING)
+            
 def main():
     init_env()
     parser = argparse.ArgumentParser(description='Git squash tool')
@@ -67,15 +52,9 @@ def main():
     args = parser.parse_args()
     
     tool = GitSquashTool()
-    result = tool.execute({
+    tool.execute({
         'commit_hash': args.commit_hash,
         'lang': args.lang
     })
-    
-    if not result['success']:
-        PrettyOutput.print(result['stderr'], OutputType.ERROR)
-        sys.exit(1)
-        
-    PrettyOutput.print(result['stdout'], OutputType.SUCCESS)
 if __name__ == "__main__":
     sys.exit(main())

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

@@ -8,7 +8,7 @@ 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
+from jarvis.jarvis_utils.utils import ct, ot, init_env
 
 
 class MultiAgent(OutputHandler):
@@ -20,12 +20,7 @@ class MultiAgent(OutputHandler):
 
     def prompt(self) -> str:
         return f"""
-# 多智能体协作系统
-
-## 身份与角色定位
-- **核心职责**：作为多智能体系统的协调者，通过结构化消息实现高效协作
-- **关键能力**：消息路由、任务分发、结果整合、流程协调
-- **工作范围**：在多个专业智能体之间建立有效沟通渠道
+# 多智能体消息发送
 
 ## 交互原则与策略
 ### 消息处理规范
@@ -36,7 +31,7 @@ class MultiAgent(OutputHandler):
 
 ### 消息格式标准
 ```
-<SEND_MESSAGE>
+{ot("SEND_MESSAGE")}
 to: 智能体名称    # 目标智能体名称
 content: |
     # 消息主题
@@ -52,31 +47,27 @@ content: |
     
     ## 期望结果
     [描述期望的输出格式和内容]
-</SEND_MESSAGE>
+
+    ## 下一步计划
+    [描述下一步的计划和行动]
+{ct("SEND_MESSAGE")}
 ```
 
-## 协作流程规范
-### 任务分发流程
-1. **需求分析**：理解用户需求并确定最适合的智能体
-2. **任务分解**：将复杂任务分解为可管理的子任务
-3. **精准分发**：根据专长将任务分配给合适的智能体
-4. **结果整合**：收集各智能体的输出并整合为连贯结果
+或者：
 
-### 消息流控制
-1. **单向流动**：发送消息后等待响应，避免消息风暴
-2. **优先级管理**：处理紧急消息优先，保持任务顺序
-3. **状态跟踪**：记录每个任务的当前状态和处理进度
-4. **异常处理**：优雅处理超时、错误和意外响应
+```
+{ot("SEND_MESSAGE")}
+to: 智能体名称    # 目标智能体名称
+content: |
+    # 消息主题
+    
+    ## 任务结果
+    [任务完成结果，用于反馈]
+{ct("SEND_MESSAGE")}
+```
 
 ## 可用智能体资源
 {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:
@@ -102,7 +93,7 @@ content: |
         Args:
             content: The content containing send message
         """
-        data = re.findall(r'<SEND_MESSAGE>(.*?)</SEND_MESSAGE>', content, re.DOTALL)
+        data = re.findall(ot("SEND_MESSAGE")+r'\n(.*?)\n'+ct("SEND_MESSAGE"), content, re.DOTALL)
         ret = []
         for item in data:
             try:
@@ -163,7 +154,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/ai8.py

@@ -23,7 +23,6 @@ class AI8Model(BasePlatform):
         super().__init__()
         self.system_message = ""
         self.conversation = {}
-        self.files = []
         self.models = {}  # 存储模型信息
 
         self.token = os.getenv("AI8_API_KEY")
@@ -103,18 +102,6 @@ class AI8Model(BasePlatform):
         except Exception as e:
             PrettyOutput.print(f"创建会话失败: {str(e)}", OutputType.ERROR)
             return False
-        
-    def upload_files(self, file_list: List[str]) -> List[Dict]:
-        for file_path in file_list:
-            name = os.path.basename(file_path)
-            with open(file_path, 'rb') as f:
-                file_data = f.read()
-            base64_data = base64.b64encode(file_data).decode('utf-8')
-            self.files.append({
-                "name": name,
-                "data": f"data:image/png;base64,{base64_data}"
-            })
-        return self.files
     
     def set_system_message(self, message: str):
         """Set system message"""
@@ -145,14 +132,6 @@ class AI8Model(BasePlatform):
                 "files": []
             }
             
-            # 如果有文件需要发送
-            if self.files:
-                for file_data in self.files:
-                    payload["files"].append({
-                        "name": file_data["name"],
-                        "data": file_data["data"]
-                    })
-                self.files = []  # 清空已使用的文件
             
             response = requests.post(
                 f"{self.BASE_URL}/api/chat/completions",
@@ -200,7 +179,6 @@ class AI8Model(BasePlatform):
     def reset(self):
         """Reset model state"""
         self.conversation = None
-        self.files = []  # 清空文件列表
             
     def delete_chat(self) -> bool:
         """Delete current chat session"""
@@ -284,13 +262,6 @@ class AI8Model(BasePlatform):
                 # 添加标签
                 model_str = f"{model['label']}"
                 
-                # 添加标签和积分信息
-                attrs = []
-                if model['attr'].get('tag'):
-                    attrs.append(model['attr']['tag'])
-                if model['attr'].get('integral'):
-                    attrs.append(model['attr']['integral'])
-                    
                 # 添加特性标记
                 features = []
                 if model['attr'].get('multimodal'):
@@ -299,12 +270,16 @@ class AI8Model(BasePlatform):
                     features.append("Plugin support")
                 if model['attr'].get('onlyImg'):
                     features.append("Image support")
-                if features:
-                    model_str += f" [{'|'.join(features)}]"
-                    
+                if model['attr'].get('tag'):
+                    features.append(model['attr']['tag'])
+                if model['attr'].get('integral'):
+                    features.append(model['attr']['integral'])
                 # 添加备注
                 if model['attr'].get('note'):
                     model_str += f" - {model['attr']['note']}"
+                if features:
+                    model_str += f" [{'|'.join(features)}]"
+                    
                 model['desc'] = model_str
             
             return list(self.models.keys())

jarvis/jarvis_platform/base.py

@@ -2,7 +2,7 @@ from abc import ABC, abstractmethod
 import re
 from typing import Dict, List, Tuple
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.utils import get_context_token_count, while_success, while_true
+from jarvis.jarvis_utils.utils import ct, ot, get_context_token_count, while_success, while_true
 
 
 class BasePlatform(ABC):
@@ -53,16 +53,11 @@ class BasePlatform(ABC):
                 )
 
             # Keep original think tag handling
-            response = re.sub(r'<think>.*?</think>', '', response, flags=re.DOTALL)
+            response = re.sub(ot("think")+r'.*?'+ct("think"), '', response, flags=re.DOTALL)
             return response
                 
         return while_true(lambda: while_success(lambda: _chat(), 5), 5)
 
-    @abstractmethod
-    def upload_files(self, file_list: List[str]) -> List[Dict]:
-        """Upload files"""
-        raise NotImplementedError("upload_files is not implemented")
-
     @abstractmethod
     def reset(self):
         """Reset model"""