jarvis-ai-assistant 0.1.124__py3-none-any.whl → 0.1.126__py3-none-any.whl

jarvis/jarvis_git_squash/main.py

@@ -0,0 +1,81 @@
+import sys
+import argparse
+from typing import Dict, Any
+from jarvis.jarvis_tools.git_commiter import GitCommitTool
+import subprocess
+
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.utils import init_env, user_confirm
+class GitSquashTool:
+    name = "git_squash_agent"
+    description = "Squash commits interactively using a base commit hash"
+    
+    def _confirm_squash(self) -> bool:
+        """Prompt user for confirmation to squash commits"""
+        return user_confirm("是否确认压缩提交?", default=True)
+    
+    def _reset_to_commit(self, commit_hash: str) -> bool:
+        """Perform soft reset to specified commit hash"""
+        try:
+            subprocess.Popen(
+                ["git", "reset", "--soft", commit_hash],
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL
+            ).wait()
+            return True
+        except Exception:
+            return False
+    
+    def execute(self, args: Dict) -> Dict[str, Any]:
+        """Execute the squash operation"""
+        try:
+            if not self._confirm_squash():
+                return {
+                    "success": False,
+                    "stdout": "Operation cancelled",
+                    "stderr": ""
+                }
+            
+            if not self._reset_to_commit(args['commit_hash']):
+                return {
+                    "success": False,
+                    "stdout": "",
+                    "stderr": "Failed to reset to specified commit"
+                }
+            
+            # 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']
+            }
+            
+        except Exception as e:
+            return {
+                "success": False,
+                "stdout": "",
+                "stderr": f"Squash failed: {str(e)}"
+            }
+def main():
+    init_env()
+    parser = argparse.ArgumentParser(description='Git squash tool')
+    parser.add_argument('commit_hash', type=str, help='Base commit hash to squash from')
+    parser.add_argument('--lang', type=str, default='Chinese', help='Language for commit messages')
+    args = parser.parse_args()
+    
+    tool = GitSquashTool()
+    result = 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

