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

jarvis/jarvis_stats/storage.py

@@ -6,13 +6,19 @@
 
 import json
 import os
-from datetime import datetime, timedelta
-from pathlib import Path
-from typing import Dict, List, Optional, Any, Set
-from collections import defaultdict
 import sys
 import time
 import uuid
+from collections import defaultdict
+from datetime import datetime
+from datetime import timedelta
+from pathlib import Path
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Optional
+from typing import Set
+from typing import cast
 
 
 class StatsStorage:
@@ -70,7 +76,7 @@ class StatsStorage:
             try:
                 with open(filepath, "r", encoding="utf-8") as f:
                     data = json.load(f)
-                    return data
+                    return cast(Dict[Any, Any], data)
             except Exception:
                 if attempt < max_retries - 1:
                     time.sleep(0.1 * (attempt + 1))  # 递增延迟
@@ -400,7 +406,7 @@ class StatsStorage:
             if info and isinstance(info, dict):
                 grp = info.get("group")
                 if grp:
-                    return grp
+                    return cast(str, grp)
 
             # 扫描历史记录以推断
             group_counts: Dict[str, int] = {}
@@ -448,10 +454,10 @@ class StatsStorage:
         except Exception:
             return None
 
-    def get_metric_info(self, metric_name: str) -> Optional[Dict]:
+    def get_metric_info(self, metric_name: str) -> Optional[Dict[Any, Any]]:
         """获取指标元信息"""
         meta = self._load_json(self.meta_file)
-        return meta.get("metrics", {}).get(metric_name)
+        return cast(Optional[Dict[Any, Any]], meta.get("metrics", {}).get(metric_name))
 
     def list_metrics(self) -> List[str]:
         """列出所有指标"""

jarvis/jarvis_stats/visualizer.py

@@ -4,15 +4,20 @@
 提供终端图形化展示功能
 """
 
-import os
 import io
-from typing import Dict, List, Optional, Any
+import os
 from collections import OrderedDict
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Optional
+from typing import cast
+
 import plotext as plt
+from rich import box
 from rich.console import Console
-from rich.table import Table
 from rich.panel import Panel
-from rich import box
+from rich.table import Table
 
 
 class StatsVisualizer:
@@ -70,7 +75,7 @@ class StatsVisualizer:
         if unit:
             plt.ylabel(unit)
 
-        chart = plt.build()
+        chart = cast(str, plt.build())
 
         if show_values and values:
             min_val = min(values)
@@ -125,7 +130,7 @@ class StatsVisualizer:
         if unit:
             plt.ylabel(unit)
 
-        return plt.build()
+        return cast(str, plt.build())
 
     def show_summary(
         self,
@@ -267,7 +272,7 @@ class StatsVisualizer:
                 f"显示: {len(display_records)} | "
                 f"最小值: {min(values):.2f} | "
                 f"最大值: {max(values):.2f} | "
-                f"平均值: {sum(values)/len(values):.2f}"
+                f"平均值: {sum(values) / len(values):.2f}"
             )
             self.console.print(
                 Panel(

jarvis/jarvis_tools/base.py

@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 import json
-from typing import Any, Callable, Dict
+from typing import Any
+from typing import Callable
+from typing import Dict
+from typing import cast
 
 
 class Tool:
@@ -49,7 +52,7 @@ class Tool:
             Dict[str, Any]: 工具执行结果
         """
         try:
-            return self.func(arguments)
+            return cast(Dict[str, Any], self.func(arguments))
         except Exception as e:
             return {
                 "success": False,

jarvis/jarvis_tools/clear_memory.py

@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
 import json
 from pathlib import Path
-from typing import Any, Dict, List, Optional
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Optional
 
 from jarvis.jarvis_utils.config import get_data_dir
-from jarvis.jarvis_utils.globals import (
-    clear_short_term_memories,
-    short_term_memories,
-)
+from jarvis.jarvis_utils.globals import clear_short_term_memories
+from jarvis.jarvis_utils.globals import short_term_memories
+from jarvis.jarvis_utils.output import PrettyOutput
 
 
 class ClearMemoryTool:
@@ -59,9 +61,9 @@ class ClearMemoryTool:
     def _get_memory_dir(self, memory_type: str) -> Path:
         """根据记忆类型获取存储目录"""
         if memory_type == "project_long_term":
-            return self.project_memory_dir
+            return Path(self.project_memory_dir)
         elif memory_type in ["global_long_term", "short_term"]:
-            return self.global_memory_dir / memory_type
+            return Path(self.global_memory_dir) / memory_type
         else:
             raise ValueError(f"未知的记忆类型: {memory_type}")
 
@@ -145,7 +147,9 @@ class ClearMemoryTool:
                     removed_count += 1
 
             except Exception as e:
-                print(f"⚠️ 处理记忆文件 {memory_file} 时出错: {str(e)}")
+                PrettyOutput.auto_print(
+                    f"⚠️ 处理记忆文件 {memory_file} 时出错: {str(e)}"
+                )
 
         # 如果目录为空，可以删除目录
         if not any(memory_dir.iterdir()) and memory_dir != self.project_memory_dir:
@@ -218,5 +222,5 @@ class ClearMemoryTool:
 
         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}

jarvis/jarvis_tools/cli/main.py

@@ -5,13 +5,13 @@ import typer
 from tabulate import tabulate
 
 from jarvis.jarvis_tools.registry import ToolRegistry
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.output import OutputType
+from jarvis.jarvis_utils.output import PrettyOutput
 from jarvis.jarvis_utils.utils import init_env
 
 app = typer.Typer(help="Jarvis 工具系统命令行界面")
 
 
-
 @app.command("list")
 def list_tools(
     as_json: bool = typer.Option(False, "--json", help="以JSON格式输出"),
@@ -38,10 +38,11 @@ def list_tools(
                 lang="json",
             )
     else:
-        print("📋 可用工具列表")
+        PrettyOutput.auto_print("📋 可用工具列表")
         # 为避免 PrettyOutput 对每行加框造成信息稀疏，先拼接字符串再统一打印
         lines = []
         import json as _json  # local import to ensure available
+
         for tool in tools:
             lines.append(f"\n{tool['name']}")
             lines.append(f"   描述: {tool['description']}")
@@ -50,7 +51,9 @@ def list_tools(
                 # 使用 Markdown 代码块统一展示参数
                 lines.append("```json")
                 try:
-                    lines.append(_json.dumps(tool["parameters"], ensure_ascii=False, indent=2))
+                    lines.append(
+                        _json.dumps(tool["parameters"], ensure_ascii=False, indent=2)
+                    )
                 except Exception:
                     lines.append(str(tool.get("parameters")))
                 lines.append("```")
@@ -90,7 +93,7 @@ def stat_tools(
             )
         else:
             time_desc = f"最近{last_days}天" if last_days else "所有历史"
-            print(f"📊 工具调用统计 ({time_desc})")
+            PrettyOutput.auto_print(f"📊 工具调用统计 ({time_desc})")
             if table_data:
                 PrettyOutput.print(
                     tabulate(
@@ -99,12 +102,14 @@ def stat_tools(
                     OutputType.CODE,
                     lang="text",
                 )
-                print(f"ℹ️ 总计: {len(table_data)} 个工具被使用，共 {sum(x[1] for x in table_data)} 次调用")
+                PrettyOutput.auto_print(
+                    f"ℹ️ 总计: {len(table_data)} 个工具被使用，共 {sum(x[1] for x in table_data)} 次调用"
+                )
             else:
-                print("ℹ️ 暂无工具调用记录")
+                PrettyOutput.auto_print("ℹ️ 暂无工具调用记录")
     else:
         # 使用 stats 系统的高级功能
-        print("📊 工具组统计")
+        PrettyOutput.auto_print("📊 工具组统计")
         # 显示所有标记为 tool 组的指标
         metrics = StatsManager.list_metrics()
         tool_metrics = []
@@ -163,7 +168,7 @@ def stat_tools(
                             tags={"group": "tool"},
                         )
         else:
-            print("ℹ️ 暂无工具调用记录")
+            PrettyOutput.auto_print("ℹ️ 暂无工具调用记录")
 
 
 @app.command("call")
@@ -179,9 +184,9 @@ def call_tool(
     tool_obj = registry.get_tool(tool_name)
 
     if not tool_obj:
-        print(f"❌ 错误: 工具 '{tool_name}' 不存在")
+        PrettyOutput.auto_print(f"❌ 错误: 工具 '{tool_name}' 不存在")
         available_tools = ", ".join([t["name"] for t in registry.get_all_tools()])
-        print(f"ℹ️ 可用工具: {available_tools}")
+        PrettyOutput.auto_print(f"ℹ️ 可用工具: {available_tools}")
         raise typer.Exit(code=1)
 
     tool_args = {}
@@ -189,14 +194,14 @@ def call_tool(
         try:
             tool_args = json.loads(args)
         except Exception:
-            print("❌ 错误: 参数必须是有效的JSON格式")
+            PrettyOutput.auto_print("❌ 错误: 参数必须是有效的JSON格式")
             raise typer.Exit(code=1)
     elif args_file:
         try:
             with open(args_file, "r", encoding="utf-8") as f:
                 tool_args = json.load(f)
         except (Exception, FileNotFoundError) as e:
-            print(f"❌ 错误: 无法从文件加载参数: {str(e)}")
+            PrettyOutput.auto_print(f"❌ 错误: 无法从文件加载参数: {str(e)}")
             raise typer.Exit(code=1)
 
     required_params = tool_obj.parameters.get("required", [])
@@ -214,22 +219,22 @@ def call_tool(
             param_info = params.get(param_name, {})
             desc = param_info.get("description", "无描述")
             lines.append(f"  - {param_name}: {desc}")
-        print("❌ " + "\n❌ ".join(lines))
+        PrettyOutput.auto_print("❌ " + "\n❌ ".join(lines))
         raise typer.Exit(code=1)
 
     result = registry.execute_tool(tool_name, tool_args)
 
     if result["success"]:
-        print(f"✅ 工具 {tool_name} 执行成功")
+        PrettyOutput.auto_print(f"✅ 工具 {tool_name} 执行成功")
     else:
-        print(f"❌ 工具 {tool_name} 执行失败")
+        PrettyOutput.auto_print(f"❌ 工具 {tool_name} 执行失败")
 
     if result.get("stdout"):
-        print("\n📤 输出:")
+        PrettyOutput.auto_print("\n📤 输出:")
         PrettyOutput.print(result["stdout"], OutputType.CODE, lang="text")
 
     if result.get("stderr"):
-        print("\n❌ 错误:")
+        PrettyOutput.auto_print("\n❌ 错误:")
         PrettyOutput.print(result["stderr"], OutputType.CODE, lang="text")
 
     if not result["success"]: