jarvis-ai-assistant 0.3.26__py3-none-any.whl → 0.3.28__py3-none-any.whl

jarvis/jarvis_platform_manager/main.py

@@ -18,6 +18,7 @@ from jarvis.jarvis_utils.input import get_multiline_input, get_single_line_input
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import init_env
 from jarvis.jarvis_platform_manager.service import start_service
+from jarvis.jarvis_utils.fzf import fzf_select
 
 app = typer.Typer(help="Jarvis AI 平台")
 
@@ -451,17 +452,33 @@ def role_command(
     )
     PrettyOutput.print(output_str, OutputType.INFO)
 
-    # 让用户选择角色
-    raw_choice = get_single_line_input("请选择角色(输入编号，直接回车退出): ")
-    if not raw_choice.strip():
-        PrettyOutput.print("已取消，退出程序", OutputType.INFO)
-        raise typer.Exit(code=0)
-    try:
-        choice = int(raw_choice)
-        selected_role = config["roles"][choice - 1]
-    except (ValueError, IndexError):
-        PrettyOutput.print("无效的选择", OutputType.ERROR)
-        return
+    # 让用户选择角色（优先 fzf，回退编号输入）
+    selected_role = None  # type: ignore[var-annotated]
+    fzf_options = [
+        f"{i:>3} | {role['name']} - {role.get('description', '')}"
+        for i, role in enumerate(config["roles"], 1)
+    ]
+    selected_str = fzf_select(fzf_options, prompt="选择角色编号 (Enter退出) > ")
+    if selected_str:
+        try:
+            num_part = selected_str.split("|", 1)[0].strip()
+            idx = int(num_part)
+            if 1 <= idx <= len(config["roles"]):
+                selected_role = config["roles"][idx - 1]
+        except Exception:
+            selected_role = None
+
+    if selected_role is None:
+        raw_choice = get_single_line_input("请选择角色(输入编号，直接回车退出): ")
+        if not raw_choice.strip():
+            PrettyOutput.print("已取消，退出程序", OutputType.INFO)
+            raise typer.Exit(code=0)
+        try:
+            choice = int(raw_choice)
+            selected_role = config["roles"][choice - 1]
+        except (ValueError, IndexError):
+            PrettyOutput.print("无效的选择", OutputType.ERROR)
+            return
 
 
 

jarvis/jarvis_platform_manager/service.py

@@ -10,7 +10,7 @@ import time
 import threading
 import uuid
 from datetime import datetime
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional
 
 import uvicorn
 from fastapi import FastAPI, HTTPException

jarvis/jarvis_rag/cli.py

@@ -1,7 +1,7 @@
 import os
 import sys
 from pathlib import Path
-from typing import Optional, List, Literal, cast, Tuple
+from typing import Optional, List, Tuple
 import mimetypes
 
 import pathspec  # type: ignore

jarvis/jarvis_rag/embedding_manager.py

@@ -43,7 +43,6 @@ class EmbeddingManager:
         try:
             # First try to load model from local cache without any network access
             try:
-                from sentence_transformers import SentenceTransformer
                 local_dir = None
                 # Prefer explicit local dir via env or direct path
 

jarvis/jarvis_rag/llm_interface.py

@@ -1,7 +1,4 @@
 from abc import ABC, abstractmethod
-import os
-import os
-from abc import ABC, abstractmethod
 
 from jarvis.jarvis_agent import Agent as JarvisAgent
 from jarvis.jarvis_platform.base import BasePlatform

jarvis/jarvis_smart_shell/main.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 import os
-import sys
 from typing import Optional, Tuple
 
 import typer

jarvis/jarvis_stats/cli.py

@@ -16,7 +16,6 @@ from pathlib import Path
 from .stats import StatsManager
 from jarvis.jarvis_utils.utils import init_env
 from jarvis.jarvis_utils.config import get_data_dir
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 app = typer.Typer(help="Jarvis 统计模块命令行工具")
 console = Console()
