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

jarvis/jarvis_platform/yuanbao.py

@@ -1,24 +1,27 @@
 # -*- coding: utf-8 -*-
-from typing import Dict, Generator, List, Tuple
-import requests
+import hashlib
+import hmac
 import json
 import os
-import hmac
-import hashlib
 import time
 import urllib.parse
+from typing import Dict, Generator, List, Tuple
+
+import requests
 from PIL import Image
-from yaspin import yaspin
-from yaspin.spinners import Spinners
-from yaspin.api import Yaspin
+from rich import box
 from rich.live import Live
-from rich.text import Text
 from rich.panel import Panel
-from rich import box
+from rich.text import Text
+from yaspin import yaspin
+from yaspin.api import Yaspin
+from yaspin.spinners import Spinners
+
 from jarvis.jarvis_platform.base import BasePlatform
+from jarvis.jarvis_utils.config import get_data_dir
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import while_success
-from jarvis.jarvis_utils.config import get_data_dir
+
 
 class YuanbaoPlatform(BasePlatform):
     """Hunyuan模型实现"""

jarvis/jarvis_platform_manager/main.py

@@ -1,18 +1,20 @@
 # -*- coding: utf-8 -*-
-import os
-from jarvis.jarvis_platform.registry import PlatformRegistry
 import asyncio
+import os
+from typing import Any, Dict, List, Optional
+
+import uvicorn
 from fastapi import FastAPI, HTTPException
+from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import StreamingResponse
 from pydantic import BaseModel, Field
-from typing import List, Dict, Any, Optional
-import uvicorn
-from fastapi.middleware.cors import CORSMiddleware
 
+from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import init_env
 
+
 def list_platforms():
     """List all supported platforms and models"""
     registry = PlatformRegistry.get_global_platform_registry()
@@ -248,10 +250,10 @@ class ChatCompletionResponse(BaseModel):
 
 def service_command(args):
     """Process service subcommand - start OpenAI-compatible API server"""
-    import time
-    import uuid
     import json
     import os
+    import time
+    import uuid
     from datetime import datetime
 
     host = args.host
@@ -451,11 +453,11 @@ def service_command(args):
 
     async def stream_chat_response(platform, message, model_name):
         """Stream chat response in OpenAI-compatible format"""
-        import time
         import json
+        import os
+        import time
         import uuid
         from datetime import datetime
-        import os
 
         completion_id = f"chatcmpl-{str(uuid.uuid4())}"
         created_time = int(time.time())

jarvis/jarvis_smart_shell/main.py

@@ -12,6 +12,7 @@ from jarvis.jarvis_utils.config import get_shell_name
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.utils import init_env
 
+
 def execute_command(command: str, should_run: bool) -> None:
     """Print command without execution"""
     print(command)

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:
     """用于智能代码库查询和分析的工具
 
@@ -96,7 +96,7 @@ class AskCodebaseTool:
                     name=f"CodebaseAnalyzer",
                     description=f"分析代码库中的功能实现和定位",
                     summary_prompt=summary_prompt,
-                    platform=PlatformRegistry().get_normal_platform(),
+                    platform=PlatformRegistry().get_thinking_platform(),
                     output_handler=[tool_registry],
                     execute_tool_confirm=False,
                     auto_complete=self.auto_complete
@@ -160,6 +160,7 @@ class AskCodebaseTool:
 5. 根据文件内容提供具体、准确的回答
 6. 确保分析的完整性，收集充分的信息后再得出结论，不要在只掌握部分信息就得出结论
 7. 优先查阅README文件、文档目录和项目文档
+8. 给出的任意结论都要有实际的代码支撑，不能假设和杜撰
 
 ## 分析步骤
 1. **确定项目的编程语言**:
@@ -257,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

@@ -1,22 +1,24 @@
 # -*- coding: utf-8 -*-
 """
-文件搜索替换工具类
+文件编辑工具类
 
 功能概述:
-1. 提供精确的文件内容搜索和替换功能
+1. 提供精确的文件内容搜索和替换功能，支持多组修改
 2. 支持单个文件的编辑操作，包括创建新文件
 3. 实现原子操作：所有修改要么全部成功，要么全部回滚
 4. 严格匹配控制：每个搜索文本必须且只能匹配一次
+5. 支持两种编辑模式：快速编辑(fast_edit)和AI辅助编辑(slow_edit)
 
 核心特性:
 - 支持不存在的文件和空文件处理
 - 自动创建所需目录结构
 - 完善的错误处理和回滚机制
 - 严格的格式保持要求
+- 支持大文件处理(自动上传到模型平台)
+- 提供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
@@ -32,28 +34,25 @@ from jarvis.jarvis_utils.utils import is_context_overflow
 
 class FileSearchReplaceTool:
     name = "edit_file"
-    description = """代码编辑工具，用于编辑单个文件
+    description = """代码编辑工具，用于精确修改单个文件
 
-# 代码补丁生成指南
+# 文件编辑工具使用指南
 
-## 重要提示
-此工具可以查看和修改单个文件的代码，只需提供要修改的代码片段即可。应尽量精简内容，只包含必要的上下文和修改部分。特别注意：不要提供完整文件内容，只提供需要修改的部分及其上下文！
 
 ## 基本使用
 1. 指定需要修改的文件路径
-2. 提供一组或多组修改，每个修改包含"reason"、"search"和"replace"
-3. 每个修改中，"search"必须包含足够的上下文确保能在文件中**唯一匹配**
+2. 提供一组或多组修改，每个修改包含:
+   - reason: 修改原因描述
+   - search: 需要查找的原始代码(必须包含足够上下文)
+   - replace: 替换后的新代码
+3. 工具会自动选择最适合的编辑模式
 
 ## 核心原则
-1. **精准修改**：只提供需要修改的代码部分及其上下文，不需要展示整个文件内容
-2. **最小补丁原则**：始终生成最小范围的补丁，只包含必要的上下文和实际修改
-3. **上下文完整性**：确保提供的上下文能唯一标识修改位置，避免匹配到多处
+1. **精准修改**: 只修改必要的代码部分，保持其他部分不变
+2. **最小补丁原则**: 生成最小范围的补丁，包含必要的上下文
+3. **唯一匹配**: 确保搜索文本在文件中唯一匹配
+4. **格式保持**: 严格保持原始代码的格式风格
 
-## 输出格式规范
-- 每个修改必须包含SEARCH部分和REPLACE部分
-- SEARCH部分是需要查找的原始代码，必须能在原文件中**唯一匹配**
-- REPLACE部分是替换后的新代码
-- 如果修改较大，可以使用多个修改块
 
 """
     parameters = {
@@ -93,24 +92,26 @@ class FileSearchReplaceTool:
         pass
 
     def execute(self, args: Dict) -> Dict[str, Any]:
-        """执行文件编辑操作，包含错误处理和回滚机制。
+        """执行文件编辑操作，支持快速编辑和AI辅助编辑两种模式。
 
         主要功能:
-        1. 处理文件创建或修改
+        1. 处理文件创建或修改，支持不存在的文件
         2. 原子操作：所有修改要么全部成功，要么全部回滚
-        3. 保存修改前后的文件状态以便回滚
-        4. 提供详细的执行状态输出
+        3. 自动选择编辑模式(fast_edit或slow_edit)
+        4. 保存修改前后的文件状态以便回滚
+        5. 提供详细的执行状态输出
 
         参数:
             args: 包含以下键的字典:
-                - file: 要修改的文件路径
-                - changes: 修改列表，每个修改包含:
+                - file: 要修改的文件路径(必填)
+                - changes: 修改列表，每个修改包含(必填):
                     - reason: 修改原因描述
-                    - patch: 修改后的代码片段
+                    - search: 需要查找的原始代码(必须包含足够上下文)
+                    - replace: 替换后的新代码
 
         返回:
             Dict[str, Any] 包含:
-                - success: 操作是否成功
+                - success: 操作是否成功(True/False)
                 - stdout: 成功时的输出消息
                 - stderr: 失败时的错误消息
 
@@ -118,9 +119,18 @@ class FileSearchReplaceTool:
         1. 捕获并记录文件操作异常
         2. 失败的修改尝试回滚到原始状态
         3. 新创建的文件在失败时会被删除
+        4. 提供3次重试机制确保操作可靠性
+        5. 支持大文件处理(自动上传到模型平台)
+
+        实现细节:
+        1. 优先尝试fast_edit模式
+        2. 如果fast_edit失败，则尝试slow_edit模式
+        3. 严格检查搜索文本的唯一匹配性
+        4. 保持原始代码的格式风格
         """
         import os
-        from jarvis.jarvis_utils.output import PrettyOutput, OutputType
+
+        from jarvis.jarvis_utils.output import OutputType, PrettyOutput
         
         stdout_messages = []
         stderr_messages = []
@@ -396,7 +406,6 @@ def fast_edit(filepath: str, patches: List[Dict[str,str]], spinner: Yaspin) -> T
         if search_text in modified_content:
             # 如果有多处，报错
             if modified_content.count(search_text) > 1:
-                spinner.write(f"❌ 补丁 #{patch_count} 应用失败：找到多个匹配的代码段")
                 success = False
                 break
             # 应用替换
@@ -404,7 +413,6 @@ def fast_edit(filepath: str, patches: List[Dict[str,str]], spinner: Yaspin) -> T
                 search_text, replace_text)
             spinner.write(f"✅ 补丁 #{patch_count} 应用成功")
         else:
-            spinner.write(f"❌ 补丁 #{patch_count} 应用失败：无法找到匹配的代码段")
             success = False
             break
     if not success:

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>
@@ -216,7 +216,7 @@ class ToolRegistry(OutputHandlerProtocol):
                 f"工具 {missing_tools} 不存在，可用的工具有: {', '.join(self.tools.keys())}",
                 OutputType.WARNING,
             )
-        self.tools = {tool_name: self.tools[tool_name] for tool_name in name}
+        self.tools = {tool_name: self.tools[tool_name] for tool_name in name if tool_name in self.tools}
 
     def dont_use_tools(self, names: List[str]) -> None:
         """从注册表中移除指定工具
@@ -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": {