jarvis-ai-assistant 0.1.177__py3-none-any.whl → 0.1.179__py3-none-any.whl

jarvis/jarvis_utils/config.py

@@ -1,14 +1,26 @@
 # -*- coding: utf-8 -*-
 import os
 from functools import lru_cache
+
 import yaml
+
 from jarvis.jarvis_utils.builtin_replace_map import BUILTIN_REPLACE_MAP
+
 """配置管理模块。
 
 该模块提供了获取Jarvis系统各种配置设置的函数。
 所有配置都从环境变量中读取，带有回退默认值。
 """
 
+def get_git_commit_prompt() -> str:
+    """
+    获取Git提交提示模板
+    
+    返回:
+        str: Git提交信息生成提示模板，如果未配置则返回空字符串
+    """
+    return os.getenv("JARVIS_GIT_COMMIT_PROMPT", "")
+
 # 输出窗口预留大小
 INPUT_WINDOW_REVERSE_SIZE = 2048
 
@@ -169,4 +181,31 @@ def get_pretty_output() -> bool:
     返回：
         bool: 如果启用PrettyOutput则返回True，默认为True
     """
-    return os.getenv('JARVIS_PRETTY_OUTPUT', 'false') == 'true'
+    return os.getenv('JARVIS_PRETTY_OUTPUT', 'false') == 'true'
+
+def is_use_methodology() -> bool:
+    """
+    获取是否启用方法论。
+
+    返回：
+        bool: 如果启用方法论则返回True，默认为True
+    """
+    return os.getenv('JARVIS_USE_METHODOLOGY', 'false') == 'true'
+
+def is_use_analysis() -> bool:
+    """
+    获取是否启用任务分析。
+
+    返回：
+        bool: 如果启用任务分析则返回True，默认为True
+    """
+    return os.getenv('JARVIS_USE_ANALYSIS', 'false') == 'true'
+
+def is_print_prompt() -> bool:
+    """
+    获取是否打印提示。
+
+    返回：
+        bool: 如果打印提示则返回True，默认为True
+    """
+    return os.getenv('JARVIS_PRINT_PROMPT', 'false') == 'true'

jarvis/jarvis_utils/embedding.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
+import functools
 import os
-from transformers import AutoTokenizer
 from typing import List
-import functools
 
-from jarvis.jarvis_utils.output import PrettyOutput, OutputType
+from transformers import AutoTokenizer
+
 from jarvis.jarvis_utils.config import get_data_dir
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 # 全局缓存，避免重复加载模型
 _global_tokenizers = {}

jarvis/jarvis_utils/file_processors.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import unicodedata
 
+
 class FileProcessor:
     """Base class for file processor"""
     @staticmethod

jarvis/jarvis_utils/git_utils.py

@@ -12,10 +12,14 @@ Git工具模块
 import os
 import re
 import subprocess
-from typing import List, Tuple, Dict
-from jarvis.jarvis_utils.config import get_auto_update, is_confirm_before_apply_patch
-from jarvis.jarvis_utils.output import PrettyOutput, OutputType
+from typing import Dict, List, Tuple
+
+from jarvis.jarvis_utils.config import (get_auto_update,
+                                        is_confirm_before_apply_patch)
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import user_confirm
+
+
 def find_git_root(start_dir: str = ".") -> str:
     """
     切换到给定路径的Git根目录，如果不是Git仓库则初始化。
@@ -101,42 +105,34 @@ def get_commits_between(start_hash: str, end_hash: str) -> List[Tuple[str, str]]
 
 
 def get_diff() -> str:
-    """使用git获取暂存区差异"""
-    import subprocess
-    
-    # 初始化状态
-    need_reset = False
+    """使用git获取工作区差异，包括修改和新增的文件内容
     
+    返回:
+        str: 差异内容或错误信息
+    """
     try:
