jarvis-ai-assistant 0.2.3__py3-none-any.whl → 0.2.4__py3-none-any.whl

jarvis/jarvis_data/config_schema.json

@@ -139,7 +139,7 @@
     "JARVIS_THINKING_MODEL": {
       "type": "string",
       "description": "思考操作模型名称",
-      "default": "deep_seek"
+      "default": "deep_seek_v3"
     },
     "JARVIS_LLM_GROUP": {
       "type": "string",
@@ -169,7 +169,7 @@
             },
             "JARVIS_THINKING_MODEL": {
               "type": "string",
-              "default": "deep_seek"
+              "default": "deep_seek_v3"
             },
             "JARVIS_MAX_TOKEN_COUNT": {
               "type": "number",
@@ -234,6 +234,14 @@
       },
       "default": []
     },
+    "JARVIS_METHODOLOGY_DIRS": {
+      "type": "array",
+      "description": "方法论加载目录",
+      "items": {
+        "type": "string"
+      },
+      "default": []
+    },
     "JARVIS_PRINT_PROMPT": {
       "type": "boolean",
       "description": "是否打印提示",
@@ -260,11 +268,11 @@
           "properties": {
             "embedding_model": {
               "type": "string",
-              "default": "BAAI/bge-base-zh-v1.5"
+              "default": "BAAI/bge-m3"
             },
             "rerank_model": {
               "type": "string",
-              "default": "BAAI/bge-reranker-base"
+              "default": "BAAI/bge-reranker-v2-m3"
             },
             "use_bm25": {
               "type": "boolean",
@@ -284,13 +292,13 @@
       "properties": {
         "embedding_model": {
           "type": "string",
-          "default": "BAAI/bge-base-zh-v1.5",
-          "description": "用于RAG的嵌入模型的名称, 默认为 'BAAI/bge-base-zh-v1.5'"
+          "default": "BAAI/bge-m3",
+          "description": "用于RAG的嵌入模型的名称, 默认为 'BAAI/bge-m3'"
         },
         "rerank_model": {
           "type": "string",
-          "default": "BAAI/bge-reranker-base",
-          "description": "用于RAG的rerank模型的名称, 默认为 'BAAI/bge-reranker-base'"
+          "default": "BAAI/bge-reranker-v2-m3",
+          "description": "用于RAG的rerank模型的名称, 默认为 'BAAI/bge-reranker-v2-m3'"
         },
         "use_bm25": {
           "type": "boolean",
@@ -304,8 +312,8 @@
         }
       },
       "default": {
-        "embedding_model": "BAAI/bge-base-zh-v1.5",
-        "rerank_model": "BAAI/bge-reranker-base",
+        "embedding_model": "BAAI/bge-m3",
+        "rerank_model": "BAAI/bge-reranker-v2-m3",
         "use_bm25": true,
         "use_rerank": true
       }
@@ -361,6 +369,11 @@
     "OYI_API_KEY": {
       "type": "string",
       "description": "Oyi API Key"
+    },
+    "SHELL": {
+      "type": "string",
+      "description": "系统Shell路径，用于获取当前使用的shell类型",
+      "default": "/bin/bash"
     }
   },
   "additionalProperties": true

jarvis/jarvis_git_squash/main.py

@@ -9,7 +9,7 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import init_env
 from jarvis.jarvis_utils.input import user_confirm
 
-app = typer.Typer(help="Git squash tool")
+app = typer.Typer(help="Git压缩工具")
 
 
 class GitSquashTool:
@@ -53,8 +53,8 @@ class GitSquashTool:
 
 @app.command()
 def cli(
-    commit_hash: str = typer.Argument(..., help="Base commit hash to squash from"),
-    lang: str = typer.Option("Chinese", "--lang", help="Language for commit messages"),
+    commit_hash: str = typer.Argument(..., help="要压缩的基础提交哈希"),
+    lang: str = typer.Option("Chinese", "--lang", help="提交信息的语言"),
 ):
     init_env("欢迎使用 Jarvis-GitSquash，您的Git压缩助手已准备就绪！")
     tool = GitSquashTool()

jarvis/jarvis_git_utils/git_commiter.py

@@ -21,7 +21,7 @@ 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
 
-app = typer.Typer(help="Git commit tool")
+app = typer.Typer(help="Git提交工具")
 
 
 class GitCommitTool:
@@ -258,17 +258,38 @@ commit信息
 
                 # 执行提交
                 print("⚙️ 正在准备提交...")
-                with tempfile.NamedTemporaryFile(mode="w", delete=True) as tmp_file:
+                # Windows 兼容性：使用 delete=False 避免权限错误
+                tmp_file = tempfile.NamedTemporaryFile(mode="w", delete=False)
+                tmp_file_path = tmp_file.name
+                try:
                     tmp_file.write(commit_message)
-                    tmp_file.flush()
+                    tmp_file.close()  # Windows 需要先关闭文件才能被其他进程读取
+
                     print("💾 正在执行提交...")
-                    commit_cmd = ["git", "commit", "-F", tmp_file.name]
-                    subprocess.Popen(
+                    commit_cmd = ["git", "commit", "-F", tmp_file_path]
+                    process = subprocess.Popen(
                         commit_cmd,
-                        stdout=subprocess.DEVNULL,
-                        stderr=subprocess.DEVNULL,
-                    ).wait()
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE,
+                        text=True,
+                    )
+                    stdout, stderr = process.communicate()
+
+                    if process.returncode != 0:
+                        # 如果提交失败，重置暂存区
+                        subprocess.run(["git", "reset", "HEAD"], check=False)
+                        error_msg = (
+                            stderr.strip() if stderr else "Unknown git commit error"
+                        )
+                        raise Exception(f"Git commit failed: {error_msg}")
+
                     print("✅ 提交")
+                finally:
+                    # 手动删除临时文件
+                    try:
+                        os.unlink(tmp_file_path)
+                    except Exception:
+                        pass
 
                 commit_hash = self._get_last_commit_hash()
                 print("✅ 完成提交")
@@ -310,17 +331,17 @@ commit信息
 @app.command()
 def cli(
     root_dir: str = typer.Option(
-        ".", "--root-dir", help="Root directory of the Git repository"
+        ".", "--root-dir", help="Git仓库的根目录路径"
     ),
     prefix: str = typer.Option(
         "",
         "--prefix",
-        help="Prefix to prepend to commit message (separated by space)",
+        help="提交信息前缀（用空格分隔）",
     ),
     suffix: str = typer.Option(
         "",
         "--suffix",
-        help="Suffix to append to commit message (separated by newline)",
+        help="提交信息后缀（用换行分隔）",
     ),
 ):
     init_env("欢迎使用 Jarvis-GitCommitTool，您的Git提交助手已准备就绪！")

jarvis/jarvis_mcp/sse_mcp_client.py

@@ -50,9 +50,9 @@ 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 = {}  # 存储等待响应的请求 {id: Event}
-        self.request_results = {}  # 存储请求结果 {id: result}
-        self.notification_handlers = {}
+        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
 
@@ -95,9 +95,7 @@ class SSEMcpClient(McpClient):
 
             # 验证服务器响应
             if "result" not in response:
-                raise RuntimeError(
-                    f"初始化失败: {response.get('error', 'Unknown error')}"
-                )
+                raise RuntimeError(f"初始化失败: {response.get('error', 'Unknown error')}")
 
             # 发送initialized通知
             self._send_notification("notifications/initialized", {})

jarvis/jarvis_mcp/streamable_mcp_client.py

@@ -45,9 +45,9 @@ class StreamableMcpClient(McpClient):
         self.session.headers.update(extra_headers)
 
         # 请求相关属性
-        self.pending_requests = {}  # 存储等待响应的请求 {id: Event}
-        self.request_results = {}  # 存储请求结果 {id: result}
-        self.notification_handlers = {}
+        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
 
@@ -70,9 +70,7 @@ class StreamableMcpClient(McpClient):
 
             # 验证服务器响应
             if "result" not in response:
-                raise RuntimeError(
-                    f"初始化失败: {response.get('error', 'Unknown error')}"
-                )
+                raise RuntimeError(f"初始化失败: {response.get('error', 'Unknown error')}")
 
             # 发送initialized通知
             self._send_notification("notifications/initialized", {})
@@ -143,9 +141,7 @@ class StreamableMcpClient(McpClient):
 
             # 发送请求到Streamable HTTP端点
             mcp_url = urljoin(self.base_url, "mcp")
-            response = self.session.post(
-                mcp_url, json=request, stream=True  # 启用流式传输
-            )
+            response = self.session.post(mcp_url, json=request, stream=True)  # 启用流式传输
             response.raise_for_status()
 
             # 处理流式响应

jarvis/jarvis_rag/retriever.py

@@ -144,7 +144,7 @@ class ChromaRetriever:
                 ]
 
             # 按分数排序并取最高结果
-            bm25_results_with_docs.sort(key=lambda x: x[2], reverse=True)
+            bm25_results_with_docs.sort(key=lambda x: x[2], reverse=True)  # type: ignore
 
             for doc_text, metadata, _ in bm25_results_with_docs[: n_results * 2]:
                 bm25_docs.append(Document(page_content=doc_text, metadata=metadata))

jarvis/jarvis_smart_shell/main.py

@@ -170,8 +170,8 @@ def process_request(request: str) -> Optional[str]:
 4. 多个命令用&&连接
 
 # 示例
-输入: "查找Python文件"
-输出: find . -name "*.py"
+输入: "显示当前目录内容"
+输出: ls -la
 """
         model.set_system_prompt(system_message)
 

jarvis/jarvis_stats/__init__.py

@@ -0,0 +1,13 @@
+"""
+Jarvis统计模块
+
+提供指标统计、数据持久化、可视化展示等功能
+"""
+
+from jarvis.jarvis_stats.stats import StatsManager
+from jarvis.jarvis_stats.storage import StatsStorage
+from jarvis.jarvis_stats.visualizer import StatsVisualizer
+
+__all__ = ["StatsManager", "StatsStorage", "StatsVisualizer"]
+
+__version__ = "1.0.0"

jarvis/jarvis_stats/cli.py

@@ -0,0 +1,337 @@
+"""
+统计模块命令行接口
+
+使用 typer 提供友好的命令行交互
+"""
+
+from datetime import datetime, timedelta
+from typing import Optional, List
+import typer
+from rich.console import Console
+from rich.table import Table
+from rich import print as rprint
+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
+
+app = typer.Typer(help="Jarvis 统计模块命令行工具")
+console = Console()
+
+# 全局变量，存储是否已初始化
+_initialized = False
+_stats_dir = None
+
+
+def _get_stats_dir():
+    """获取统计数据目录"""
+    global _initialized, _stats_dir
+    if not _initialized:
+        _stats_dir = Path(get_data_dir()) / "stats"
+        _initialized = True
+    return str(_stats_dir)
+
+
+@app.command()
+def add(
+    metric: str = typer.Argument(..., help="指标名称"),
+    value: float = typer.Argument(..., help="指标值"),
+    unit: Optional[str] = typer.Option(None, "--unit", "-u", help="单位"),
+    tags: Optional[List[str]] = typer.Option(
+        None, "--tag", "-t", help="标签，格式: key=value"
+    ),
+):
+    """添加统计数据"""
+    stats = StatsManager(_get_stats_dir())
+
+    # 解析标签
+    tag_dict = {}
+    if tags:
+        for tag in tags:
+            if "=" in tag:
+                key, val = tag.split("=", 1)
+                tag_dict[key] = val
+
+    stats.increment(
+        metric,
+        amount=value,
+        unit=unit if unit else "count",
+        tags=tag_dict if tag_dict else None,
+    )
+
+    rprint(
+        f"[green]✓[/green] 已添加数据: {metric}={value}" + (f" {unit}" if unit else "")
+    )
+    if tag_dict:
+        rprint(f"  标签: {tag_dict}")
+
+
+@app.command()
+def inc(
+    metric: str = typer.Argument(..., help="指标名称"),
+    amount: int = typer.Option(1, "--amount", "-a", help="增加的数量"),
+    tags: Optional[List[str]] = typer.Option(
+        None, "--tag", "-t", help="标签，格式: key=value"
+    ),
+):
+    """增加计数型指标"""
+    stats = StatsManager(_get_stats_dir())
+
+    # 解析标签
+    tag_dict = {}
+    if tags:
+        for tag in tags:
+            if "=" in tag:
+                key, val = tag.split("=", 1)
+                tag_dict[key] = val
+
+    stats.increment(metric, amount=amount, tags=tag_dict if tag_dict else None)
+
+    rprint(f"[green]✓[/green] 已增加计数: {metric} +{amount}")
+    if tag_dict:
+        rprint(f"  标签: {tag_dict}")
+
+
+@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"
+    ),
+    tags: Optional[List[str]] = typer.Option(
+        None, "--tag", "-t", help="标签过滤，格式: key=value"
+    ),
+):
+    """显示统计数据"""
+    stats = StatsManager(_get_stats_dir())
+
+    # 解析标签
+    tag_dict = {}
+    if tags:
+        for tag in tags:
+            if "=" in tag:
+                key, val = tag.split("=", 1)
+                tag_dict[key] = val
+
+    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,
+    )
+
+
+@app.command()
+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"
+    ),
+    width: Optional[int] = typer.Option(None, "--width", "-w", help="图表宽度"),
+    height: Optional[int] = typer.Option(None, "--height", "-H", help="图表高度"),
+    tags: Optional[List[str]] = typer.Option(
+        None, "--tag", "-t", help="标签过滤，格式: key=value"
+    ),
+):
+    """绘制指标折线图，支持根据标签过滤显示多个指标"""
+    stats = StatsManager(_get_stats_dir())
+
+    # 解析标签
+    tag_dict = {}
+    if tags:
+        for tag in tags:
+            if "=" in tag:
+                key, val = tag.split("=", 1)
+                tag_dict[key] = val
+
+    stats.plot(
+        metric_name=metric,
+        last_hours=last_hours,
+        last_days=last_days,
+        aggregation=aggregation,
+        width=width,
+        height=height,
+        tags=tag_dict if tag_dict else None,
+    )
+
+
+@app.command()
+def list():
+    """列出所有指标"""
+    stats = StatsManager(_get_stats_dir())
+    metrics = stats.list_metrics()
+
+    if not metrics:
+        rprint("[yellow]没有找到任何指标[/yellow]")
+        return
+
+    # 创建表格
+    table = Table(title="统计指标列表")
+    table.add_column("指标名称", style="cyan")
+    table.add_column("单位", style="green")
+    table.add_column("最后更新", style="yellow")
+    table.add_column("7天数据点", style="magenta")
+
+    # 获取每个指标的信息
+    end_time = datetime.now()
+    start_time = end_time - timedelta(days=7)
+
+    for metric in metrics:
+        info = stats.storage.get_metric_info(metric)
+        if info:
+            unit = info.get("unit", "-")
+            last_updated = info.get("last_updated", "-")
+
+            # 格式化时间
+            if last_updated != "-":
+                try:
+                    dt = datetime.fromisoformat(last_updated)
+                    last_updated = dt.strftime("%Y-%m-%d %H:%M")
+                except:
+                    pass
+
+            # 获取数据点数
+            records = stats.storage.get_metrics(metric, start_time, end_time)
+            count = len(records)
+
+            table.add_row(metric, unit, last_updated, str(count))
+
+    console.print(table)
+    rprint(f"\n[green]总计: {len(metrics)} 个指标[/green]")
+
+
+@app.command()
+def clean(
+    days: int = typer.Option(30, "--days", "-d", help="保留最近N天的数据"),
+    yes: bool = typer.Option(False, "--yes", "-y", help="跳过确认"),
+):
+    """清理旧数据"""
+    if not yes:
+        confirm = typer.confirm(f"确定要删除 {days} 天前的数据吗？")
+        if not confirm:
+            rprint("[yellow]已取消操作[/yellow]")
+            return
+
+    stats = StatsManager(_get_stats_dir())
+    stats.clean_old_data(days_to_keep=days)
+    rprint(f"[green]✓[/green] 已清理 {days} 天前的数据")
+
+
+@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"
+    ),
+):
+    """导出统计数据"""
+    import json
+    import csv
+    import sys
+
+    stats = StatsManager(_get_stats_dir())
+
+    # 解析标签
+    tag_dict = {}
+    if tags:
+        for tag in tags:
+            if "=" in tag:
+                key, val = tag.split("=", 1)
+                tag_dict[key] = val
+
+    # 获取数据
+    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格式输出
+        print(json.dumps(data, indent=2, ensure_ascii=False))
+    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)
+
+
+@app.command()
+def demo():
+    """运行演示，展示统计模块的功能"""
+    import random
+    import time
+
+    console.print("[bold cyan]Jarvis 统计模块演示[/bold cyan]\n")
+
+    stats = StatsManager(_get_stats_dir())
+
+    # 添加演示数据
+    with console.status("[bold green]正在生成演示数据...") as status:
+        # API响应时间
+        for i in range(20):
+            response_time = random.uniform(0.1, 2.0)
+            status_code = random.choice(["200", "404", "500"])
+            stats.increment(
+                "demo_response_time",
+                amount=response_time,
+                unit="seconds",
+                tags={"status": status_code},
+            )
+            time.sleep(0.05)
+
+        # 访问计数
+        for i in range(30):
+            endpoint = random.choice(["/api/users", "/api/posts", "/api/admin"])
+            stats.increment("demo_api_calls", tags={"endpoint": endpoint})
+            time.sleep(0.05)
+
+    rprint("[green]✓[/green] 演示数据生成完成\n")
+
+    # 显示数据
+    console.rule("[bold blue]指标列表")
+    stats.show()
+
+    console.rule("[bold blue]响应时间详情")
+    stats.show("demo_response_time", last_hours=1)
+
+    console.rule("[bold blue]API调用折线图")
+    stats.plot("demo_api_calls", last_hours=1, height=10)
+
+    console.rule("[bold blue]响应时间汇总")
+    stats.show("demo_response_time", last_hours=1, format="summary")
+
+    rprint("\n[green]✓[/green] 演示完成！")
+
+
+def main():
+    """主入口函数"""
+    # 初始化环境，防止设置初始化太迟
+    init_env("欢迎使用 Jarvis-Stats，您的统计分析工具已准备就绪！", None)
+    app()
+
+
+if __name__ == "__main__":
+    main()