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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.10
+Version: 0.3.11
 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.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.3.10"
+version = "0.3.11"
 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.11}/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.11",
     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.11}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.3.10 → jarvis_ai_assistant-0.3.11}/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.11}/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.11}/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.11/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.11
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire