jarvis-ai-assistant 0.7.8__py3-none-any.whl → 1.0.2__py3-none-any.whl

jarvis/jarvis_git_squash/main.py

@@ -5,9 +5,11 @@ from typing import Dict
 import typer
 
 from jarvis.jarvis_git_utils.git_commiter import GitCommitTool
-from jarvis.jarvis_utils.utils import init_env
+from jarvis.jarvis_utils.globals import get_agent
+from jarvis.jarvis_utils.globals import get_current_agent_name
 from jarvis.jarvis_utils.input import user_confirm
-from jarvis.jarvis_utils.globals import get_agent, current_agent_name
+from jarvis.jarvis_utils.output import PrettyOutput
+from jarvis.jarvis_utils.utils import init_env
 
 app = typer.Typer(help="Git压缩工具")
 
@@ -37,22 +39,22 @@ class GitSquashTool:
         """Execute the squash operation"""
         try:
             if not self._confirm_squash():
-                print("⚠️ 操作已取消")
+                PrettyOutput.auto_print("⚠️ 操作已取消")
                 return
 
             if not self._reset_to_commit(args["commit_hash"]):
-                print("⚠️ 重置到指定提交失败")
+                PrettyOutput.auto_print("⚠️ 重置到指定提交失败")
                 return
 
             # Use existing GitCommitTool for new commit
             commit_tool = GitCommitTool()
-            agent = get_agent(current_agent_name)
+            agent = get_agent(get_current_agent_name())
             exec_args = {"lang": args.get("lang", "Chinese")}
             if agent:
                 exec_args["agent"] = agent
             commit_tool.execute(exec_args)
         except Exception as e:
-            print(f"⚠️ 压缩提交失败: {str(e)}")
+            PrettyOutput.auto_print(f"⚠️ 压缩提交失败: {str(e)}")
 
 
 @app.command()

jarvis/jarvis_git_utils/git_commiter.py

@@ -3,27 +3,32 @@ import os
 import re
 import subprocess
 import tempfile
-from typing import Any, Dict, Optional
+from typing import Any
+from typing import Dict
+from typing import Optional
 
 import typer
-import yaml  # type: ignore
+import yaml
+from rich.console import Console
+from rich.panel import Panel
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.config import get_git_commit_prompt
-from jarvis.jarvis_utils.git_utils import (
-    confirm_add_new_files,
-    find_git_root_and_cd,
-    has_uncommitted_changes,
-)
-from jarvis.jarvis_utils.globals import get_agent, current_agent_name
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.tag import ct, ot
-from jarvis.jarvis_utils.utils import init_env, is_context_overflow
+from jarvis.jarvis_utils.git_utils import confirm_add_new_files
+from jarvis.jarvis_utils.git_utils import find_git_root_and_cd
+from jarvis.jarvis_utils.git_utils import has_uncommitted_changes
+from jarvis.jarvis_utils.globals import get_global_model_group
+from jarvis.jarvis_utils.output import PrettyOutput
+from jarvis.jarvis_utils.tag import ct
+from jarvis.jarvis_utils.tag import ot
+from jarvis.jarvis_utils.utils import init_env
+from jarvis.jarvis_utils.utils import is_context_overflow
 
 app = typer.Typer(help="Git提交工具")
 
 
 class GitCommitTool:
+    console = Console()
     name = "git_commit_agent"
     description = "根据代码变更自动生成并执行Git提交"
     labels = ["git", "version_control"]
@@ -75,7 +80,7 @@ class GitCommitTool:
         os.chdir(root_dir)
         find_git_root_and_cd()
         if not has_uncommitted_changes():
-            print("✅ 没有未提交的更改")
+            PrettyOutput.auto_print("✅ 没有未提交的更改")
             return None
         return original_dir
 
@@ -129,67 +134,23 @@ class GitCommitTool:
 
             try:
                 temp_diff_file_path = None
-                
-                # Get model_group from args
-                model_group = args.get("model_group")
 
