jarvis-ai-assistant 0.3.27__py3-none-any.whl → 0.3.29__py3-none-any.whl

jarvis/jarvis_stats/stats.py

@@ -167,7 +167,6 @@ class StatsManager:
         """
         # 处理时间范围
         # 当未提供时间过滤参数时，默认显示全历史数据
-        all_time = False
         if last_hours or last_days:
             if end_time is None:
                 end_time = datetime.now()
@@ -177,7 +176,7 @@ class StatsManager:
                 elif last_days:
                     start_time = end_time - timedelta(days=last_days)
         else:
-            all_time = True
+            pass
 
         if metric_name is None:
             # 显示所有指标摘要
@@ -605,8 +604,8 @@ class StatsManager:
 
     @staticmethod
     def _show_multiple_charts(
-        start_time: datetime,
-        end_time: datetime,
+        start_time: Optional[datetime],
+        end_time: Optional[datetime],
         aggregation: str,
         tags: Optional[Dict[str, str]],
         width: Optional[int] = None,

jarvis/jarvis_stats/storage.py

@@ -8,7 +8,7 @@ import json
 import os
 from datetime import datetime, timedelta
 from pathlib import Path
-from typing import Dict, List, Optional, Any
+from typing import Dict, List, Optional, Any, Set
 from collections import defaultdict
 import sys
 import time
@@ -457,7 +457,7 @@ class StatsStorage:
         metrics_from_meta = set(meta.get("metrics", {}).keys())
 
         # 扫描所有数据文件获取实际存在的指标
-        metrics_from_data: set[str] = set()
+        metrics_from_data: Set[str] = set()
         for data_file in self.data_dir.glob("stats_*.json"):
             try:
                 data = self._load_json(data_file)
@@ -467,7 +467,7 @@ class StatsStorage:
                 continue
 
         # 扫描总量缓存目录中已有的指标文件
-        metrics_from_totals: set[str] = set()
+        metrics_from_totals: Set[str] = set()
         try:
             for f in self.totals_dir.glob("*"):
                 if f.is_file():

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

@@ -14,7 +14,7 @@
 - 完善的错误处理和回滚机制
 - 严格的格式保持要求
 """
-from typing import Any, Dict
+from typing import Any, Dict, List
 
 from jarvis.jarvis_agent.edit_file_handler import EditFileHandler
 
@@ -122,8 +122,7 @@ class FileSearchReplaceTool:
 
         from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
-        stdout_messages: list[str] = []
-        stderr_messages: list[str] = []
+        stdout_messages: List[str] = []
         overall_success = False
         file_results = []
 
@@ -168,7 +167,7 @@ class FileSearchReplaceTool:
                 )
 
         # 整合所有错误信息到stderr
-        all_stderr: list[str] = []
+        all_stderr: List[str] = []
         for file_result in file_results:
             if not file_result["success"]:
                 all_stderr.append(f"文件 {file_result['file']} 处理失败: {file_result['stderr']}")

jarvis/jarvis_tools/execute_script.py

@@ -2,7 +2,7 @@
 import os
 import tempfile
 from pathlib import Path
-from typing import Any, Dict
+from typing import Any, Dict, List
 
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
@@ -74,7 +74,7 @@ class ScriptTool:
         stream.feed(data)
 
         # 清理每行右侧空格，并过滤空行
-        cleaned: list[str] = []
+        cleaned: List[str] = []
         for y in range(screen.lines):
             line = screen.buffer[y]
             stripped = "".join(char.data for char in line.values()).rstrip()

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 = {}

jarvis/jarvis_tools/retrieve_memory.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import json
-import random
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
@@ -170,7 +169,7 @@ class RetrieveMemoryTool:
                 pass
 
             # 格式化为Markdown输出
-            markdown_output = f"# 记忆检索结果\n\n"
+            markdown_output = "# 记忆检索结果\n\n"
             markdown_output += f"**检索到 {len(all_memories)} 条记忆**\n\n"
 
             if tags:
@@ -201,7 +200,7 @@ class RetrieveMemoryTool:
                     if k not in ["id", "type", "tags", "created_at", "content"]
                 }
                 if metadata:
-                    markdown_output += f"**其他信息**:\n"
+                    markdown_output += "**其他信息**:\n"
                     for key, value in metadata.items():
                         markdown_output += f"- {key}: {value}\n"
                     markdown_output += "\n"

