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

jarvis/jarvis_git_squash/main.py

@@ -5,7 +5,6 @@ from typing import Dict
 import typer
 
 from jarvis.jarvis_git_utils.git_commiter import GitCommitTool
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import init_env
 from jarvis.jarvis_utils.input import user_confirm
 from jarvis.jarvis_utils.globals import get_agent, current_agent_name
@@ -38,11 +37,11 @@ class GitSquashTool:
         """Execute the squash operation"""
         try:
             if not self._confirm_squash():
-                PrettyOutput.print("操作已取消", OutputType.WARNING)
+                print("⚠️ 操作已取消")
                 return
 
             if not self._reset_to_commit(args["commit_hash"]):
-                PrettyOutput.print("重置到指定提交失败", OutputType.WARNING)
+                print("⚠️ 重置到指定提交失败")
                 return
 
             # Use existing GitCommitTool for new commit
@@ -53,7 +52,7 @@ class GitSquashTool:
                 exec_args["agent"] = agent
             commit_tool.execute(exec_args)
         except Exception as e:
-            PrettyOutput.print(f"压缩提交失败: {str(e)}", OutputType.WARNING)
+            print(f"⚠️ 压缩提交失败: {str(e)}")
 
 
 @app.command()
@@ -61,7 +60,7 @@ def cli(
     commit_hash: str = typer.Argument(..., help="要压缩的基础提交哈希"),
     lang: str = typer.Option("Chinese", "--lang", help="提交信息的语言"),
 ):
-    init_env("欢迎使用 Jarvis-GitSquash，您的Git压缩助手已准备就绪！")
+    init_env()
     tool = GitSquashTool()
     tool.execute({"commit_hash": commit_hash, "lang": lang})
 

jarvis/jarvis_git_utils/git_commiter.py

@@ -75,7 +75,7 @@ class GitCommitTool:
         os.chdir(root_dir)
         find_git_root_and_cd()
         if not has_uncommitted_changes():
-            PrettyOutput.print("没有未提交的更改", OutputType.SUCCESS)
+            print("✅ 没有未提交的更改")
             return None
         return original_dir
 
@@ -129,42 +129,7 @@ class GitCommitTool:
 
             try:
                 temp_diff_file_path = None
-                # 生成提交信息
-                PrettyOutput.print("正在生成提交消息...", OutputType.INFO)
-
-                # 准备提示信息
-                custom_prompt = get_git_commit_prompt()
-                base_prompt = (
-                    custom_prompt
-                    if custom_prompt
-                    else """根据代码差异生成提交信息：
-                提交信息应使用中文书写
-# 格式模板
-必须使用以下格式：
-
-<类型>(<范围>): <主题>
-
-[可选] 详细描述变更内容和原因
-
-# 格式规则
-1. 类型: fix(修复bug), feat(新功能), docs(文档), style(格式), refactor(重构), test(测试), chore(其他)
-2. 范围表示变更的模块或组件 (例如: auth, database, ui)
-3. 主题行不超过72个字符，不以句号结尾，使用祈使语气
-4. 如有详细描述，使用空行分隔主题和详细描述
-5. 详细描述部分应解释"是什么"和"为什么"，而非"如何"
-6. 仅输出提交信息，不要输出其他内容
-"""
-                )
-                base_prompt += f"""
-# 输出格式
-{ot("COMMIT_MESSAGE")}
-commit信息
-{ct("COMMIT_MESSAGE")}
-                """
-
-                # 优先从调用方传入的 agent 获取平台与模型
-                agent_from_args = args.get("agent")
-
+                
                 # Get model_group from args
                 model_group = args.get("model_group")
 
@@ -184,6 +149,7 @@ commit信息
                     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")
@@ -239,6 +205,40 @@ commit信息
                 else:
                     platform = PlatformRegistry().get_normal_platform()
 