-                # Get platform and model based on model_group (thinking mode removed)
-                from jarvis.jarvis_utils.config import (
-                    get_normal_platform_name,
-                    get_normal_model_name,
-                )
+                # 优先使用args中的model_group，否则使用全局模型组（不再从agent继承）
+                model_group = args.get("model_group") or get_global_model_group()
 
-                platform_name = None
-                model_name = None
+                # Get platform and model based on model_group (thinking mode removed)
+                from jarvis.jarvis_utils.config import get_normal_model_name
+                from jarvis.jarvis_utils.config import get_normal_platform_name
 
+                # 始终使用normal模型生成提交信息，不从agent.model获取（避免使用smart模型）
                 # 优先根据 model_group 获取（确保配置一致性）
-                # 如果 model_group 存在，强制使用它来解析，避免使用 agent.model 中可能不一致的值
                 if model_group:
                     platform_name = get_normal_platform_name(model_group)
                     model_name = get_normal_model_name(model_group)
                 else:
-                    # 如果没有提供 model_group，尝试从传入的 agent 获取
-                    agent_from_args = args.get("agent")
-                    if (
-                        agent_from_args
-                        and hasattr(agent_from_args, "model")
-                        and getattr(agent_from_args, "model", None)
-                    ):
-                        try:
-                            platform_name = agent_from_args.model.platform_name()
-                            model_name = agent_from_args.model.name()
-                            if hasattr(agent_from_args.model, "model_group"):
-                                model_group = agent_from_args.model.model_group
-                        except Exception:
-                            # 安全回退到后续逻辑
-                            platform_name = None
-                            model_name = None
-                    
-                    # 如果仍未获取到，使用配置文件中的默认值（传入 None 会读取默认配置）
-                    if not platform_name:
-                        platform_name = get_normal_platform_name(None)
-                    if not model_name:
-                        model_name = get_normal_model_name(None)
-
-                # 最后的回退：尝试从全局 agent 获取（仅当仍未获取到时）
-                if not platform_name:
-                    agent = get_agent(current_agent_name)
-                    if (
-                        agent
-                        and hasattr(agent, "model")
-                        and getattr(agent, "model", None)
-                    ):
-                        try:
-                            platform_name = agent.model.platform_name()
-                            model_name = agent.model.name()
-                            if not model_group and hasattr(agent.model, "model_group"):
-                                model_group = agent.model.model_group
-                        except Exception:
-                            # 如果全局 agent 也无法获取，使用配置文件默认值
-                            if not platform_name:
-                                platform_name = get_normal_platform_name(None)
-                            if not model_name:
-                                model_name = get_normal_model_name(None)
+                    # 如果没有提供 model_group，直接使用配置文件中的默认normal模型
+                    platform_name = get_normal_platform_name(None)
+                    model_name = get_normal_model_name(None)
 
                 # Create a new platform instance
                 if platform_name:
@@ -201,13 +162,17 @@ class GitCommitTool:
                             platform.set_model_group(model_group)
                         except Exception:
                             # 兼容早期实现
-                            platform.model_group = model_group  # type: ignore
+                            platform.model_group = model_group
                 else:
                     platform = PlatformRegistry().get_normal_platform()
 
                 # 生成提交信息
-                model_display_name = model_name or (platform.name() if platform else "AI")
-                print(f"ℹ️ 正在使用{model_display_name}生成提交消息...")
+                model_display_name = model_name or (
+                    platform.name() if platform else "AI"
+                )
+                PrettyOutput.auto_print(
+                    f"ℹ️ 正在使用{model_display_name}生成提交消息..."
+                )
 
                 # 准备提示信息
                 custom_prompt = get_git_commit_prompt()
@@ -260,7 +225,7 @@ commit信息
 
                 if is_large_content:
                     if not platform.support_upload_files():