jarvis/jarvis_tools/save_memory.py

@@ -3,7 +3,7 @@ import json
 import time
 from datetime import datetime
 from pathlib import Path
-from typing import Any, Dict, List
+from typing import Any, Dict
 
 from jarvis.jarvis_utils.config import get_data_dir
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
@@ -157,8 +157,8 @@ class SaveMemoryTool:
                     success_count += 1
 
                     # 打印单条记忆保存信息
-                    memory_type = memory_data["memory_type"]
-                    tags = memory_data.get("tags", [])
+                    memory_data["memory_type"]
+                    memory_data.get("tags", [])
 
                 except Exception as e:
                     failed_count += 1

jarvis/jarvis_tools/search_web.py

@@ -54,7 +54,7 @@ class SearchWebTool:
                     break
 
                 url = r["href"]
-                title = r.get("title", url)
+                r.get("title", url)
 
                 try:
 
@@ -79,7 +79,7 @@ class SearchWebTool:
                     "success": False,
                 }
 
-            url_list_str = "\n".join(f"  - {u}" for u in visited_urls)
+            "\n".join(f"  - {u}" for u in visited_urls)
 
             summary_prompt = f"请为查询“{query}”总结以下内容：\n\n{full_content}"
 

jarvis/jarvis_tools/sub_agent.py

@@ -8,12 +8,13 @@ sub_agent 工具
 - 继承父 Agent 的部分配置：model_group、input_handler、execute_tool_confirm、multiline_inputer；其他参数需显式提供
 - 子Agent必须自动完成(auto_complete=True)且需要summary(need_summary=True)
 """
-from typing import Any, Dict, Optional
+from typing import Any, Dict, List
 import json
 
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_utils.globals import delete_agent
 from jarvis.jarvis_tools.registry import ToolRegistry
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class SubAgentTool:
@@ -106,7 +107,7 @@ class SubAgentTool:
 
             # 解析可用工具列表（支持数组或以逗号分隔的字符串）
             _use_tools = args.get("use_tools", None)
-            use_tools: list[str] = []
+            use_tools: List[str] = []
             if isinstance(_use_tools, list):
                 use_tools = [str(x).strip() for x in _use_tools if str(x).strip()]
             elif isinstance(_use_tools, str):
@@ -175,6 +176,24 @@ class SubAgentTool:
             except Exception:
                 pass
 
+            # 校验子Agent所用模型是否有效，必要时回退到平台可用模型
+            try:
+                platform = getattr(agent, "model", None)
+                if platform:
+                    available_models = platform.get_model_list()
+                    if available_models:
+                        available_names = [m for m, _ in available_models]
+                        current_model_name = platform.name()
+                        if current_model_name not in available_names:
+                            PrettyOutput.print(
+                                f"检测到子Agent模型 {current_model_name} 不存在于平台 {platform.platform_name()} 的可用模型列表，将回退到 {available_names[0]}",
+                                OutputType.WARNING,
+                            )
+                            platform.set_model_name(available_names[0])
+            except Exception:
+                # 获取模型列表或设置模型失败时，保持原设置并继续，交由底层报错处理
+                pass
+
             # 执行任务
             result = agent.run(enhanced_task)
 

jarvis/jarvis_tools/sub_code_agent.py

@@ -8,12 +8,13 @@ sub_code_agent 工具
 - 不依赖父 Agent，所有配置使用系统默认与全局变量
 - 子Agent必须自动完成(auto_complete=True)且需要summary(need_summary=True)
 """
-from typing import Any, Dict, Optional
+from typing import Any, Dict, List
 import json
 
 from jarvis.jarvis_code_agent.code_agent import CodeAgent
 from jarvis.jarvis_utils.globals import delete_agent
 from jarvis.jarvis_utils.config import set_config, get_git_check_mode
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class SubCodeAgentTool:
@@ -84,7 +85,7 @@ class SubCodeAgentTool:
                 except Exception:
                     parent_agent = None
             model_group = None
-            use_tools: list[str] = []
+            use_tools: List[str] = []
             try:
                 if parent_agent is not None:
                     if getattr(parent_agent, "model", None):
@@ -171,6 +172,21 @@ class SubCodeAgentTool:
                             model_obj: Any = getattr(code_agent.agent, "model", None)
                             if model_obj is not None:
                                 model_obj.set_model_name(parent_model_name)