-        # 暂存所有修改
-        subprocess.run(['git', 'add', '.'], check=True)
-        need_reset = True
+        # 暂存新增文件
+        subprocess.run(['git', 'add', '-N', '.'], check=True)
         
-        # 获取差异
+        # 获取所有差异（包括新增文件）
         result = subprocess.run(
-            ['git', 'diff', '--cached'],
+            ['git', 'diff', 'HEAD'],
             capture_output=True,
             text=False,
             check=True
         )
         
-        # 解码输出
-        try:
-            ret = result.stdout.decode('utf-8')
-        except UnicodeDecodeError:
-            ret = result.stdout.decode('utf-8', errors='replace')
-        
         # 重置暂存区
-        subprocess.run(['git', "reset", "--mixed"], check=False)
-        return ret
+        subprocess.run(['git', 'reset'], check=True)
         
+        try:
+            return result.stdout.decode('utf-8')
+        except UnicodeDecodeError:
+            return result.stdout.decode('utf-8', errors='replace')
+            
     except subprocess.CalledProcessError as e:
-        if need_reset:
-            subprocess.run(['git', "reset", "--mixed"], check=False)
         return f"获取差异失败: {str(e)}"
     except Exception as e:
-        if need_reset:
-            subprocess.run(['git', "reset", "--mixed"], check=False)
         return f"发生意外错误: {str(e)}"
 
 
@@ -333,3 +329,37 @@ def check_and_update_git_repo(repo_path: str) -> bool:
         return False
     finally:
         os.chdir(curr_dir)
+
+
+def get_diff_file_list() -> List[str]:
+    """获取HEAD到当前变更的文件列表，包括修改和新增的文件
+    
+    返回:
+        List[str]: 修改和新增的文件路径列表
+    """
+    try:
+        # 暂存新增文件
+        subprocess.run(['git', 'add', '-N', '.'], check=True)
+        
+        # 获取所有差异文件（包括新增文件）
+        result = subprocess.run(
+            ['git', 'diff', '--name-only', 'HEAD'],
+            capture_output=True,
+            text=True
+        )
+        
+        # 重置暂存区
+        subprocess.run(['git', 'reset'], check=True)
+        
+        if result.returncode != 0:
+            PrettyOutput.print(f"获取差异文件列表失败: {result.stderr}", OutputType.ERROR)
+            return []
+        
+        return [f for f in result.stdout.splitlines() if f]
+        
+    except subprocess.CalledProcessError as e:
+        PrettyOutput.print(f"获取差异文件列表失败: {str(e)}", OutputType.ERROR)
+        return []
+    except Exception as e:
+        PrettyOutput.print(f"获取差异文件列表异常: {str(e)}", OutputType.ERROR)
+        return []

jarvis/jarvis_utils/globals.py

@@ -7,11 +7,13 @@
 - 带有自定义主题的控制台配置
 - 环境初始化
 """
-from typing import Any, Set, Dict
-import colorama
 import os
+from typing import Any, Dict, Set
+
+import colorama
 from rich.console import Console
 from rich.theme import Theme
+
 # 初始化colorama以支持跨平台的彩色文本
 colorama.init()
 # 禁用tokenizers并行以避免多进程问题

jarvis/jarvis_utils/input.py

@@ -8,17 +8,21 @@
 - 带有模糊匹配的文件路径补全
 - 用于输入控制的自定义键绑定
 """
+from colorama import Fore
+from colorama import Style as ColoramaStyle
+from fuzzywuzzy import process
 from prompt_toolkit import PromptSession
-from prompt_toolkit.styles import Style as PromptStyle
-from prompt_toolkit.formatted_text import FormattedText
 from prompt_toolkit.completion import Completer, Completion, PathCompleter
 from prompt_toolkit.document import Document
+from prompt_toolkit.formatted_text import FormattedText
 from prompt_toolkit.key_binding import KeyBindings
-from fuzzywuzzy import process
-from colorama import Fore, Style as ColoramaStyle
-from jarvis.jarvis_utils.output import PrettyOutput, OutputType
-from jarvis.jarvis_utils.tag import ot
+from prompt_toolkit.styles import Style as PromptStyle
+
 from jarvis.jarvis_utils.config import get_replace_map
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.tag import ot
+
+
 def get_single_line_input(tip: str) -> str:
     """
     获取支持历史记录的单行输入。
@@ -176,9 +180,12 @@ def get_multiline_input(tip: str) -> str:
         'prompt': 'ansicyan',
     })
     try:
+        import os
+
         from prompt_toolkit.history import FileHistory
+
         from jarvis.jarvis_utils.config import get_data_dir
-        import os
+
         # 获取数据目录路径
         history_dir = get_data_dir()
         # 初始化带历史记录的会话

jarvis/jarvis_utils/methodology.py

@@ -7,17 +7,18 @@
 - 生成方法论临时文件
 - 上传方法论文件到大模型
 """
-import os
 import json
+import os
 import tempfile
 from typing import Any, Dict, Optional
 
 from jarvis.jarvis_platform.base import BasePlatform
-from jarvis.jarvis_utils.config import get_data_dir
-from jarvis.jarvis_utils.output import PrettyOutput, OutputType
 from jarvis.jarvis_platform.registry import PlatformRegistry
+from jarvis.jarvis_utils.config import get_data_dir
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import is_context_overflow
 
+
 def _get_methodology_directory() -> str:
     """
     获取方法论目录路径，如果不存在则创建
@@ -139,7 +140,8 @@ def load_methodology(user_input: str, tool_registery: Optional[Any] = None) -> s
     返回：
         str: 相关的方法论提示，如果未找到方法论则返回空字符串
     """
-    from yaspin import yaspin # type: ignore
+    from yaspin import yaspin  # type: ignore
+
     from jarvis.jarvis_tools.registry import ToolRegistry
 
     prompt = tool_registery.prompt() if tool_registery else ""

jarvis/jarvis_utils/output.py

@@ -8,18 +8,22 @@
 - 多种编程语言的语法高亮支持
 - 结构化输出的面板显示
 """
-from enum import Enum
 from datetime import datetime
+from enum import Enum
 from typing import Optional, Tuple
-from rich.panel import Panel
-from rich.text import Text
-from rich.syntax import Syntax
-from rich.style import Style as RichStyle
+
 from pygments.lexers import guess_lexer
 from pygments.util import ClassNotFound
+from rich.box import SIMPLE
+from rich.panel import Panel
+from rich.style import Style as RichStyle
+from rich.syntax import Syntax
+from rich.text import Text
+
 from jarvis.jarvis_utils.config import get_pretty_output
 from jarvis.jarvis_utils.globals import console, get_agent_list
-from rich.box import SIMPLE
+
+
 class OutputType(Enum):
     """
     输出类型枚举，用于分类和样式化不同类型的消息。

jarvis/jarvis_utils/utils.py

@@ -1,25 +1,31 @@
 # -*- coding: utf-8 -*-
-import os
-import time
 import hashlib
+import os
 import tarfile
+import time
+from datetime import datetime
 from pathlib import Path
-from typing import Any, Callable
+from typing import Any, Callable, Dict
+
+import yaml
 
 from jarvis import __version__
-from jarvis.jarvis_utils.config import get_max_big_content_size, get_data_dir
+from jarvis.jarvis_utils.config import get_data_dir, get_max_big_content_size
 from jarvis.jarvis_utils.embedding import get_context_token_count
 from jarvis.jarvis_utils.input import get_single_line_input
-from jarvis.jarvis_utils.output import PrettyOutput, OutputType
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
+
 def init_env(welcome_str: str) -> None:
     """初始化环境变量从jarvis_data/env文件
-
     功能：
     1. 创建不存在的jarvis_data目录
     2. 加载环境变量到os.environ
     3. 处理文件读取异常
     4. 检查git仓库状态并在落后时更新
+    5. 统计当前命令使用次数
     """