+                # 生成提交信息
+                model_display_name = model_name or (platform.name() if platform else "AI")
+                print(f"ℹ️ 正在使用{model_display_name}生成提交消息...")
+
+                # 准备提示信息
+                custom_prompt = get_git_commit_prompt()
+                base_prompt = (
+                    custom_prompt
+                    if custom_prompt
+                    else """根据代码差异生成提交信息：
+                提交信息应使用中文书写
+# 格式模板
+必须使用以下格式：
+
+<类型>(<范围>): <主题>
+
+[可选] 详细描述变更内容和原因
+
+# 格式规则
+1. 类型: fix(修复bug), feat(新功能), docs(文档), style(格式), refactor(重构), test(测试), chore(其他)
+2. 范围表示变更的模块或组件 (例如: auth, database, ui)
+3. 主题行不超过72个字符，不以句号结尾，使用祈使语气
+4. 如有详细描述，使用空行分隔主题和详细描述
+5. 详细描述部分应解释"是什么"和"为什么"，而非"如何"
+6. 仅输出提交信息，不要输出其他内容
+"""
+                )
+                base_prompt += f"""
+# 输出格式
+{ot("COMMIT_MESSAGE")}
+commit信息
+{ct("COMMIT_MESSAGE")}
+                """
+
                 # 跳过模型可用性校验：
                 # 为避免某些平台/代理不支持 get_model_list 接口导致的噪音日志（如 404），
                 # 这里默认不调用 platform.get_model_list() 进行模型可用性校验。
@@ -256,11 +256,11 @@ commit信息
                 upload_success = False
 
                 # Check if content is too large
-                is_large_content = is_context_overflow(diff, model_group)
+                is_large_content = is_context_overflow(diff, model_group, platform)
 
                 if is_large_content:
                     if not platform.support_upload_files():
-                        PrettyOutput.print("差异文件太大，无法处理", OutputType.ERROR)
+                        print("❌ 差异文件太大，无法处理")
                         return {
                             "success": False,
                             "stdout": "",
@@ -279,7 +279,7 @@ commit信息
                     if upload_success:
                         pass
                     else:
-                        PrettyOutput.print("上传代码差异文件失败", OutputType.ERROR)
+                        print("❌ 上传代码差异文件失败")
                         return {
                             "success": False,
                             "stdout": "",
@@ -378,14 +378,9 @@ commit信息
                     try:
                         os.unlink(temp_diff_file_path)
                     except Exception as e:
-                        PrettyOutput.print(
-                            f"无法删除临时文件: {str(e)}", OutputType.WARNING
-                        )
+                        print(f"⚠️ 无法删除临时文件: {str(e)}")
 
-            PrettyOutput.print(
-                f"提交哈希: {commit_hash}\n提交消息: {commit_message}",
-                OutputType.SUCCESS,
-            )
+            PrettyOutput.print(f"提交哈希: {commit_hash}\n提交消息: {commit_message}", OutputType.SUCCESS)
 
             return {
                 "success": True,
@@ -396,7 +391,7 @@ commit信息
                 "stderr": "",
             }
         except Exception as e:
-            PrettyOutput.print(f"提交失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 提交失败: {str(e)}")
             return {
                 "success": False,
                 "stdout": "",
@@ -425,7 +420,7 @@ def cli(
         None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
 ):
-    init_env("欢迎使用 Jarvis-GitCommitTool，您的Git提交助手已准备就绪！")
+    init_env()
     tool = GitCommitTool()
     tool.execute(
         {

jarvis/jarvis_mcp/sse_mcp_client.py

@@ -8,7 +8,6 @@ from urllib.parse import parse_qs, urlencode, urljoin
 import requests  # type: ignore[import-untyped]
 
 from jarvis.jarvis_mcp import McpClient
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class SSEMcpClient(McpClient):
@@ -78,13 +77,10 @@ class SSEMcpClient(McpClient):
 
             if not self.messages_endpoint:
                 self.messages_endpoint = "/messages"  # 默认端点
-                PrettyOutput.print(
-                    f"未获取到消息端点，使用默认值: {self.messages_endpoint}",
-                    OutputType.WARNING,
-                )
+                print(f"⚠️ 未获取到消息端点，使用默认值: {self.messages_endpoint}")
 
             if not self.session_id:
-                PrettyOutput.print("未获取到会话ID", OutputType.WARNING)
+                print("⚠️ 未获取到会话ID")
 
             # 发送初始化请求
             response = self._send_request(
@@ -107,7 +103,7 @@ class SSEMcpClient(McpClient):
             self._send_notification("notifications/initialized", {})
 
         except Exception as e:
-            PrettyOutput.print(f"MCP初始化失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ MCP初始化失败: {str(e)}")
             raise
 
     def _start_sse_connection(self) -> None:
@@ -138,7 +134,7 @@ class SSEMcpClient(McpClient):
                 self.sse_thread.start()
 
         except Exception as e:
-            PrettyOutput.print(f"SSE连接失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ SSE连接失败: {str(e)}")
             raise
 
     def _process_sse_events(self) -> None:
@@ -166,9 +162,7 @@ class SSEMcpClient(McpClient):
                                 if "session_id" in query_params:
                                     self.session_id = query_params["session_id"][0]
                         except Exception as e:
-                            PrettyOutput.print(
-                                f"解析消息端点或会话ID失败: {e}", OutputType.WARNING
-                            )
+                            print(f"⚠️ 解析消息端点或会话ID失败: {e}")
                     else:
                         buffer += data
                 elif line.startswith(":"):  # 忽略注释行
@@ -184,10 +178,10 @@ class SSEMcpClient(McpClient):
                     try:
                         self._handle_sse_event(buffer)
                     except Exception as e:
-                        PrettyOutput.print(f"处理SSE事件出错: {e}", OutputType.ERROR)
+                        print(f"❌ 处理SSE事件出错: {e}")
                     buffer = ""
 
-        PrettyOutput.print("SSE连接已关闭", OutputType.WARNING)
+        print("⚠️ SSE连接已关闭")
 
     def _handle_sse_event(self, data: str) -> None:
         """处理单个SSE事件数据"""
@@ -217,11 +211,10 @@ class SSEMcpClient(McpClient):
                         except Exception as e:
                             error_lines.append(f"处理通知时出错 ({method}): {e}")
                     if error_lines:
-                        PrettyOutput.print("\n".join(error_lines), OutputType.ERROR)
-        except json.JSONDecodeError:
-            PrettyOutput.print(f"无法解析SSE事件: {data}", OutputType.WARNING)
-        except Exception as e:
-            PrettyOutput.print(f"处理SSE事件时出错: {e}", OutputType.ERROR)
+                        joined_errors = '\n'.join(error_lines)
+                        print(f"❌ {joined_errors}")
+        except Exception:
+            print(f"⚠️ 无法解析SSE事件: {data}")
 
     def register_notification_handler(self, method: str, handler: Callable) -> None:
         """注册通知处理器
@@ -341,7 +334,7 @@ class SSEMcpClient(McpClient):
                 self.pending_requests.pop(req_id, None)
                 self.request_results.pop(req_id, None)
 
-            PrettyOutput.print(f"发送请求失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 发送请求失败: {str(e)}")
             raise
 
     def _send_notification(self, method: str, params: Dict[str, Any]) -> None:
@@ -396,7 +389,7 @@ class SSEMcpClient(McpClient):
                     post_response.raise_for_status()
 
         except Exception as e:
-            PrettyOutput.print(f"发送通知失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 发送通知失败: {str(e)}")
             raise
 
     def get_tool_list(self) -> List[Dict[str, Any]]:
@@ -439,10 +432,10 @@ class SSEMcpClient(McpClient):
                 else:
                     error_msg += ": 未知错误"
 
-                PrettyOutput.print(error_msg, OutputType.ERROR)
+                print(f"❌ {error_msg}")
                 return []
         except Exception as e:
-            PrettyOutput.print(f"获取工具列表失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 获取工具列表失败: {str(e)}")
             return []
 
     def execute(self, tool_name: str, arguments: Dict[str, Any]) -> Dict[str, Any]:
@@ -481,7 +474,7 @@ class SSEMcpClient(McpClient):
                     "stderr": response.get("error", "Unknown error"),
                 }
         except Exception as e:
-            PrettyOutput.print(f"执行工具失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 执行工具失败: {str(e)}")
             return {"success": False, "stdout": "", "stderr": str(e)}
 
     def get_resource_list(self) -> List[Dict[str, Any]]:
@@ -504,10 +497,10 @@ class SSEMcpClient(McpClient):
                     error_msg += f": {response['error']}"
                 else:
                     error_msg += ": 未知错误"
-                PrettyOutput.print(error_msg, OutputType.ERROR)
+                print(f"❌ {error_msg}")
                 return []
         except Exception as e:
-            PrettyOutput.print(f"获取资源列表失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 获取资源列表失败: {str(e)}")
             return []
 
     def get_resource(self, uri: str) -> Dict[str, Any]:
@@ -548,11 +541,11 @@ class SSEMcpClient(McpClient):
                     error_msg += f": {response['error']}"
                 else:
                     error_msg += ": 未知错误"
-                PrettyOutput.print(error_msg, OutputType.ERROR)
+                print(f"❌ {error_msg}")
                 return {"success": False, "stdout": "", "stderr": error_msg}
         except Exception as e:
             error_msg = f"获取资源内容失败: {str(e)}"
-            PrettyOutput.print(error_msg, OutputType.ERROR)
+            print(f"❌ {error_msg}")
             return {"success": False, "stdout": "", "stderr": error_msg}
 
     def __del__(self):

jarvis/jarvis_mcp/stdio_mcp_client.py

@@ -5,7 +5,6 @@ import subprocess
 from typing import Any, Dict, List, Optional
 
 from jarvis.jarvis_mcp import McpClient
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class StdioMcpClient(McpClient):
@@ -50,7 +49,7 @@ class StdioMcpClient(McpClient):
             )
 
         except Exception as e:
-            PrettyOutput.print(f"启动MCP进程失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 启动MCP进程失败: {str(e)}")
             raise
 
     def _initialize(self) -> None:
@@ -79,7 +78,7 @@ class StdioMcpClient(McpClient):
             self._send_notification("notifications/initialized", {})
 
         except Exception as e:
-            PrettyOutput.print(f"MCP初始化失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ MCP初始化失败: {str(e)}")
             raise
 
     def _send_request(self, method: str, params: Dict[str, Any]) -> Dict[str, Any]:
@@ -108,7 +107,7 @@ class StdioMcpClient(McpClient):
             return json.loads(response)
 
         except Exception as e:
-            PrettyOutput.print(f"发送请求失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 发送请求失败: {str(e)}")
             raise
 
     def _send_notification(self, method: str, params: Dict[str, Any]) -> None:
@@ -129,7 +128,7 @@ class StdioMcpClient(McpClient):
             self.process.stdin.flush()  # type: ignore
 
         except Exception as e:
-            PrettyOutput.print(f"发送通知失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 发送通知失败: {str(e)}")
             raise
 
     def get_tool_list(self) -> List[Dict[str, Any]]:
@@ -172,10 +171,10 @@ class StdioMcpClient(McpClient):
                 else:
                     error_msg += ": 未知错误"
 
-                PrettyOutput.print(error_msg, OutputType.ERROR)
+                print(f"❌ {error_msg}")
                 return []
         except Exception as e:
-            PrettyOutput.print(f"获取工具列表失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 获取工具列表失败: {str(e)}")
             return []
 
     def execute(self, tool_name: str, arguments: Dict[str, Any]) -> Dict[str, Any]:
@@ -214,7 +213,7 @@ class StdioMcpClient(McpClient):
                     "stderr": response.get("error", "Unknown error"),
                 }
         except Exception as e:
-            PrettyOutput.print(f"执行工具失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 执行工具失败: {str(e)}")
             return {"success": False, "stdout": "", "stderr": str(e)}
 
     def get_resource_list(self) -> List[Dict[str, Any]]:
@@ -237,10 +236,10 @@ class StdioMcpClient(McpClient):
                     error_msg += f": {response['error']}"
                 else:
                     error_msg += ": 未知错误"
-                PrettyOutput.print(error_msg, OutputType.ERROR)
+                print(f"❌ {error_msg}")
                 return []
         except Exception as e:
-            PrettyOutput.print(f"获取资源列表失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 获取资源列表失败: {str(e)}")
             return []
 
     def get_resource(self, uri: str) -> Dict[str, Any]:
@@ -281,11 +280,11 @@ class StdioMcpClient(McpClient):
                     error_msg += f": {response['error']}"
                 else:
                     error_msg += ": 未知错误"
-                PrettyOutput.print(error_msg, OutputType.ERROR)
+                print(f"❌ {error_msg}")
                 return {"success": False, "stdout": "", "stderr": error_msg}
         except Exception as e:
             error_msg = f"获取资源内容失败: {str(e)}"
-            PrettyOutput.print(error_msg, OutputType.ERROR)
+            print(f"❌ {error_msg}")
             return {"success": False, "stdout": "", "stderr": error_msg}
 
     def __del__(self):

jarvis/jarvis_mcp/streamable_mcp_client.py

@@ -7,7 +7,6 @@ from urllib.parse import urljoin
 import requests  # type: ignore[import-untyped]
 
 from jarvis.jarvis_mcp import McpClient
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class StreamableMcpClient(McpClient):
@@ -86,7 +85,7 @@ class StreamableMcpClient(McpClient):
             self._send_notification("notifications/initialized", {})
 
         except Exception as e:
-            PrettyOutput.print(f"MCP初始化失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ MCP初始化失败: {str(e)}")
             raise
 
     def register_notification_handler(self, method: str, handler: Callable) -> None:
@@ -182,14 +181,16 @@ class StreamableMcpClient(McpClient):
                                         handler(params)
                                     except Exception as e:
                                         error_lines.append(f"处理通知时出错 ({notify_method}): {e}")
-                    except json.JSONDecodeError:
+                    except Exception:
                         warning_lines.append(f"无法解析响应: {line}")
                         continue
 
             if warning_lines:
-                PrettyOutput.print("\n".join(warning_lines), OutputType.WARNING)
+                joined_warnings = '\n'.join(warning_lines)
+                print(f"⚠️ {joined_warnings}")
             if error_lines:
-                PrettyOutput.print("\n".join(error_lines), OutputType.ERROR)
+                joined_errors = '\n'.join(error_lines)
+                print(f"❌ {joined_errors}")
             # Ensure response is closed after streaming
             response.close()
             if result is None:
@@ -198,7 +199,7 @@ class StreamableMcpClient(McpClient):
             return result
 
         except Exception as e:
-            PrettyOutput.print(f"发送请求失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 发送请求失败: {str(e)}")
             raise
         finally:
             # 清理请求状态
@@ -226,7 +227,7 @@ class StreamableMcpClient(McpClient):
             response.close()
 
         except Exception as e:
-            PrettyOutput.print(f"发送通知失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 发送通知失败: {str(e)}")
             raise
 
     def get_tool_list(self) -> List[Dict[str, Any]]:
@@ -269,10 +270,10 @@ class StreamableMcpClient(McpClient):
                 else:
                     error_msg += ": 未知错误"
 
-                PrettyOutput.print(error_msg, OutputType.ERROR)
+                print(f"❌ {error_msg}")
                 return []
         except Exception as e:
-            PrettyOutput.print(f"获取工具列表失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 获取工具列表失败: {str(e)}")
             return []
 
     def execute(self, tool_name: str, arguments: Dict[str, Any]) -> Dict[str, Any]:
@@ -311,7 +312,7 @@ class StreamableMcpClient(McpClient):
                     "stderr": response.get("error", "Unknown error"),
                 }
         except Exception as e:
-            PrettyOutput.print(f"执行工具失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 执行工具失败: {str(e)}")
             return {"success": False, "stdout": "", "stderr": str(e)}
 
     def get_resource_list(self) -> List[Dict[str, Any]]:
@@ -334,10 +335,10 @@ class StreamableMcpClient(McpClient):
                     error_msg += f": {response['error']}"
                 else:
                     error_msg += ": 未知错误"
-                PrettyOutput.print(error_msg, OutputType.ERROR)
+                print(f"❌ {error_msg}")
                 return []
         except Exception as e:
-            PrettyOutput.print(f"获取资源列表失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 获取资源列表失败: {str(e)}")
             return []
 
     def get_resource(self, uri: str) -> Dict[str, Any]:
@@ -378,11 +379,11 @@ class StreamableMcpClient(McpClient):
                     error_msg += f": {response['error']}"
                 else:
                     error_msg += ": 未知错误"
-                PrettyOutput.print(error_msg, OutputType.ERROR)
+                print(f"❌ {error_msg}")
                 return {"success": False, "stdout": "", "stderr": error_msg}
         except Exception as e:
             error_msg = f"获取资源内容失败: {str(e)}"
-            PrettyOutput.print(error_msg, OutputType.ERROR)
+            print(f"❌ {error_msg}")
             return {"success": False, "stdout": "", "stderr": error_msg}
 
     def __del__(self):