@@ -125,18 +125,6 @@ class BaseLSP(ABC):
         """
         return None
     
-    @abstractmethod
-    def validate_edit(self, file_path: str, edit: Dict[str, Any]) -> bool:
-        """Validate if proposed edit is syntactically correct.
-        
-        Args:
-            file_path: Path to the file
-            edit: Edit operation in LSP format
-            
-        Returns:
-            bool: True if edit is valid
-        """
-        return False
     
     def shutdown(self):
         """Shutdown LSP server cleanly."""

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.jarvis_utils import PrettyOutput, OutputType
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 class CPPLSP(BaseLSP):
     """C++ LSP implementation using clangd."""
@@ -114,15 +114,6 @@ class CPPLSP(BaseLSP):
         })
         return result
     
-    def validate_edit(self, file_path: str, edit: Dict[str, Any]) -> bool:
-        # Send workspace/willRenameFiles request to check validity
-        result = self._send_request("workspace/willRenameFiles", {
-            "files": [{
-                "oldUri": f"file://{file_path}",
-                "newUri": f"file://{file_path}.tmp"
-            }]
-        })
-        return bool(result)
     
     def shutdown(self):
         if self.clangd_process:

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.jarvis_utils import PrettyOutput, OutputType
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 class GoLSP(BaseLSP):
     """Go LSP implementation using gopls."""
@@ -120,15 +120,6 @@ class GoLSP(BaseLSP):
         })
         return result
     
-    def validate_edit(self, file_path: str, edit: Dict[str, Any]) -> bool:
-        # Send workspace/willRenameFiles request to check validity
-        result = self._send_request("workspace/willRenameFiles", {
-            "files": [{
-                "oldUri": f"file://{file_path}",
-                "newUri": f"file://{file_path}.tmp"
-            }]
-        })
-        return bool(result)
     
     def shutdown(self):
         if self.gopls_process:

jarvis/jarvis_lsp/python.py

@@ -100,34 +100,6 @@ class PythonLSP(BaseLSP):
             return None
         return None
     
-    def validate_edit(self, file_path: str, edit: Dict[str, Any]) -> bool:
-        try:
-            # Simple syntax check of the edited content
-            content = ""
-            with open(file_path, 'r') as f:
-                content = f.read()
-            
-            # Apply edit
-            start = edit["range"]["start"]
-            end = edit["range"]["end"]
-            new_text = edit["newText"]
-            
-            lines = content.splitlines(True)
-            before = "".join(lines[:start["line"]])
-            after = "".join(lines[end["line"] + 1:])
-            current_line = lines[start["line"]]
-            
-            edited_line = (current_line[:start["character"]] + 
-                         new_text + 
-                         current_line[end["character"]:])
-            
-            new_content = before + edited_line + after
-            
-            # Check if new content is valid Python
-            jedi.Script(code=new_content)
-            return True
-        except Exception:
-            return False
     
     def shutdown(self):
         self.script_cache.clear()

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.jarvis_utils import PrettyOutput, OutputType
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 REQUIRED_METHODS = [
     ('initialize', ['workspace_path']),
@@ -14,7 +14,6 @@ REQUIRED_METHODS = [
     ('get_document_symbols', ['file_path']),
     ('get_diagnostics', ['file_path']),
     ('prepare_rename', ['file_path', 'position']),
-    ('validate_edit', ['file_path', 'edit']),
     ('shutdown', [])
 ]
 
@@ -189,7 +188,7 @@ def main():
         PrettyOutput.print(f"没有 LSP 支持的语言: {args.language}", OutputType.WARNING)
         return 1
         
-    if not lsp.initialize(os.path.dirname(os.path.abspath(args.file))):
+    if not lsp.initialize(os.path.abspath(os.getcwd())):
         PrettyOutput.print("LSP 初始化失败", OutputType.WARNING)
         return 1
     

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.jarvis_utils import PrettyOutput, OutputType
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 class RustLSP(BaseLSP):
     """Rust LSP implementation using rust-analyzer."""
@@ -122,15 +122,6 @@ class RustLSP(BaseLSP):
         })
         return result
     
-    def validate_edit(self, file_path: str, edit: Dict[str, Any]) -> bool:
-        # Send workspace/willRenameFiles request to check validity
-        result = self._send_request("workspace/willRenameFiles", {
-            "files": [{
-                "oldUri": f"file://{file_path}",
-                "newUri": f"file://{file_path}.tmp"
-            }]
-        })
-        return bool(result)
     
     def shutdown(self):
         if self.analyzer_process:

jarvis/jarvis_multi_agent/__init__.py

@@ -5,7 +5,7 @@ import yaml
 
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_agent.output_handler import OutputHandler
-from jarvis.jarvis_utils import OutputType, PrettyOutput
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class AgentConfig:
@@ -32,65 +32,65 @@ class MultiAgent(OutputHandler):
 
     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
+to: 智能体名称    # 目标智能体名称
 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
+# 🔄 操作顺序
+1. 选择最重要的操作
+   - 评估优先级
+   - 选择一个操作
+   - 执行该操作
 
-2. Wait for Response
-   - Process result/response
-   - Plan next action
-   - Wait for next turn
+2. 等待响应
+   - 处理结果/响应
+   - 计划下一步操作
+   - 等待下一轮
 
-3. Handle Responses
-   - Process incoming messages
-   - Reply to sender when needed
-   - Continue task based on response
+3. 处理响应
+   - 处理收到的消息
+   - 需要时回复发送者
+   - 根据响应继续任务
 
-# 👥 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
+# ❗ 重要规则
+1. 每轮只能执行一个操作
+2. 等待响应
+3. 处理后再进行下一步
+4. 回复消息
+5. 需要时转发任务
+
+# 💡 提示
+- 第一个操作将被执行
+- 额外的操作将被忽略
+- 总是先处理响应
+- 需要时发送消息以继续任务
+- 处理并回复收到的消息
 """
 
     def can_handle(self, response: str) -> bool:
@@ -161,10 +161,10 @@ 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()}")
+                    PrettyOutput.print(f"未找到智能体 {msg['to']}，正在重试...", OutputType.WARNING)
+                    msg = self.agents[last_agent].run(f"未找到智能体 {msg['to']}，可用智能体列表: {self.agents.keys()}")
                     continue
-                PrettyOutput.print(f"{last_agent} 发送消息给 {msg['to']}...", OutputType.INFO)
+                PrettyOutput.print(f"{last_agent} 正在向 {msg['to']} 发送消息...", OutputType.INFO)
                 last_agent = self.agents[msg['to']].name
                 msg = self.agents[msg['to']].run(prompt)
-        return ""
+        return ""

jarvis/jarvis_platform/ai8.py

@@ -1,11 +1,12 @@
 import os
 from typing import Dict, List, Tuple
 from jarvis.jarvis_platform.base import BasePlatform
-from jarvis.jarvis_utils import PrettyOutput, OutputType
 import requests
 import json
 import base64
 
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
 class AI8Model(BasePlatform):
     """AI8 model implementation"""
     

jarvis/jarvis_platform/base.py

@@ -1,10 +1,8 @@
 from abc import ABC, abstractmethod
 import re
 from typing import Dict, List, Tuple
-
-from jarvis.jarvis_utils import OutputType, PrettyOutput, while_success, while_true
-from yaspin import yaspin
-from yaspin.spinners import Spinners
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.utils import get_context_token_count, while_success, while_true
 
 
 class BasePlatform(ABC):
@@ -34,27 +32,24 @@ class BasePlatform(ABC):
             start_time = time.time()
             response = self.chat(message)
             
-            # Calculate statistics
-            if not self.suppress_output:
-                end_time = time.time()
-                duration = end_time - start_time
-                char_count = len(response)
-                
-                # Calculate token count and tokens per second
-                try:
-                    from jarvis.jarvis_utils import get_context_token_count
-                    token_count = get_context_token_count(response)
-                    tokens_per_second = token_count / duration if duration > 0 else 0
-                except Exception as e:
-                    PrettyOutput.print(f"Tokenization failed: {str(e)}", OutputType.WARNING)
-                    token_count = 0
-                    tokens_per_second = 0
+            end_time = time.time()
+            duration = end_time - start_time
+            char_count = len(response)
+            
+            # Calculate token count and tokens per second
+            try:
+                token_count = get_context_token_count(response)
+                tokens_per_second = token_count / duration if duration > 0 else 0
+            except Exception as e:
+                PrettyOutput.print(f"Tokenization failed: {str(e)}", OutputType.WARNING)
+                token_count = 0
+                tokens_per_second = 0
 
-                    # Print statistics
-                    PrettyOutput.print(
-                        f"对话完成 - 耗时: {duration:.2f}秒, 输出字符数: {char_count}, 输出Token数量: {token_count}, 每秒Token数量: {tokens_per_second:.2f}",
-                        OutputType.INFO,
-                    )
+            # Print statistics
+            PrettyOutput.print(
+                f"对话完成 - 耗时: {duration:.2f}秒, 输出字符数: {char_count}, 输出Token数量: {token_count}, 每秒Token数量: {tokens_per_second:.2f}",
+                OutputType.INFO,
+            )
 
             # Keep original think tag handling
             response = re.sub(r'<think>.*?</think>', '', response, flags=re.DOTALL)

jarvis/jarvis_platform/kimi.py

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

jarvis/jarvis_platform/ollama.py

@@ -1,10 +1,12 @@
 import requests
 from typing import List, Dict, Tuple
 from jarvis.jarvis_platform.base import BasePlatform
-from jarvis.jarvis_utils import OutputType, PrettyOutput, get_single_line_input
 import os
 import json
 
+from jarvis.jarvis_utils.input import get_single_line_input
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
 class OllamaPlatform(BasePlatform):
     """Ollama platform implementation"""
     

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.jarvis_utils import PrettyOutput, OutputType
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 class OpenAIModel(BasePlatform):
     platform_name = "openai"

jarvis/jarvis_platform/oyi.py

@@ -2,10 +2,11 @@ import mimetypes
 import os
 from typing import Dict, List, Tuple
 from jarvis.jarvis_platform.base import BasePlatform
-from jarvis.jarvis_utils import PrettyOutput, OutputType
 import requests
 import json
 
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
 class OyiModel(BasePlatform):
     """Oyi model implementation"""
     

jarvis/jarvis_platform/registry.py

@@ -4,7 +4,8 @@ import os
 import sys
 from typing import Dict, Type, Optional, List
 from jarvis.jarvis_platform.base import BasePlatform
-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
+from jarvis.jarvis_utils.config import 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.output import OutputType, PrettyOutput
 
 REQUIRED_METHODS = [
     ('chat', ['message']),           # 方法名和参数列表

jarvis/jarvis_platform_manager/main.py

@@ -1,18 +1,16 @@
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_utils import PrettyOutput, OutputType, init_env, get_multiline_input
 import asyncio
 from fastapi import FastAPI, HTTPException
 from fastapi.responses import StreamingResponse
 from pydantic import BaseModel, Field
 from typing import List, Dict, Any, Optional
 import uvicorn
-import io
-from contextlib import redirect_stdout
-import json
-import os
-from datetime import datetime
 from fastapi.middleware.cors import CORSMiddleware
 
+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
+
 def list_platforms():
     """List all supported platforms and models"""
     registry = PlatformRegistry.get_global_platform_registry()

jarvis/jarvis_platform_manager/openai_test.py

@@ -4,7 +4,6 @@ Test script for Jarvis OpenAI-compatible API service.
 """
 
 import argparse
-import os
 import sys
 from openai import OpenAI
 

jarvis/jarvis_rag/main.py

@@ -3,8 +3,6 @@ import numpy as np
 import faiss
 from typing import List, Tuple, Optional, Dict
 import pickle
-from jarvis.jarvis_utils import OutputType, PrettyOutput, get_context_token_count, get_embedding, get_embedding_batch, get_file_md5, get_max_token_count, get_max_paragraph_length, get_min_paragraph_length, get_thread_count, init_gpu_config, load_embedding_model
-from jarvis.jarvis_utils import init_env
 from dataclasses import dataclass
 from tqdm import tqdm
 import fitz  # PyMuPDF for PDF files
@@ -15,6 +13,11 @@ import lzma  # 添加 lzma 导入
 from threading import Lock
 import hashlib
 
+from jarvis.jarvis_utils.config import get_max_paragraph_length, get_max_token_count, get_min_paragraph_length, get_thread_count
+from jarvis.jarvis_utils.embedding import get_context_token_count, get_embedding, get_embedding_batch, load_embedding_model
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.utils import  get_file_md5, init_env, init_gpu_config
+
 @dataclass
 class Document:
     """Document class, for storing document content and metadata"""

jarvis/jarvis_smart_shell/main.py

@@ -4,11 +4,14 @@ import os
 import sys
 import readline
 from typing import Optional
-from yaspin import yaspin # type: ignore
-from yaspin.spinners import Spinners # type: ignore
+
+from yaspin import yaspin
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_utils import PrettyOutput, OutputType, get_multiline_input, get_shell_name, init_env
+from jarvis.jarvis_utils.config import get_shell_name
+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
 
 def execute_command(command: str) -> None:
     """Show command and allow user to edit, then execute, Ctrl+C to cancel"""
@@ -95,7 +98,9 @@ Output: find . -name "*.py"
         prefix = f"Current path: {current_path}\n"
         prefix += f"Current shell: {shell}\n"
         
-        result = model.chat_until_success(prefix + request)
+        with yaspin(text="正在生成命令...", color="cyan") as spinner:
+            result = model.chat_until_success(prefix + request)
+            spinner.ok("✅ 命令生成成功")
         
         # 提取命令
         if result and isinstance(result, str):