jarvis-ai-assistant 0.3.10__tar.gz → 0.3.12__tar.gz

{jarvis_ai_assistant-0.3.10/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.3.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.10
+Version: 0.3.12
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

{jarvis_ai_assistant-0.3.10 → jarvis_ai_assistant-0.3.12}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.3.10"
+version = "0.3.12"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]

{jarvis_ai_assistant-0.3.10 → jarvis_ai_assistant-0.3.12}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.3.10",
+    version="0.3.12",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.3.10 → jarvis_ai_assistant-0.3.12}/src/jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.3.10"
+__version__ = "0.3.12"

{jarvis_ai_assistant-0.3.10 → jarvis_ai_assistant-0.3.12}/src/jarvis/jarvis_agent/__init__.py

@@ -284,9 +284,7 @@ class Agent:
 
         self.model = PlatformRegistry().create_platform(platform_name)
         if self.model is None:
-            PrettyOutput.print(
-                f"平台 {platform_name} 不存在，将使用普通模型", OutputType.WARNING
-            )
+            PrettyOutput.print(f"平台 {platform_name} 不存在，将使用普通模型", OutputType.WARNING)
             self.model = PlatformRegistry().get_normal_platform()
 
         if model_name:
@@ -444,9 +442,10 @@ class Agent:
             4. 会检查并处理上下文长度限制
         """
         # 处理输入
-        message = self._process_input(message, run_input_handlers)
-        if run_input_handlers and self._should_return_early(message):
-            return message
+        if run_input_handlers:
+            message = self._process_input(message)
+            if not message:
+                return ""
 
         # 添加附加提示
         message = self._add_addon_prompt(message, need_complete)
@@ -459,21 +458,16 @@ class Agent:
 
         return response
 
-    def _process_input(self, message: str, run_input_handlers: bool) -> str:
+    def _process_input(self, message: str) -> str:
         """处理输入消息"""
-        if run_input_handlers:
-            for handler in self.input_handler:
-                message, need_return = handler(message, self)
-                if need_return:
-                    self._last_handler_returned = True
-                    return message
+        for handler in self.input_handler:
+            message, need_return = handler(message, self)
+            if need_return:
+                self._last_handler_returned = True
+                return message
         self._last_handler_returned = False
         return message
 
-    def _should_return_early(self, message: str) -> bool:
-        """检查是否需要提前返回"""
-        return hasattr(self, "_last_handler_returned") and self._last_handler_returned
-
     def _add_addon_prompt(self, message: str, need_complete: bool) -> str:
         """添加附加提示到消息"""
         if self.session.addon_prompt:
@@ -561,12 +555,19 @@ class Agent:
     def _handle_history_with_summary(self) -> str:
         """使用摘要方式处理历史"""
         summary = self.generate_summary()
-        self.clear_history()
 
-        if not summary:
-            return ""
+        # 先获取格式化的摘要消息
+        formatted_summary = ""
+        if summary:
+            formatted_summary = self._format_summary_message(summary)
+
+        # 清理历史（但不清理prompt，因为prompt会在builtin_input_handler中设置）
+        if self.model:
+            self.model.reset()
+        # 重置会话
+        self.session.clear_history()
 
-        return self._format_summary_message(summary)
+        return formatted_summary
 
     def _handle_history_with_file_upload(self) -> str:
         """使用文件上传方式处理历史"""
@@ -704,6 +705,7 @@ class Agent:
                 current_response = self._call_model(
                     self.session.prompt, True, run_input_handlers
                 )
+
                 self.session.prompt = ""
                 run_input_handlers = False
 
@@ -783,9 +785,7 @@ class Agent:
         返回:
             str: "continue" 或 "complete"
         """
-        user_input = self.multiline_inputer(
-            f"{self.name}: 请输入，或输入空行来结束当前任务："
-        )
+        user_input = self.multiline_inputer(f"{self.name}: 请输入，或输入空行来结束当前任务：")
 
         if user_input:
             self.session.prompt = user_input

{jarvis_ai_assistant-0.3.10 → jarvis_ai_assistant-0.3.12}/src/jarvis/jarvis_agent/builtin_input_handler.py

@@ -32,8 +32,16 @@ def builtin_input_handler(user_input: str, agent_: Any) -> Tuple[str, bool]:
     for tag in special_tags:
         # 优先处理特殊标记
         if tag == "Summary":
-            agent._summarize_and_clear_history()
-            return "", True
+            summary = agent._summarize_and_clear_history()
+            memory_tags_prompt = agent.memory_manager.prepare_memory_tags_prompt()
+            prompt = ""
+            if summary:
+                # 将摘要和记忆标签设置为新会话的初始提示
+                prompt = summary + "\n" + memory_tags_prompt
+            else:
+                # 即使没有摘要，也确保设置记忆标签作为新会话的初始提示
+                prompt = memory_tags_prompt
+            return prompt, True
         elif tag == "Clear":
             agent.clear()
             return "", True

{jarvis_ai_assistant-0.3.10 → jarvis_ai_assistant-0.3.12}/src/jarvis/jarvis_agent/file_methodology_manager.py