-                        print("❌ 差异文件太大，无法处理")
+                        PrettyOutput.auto_print("❌ 差异文件太大，无法处理")
                         return {
                             "success": False,
                             "stdout": "",
@@ -279,7 +244,7 @@ commit信息
                     if upload_success:
                         pass
                     else:
-                        print("❌ 上传代码差异文件失败")
+                        PrettyOutput.auto_print("❌ 上传代码差异文件失败")
                         return {
                             "success": False,
                             "stdout": "",
@@ -378,9 +343,17 @@ commit信息
                     try:
                         os.unlink(temp_diff_file_path)
                     except Exception as e:
-                        print(f"⚠️ 无法删除临时文件: {str(e)}")
-
-            PrettyOutput.print(f"提交哈希: {commit_hash}\n提交消息: {commit_message}", OutputType.SUCCESS)
+                        PrettyOutput.auto_print(f"⚠️ 无法删除临时文件: {str(e)}")
+
+            self.console.print(
+                Panel(
+                    f"[bold green]✅ 提交成功[/bold green]\n\n"
+                    f"[bold]提交哈希:[/bold] {commit_hash}\n"
+                    f"[bold]提交消息:[/bold]\n{commit_message}",
+                    title="Git Commit Result",
+                    border_style="green",
+                )
+            )
 
             return {
                 "success": True,
@@ -391,7 +364,13 @@ commit信息
                 "stderr": "",
             }
         except Exception as e:
-            print(f"❌ 提交失败: {str(e)}")
+            self.console.print(
+                Panel(
+                    f"[bold red]❌ 提交失败[/bold red]\n\n{str(e)}",
+                    title="Git Commit Error",
+                    border_style="red",
+                )
+            )
             return {
                 "success": False,
                 "stdout": "",
@@ -415,7 +394,6 @@ def cli(
         "--suffix",
         help="提交信息后缀（用换行分隔）",
     ),
-
     model_group: Optional[str] = typer.Option(
         None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
@@ -427,7 +405,6 @@ def cli(
             "root_dir": root_dir,
             "prefix": prefix,
             "suffix": suffix,
-
             "model_group": model_group,
         }
     )

jarvis/jarvis_mcp/__init__.py

@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
-from abc import ABC, abstractmethod
-from typing import Any, Dict, List
+from abc import ABC
+from abc import abstractmethod
+from typing import Any
+from typing import Dict
+from typing import List
 
 
 class McpClient(ABC):

jarvis/jarvis_mcp/sse_mcp_client.py

@@ -2,12 +2,20 @@
 import json
 import threading
 import time
-from typing import Any, Callable, Dict, List, Optional
-from urllib.parse import parse_qs, urlencode, urljoin
-
-import requests  # type: ignore[import-untyped]
+from typing import Any
+from typing import Callable
+from typing import Dict
+from typing import List
+from typing import Optional
+from typing import cast
+from urllib.parse import parse_qs
+from urllib.parse import urlencode
+from urllib.parse import urljoin
+
+import requests
 
 from jarvis.jarvis_mcp import McpClient
+from jarvis.jarvis_utils.output import PrettyOutput
 
 
 class SSEMcpClient(McpClient):
@@ -49,12 +57,12 @@ class SSEMcpClient(McpClient):
         self.sse_thread: Optional[threading.Thread] = None
         self.messages_endpoint: Optional[str] = None
         self.session_id: Optional[str] = None
-        self.pending_requests: Dict[str, threading.Event] = (
-            {}
-        )  # 存储等待响应的请求 {id: Event}
-        self.request_results: Dict[str, Dict[str, Any]] = (
-            {}
-        )  # 存储请求结果 {id: result}
+        self.pending_requests: Dict[
+            str, threading.Event
+        ] = {}  # 存储等待响应的请求 {id: Event}
+        self.request_results: Dict[
+            str, Dict[str, Any]
+        ] = {}  # 存储请求结果 {id: result}
         self.notification_handlers: Dict[str, List[Callable]] = {}
         self.event_lock = threading.Lock()
         self.request_id_counter = 0
@@ -77,10 +85,12 @@ class SSEMcpClient(McpClient):
 
             if not self.messages_endpoint:
                 self.messages_endpoint = "/messages"  # 默认端点
-                print(f"⚠️ 未获取到消息端点，使用默认值: {self.messages_endpoint}")
+                PrettyOutput.auto_print(
+                    f"⚠️ 未获取到消息端点，使用默认值: {self.messages_endpoint}"
+                )
 
             if not self.session_id:
-                print("⚠️ 未获取到会话ID")
+                PrettyOutput.auto_print("⚠️ 未获取到会话ID")
 
             # 发送初始化请求
             response = self._send_request(
@@ -103,7 +113,7 @@ class SSEMcpClient(McpClient):
             self._send_notification("notifications/initialized", {})
 
         except Exception as e:
-            print(f"❌ MCP初始化失败: {str(e)}")
+            PrettyOutput.auto_print(f"❌ MCP初始化失败: {str(e)}")
             raise
 
     def _start_sse_connection(self) -> None:
@@ -134,7 +144,7 @@ class SSEMcpClient(McpClient):
                 self.sse_thread.start()
 
         except Exception as e:
-            print(f"❌ SSE连接失败: {str(e)}")
+            PrettyOutput.auto_print(f"❌ SSE连接失败: {str(e)}")
             raise
 
     def _process_sse_events(self) -> None:
@@ -162,7 +172,7 @@ class SSEMcpClient(McpClient):
                                 if "session_id" in query_params:
                                     self.session_id = query_params["session_id"][0]
                         except Exception as e:
-                            print(f"⚠️ 解析消息端点或会话ID失败: {e}")
+                            PrettyOutput.auto_print(f"⚠️ 解析消息端点或会话ID失败: {e}")
                     else:
                         buffer += data
                 elif line.startswith(":"):  # 忽略注释行
@@ -178,10 +188,10 @@ class SSEMcpClient(McpClient):
                     try:
                         self._handle_sse_event(buffer)
                     except Exception as e:
-                        print(f"❌ 处理SSE事件出错: {e}")
+                        PrettyOutput.auto_print(f"❌ 处理SSE事件出错: {e}")
                     buffer = ""
 
-        print("⚠️ SSE连接已关闭")
+        PrettyOutput.auto_print("⚠️ SSE连接已关闭")
 
     def _handle_sse_event(self, data: str) -> None:
         """处理单个SSE事件数据"""
@@ -211,10 +221,10 @@ class SSEMcpClient(McpClient):
                         except Exception as e:
                             error_lines.append(f"处理通知时出错 ({method}): {e}")
                     if error_lines:
-                        joined_errors = '\n'.join(error_lines)
-                        print(f"❌ {joined_errors}")
+                        joined_errors = "\n".join(error_lines)
+                        PrettyOutput.auto_print(f"❌ {joined_errors}")
         except Exception:
-            print(f"⚠️ 无法解析SSE事件: {data}")
+            PrettyOutput.auto_print(f"⚠️ 无法解析SSE事件: {data}")
 
     def register_notification_handler(self, method: str, handler: Callable) -> None:
         """注册通知处理器
@@ -334,7 +344,7 @@ class SSEMcpClient(McpClient):
                 self.pending_requests.pop(req_id, None)
                 self.request_results.pop(req_id, None)
 
-            print(f"❌ 发送请求失败: {str(e)}")
+            PrettyOutput.auto_print(f"❌ 发送请求失败: {str(e)}")
             raise
 
     def _send_notification(self, method: str, params: Dict[str, Any]) -> None:
@@ -389,7 +399,7 @@ class SSEMcpClient(McpClient):
                     post_response.raise_for_status()
 
         except Exception as e:
-            print(f"❌ 发送通知失败: {str(e)}")
+            PrettyOutput.auto_print(f"❌ 发送通知失败: {str(e)}")
             raise
 
     def get_tool_list(self) -> List[Dict[str, Any]]:
@@ -432,10 +442,10 @@ class SSEMcpClient(McpClient):
                 else:
                     error_msg += ": 未知错误"
 
-                print(f"❌ {error_msg}")
+                PrettyOutput.auto_print(f"❌ {error_msg}")
                 return []
         except Exception as e:
-            print(f"❌ 获取工具列表失败: {str(e)}")
+            PrettyOutput.auto_print(f"❌ 获取工具列表失败: {str(e)}")
             return []
 
     def execute(self, tool_name: str, arguments: Dict[str, Any]) -> Dict[str, Any]:
@@ -474,7 +484,7 @@ class SSEMcpClient(McpClient):
                     "stderr": response.get("error", "Unknown error"),
                 }
         except Exception as e:
-            print(f"❌ 执行工具失败: {str(e)}")
+            PrettyOutput.auto_print(f"❌ 执行工具失败: {str(e)}")
             return {"success": False, "stdout": "", "stderr": str(e)}
 
     def get_resource_list(self) -> List[Dict[str, Any]]:
@@ -490,17 +500,17 @@ class SSEMcpClient(McpClient):
         try:
             response = self._send_request("resources/list", {})
             if "result" in response and "resources" in response["result"]:
-                return response["result"]["resources"]
+                return cast(List[Dict[str, Any]], response["result"]["resources"])
             else:
                 error_msg = "获取资源列表失败"
                 if "error" in response:
                     error_msg += f": {response['error']}"
                 else:
                     error_msg += ": 未知错误"
-                print(f"❌ {error_msg}")
+                PrettyOutput.auto_print(f"❌ {error_msg}")
                 return []
         except Exception as e:
-            print(f"❌ 获取资源列表失败: {str(e)}")
+            PrettyOutput.auto_print(f"❌ 获取资源列表失败: {str(e)}")
             return []
 
     def get_resource(self, uri: str) -> Dict[str, Any]:
@@ -541,11 +551,11 @@ class SSEMcpClient(McpClient):
                     error_msg += f": {response['error']}"
                 else:
                     error_msg += ": 未知错误"
-                print(f"❌ {error_msg}")
+                PrettyOutput.auto_print(f"❌ {error_msg}")
                 return {"success": False, "stdout": "", "stderr": error_msg}
         except Exception as e:
             error_msg = f"获取资源内容失败: {str(e)}"
-            print(f"❌ {error_msg}")
+            PrettyOutput.auto_print(f"❌ {error_msg}")
             return {"success": False, "stdout": "", "stderr": error_msg}
 
     def __del__(self):

jarvis/jarvis_mcp/stdio_mcp_client.py

@@ -2,9 +2,14 @@
 import json
 import os
 import subprocess
-from typing import Any, Dict, List, Optional
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Optional
+from typing import cast
 
 from jarvis.jarvis_mcp import McpClient
+from jarvis.jarvis_utils.output import PrettyOutput
 
 
 class StdioMcpClient(McpClient):
@@ -49,7 +54,7 @@ class StdioMcpClient(McpClient):
             )
 
         except Exception as e:
-            print(f"❌ 启动MCP进程失败: {str(e)}")
+            PrettyOutput.auto_print(f"❌ 启动MCP进程失败: {str(e)}")
             raise
 
     def _initialize(self) -> None:
@@ -78,7 +83,7 @@ class StdioMcpClient(McpClient):
             self._send_notification("notifications/initialized", {})
 
         except Exception as e:
-            print(f"❌ MCP初始化失败: {str(e)}")
+            PrettyOutput.auto_print(f"❌ MCP初始化失败: {str(e)}")
             raise
 
     def _send_request(self, method: str, params: Dict[str, Any]) -> Dict[str, Any]:
@@ -99,15 +104,17 @@ class StdioMcpClient(McpClient):
             request = {"jsonrpc": "2.0", "method": method, "params": params, "id": 1}
 
             # 发送请求
-            self.process.stdin.write(json.dumps(request) + "\n")  # type: ignore
-            self.process.stdin.flush()  # type: ignore
+            assert self.process.stdin is not None
+            assert self.process.stdout is not None
+            self.process.stdin.write(json.dumps(request) + "\n")
+            self.process.stdin.flush()
 
             # 读取响应
-            response = self.process.stdout.readline()  # type: ignore
-            return json.loads(response)
+            response = self.process.stdout.readline()
+            return cast(Dict[str, Any], json.loads(response))
 
         except Exception as e:
-            print(f"❌ 发送请求失败: {str(e)}")
+            PrettyOutput.auto_print(f"❌ 发送请求失败: {str(e)}")
             raise
 
     def _send_notification(self, method: str, params: Dict[str, Any]) -> None:
@@ -124,11 +131,12 @@ class StdioMcpClient(McpClient):
             # 构建通知
             notification = {"jsonrpc": "2.0", "method": method, "params": params}
             # 发送通知
-            self.process.stdin.write(json.dumps(notification) + "\n")  # type: ignore
-            self.process.stdin.flush()  # type: ignore
+            assert self.process.stdin is not None
+            self.process.stdin.write(json.dumps(notification) + "\n")
+            self.process.stdin.flush()
 
         except Exception as e:
-            print(f"❌ 发送通知失败: {str(e)}")
+            PrettyOutput.auto_print(f"❌ 发送通知失败: {str(e)}")
             raise
 
     def get_tool_list(self) -> List[Dict[str, Any]]:
@@ -171,10 +179,10 @@ class StdioMcpClient(McpClient):
                 else:
                     error_msg += ": 未知错误"
 
-                print(f"❌ {error_msg}")
+                PrettyOutput.auto_print(f"❌ {error_msg}")
                 return []
         except Exception as e:
-            print(f"❌ 获取工具列表失败: {str(e)}")
+            PrettyOutput.auto_print(f"❌ 获取工具列表失败: {str(e)}")
             return []
 
     def execute(self, tool_name: str, arguments: Dict[str, Any]) -> Dict[str, Any]:
@@ -213,7 +221,7 @@ class StdioMcpClient(McpClient):
                     "stderr": response.get("error", "Unknown error"),
                 }
         except Exception as e:
-            print(f"❌ 执行工具失败: {str(e)}")
+            PrettyOutput.auto_print(f"❌ 执行工具失败: {str(e)}")
             return {"success": False, "stdout": "", "stderr": str(e)}
 
     def get_resource_list(self) -> List[Dict[str, Any]]:
@@ -229,17 +237,17 @@ class StdioMcpClient(McpClient):
         try:
             response = self._send_request("resources/list", {})
             if "result" in response and "resources" in response["result"]:
-                return response["result"]["resources"]
+                return cast(List[Dict[str, Any]], response["result"]["resources"])
             else:
                 error_msg = "获取资源列表失败"
                 if "error" in response:
                     error_msg += f": {response['error']}"
                 else:
                     error_msg += ": 未知错误"
-                print(f"❌ {error_msg}")
+                PrettyOutput.auto_print(f"❌ {error_msg}")
                 return []
         except Exception as e:
-            print(f"❌ 获取资源列表失败: {str(e)}")
+            PrettyOutput.auto_print(f"❌ 获取资源列表失败: {str(e)}")
             return []
 
     def get_resource(self, uri: str) -> Dict[str, Any]:
@@ -280,11 +288,11 @@ class StdioMcpClient(McpClient):
                     error_msg += f": {response['error']}"
                 else:
                     error_msg += ": 未知错误"
-                print(f"❌ {error_msg}")
+                PrettyOutput.auto_print(f"❌ {error_msg}")
                 return {"success": False, "stdout": "", "stderr": error_msg}
         except Exception as e:
             error_msg = f"获取资源内容失败: {str(e)}"
-            print(f"❌ {error_msg}")
+            PrettyOutput.auto_print(f"❌ {error_msg}")
             return {"success": False, "stdout": "", "stderr": error_msg}
 
     def __del__(self):