+    count_cmd_usage()
 
     jarvis_ascii_art = f"""
    ██╗ █████╗ ██████╗ ██╗   ██╗██╗███████╗
@@ -59,15 +65,52 @@ def init_env(welcome_str: str) -> None:
 
     if env_file.exists():
         try:
+            # 首先尝试作为YAML文件读取
+            try:
+                with open(env_file, "r", encoding="utf-8") as f:
+                    env_data = yaml.safe_load(f) or {}
+                    if isinstance(env_data, dict):
+                        os.environ.update({str(k): str(v) for k, v in env_data.items() if v is not None})
+                        return
+            except yaml.YAMLError:
+                pass
+            
+            # 如果不是YAML格式，按旧格式处理
+            current_key = None
+            current_value = []
+            env_data = {}
             with open(env_file, "r", encoding="utf-8", errors="ignore") as f:
                 for line in f:
-                    line = line.strip()
-                    if line and not line.startswith(("#", ";")):
-                        try:
-                            key, value = line.split("=", 1)
-                            os.environ[key.strip()] = value.strip().strip("'").strip('"')
-                        except ValueError:
-                            continue
+                    line = line.rstrip()
+                    if not line or line.startswith(("#", ";")):
+                        continue
+                    if "=" in line and not line.startswith((" ", "\t")):
+                        # 处理之前收集的多行值
+                        if current_key is not None:
+                            env_data[current_key] = "\n".join(current_value).strip().strip("'").strip('"')
+                            current_value = []
+                        # 解析新的键值对
+                        key, value = line.split("=", 1)
+                        current_key = key.strip()
+                        current_value.append(value.strip())
+                    elif current_key is not None:
+                        # 多行值的后续行
+                        current_value.append(line.strip())
+            # 处理最后一个键值对
+            if current_key is not None:
+                env_data[current_key] = "\n".join(current_value).strip().strip("'").strip('"')
+            
+            # 更新环境变量
+            os.environ.update(env_data)
+            
+            # 如果是旧格式，转换为YAML并备份
+            backup_file = env_file.with_name(f"env.bak.{datetime.now().strftime('%Y%m%d%H%M%S')}")
+            env_file.rename(backup_file)
+            with open(env_file, "w", encoding="utf-8") as f:
+                yaml.dump(env_data, f, default_flow_style=False, allow_unicode=True)
+            
+            PrettyOutput.print(f"检测到旧格式配置文件，已自动转换为YAML格式并备份到 {backup_file}", OutputType.INFO)
+            
         except Exception as e:
             PrettyOutput.print(f"警告: 读取 {env_file} 失败: {e}", OutputType.WARNING)
 
@@ -143,6 +186,39 @@ def get_file_line_count(filename: str) -> int:
 
 
 
+def _get_cmd_stats() -> Dict[str, int]:
+    """从数据目录获取命令调用统计"""
+    stats_file = Path(get_data_dir()) / "cmd_stat.yaml"
+    if stats_file.exists():
+        try:
+            with open(stats_file, "r", encoding="utf-8") as f:
+                return yaml.safe_load(f) or {}
+        except Exception as e:
+            PrettyOutput.print(
+                f"加载命令调用统计失败: {str(e)}", OutputType.WARNING
+            )
+    return {}
+
+def _update_cmd_stats(cmd_name: str) -> None:
+    """更新命令调用统计"""
+    stats = _get_cmd_stats()
+    stats[cmd_name] = stats.get(cmd_name, 0) + 1
+    stats_file = Path(get_data_dir()) / "cmd_stat.yaml"
+    try:
+        with open(stats_file, "w", encoding="utf-8") as f:
+            yaml.safe_dump(stats, f)
+    except Exception as e:
+        PrettyOutput.print(
+            f"保存命令调用统计失败: {str(e)}", OutputType.WARNING
+        )
+
+def count_cmd_usage() -> None:
+    """统计当前命令的使用次数"""
+    import sys
+    if len(sys.argv) > 1:
+        cmd_name = sys.argv[1]
+        _update_cmd_stats(cmd_name)
+
 def is_context_overflow(content: str) -> bool:
     """判断文件内容是否超出上下文限制"""
     return get_context_token_count(content) > get_max_big_content_size() 

{jarvis_ai_assistant-0.1.177.dist-info → jarvis_ai_assistant-0.1.179.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.177
+Version: 0.1.179
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -46,16 +46,15 @@ Requires-Dist: prompt_toolkit==3.0.50
 Requires-Dist: yaspin==2.4.0
 Requires-Dist: pygments==2.19.1
 Requires-Dist: fuzzywuzzy==0.18.0
-Requires-Dist: jedi==0.19.2
 Requires-Dist: fastapi==0.115.12
 Requires-Dist: uvicorn==0.33.0
 Requires-Dist: rich==14.0.0
 Requires-Dist: transformers==4.46.3
 Requires-Dist: torch==2.4.1
 Requires-Dist: python-Levenshtein==0.25.1
-Requires-Dist: sseclient==0.0.27
 Requires-Dist: pillow==10.2.0
 Requires-Dist: openai==1.78.1
+Requires-Dist: tabulate==0.9.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"
@@ -78,15 +77,7 @@ Dynamic: requires-python
 
 *您的智能开发和系统交互助手*
 
-[核心特色](#core-features) •
-[视频介绍](#video-introduction) •
-[快速开始](#quick-start) •
-[配置说明](#configuration) •
-[工具说明](#tools) •
-[扩展开发](#extensions) •
-[贡献指南](#contributing) •
-[许可证](#license) •
-[Wiki文档](https://deepwiki.com/skyfireitdiy/Jarvis)
+[核心特色](#core-features) • [视频介绍](#video-introduction) • [快速开始](#quick-start) • [配置说明](#configuration) • [工具说明](#tools) • [扩展开发](#extensions) • [贡献指南](#contributing) • [许可证](#license) • [Wiki文档](https://deepwiki.com/skyfireitdiy/Jarvis)
 </div>
 
 ---
@@ -123,15 +114,17 @@ pip3 install jarvis-ai-assistant
 
 ### 最小化配置
 
+将以下配置写入到`~/.jarvis/env`文件中。
+
 #### 腾讯元宝
-```bash
-JARVIS_PLATFORM=yuanbao
-JARVIS_MODEL=deep_seek_v3
-JARVIS_THINKING_PLATFORM=yuanbao
-JARVIS_THINKING_MODEL=deep_seek
+```yaml
+JARVIS_PLATFORM: yuanbao
+JARVIS_MODEL: deep_seek_v3
+JARVIS_THINKING_PLATFORM: yuanbao
+JARVIS_THINKING_MODEL: deep_seek
 
-YUANBAO_COOKIES=<元宝cookies>
-YUANBAO_AGENT_ID=<元宝AgentID>
+YUANBAO_COOKIES: <元宝cookies>
+YUANBAO_AGENT_ID: <元宝AgentID>
 ```
 
 元宝cookies以及AgentID获取方式：
@@ -142,13 +135,13 @@ YUANBAO_AGENT_ID=<元宝AgentID>
 
 
 #### Kimi
-```bash
-JARVIS_PLATFORM=kimi
-JARVIS_MODEL=kimi
-JARVIS_THINKING_PLATFORM=kimi
-JARVIS_THINKING_MODEL=k1
+```yaml
+JARVIS_PLATFORM: kimi
+JARVIS_MODEL: kimi
+JARVIS_THINKING_PLATFORM: kimi
+JARVIS_THINKING_MODEL: k1
 
-KIMI_API_KEY=<Kimi API KEY>
+KIMI_API_KEY: <Kimi API KEY>
 ```
 
 Kimi API Key获取方式：
@@ -159,14 +152,14 @@ Kimi API Key获取方式：
 
 
 #### OpenAI
-```bash
-JARVIS_PLATFORM=openai
-JARVIS_MODEL=gpt-4o  # 默认模型，可选gpt-4-turbo, gpt-3.5-turbo等
-JARVIS_THINKING_PLATFORM=openai
-JARVIS_THINKING_MODEL=gpt-4o
+```yaml
+JARVIS_PLATFORM: openai
+JARVIS_MODEL: gpt-4o  # 默认模型，可选gpt-4-turbo, gpt-3.5-turbo等
+JARVIS_THINKING_PLATFORM: openai
+JARVIS_THINKING_MODEL: gpt-4o
 
-OPENAI_API_KEY=<OpenAI API Key>
-OPENAI_API_BASE=https://api.openai.com/v1  # 可选，默认为官方API地址
+OPENAI_API_KEY: <OpenAI API Key>
+OPENAI_API_BASE: https://api.openai.com/v1  # 可选，默认为官方API地址
 ```
 
 配置说明：
@@ -198,6 +191,24 @@ OPENAI_API_BASE=https://api.openai.com/v1  # 可选，默认为官方API地址
 ---
 
 ## ⚙️ 配置说明 <a id="configuration"></a>
+### 配置文件格式
+配置文件支持两种格式：
+1. **YAML格式（推荐）**：
+   ```yaml
+   JARVIS_PLATFORM: yuanbao
+   JARVIS_MODEL: deep_seek_v3
+   YUANBAO_COOKIES: "your_cookies_here"
+   ```
+
+2. **传统键值对格式**：
+   ```
+   JARVIS_PLATFORM=yuanbao
+   JARVIS_MODEL=deep_seek_v3
+   YUANBAO_COOKIES=your_cookies_here
+   ```
+
+系统会自动检测格式并处理。当检测到传统格式时，会自动转换为YAML格式并备份原文件。
+
 ### 环境变量配置
 | 变量名称 | 默认值 | 说明 |
 |----------|--------|------|
@@ -215,6 +226,8 @@ OPENAI_API_BASE=https://api.openai.com/v1  # 可选，默认为官方API地址
 | `JARVIS_AUTO_UPDATE` | true | 是否自动更新Jarvis（仅在以git仓库方式安装时有效） |
 | `JARVIS_MAX_BIG_CONTENT_SIZE` | 1024000 | 最大大内容大小 |
 | `JARVIS_PRETTY_OUTPUT` | false | 是否启用PrettyOutput |
+| `JARVIS_GIT_COMMIT_PROMPT` | "" | 自定义git提交信息生成提示模板 |
+| `JARVIS_PRINT_PROMPT` | false | 是否打印提示 |
 
 所有配置编写到`~/.jarvis/env`文件中即可生效。
 
@@ -236,7 +249,6 @@ OPENAI_API_BASE=https://api.openai.com/v1  # 可选，默认为官方API地址
 | file_analyzer | 分析文件内容并提取关键信息。支持的文件：文本文件、word文档、pdf文件、图片 |
 | file_operation | 文件批量操作工具，可批量读写多个文件，支持文本文件，适用于需要同时处理多个文件的场景（读取配置文件、保存生成内容等） |
 | find_methodology | 方法论查找工具，用于在执行过程中查看历史方法论辅助决策 |
-| lsp_get_diagnostics | 获取代码诊断信息（错误、警告） |
 | methodology | 方法论管理工具，支持添加、更新和删除操作 |
 | read_code | 代码阅读与分析工具，用于读取源代码文件并添加行号，针对代码文件优化，提供更好的格式化输出和行号显示，适用于代码分析、审查和理解代码实现的场景 |
 | read_webpage | 读取网页内容并分析 |