@@ -48,13 +48,10 @@ class FileMethodologyManager:
             # 上传成功
             from jarvis.jarvis_agent.memory_manager import MemoryManager
 
-            memory_manager = MemoryManager(self.agent)
-            memory_tags_prompt = memory_manager.prepare_memory_tags_prompt()
-
             if self.agent.files:
-                self.agent.session.prompt = f"{self.agent.session.prompt}\n\n上传的文件包含历史对话信息和方法论文件，可以从中获取一些经验信息。{memory_tags_prompt}"
+                self.agent.session.prompt = f"{self.agent.session.prompt}\n\n上传的文件包含历史对话信息和方法论文件，可以从中获取一些经验信息。"
             else:
-                self.agent.session.prompt = f"{self.agent.session.prompt}\n\n上传的文件包含历史对话信息，可以从中获取一些经验信息。{memory_tags_prompt}"
+                self.agent.session.prompt = f"{self.agent.session.prompt}\n\n上传的文件包含历史对话信息，可以从中获取一些经验信息。"
 
     def _handle_files_upload(self):
         """处理普通文件上传"""
@@ -79,14 +76,13 @@ class FileMethodologyManager:
         from jarvis.jarvis_agent.memory_manager import MemoryManager
 
         memory_manager = MemoryManager(self.agent)
-        memory_tags_prompt = memory_manager.prepare_memory_tags_prompt()
         methodology = load_methodology(
             msg,
             self.agent.get_tool_registry(),
             platform_name=self.agent.model.platform_name(),
             model_name=self.agent.model.name(),
         )
-        self.agent.session.prompt = f"{self.agent.session.prompt}\n\n以下是历史类似问题的执行经验，可参考：\n{methodology}{memory_tags_prompt}"
+        self.agent.session.prompt = f"{self.agent.session.prompt}\n\n以下是历史类似问题的执行经验，可参考：\n{methodology}"
 
     def handle_history_with_file_upload(self) -> str:
         """使用文件上传方式处理历史"""

{jarvis_ai_assistant-0.3.10 → jarvis_ai_assistant-0.3.12}/src/jarvis/jarvis_agent/jarvis.py