@@ -98,11 +97,6 @@ def inc(
 @app.command()
 def show(
     metric: Optional[str] = typer.Argument(None, help="指标名称，不指定则显示所有"),
-    last_hours: Optional[int] = typer.Option(None, "--hours", "-h", help="最近N小时"),
-    last_days: Optional[int] = typer.Option(None, "--days", "-d", help="最近N天"),
-    format: str = typer.Option(
-        "table", "--format", "-f", help="显示格式: table/chart/summary"
-    ),
     aggregation: str = typer.Option(
         "hourly", "--agg", "-a", help="聚合方式: hourly/daily"
     ),
@@ -123,9 +117,7 @@ def show(
 
     stats.show(
         metric_name=metric,
-        last_hours=last_hours,
-        last_days=last_days,
-        format=format,
+
         aggregation=aggregation,
         tags=tag_dict if tag_dict else None,
     )
@@ -136,8 +128,6 @@ def plot(
     metric: Optional[str] = typer.Argument(
         None, help="指标名称（可选，不指定则根据标签过滤所有匹配的指标）"
     ),
-    last_hours: Optional[int] = typer.Option(None, "--hours", "-h", help="最近N小时"),
-    last_days: Optional[int] = typer.Option(None, "--days", "-d", help="最近N天"),
     aggregation: str = typer.Option(
         "hourly", "--agg", "-a", help="聚合方式: hourly/daily"
     ),
@@ -160,8 +150,6 @@ def plot(
 
     stats.plot(
         metric_name=metric,
-        last_hours=last_hours,
-        last_days=last_days,
         aggregation=aggregation,
         width=width,
         height=height,
@@ -260,9 +248,9 @@ def clean(
 @app.command()
 def export(
     metric: str = typer.Argument(..., help="指标名称"),
-    output: str = typer.Option("csv", "--format", "-f", help="输出格式: csv/json"),
-    last_hours: Optional[int] = typer.Option(None, "--hours", "-h", help="最近N小时"),
-    last_days: Optional[int] = typer.Option(None, "--days", "-d", help="最近N天"),
+
+
+
     tags: Optional[List[str]] = typer.Option(
         None, "--tag", "-t", help="标签过滤，格式: key=value"
     ),
@@ -285,27 +273,19 @@ def export(
     # 获取数据
     data = stats.get_stats(
         metric_name=metric,
-        last_hours=last_hours,
-        last_days=last_days,
         tags=tag_dict if tag_dict else None,
     )
 
-    if output == "json":
-        # JSON格式输出
-        PrettyOutput.print(
-            json.dumps(data, indent=2, ensure_ascii=False), OutputType.CODE, lang="json"
-        )
+    # CSV格式输出（默认）
+    records = data.get("records", [])
+    if records:
+        writer = csv.writer(sys.stdout)
+        writer.writerow(["timestamp", "value", "tags"])
+        for record in records:
+            tags_str = json.dumps(record.get("tags", {}))
+            writer.writerow([record["timestamp"], record["value"], tags_str])
     else:
-        # CSV格式输出
-        records = data.get("records", [])
-        if records:
-            writer = csv.writer(sys.stdout)
-            writer.writerow(["timestamp", "value", "tags"])
-            for record in records:
-                tags_str = json.dumps(record.get("tags", {}))
-                writer.writerow([record["timestamp"], record["value"], tags_str])
-        else:
-            rprint("[yellow]没有找到数据[/yellow]", file=sys.stderr)
+        rprint("[yellow]没有找到数据[/yellow]", file=sys.stderr)
 
 
 @app.command()
@@ -329,7 +309,7 @@ def remove(
             unit = info.get("unit", "-")
             last_updated = info.get("last_updated", "-")
 
-            rprint(f"\n[yellow]准备删除指标:[/yellow]")
+            rprint("\n[yellow]准备删除指标:[/yellow]")
             rprint(f"  名称: {metric}")
             rprint(f"  单位: {unit}")
             rprint(f"  最后更新: {last_updated}")
@@ -359,7 +339,7 @@ def demo():
     stats = StatsManager(_get_stats_dir())
 
     # 添加演示数据
-    with console.status("[bold green]正在生成演示数据...") as status:
+    with console.status("[bold green]正在生成演示数据..."):
         # API响应时间
         for i in range(20):
             response_time = random.uniform(0.1, 2.0)

jarvis/jarvis_stats/stats.py

@@ -166,32 +166,57 @@ class StatsManager:
             >>> StatsManager.show("response_time", last_days=7, format="chart")  # 图表显示
         """
         # 处理时间范围
-        if end_time is None:
-            end_time = datetime.now()
-
-        if start_time is None:
-            if last_hours:
-                start_time = end_time - timedelta(hours=last_hours)
-            elif last_days:
-                start_time = end_time - timedelta(days=last_days)
-            else:
-                start_time = end_time - timedelta(days=7)  # 默认7天
+        # 当未提供时间过滤参数时，默认显示全历史数据
+        if last_hours or last_days:
+            if end_time is None:
+                end_time = datetime.now()
+            if start_time is None:
+                if last_hours:
+                    start_time = end_time - timedelta(hours=last_hours)
+                elif last_days:
+                    start_time = end_time - timedelta(days=last_days)
+        else:
+            pass
 
         if metric_name is None:
             # 显示所有指标摘要
             StatsManager._show_metrics_summary(start_time, end_time, tags)
         else:
+            # 基于元数据的 created_at / last_updated 推断全历史时间范围
+            storage = StatsManager._get_storage()
+            if start_time is None or end_time is None:
+                info = storage.get_metric_info(metric_name)
+                if info:
+                    try:
+                        created_at = info.get("created_at")
+                        last_updated = info.get("last_updated")
+                        start_dt = start_time or (
+                            datetime.fromisoformat(created_at) if created_at else datetime.now()
+                        )
+                        end_dt = end_time or (
+                            datetime.fromisoformat(last_updated) if last_updated else datetime.now()
+                        )
+                    except Exception:
+                        start_dt = start_time or (datetime.now() - timedelta(days=7))
+                        end_dt = end_time or datetime.now()
+                else:
+                    start_dt = start_time or (datetime.now() - timedelta(days=7))
+                    end_dt = end_time or datetime.now()
+            else:
+                start_dt = start_time
+                end_dt = end_time
+
             # 根据格式显示数据
             if format == "chart":
                 StatsManager._show_chart(
-                    metric_name, start_time, end_time, aggregation, tags
+                    metric_name, start_dt, end_dt, aggregation, tags
                 )
             elif format == "summary":
                 StatsManager._show_summary(
-                    metric_name, start_time, end_time, aggregation, tags
+                    metric_name, start_dt, end_dt, aggregation, tags
                 )
             else:
-                StatsManager._show_table(metric_name, start_time, end_time, tags)
+                StatsManager._show_table(metric_name, start_dt, end_dt, tags)
 
     @staticmethod
     def plot(
@@ -224,21 +249,44 @@ class StatsManager:
             >>> StatsManager.plot(tags={"service": "api"}, last_days=7)
         """
         # 处理时间范围
-        if end_time is None:
-            end_time = datetime.now()
-
-        if start_time is None:
-            if last_hours:
-                start_time = end_time - timedelta(hours=last_hours)
-            elif last_days:
-                start_time = end_time - timedelta(days=last_days)
-            else:
-                start_time = end_time - timedelta(days=7)
+        # 当未提供时间过滤参数时，默认使用全历史数据
+        if last_hours or last_days:
+            if end_time is None:
+                end_time = datetime.now()
+            if start_time is None:
+                if last_hours:
+                    start_time = end_time - timedelta(hours=last_hours)
+                elif last_days:
+                    start_time = end_time - timedelta(days=last_days)
 
         # 如果指定了metric_name，显示单个图表
         if metric_name:
+            # 基于元数据的 created_at / last_updated 推断全历史时间范围
+            storage = StatsManager._get_storage()
+            if start_time is None or end_time is None:
+                info = storage.get_metric_info(metric_name)
+                if info:
+                    try:
+                        created_at = info.get("created_at")
+                        last_updated = info.get("last_updated")
+                        start_dt = start_time or (
+                            datetime.fromisoformat(created_at) if created_at else datetime.now()
+                        )
+                        end_dt = end_time or (
+                            datetime.fromisoformat(last_updated) if last_updated else datetime.now()
+                        )
+                    except Exception:
+                        start_dt = start_time or (datetime.now() - timedelta(days=7))
+                        end_dt = end_time or datetime.now()
+                else:
+                    start_dt = start_time or (datetime.now() - timedelta(days=7))
+                    end_dt = end_time or datetime.now()
+            else:
+                start_dt = start_time
+                end_dt = end_time
+
             StatsManager._show_chart(
-                metric_name, start_time, end_time, aggregation, tags, width, height
+                metric_name, start_dt, end_dt, aggregation, tags, width, height
             )
         else:
             # 如果没有指定metric_name，根据标签过滤获取所有匹配的指标
@@ -272,32 +320,53 @@ class StatsManager:
             统计数据字典
         """
         # 处理时间范围
-        if end_time is None:
-            end_time = datetime.now()
-
-        if start_time is None:
-            if last_hours:
-                start_time = end_time - timedelta(hours=last_hours)
-            elif last_days:
-                start_time = end_time - timedelta(days=last_days)
-            else:
-                start_time = end_time - timedelta(days=7)
+        # 当未提供时间过滤参数时，返回全历史数据
+        if last_hours or last_days or start_time is not None:
+            if end_time is None:
+                end_time = datetime.now()
+            if start_time is None:
+                if last_hours:
+                    start_time = end_time - timedelta(hours=last_hours)
+                elif last_days:
+                    start_time = end_time - timedelta(days=last_days)
 
         storage = StatsManager._get_storage()
+
+        # 基于元数据推断全历史范围（当未提供时间过滤参数时）
+        start_dt = start_time
+        end_dt = end_time
+        if start_dt is None or end_dt is None:
+            info = storage.get_metric_info(metric_name)
+            if info:
+                try:
+                    created_at = info.get("created_at")
+                    last_updated = info.get("last_updated")
+                    if start_dt is None and created_at:
+                        start_dt = datetime.fromisoformat(created_at)
+                    if end_dt is None and last_updated:
+                        end_dt = datetime.fromisoformat(last_updated)
+                except Exception:
+                    pass
+        if start_dt is None:
+            start_dt = datetime.now() - timedelta(days=7)
+        if end_dt is None:
+            end_dt = datetime.now()
+
         if aggregation:
-            # 返回聚合数据
+            # 返回聚合数据（按推断的全历史时间范围）
             return storage.aggregate_metrics(
-                metric_name, start_time, end_time, aggregation, tags
+                metric_name, start_dt, end_dt, aggregation, tags
             )
         else:
-            # 返回原始数据
-            records = storage.get_metrics(metric_name, start_time, end_time, tags)
+            # 返回原始数据（全历史或指定范围）
+            records = storage.get_metrics(metric_name, start_dt, end_dt, tags)
+
             return {
                 "metric": metric_name,
                 "records": records,
                 "count": len(records),
-                "start_time": start_time.isoformat(),
-                "end_time": end_time.isoformat(),
+                "start_time": start_dt.isoformat(),
+                "end_time": end_dt.isoformat(),
             }
 
     @staticmethod
@@ -343,24 +412,56 @@ class StatsManager:
             console.print("[yellow]没有找到任何统计指标[/yellow]")
             return
 
-        # 如果没有指定时间范围，使用默认值
-        if end_time is None:
-            end_time = datetime.now()
-        if start_time is None:
-            start_time = end_time - timedelta(days=7)
+        # 如果未指定时间范围且两者皆为 None，则表示使用全历史数据
+        all_time = False
+        if start_time is None and end_time is None:
+            all_time = True
+        else:
+            if end_time is None:
+                end_time = datetime.now()
+            if start_time is None:
+                start_time = end_time - timedelta(days=7)
+
+
+
+        # 计算时间范围列标题
+        if start_time is None or end_time is None:
+            period_label = "值"
+        else:
+            delta = end_time - start_time
+            if delta.days >= 1:
+                period_label = f"{delta.days}天数据点"
+            else:
+                hours = max(1, int(delta.total_seconds() // 3600))
+                period_label = f"{hours}小时数据点"
 
         # 创建表格
         table = Table(title="统计指标摘要")
         table.add_column("指标名称", style="cyan")
         table.add_column("单位", style="green")
         table.add_column("最后更新", style="yellow")
-        table.add_column("7天数据点", style="magenta")
+        table.add_column(period_label, style="magenta")
 
         # 过滤满足标签条件的指标
         displayed_count = 0
         for metric in metrics:
-            # 获取该指标的记录
-            records = storage.get_metrics(metric, start_time, end_time, tags)
+            # 获取该指标的记录（全历史或指定范围）
+            if 'all_time' in locals() and all_time:
+                _start = None
+                _end = None
+                try:
+                    info = storage.get_metric_info(metric)
+                    if info:
+                        ca = info.get("created_at")
+                        lu = info.get("last_updated")
+                        _start = datetime.fromisoformat(ca) if ca else None
+                        _end = datetime.fromisoformat(lu) if lu else None
+                except Exception:
+                    _start = None
+                    _end = None
+                records = storage.get_metrics(metric, _start, _end, tags)
+            else:
+                records = storage.get_metrics(metric, start_time, end_time, tags)
 
             # 如果指定了标签过滤，但没有匹配的记录，跳过该指标
             if tags and len(records) == 0:
@@ -382,8 +483,14 @@ class StatsManager:
                     except:
                         pass
 
-            count = len(records)
-            table.add_row(metric, unit, last_updated, str(count))
+            total_value = sum(r.get("value", 0) for r in records)
+            # 智能格式化，如果是整数则不显示小数点
+            if total_value == int(total_value):
+                value_to_display = str(int(total_value))
+            else:
+                value_to_display = f"{total_value:.2f}"
+
+            table.add_row(metric, unit, last_updated, value_to_display)
             displayed_count += 1
 
         if displayed_count == 0:
@@ -532,8 +639,28 @@ class StatsManager:
             if i > 0:
                 console.print("\n" + "=" * 80 + "\n")  # 分隔符
 
+            # 计算该指标的有效时间范围（基于元数据推断全历史）
+            _start = start_time
+            _end = end_time
+            if _start is None or _end is None:
+                info = storage.get_metric_info(metric)
+                if info:
+                    try:
+                        ca = info.get("created_at")
+                        lu = info.get("last_updated")
+                        if _start is None and ca:
+                            _start = datetime.fromisoformat(ca)
+                        if _end is None and lu:
+                            _end = datetime.fromisoformat(lu)
+                    except Exception:
+                        pass
+                if _start is None:
+                    _start = datetime.now() - timedelta(days=7)
+                if _end is None:
+                    _end = datetime.now()
+
             StatsManager._show_chart(
-                metric, start_time, end_time, aggregation, tags, width, height
+                metric, _start, _end, aggregation, tags, width, height
             )
 
     @staticmethod

jarvis/jarvis_tools/clear_memory.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import json
-import shutil
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
@@ -8,7 +7,6 @@ from jarvis.jarvis_utils.config import get_data_dir
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.globals import (
     clear_short_term_memories,
-    get_short_term_memories,
     short_term_memories,
 )
 
@@ -212,7 +210,7 @@ class ClearMemoryTool:
             # 生成结果报告
 
             # 详细报告
-            report = f"# 记忆清除报告\n\n"
+            report = "# 记忆清除报告\n\n"
             report += f"**总计清除**: {total_removed} 条记忆\n\n"
 
             if tags:

jarvis/jarvis_tools/cli/main.py

@@ -1,4 +1,3 @@
-import sys
 import json
 from typing import Optional
 

jarvis/jarvis_tools/edit_file.py

@@ -123,7 +123,6 @@ class FileSearchReplaceTool:
         from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
         stdout_messages: list[str] = []
-        stderr_messages: list[str] = []
         overall_success = False
         file_results = []
 

jarvis/jarvis_tools/generate_new_tool.py

@@ -120,15 +120,13 @@ class generate_new_tool:
             # 注册新工具到当前的工具注册表
             success_message = f"工具 '{tool_name}' 已成功生成在 {tool_file_path}"
 
-            registration_successful = False
             if agent:
                 tool_registry = agent.get_tool_registry()
                 if tool_registry:
                     # 尝试加载并注册新工具
 
                     if tool_registry.register_tool_by_file(str(tool_file_path)):
-                        success_message += f"\n已成功注册到当前会话的工具注册表中"
-                        registration_successful = True
+                        success_message += "\n已成功注册到当前会话的工具注册表中"
                     else:
                         # 注册失败，删除已创建的文件
                         PrettyOutput.print(
@@ -140,13 +138,13 @@ class generate_new_tool:
                         return {
                             "success": False,
                             "stdout": "",
-                            "stderr": f"工具文件已生成，但注册失败。文件已被删除。",
+                            "stderr": "工具文件已生成，但注册失败。文件已被删除。",
                         }
                 else:
                     PrettyOutput.print(
                         "未找到工具注册表，无法自动注册工具", OutputType.WARNING
                     )
-                    success_message += f"\n注册到当前会话失败，可能需要重新启动Jarvis"
+                    success_message += "\n注册到当前会话失败，可能需要重新启动Jarvis"
 
             # 检查并安装缺失的依赖
             try:

jarvis/jarvis_tools/registry.py

@@ -15,7 +15,6 @@ from jarvis.jarvis_mcp.stdio_mcp_client import StdioMcpClient
 from jarvis.jarvis_mcp.streamable_mcp_client import StreamableMcpClient
 from jarvis.jarvis_tools.base import Tool
 from jarvis.jarvis_utils.config import get_data_dir, get_tool_load_dirs
-from jarvis.jarvis_utils.input import user_confirm
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
 from jarvis.jarvis_utils.utils import is_context_overflow, daily_check_git_updates
@@ -128,7 +127,7 @@ class ToolRegistry(OutputHandlerProtocol):
         """加载工具"""
         tools = self.get_all_tools()
         if tools:
-            tools_prompt = f"<tools_section>\n"
+            tools_prompt = "<tools_section>\n"
             tools_prompt += "  <header>## 可用工具:</header>\n"
             tools_prompt += "  <tools_list>\n"
             for tool in tools:
@@ -202,7 +201,7 @@ class ToolRegistry(OutputHandlerProtocol):
     def _get_tool_stats(self) -> Dict[str, int]:
         """从数据目录获取工具调用统计"""
         from jarvis.jarvis_stats.stats import StatsManager
-        from datetime import datetime, timedelta
+        from datetime import datetime
 
         # 获取所有工具的统计数据
         tool_stats = {}
@@ -839,6 +838,21 @@ class ToolRegistry(OutputHandlerProtocol):
             # 执行工具调用（根据工具实现的协议版本，由系统在内部决定agent的传递方式）
             result = self.execute_tool(name, args, agent)
 
+            # 记录本轮实际执行的工具，供上层逻辑（如记忆保存判定）使用
+            try:
+                from jarvis.jarvis_agent import Agent  # 延迟导入避免循环依赖
+                agent_instance_for_record: Agent = agent_instance
+                # 记录最后一次执行的工具
+                agent_instance_for_record.set_user_data("__last_executed_tool__", name)  # type: ignore
+                # 记录本轮累计执行的工具列表
+                executed_list = agent_instance_for_record.get_user_data("__executed_tools__")  # type: ignore
+                if not isinstance(executed_list, list):
+                    executed_list = []
+                executed_list.append(name)
+                agent_instance_for_record.set_user_data("__executed_tools__", executed_list)  # type: ignore
+            except Exception:
+                pass
+
             # 格式化输出
             output = self._format_tool_output(
                 result["stdout"], result.get("stderr", "")