+                                # 模型有效性校验与回退，确保父Agent模型在子Agent平台上可用
+                                try:
+                                    available_models = model_obj.get_model_list()
+                                    if available_models:
+                                        available_names = [m for m, _ in available_models]
+                                        current_model_name = model_obj.name()
+                                        if current_model_name not in available_names:
+                                            PrettyOutput.print(
+                                                f"检测到子CodeAgent模型 {current_model_name} 不存在于平台 {model_obj.platform_name()} 的可用模型列表，将回退到 {available_names[0]}",
+                                                OutputType.WARNING,
+                                            )
+                                            model_obj.set_model_name(available_names[0])
+                                except Exception:
+                                    # 获取模型列表或设置模型失败时，保持原设置并继续，交由底层报错处理
+                                    pass
                     except Exception:
                         pass
             except Exception:

jarvis/jarvis_tools/virtual_tty.py

@@ -7,25 +7,14 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 # 为了类型检查，总是导入这些模块
 if TYPE_CHECKING:
-    import fcntl
-    import pty
-    import select
-    import signal
-    import subprocess
-    import threading
-    import queue
+    pass
 
 # 平台相关的导入
 if sys.platform != "win32":
-    import fcntl
-    import pty
-    import select
-    import signal
+    pass
 else:
     # Windows平台的导入
-    import subprocess
-    import threading
-    import queue
+    pass
 
 
 class VirtualTTYTool:

jarvis/jarvis_utils/builtin_replace_map.py