@@ -19,21 +19,18 @@ def run_cli(
     ctx: typer.Context,
     llm_type: str = typer.Option(
         "normal",
-        "-t", "--llm-type",
+        "-t",
+        "--llm-type",
         help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
     ),
-    task: Optional[str] = typer.Option(
-        None, "-T", "--task", help="从命令行直接输入任务内容"
-    ),
+    task: Optional[str] = typer.Option(None, "-T", "--task", help="从命令行直接输入任务内容"),
     model_group: Optional[str] = typer.Option(
         None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
     tool_group: Optional[str] = typer.Option(
         None, "-G", "--tool-group", help="使用的工具组，覆盖配置文件中的设置"
     ),
-    config_file: Optional[str] = typer.Option(
-        None, "-f", "--config", help="自定义配置文件路径"
-    ),
+    config_file: Optional[str] = typer.Option(None, "-f", "--config", help="自定义配置文件路径"),
     restore_session: bool = typer.Option(
         False,
         "--restore-session",
@@ -43,9 +40,7 @@ def run_cli(
     share_methodology: bool = typer.Option(
         False, "--share-methodology", help="分享本地方法论到中心方法论仓库"
     ),
-    share_tool: bool = typer.Option(
-        False, "--share-tool", help="分享本地工具到中心工具仓库"
-    ),
+    share_tool: bool = typer.Option(False, "--share-tool", help="分享本地工具到中心工具仓库"),
 ) -> None:
     """Jarvis AI assistant command-line interface."""
     if ctx.invoked_subcommand is not None:
@@ -59,21 +54,19 @@ def run_cli(
     # 处理方法论分享
     if share_methodology:
         init_env("", config_file=config_file)  # 初始化配置但不显示欢迎信息
-        manager = MethodologyShareManager()
-        manager.run()
+        methodology_manager = MethodologyShareManager()
+        methodology_manager.run()
         return
 
     # 处理工具分享
     if share_tool:
         init_env("", config_file=config_file)  # 初始化配置但不显示欢迎信息
-        manager = ToolShareManager()
-        manager.run()
+        tool_manager = ToolShareManager()
+        tool_manager.run()
         return
 
     # 初始化环境
-    init_env(
-        "欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=config_file
-    )
+    init_env("欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=config_file)
 
     # 运行主流程
     try:

{jarvis_ai_assistant-0.3.10 → jarvis_ai_assistant-0.3.12}/src/jarvis/jarvis_agent/share_manager.py

@@ -2,7 +2,7 @@
 """分享管理模块，负责工具和方法论的分享功能"""
 import os
 import subprocess
-from typing import List, Dict, Any
+from typing import List, Dict, Any, Set
 from abc import ABC, abstractmethod
 
 from prompt_toolkit import prompt
@@ -16,7 +16,7 @@ def parse_selection(selection_str: str, max_value: int) -> List[int]:
 
     例如: "1,2,3,4-9,20" -> [1, 2, 3, 4, 5, 6, 7, 8, 9, 20]
     """
-    selected: set[int] = set()
+    selected: Set[int] = set()
     parts = selection_str.split(",")
 
     for part in parts:
@@ -73,13 +73,15 @@ class ShareManager(ABC):
                     if "__pycache__" not in content:
                         f.write("\n__pycache__/\n")
                         modified = True
-            
+
             if modified:
-                subprocess.run(["git", "add", ".gitignore"], cwd=self.repo_path, check=True)
                 subprocess.run(
-                    ["git", "commit", "-m", "chore: add __pycache__ to .gitignore"], 
-                    cwd=self.repo_path, 
-                    check=True
+                    ["git", "add", ".gitignore"], cwd=self.repo_path, check=True
+                )
+                subprocess.run(
+                    ["git", "commit", "-m", "chore: add __pycache__ to .gitignore"],
+                    cwd=self.repo_path,
+                    check=True,
                 )
                 subprocess.run(["git", "push"], cwd=self.repo_path, check=True)
         else:
@@ -163,9 +165,7 @@ class ShareManager(ABC):
     def select_resources(self, resources: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
         """让用户选择要分享的资源"""
         # 显示可选的资源
-        resource_list = [
-            f"\n可分享的{self.get_resource_type()}（已排除中心仓库中已有的）："
-        ]
+        resource_list = [f"\n可分享的{self.get_resource_type()}（已排除中心仓库中已有的）："]
         for i, resource in enumerate(resources, 1):
             resource_list.append(f"[{i}] {self.format_resource_display(resource)}")
 

{jarvis_ai_assistant-0.3.10 → jarvis_ai_assistant-0.3.12}/src/jarvis/jarvis_data/config_schema.json

@@ -136,6 +136,16 @@
       "description": "思考操作模型名称",
       "default": "deep_seek_v3"
     },
+    "JARVIS_WEB_SEARCH_PLATFORM": {
+      "type": "string",
+      "description": "Web搜索使用的平台名称",
+      "default": ""
+    },
+    "JARVIS_WEB_SEARCH_MODEL": {
+      "type": "string",
+      "description": "Web搜索使用的模型名称",
+      "default": ""
+    },
     "JARVIS_LLM_GROUP": {
       "type": "string",
       "description": "选择一个预定义的模型组",

{jarvis_ai_assistant-0.3.10 → jarvis_ai_assistant-0.3.12}/src/jarvis/jarvis_tools/search_web.py

@@ -12,6 +12,10 @@ from ddgs import DDGS  # type: ignore[import-not-found]
 
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_platform.registry import PlatformRegistry
+from jarvis.jarvis_utils.config import (
+    get_web_search_platform_name,
+    get_web_search_model_name,
+)
 from jarvis.jarvis_utils.http import get as http_get
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
@@ -136,6 +140,25 @@ class SearchWebTool:
                 "success": False,
             }
 
+        # 检查是否配置了专门的 Web 搜索平台和模型
+        web_search_platform = get_web_search_platform_name()
+        web_search_model = get_web_search_model_name()
+
+        # 如果配置了专门的 Web 搜索平台和模型，优先使用
+        if web_search_platform and web_search_model:
+            model = PlatformRegistry().create_platform(web_search_platform)
+            if model:
+                model.set_model_name(web_search_model)
+                if model.support_web():
+                    model.set_web(True)
+                    model.set_suppress_output(False)
+                    return {
+                        "stdout": model.chat_until_success(query),
+                        "stderr": "",
+                        "success": True,
+                    }
+
+        # 否则使用现有的模型选择流程
         if agent.model.support_web():
             model = PlatformRegistry().create_platform(agent.model.platform_name())
             if not model:

{jarvis_ai_assistant-0.3.10 → jarvis_ai_assistant-0.3.12}/src/jarvis/jarvis_utils/config.py

@@ -499,6 +499,31 @@ def get_rag_use_rerank() -> bool:
     return config.get("use_rerank", True) is True
 
 
+# ==============================================================================
+# Web Search Configuration
+# ==============================================================================
+
+
+def get_web_search_platform_name() -> Optional[str]:
+    """
+    获取Web搜索使用的平台名称。
+
+    返回:
+        Optional[str]: 平台名称，如果未配置则返回None
+    """
+    return GLOBAL_CONFIG_DATA.get("JARVIS_WEB_SEARCH_PLATFORM")
+
+
+def get_web_search_model_name() -> Optional[str]:
+    """
+    获取Web搜索使用的模型名称。
+
+    返回:
+        Optional[str]: 模型名称，如果未配置则返回None
+    """
+    return GLOBAL_CONFIG_DATA.get("JARVIS_WEB_SEARCH_MODEL")
+
+
 # ==============================================================================
 # Tool Configuration
 # ==============================================================================

{jarvis_ai_assistant-0.3.10 → jarvis_ai_assistant-0.3.12/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.10
+Version: 0.3.12
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire