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

jarvis/jarvis_tools/ask_codebase.py

@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
-from typing import Dict, Any
 import os
-
+from typing import Any, Dict
 
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.git_utils import find_git_root
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import init_env
 
+
 class AskCodebaseTool:
     """用于智能代码库查询和分析的工具
 
@@ -258,6 +258,7 @@ def main():
     """
     import argparse
     import sys
+
     from jarvis.jarvis_utils.input import get_multiline_input
 
     init_env("欢迎使用 Jarvis-AskCodebase，您的智能代码库查询工具已准备就绪！")

jarvis/jarvis_tools/ask_user.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 # 导入所需的类型注解模块
-from typing import Dict, Any
+from typing import Any, Dict
 
 # 导入多行输入工具和输出工具
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
+
 # 定义AskUserTool类，用于向用户提问
 class AskUserTool:
     name="ask_user"

jarvis/jarvis_tools/base.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
-from typing import Dict, Any, Callable
 import json
+from typing import Any, Callable, Dict
+
+
 class Tool:
     """工具类，用于封装工具的基本信息和执行方法"""
 

jarvis/jarvis_tools/chdir.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
-from typing import Dict, Any
 import os
+from typing import Any, Dict
+
 
 class ChdirTool:
     name = "chdir"

jarvis/jarvis_tools/cli/main.py

@@ -1,5 +1,6 @@
 
 import sys
+
 from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import init_env

jarvis/jarvis_tools/code_plan.py

@@ -9,13 +9,15 @@
 4. 修改计划输出
 """
 
-from typing import Dict, Any
 import os
-from jarvis.jarvis_tools.registry import ToolRegistry
+from typing import Any, Dict
+
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.jarvis_utils.git_utils import find_git_root
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
 
 class CodePlanTool:
     """用于代码修改规划和需求分析的工具

jarvis/jarvis_tools/create_code_agent.py

@@ -1,11 +1,14 @@
 # -*- coding: utf-8 -*-
-from typing import Dict, Any
 import os
+from typing import Any, Dict
+
 from jarvis.jarvis_code_agent.code_agent import CodeAgent
 from jarvis.jarvis_git_utils.git_commiter import GitCommitTool
-from jarvis.jarvis_utils.git_utils import get_latest_commit_hash, has_uncommitted_changes
+from jarvis.jarvis_utils.git_utils import (get_latest_commit_hash,
+                                           has_uncommitted_changes)
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
+
 class CreateCodeAgentTool:
     """用于管理代码开发工作流的工具"""
 

jarvis/jarvis_tools/create_sub_agent.py

@@ -1,13 +1,11 @@
 # -*- coding: utf-8 -*-
-from typing import Dict, Any
 import os
-
+from typing import Any, Dict
 
 from jarvis.jarvis_agent import Agent, origin_agent_system_prompt
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
-
 class SubAgentTool:
     name = "create_sub_agent"
     description = "创建子代理以处理特定任务，子代理将生成任务总结报告"

jarvis/jarvis_tools/edit_file.py

@@ -17,9 +17,8 @@
 - 支持大文件处理(自动上传到模型平台)
 - 提供3次重试机制确保操作可靠性
 """
-from typing import List
 import re
-from typing import Any, Dict, Tuple
+from typing import Any, Dict, List, Tuple
 
 import yaml
 from yaspin import yaspin
@@ -130,7 +129,8 @@ class FileSearchReplaceTool:
         4. 保持原始代码的格式风格
         """
         import os
-        from jarvis.jarvis_utils.output import PrettyOutput, OutputType
+
+        from jarvis.jarvis_utils.output import OutputType, PrettyOutput
         
         stdout_messages = []
         stderr_messages = []

jarvis/jarvis_tools/execute_script.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-from typing import Dict, Any
 import os
 import tempfile
 from pathlib import Path
+from typing import Any, Dict
 
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 

jarvis/jarvis_tools/file_analyzer.py

@@ -1,11 +1,13 @@
 # -*- coding: utf-8 -*-
-from typing import Dict, Any
 import os
+from typing import Any, Dict
+
+from yaspin import yaspin  # type: ignore
+from yaspin.spinners import Spinners  # type: ignore
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from yaspin import yaspin # type: ignore
-from yaspin.spinners import Spinners # type: ignore
+
 
 class FileAnalyzerTool:
     name = "file_analyzer"

jarvis/jarvis_tools/file_operation.py

@@ -1,16 +1,13 @@
 # -*- coding: utf-8 -*-
-from typing import Dict, Any
 import os
 from pathlib import Path
+from typing import Any, Dict
 
-from yaspin import yaspin # type: ignore
+from yaspin import yaspin  # type: ignore
 
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 # 导入文件处理器
-from jarvis.jarvis_utils.file_processors import (
-    TextFileProcessor
-)
-
+from jarvis.jarvis_utils.file_processors import TextFileProcessor
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class FileOperationTool:

jarvis/jarvis_tools/find_methodology.py

@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
-from typing import Dict, Any
+from typing import Any, Dict
+
 from yaspin import yaspin
 
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.methodology import load_methodology
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
 
 class FindMethodologyTool:
     name = "find_methodology"

jarvis/jarvis_tools/generate_new_tool.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 import re
 from pathlib import Path
-from typing import Dict, Any, Tuple
+from typing import Any, Dict, Tuple
 
 from jarvis.jarvis_utils.config import get_data_dir
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
+
 class generate_new_tool:
     name = "generate_new_tool"
     description = """

jarvis/jarvis_tools/methodology.py

@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
-import os
-import json
 import hashlib
-from typing import Dict, Any
+import json
+import os
+from typing import Any, Dict
 
 from jarvis.jarvis_utils.config import get_data_dir
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
-
 class MethodologyTool:
     """经验管理工具"""
 

jarvis/jarvis_tools/read_code.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
-from typing import Dict, Any
 import os
+from typing import Any, Dict
 
 from yaspin import yaspin
 
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
+
 class ReadCodeTool:
     name = "read_code"
     description = "代码阅读与分析工具，用于读取源代码文件并添加行号，针对代码文件优化，提供更好的格式化输出和行号显示，适用于代码分析、审查和理解代码实现的场景"

jarvis/jarvis_tools/read_webpage.py

@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
-from typing import Dict, Any
 import os
+from typing import Any, Dict
+
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
+
 class WebpageTool:
     name = "read_webpage"
     description = "读取网页内容，提取标题、文本和超链接"

jarvis/jarvis_tools/registry.py

@@ -1,24 +1,24 @@
 # -*- coding: utf-8 -*-
 import json
-from pathlib import Path
+import os
 import re
 import sys
 import tempfile
-import os
-from typing import Any, Callable, Dict, List, Optional, Tuple, Protocol
+from pathlib import Path
+from typing import Any, Callable, Dict, List, Optional, Protocol, Tuple
 
 import yaml
 
+from jarvis.jarvis_mcp import McpClient
+from jarvis.jarvis_mcp.sse_mcp_client import SSEMcpClient
+from jarvis.jarvis_mcp.stdio_mcp_client import StdioMcpClient
+from jarvis.jarvis_mcp.streamable_mcp_client import StreamableMcpClient
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.base import Tool
 from jarvis.jarvis_utils.config import get_data_dir
 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
-from jarvis.jarvis_utils.tag import ot, ct
-from jarvis.jarvis_mcp.stdio_mcp_client import StdioMcpClient
-from jarvis.jarvis_mcp.sse_mcp_client import SSEMcpClient
-from jarvis.jarvis_mcp import McpClient
-
 
 tool_call_help = f"""
 <tool_system_guide>
@@ -351,6 +351,12 @@ class ToolRegistry(OutputHandlerProtocol):
                         f"文件 {file_path} 缺少base_url字段", OutputType.WARNING
                     )
                     return False
+            elif config["type"] == "streamable":
+                if "base_url" not in config:
+                    PrettyOutput.print(
+                        f"文件 {file_path} 缺少base_url字段", OutputType.WARNING
+                    )
+                    return False
             else:
                 PrettyOutput.print(
                     f"文件 {file_path} 类型错误: {config['type']}", OutputType.WARNING
@@ -358,11 +364,14 @@ class ToolRegistry(OutputHandlerProtocol):
                 return False
 
             # 创建MCP客户端
-            mcp_client: McpClient = (
-                StdioMcpClient(config)
-                if config["type"] == "stdio"
-                else SSEMcpClient(config)
-            )
+            if config["type"] == "stdio":
+                mcp_client: McpClient = StdioMcpClient(config)
+            elif config["type"] == "sse":
+                mcp_client: McpClient = SSEMcpClient(config)
+            elif config["type"] == "streamable":
+                mcp_client: McpClient = StreamableMcpClient(config)
+            else:
+                raise ValueError(f"不支持的MCP客户端类型: {config['type']}")
 
             # 获取工具信息
             tools = mcp_client.get_tool_list()

jarvis/jarvis_tools/rewrite_file.py

@@ -80,7 +80,8 @@ class FileRewriteTool:
             }
         """
         import os
-        from jarvis.jarvis_utils.output import PrettyOutput, OutputType
+
+        from jarvis.jarvis_utils.output import OutputType, PrettyOutput
         
         stdout_messages = []
         stderr_messages = []

jarvis/jarvis_tools/search_web.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import os
 from typing import Any, Dict
+
 from jarvis.jarvis_platform.registry import PlatformRegistry
 
 

jarvis/jarvis_tools/virtual_tty.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
-from typing import Dict, Any
+import fcntl
 import os
-import time
 import pty
-import fcntl
-import signal
 import select
+import signal
+import time
+from typing import Any, Dict
+
 
 class VirtualTTYTool:
     name = "virtual_tty"

jarvis/jarvis_utils/__init__.py

@@ -13,8 +13,10 @@ Jarvis工具模块
 - utils: 通用工具
 """
 import os
+
 import colorama
 from rich.traceback import install as install_rich_traceback
+
 # 从新模块重新导出
 # 这些导入是项目功能所必需的，可能会被动态使用
 # 初始化colorama以支持跨平台的彩色文本

jarvis/jarvis_utils/builtin_replace_map.py

@@ -5,7 +5,7 @@
 格式: {"标记名": {"template": "替换模板", "description": "描述信息"}}
 """
 
-from jarvis.jarvis_utils.tag import ot, ct
+from jarvis.jarvis_utils.tag import ct, ot
 
 BUILTIN_REPLACE_MAP = {
     "CodeBase": {

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
 
@@ -178,4 +190,22 @@ def is_use_methodology() -> bool:
     返回：
         bool: 如果启用方法论则返回True，默认为True
     """
-    return os.getenv('JARVIS_USE_METHODOLOGY', '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()
         # 初始化带历史记录的会话