@@ -31,25 +31,25 @@ arguments:
     },
     "FindRelatedFiles": {
         "append": False,
-        "template": f"""
+        "template": """
 请使用工具在当前目录下查找与以下功能相关的文件：
 """,
     },
     "Dev": {
         "append": False,
-        "template": f"""
+        "template": """
 请调用create_code_agent开发以下需求：
 """,
     },
     "Fix": {
         "append": False,
-        "template": f"""
+        "template": """
 请修复以下问题：
 """,
     },
     "Check": {
         "append": True,
-        "template": f"""
+        "template": """
 请使用静态检查工具检查当前代码，必须严格遵守工具调用格式。
 
 检查要求：

jarvis/jarvis_utils/config.py

@@ -130,9 +130,14 @@ def _get_resolved_model_config(
     解析并合并模型配置，处理模型组。
 
     优先级顺序:
-    1. 单独的环境变量 (JARVIS_PLATFORM, JARVIS_MODEL, etc.)
-    2. JARVIS_LLM_GROUP 中定义的组配置
-    3. 代码中的默认值
+    - 当通过 model_group_override（例如命令行 -g/--llm-group）指定组时：
+        1. JARVIS_LLM_GROUP 中定义的组配置
+        2. 仅当组未提供对应键时，回退到顶层环境变量 (JARVIS_PLATFORM, JARVIS_MODEL, JARVIS_MAX_INPUT_TOKEN_COUNT)
+        3. 代码中的默认值
+    - 当未显式指定组时（使用默认组或未设置）：
+        1. 顶层环境变量 (JARVIS_PLATFORM, JARVIS_MODEL, JARVIS_MAX_INPUT_TOKEN_COUNT)
+        2. JARVIS_LLM_GROUP 中定义的组配置
+        3. 代码中的默认值
 
     返回:
         Dict[str, Any]: 解析后的模型配置字典
@@ -155,14 +160,24 @@ def _get_resolved_model_config(
     # Start with group config
     resolved_config = group_config.copy()
 
-    # Override with specific settings from GLOBAL_CONFIG_DATA
-    for key in [
+    # 覆盖策略：
+    # - 若通过 CLI 传入了 model_group_override，则优先使用组内配置；
+    #   仅当组未提供对应键时，才回落到顶层 GLOBAL_CONFIG_DATA。
+    # - 若未传入 override（即使用默认组），保持原有行为：由顶层键覆盖组配置。
+    override_keys = [
         "JARVIS_PLATFORM",
         "JARVIS_MODEL",
         "JARVIS_MAX_INPUT_TOKEN_COUNT",
-    ]:
+    ]
+    for key in override_keys:
         if key in GLOBAL_CONFIG_DATA:
-            resolved_config[key] = GLOBAL_CONFIG_DATA[key]
+            if model_group_override is None:
+                # 未显式指定组：顶层覆盖组
+                resolved_config[key] = GLOBAL_CONFIG_DATA[key]
+            else:
+                # 显式指定组：仅在组未定义该键时回退到顶层
+                if key not in resolved_config:
+                    resolved_config[key] = GLOBAL_CONFIG_DATA[key]
 
     return resolved_config
 
@@ -196,7 +211,7 @@ def _deprecated_platform_name_v1(model_group_override: Optional[str] = None) ->
     返回：
         str: 平台名称，默认为正常操作平台
     """
-    config = _get_resolved_model_config(model_group_override)
+    _get_resolved_model_config(model_group_override)
     # Fallback to normal platform if thinking platform is not specified
     return get_normal_platform_name(model_group_override)
 
@@ -208,7 +223,7 @@ def _deprecated_model_name_v1(model_group_override: Optional[str] = None) -> str
     返回：
         str: 模型名称，默认为正常操作模型
     """
-    config = _get_resolved_model_config(model_group_override)
+    _get_resolved_model_config(model_group_override)
     # Fallback to normal model if thinking model is not specified
     return get_normal_model_name(model_group_override)
 
@@ -220,7 +235,7 @@ def is_execute_tool_confirm() -> bool:
     返回：
         bool: 如果需要确认则返回True，默认为False
     """
-    return GLOBAL_CONFIG_DATA.get("JARVIS_EXECUTE_TOOL_CONFIRM", False) == True
+    return GLOBAL_CONFIG_DATA.get("JARVIS_EXECUTE_TOOL_CONFIRM", False)
 
 
 def is_confirm_before_apply_patch() -> bool:
@@ -230,7 +245,7 @@ def is_confirm_before_apply_patch() -> bool:
     返回：
         bool: 如果需要确认则返回True，默认为False
     """
-    return GLOBAL_CONFIG_DATA.get("JARVIS_CONFIRM_BEFORE_APPLY_PATCH", False) == True
+    return GLOBAL_CONFIG_DATA.get("JARVIS_CONFIRM_BEFORE_APPLY_PATCH", False)
 
 
 def get_data_dir() -> str:
@@ -270,7 +285,7 @@ def get_pretty_output() -> bool:
     if platform.system() == "Windows":
         return False
 
-    return GLOBAL_CONFIG_DATA.get("JARVIS_PRETTY_OUTPUT", False) == True
+    return GLOBAL_CONFIG_DATA.get("JARVIS_PRETTY_OUTPUT", True)
 
 
 def is_use_methodology() -> bool:
@@ -280,7 +295,7 @@ def is_use_methodology() -> bool:
     返回：
         bool: 如果启用方法论则返回True，默认为True
     """
-    return GLOBAL_CONFIG_DATA.get("JARVIS_USE_METHODOLOGY", True) == True
+    return GLOBAL_CONFIG_DATA.get("JARVIS_USE_METHODOLOGY", True)
 
 
 def is_use_analysis() -> bool:
@@ -290,7 +305,7 @@ def is_use_analysis() -> bool:
     返回：
         bool: 如果启用任务分析则返回True，默认为True
     """
-    return GLOBAL_CONFIG_DATA.get("JARVIS_USE_ANALYSIS", True) == True
+    return GLOBAL_CONFIG_DATA.get("JARVIS_USE_ANALYSIS", True)
 
 
 def get_tool_load_dirs() -> List[str]:
@@ -390,7 +405,7 @@ def is_print_prompt() -> bool:
     返回：
         bool: 如果打印提示则返回True，默认为True
     """
-    return GLOBAL_CONFIG_DATA.get("JARVIS_PRINT_PROMPT", False) == True
+    return GLOBAL_CONFIG_DATA.get("JARVIS_PRINT_PROMPT", False)
 
 
 def is_print_error_traceback() -> bool:
@@ -408,9 +423,9 @@ def is_force_save_memory() -> bool:
     获取是否强制保存记忆。
 
     返回：
-        bool: 如果强制保存记忆则返回True，默认为True
+        bool: 如果强制保存记忆则返回True，默认为False
     """
-    return GLOBAL_CONFIG_DATA.get("JARVIS_FORCE_SAVE_MEMORY", True) is True
+    return GLOBAL_CONFIG_DATA.get("JARVIS_FORCE_SAVE_MEMORY", False) is True
 
 
 def is_enable_static_analysis() -> bool:

jarvis/jarvis_utils/fzf.py

@@ -2,10 +2,10 @@
 """FZF selector utility."""
 import shutil
 import subprocess
-from typing import List, Optional, Union
+from typing import List, Optional, Union, Dict, Any, cast
 
 def fzf_select(
-    options: Union[List[str], List[dict]],
+    options: Union[List[str], List[Dict[str, Any]]],
     prompt: str = "SELECT> ",
     key: Optional[str] = None,
 ) -> Optional[str]:
@@ -29,7 +29,8 @@ def fzf_select(
     if isinstance(options[0], dict):
         if key is None:
             raise ValueError("A key must be provided for a list of dicts.")
-        input_lines = [str(item.get(key, "")) for item in options]
+        options_dict = cast(List[Dict[str, Any]], options)
+        input_lines = [str(item.get(key, "")) for item in options_dict]
     else:
         input_lines = [str(item) for item in options]
 

jarvis/jarvis_utils/git_utils.py

@@ -246,7 +246,7 @@ def handle_commit_workflow() -> bool:
             ["git", "commit", "-m", f"CheckPoint #{commit_count + 1}"], check=True
         )
         return True
-    except subprocess.CalledProcessError as e:
+    except subprocess.CalledProcessError:
         return False
 
 

jarvis/jarvis_utils/globals.py

@@ -10,8 +10,7 @@
 import os
 
 # 全局变量：保存消息历史
-from typing import Any, Dict, Set, List, Optional
-from datetime import datetime
+from typing import Any, Dict, List, Optional
 
 message_history: List[str] = []
 MAX_HISTORY_SIZE = 50

jarvis/jarvis_utils/input.py

@@ -11,7 +11,7 @@
 import os
 import sys
 import base64
-from typing import Iterable, List
+from typing import Iterable, List, Optional
 import wcwidth
 
 from colorama import Fore
@@ -308,7 +308,7 @@ class FileCompleter(Completer):
                 import os as _os
 
                 if self._all_files_cache is None:
-                    files: list[str] = []
+                    files: List[str] = []
                     for root, dirs, fnames in _os.walk(".", followlinks=False):
                         # Exclude .git directory
                         dirs[:] = [d for d in dirs if d != ".git"]
@@ -429,7 +429,7 @@ def _show_history_and_copy():
 
 
 def _get_multiline_input_internal(
-    tip: str, preset: str | None = None, preset_cursor: int | None = None
+    tip: str, preset: Optional[str] = None, preset_cursor: Optional[int] = None
 ) -> str:
     """
     Internal function to get multiline input using prompt_toolkit.
@@ -660,8 +660,8 @@ def get_multiline_input(tip: str, print_on_empty: bool = True) -> str:
         tip: 提示文本，将显示在底部工具栏中
         print_on_empty: 当输入为空字符串时，是否打印“输入已取消”提示。默认打印。
     """
-    preset: str | None = None
-    preset_cursor: int | None = None
+    preset: Optional[str] = None
+    preset_cursor: Optional[int] = None
     while True:
         user_input = _get_multiline_input_internal(
             tip, preset=preset, preset_cursor=preset_cursor

jarvis/jarvis_utils/methodology.py

@@ -10,7 +10,6 @@
 import json
 import os
 import tempfile
-from pathlib import Path
 from typing import Any, Dict, List, Optional
 
 from jarvis.jarvis_platform.base import BasePlatform
@@ -21,9 +20,8 @@ from jarvis.jarvis_utils.config import (
     get_central_methodology_repo,
     get_max_input_token_count,
 )
-from jarvis.jarvis_utils.globals import get_agent, current_agent_name
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.utils import is_context_overflow, daily_check_git_updates
+from jarvis.jarvis_utils.utils import daily_check_git_updates
 from jarvis.jarvis_utils.embedding import get_context_token_count
 
 
@@ -234,7 +232,7 @@ def load_methodology(
         methodology_titles = list(methodologies.keys())
 
         # 步骤2：让大模型选择相关性高的方法论
-        selection_prompt = f"""以下是所有可用的方法论标题：
+        selection_prompt = """以下是所有可用的方法论标题：
 
 """
         for i, title in enumerate(methodology_titles, 1):
@@ -305,7 +303,7 @@ def load_methodology(
 
         # 步骤3：将选择出来的方法论内容提供给大模型生成步骤
         # 首先构建基础提示词部分
-        base_prompt = f"""以下是与用户需求相关的方法论内容：
+        base_prompt = """以下是与用户需求相关的方法论内容：
 
 """
         suffix_prompt = f"""以下是所有可用的工具内容：