jarvis-ai-assistant 0.3.10__py3-none-any.whl → 0.3.11__py3-none-any.whl

jarvis/__init__.py

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

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/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/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.dist-info → jarvis_ai_assistant-0.3.11.dist-info}/METADATA

@@ -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.dist-info → jarvis_ai_assistant-0.3.11.dist-info}/RECORD

@@ -1,4 +1,4 @@
-jarvis/__init__.py,sha256=tk1ticxnbAOJGeyx5laAITBb3eg6KF7MxbYRsoDNBe0,74
+jarvis/__init__.py,sha256=4eE4JJA0Fb7zUXTVi01_rPJMEyES6tv7MbD410hdOqw,74
 jarvis/jarvis_agent/__init__.py,sha256=NF_eUF85RRplGJyLmInIsTn-09aEPtjj4utYvEALvJw,31802
 jarvis/jarvis_agent/agent_manager.py,sha256=YzpMiF0H2-eyk2kn2o24Bkj3bXsQx7Pv2vfD4gWepo0,2893
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=Qs4LAr4xdKLBJpQE81YP4CkucAop86ms0iVoKa1nnso,2468
@@ -44,7 +44,7 @@ jarvis/jarvis_code_analysis/checklists/shell.py,sha256=aRFYhQQvTgbYd-uY5pc8UHIUA
 jarvis/jarvis_code_analysis/checklists/sql.py,sha256=vR0T6qC7b4dURjJVAd7kSVxyvZEQXPG1Jqc2sNTGp5c,2355
 jarvis/jarvis_code_analysis/checklists/swift.py,sha256=TPx4I6Gupvs6tSerRKmTSKEPQpOLEbH2Y7LXg1uBgxc,2566
 jarvis/jarvis_code_analysis/checklists/web.py,sha256=25gGD7pDadZQybNFvALYxWvK0VRjGQb1NVJQElwjyk0,3943
-jarvis/jarvis_data/config_schema.json,sha256=xri_qfCrs2AJ-fPwvnV4oU7VJpIrUxddffQMoSaHZ2A,11419
+jarvis/jarvis_data/config_schema.json,sha256=Mw8LveVXoyTaHEgn4d8HOuH-uUEbgjE0yuJJCnppEgo,11700
 jarvis/jarvis_data/tiktoken/9b5ad71b2ce5302211f9c61530b329a4922fc6a4,sha256=Ijkht27pm96ZW3_3OFE-7xAPtR0YyTWXoRO8_-hlsqc,1681126
 jarvis/jarvis_git_squash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_git_squash/main.py,sha256=6PECdAbTbrsJBRLK1pXBh4hdJ_LADh-XXSic1xJi97E,2255
@@ -101,14 +101,14 @@ jarvis/jarvis_tools/registry.py,sha256=TtZ415LUMfWqfcgn3G5V4e3QLLU2ILNRatkP10U0Y
 jarvis/jarvis_tools/retrieve_memory.py,sha256=0UBZm4wQTXLTj5WHXR9fjsiIDQh-Z2UINVu8cJ12YYg,9488
 jarvis/jarvis_tools/rewrite_file.py,sha256=eG_WKg6cVAXmuGwUqlWkcuyay5S8DOzEi8vZCmX3O8w,7255
 jarvis/jarvis_tools/save_memory.py,sha256=DjeFb38OtK9Y_RpWYHz8vL72JdauXZTlc_Y0FUQBtiM,7486
-jarvis/jarvis_tools/search_web.py,sha256=kDwC6fy4TFFyok5zFYZ4VCZXyLsbU9jAoxxy26--GIk,5809
+jarvis/jarvis_tools/search_web.py,sha256=Ch11Pacxk83WDfhXUDfavL3S9JYl72HkZyFQjFZbSew,6764
 jarvis/jarvis_tools/virtual_tty.py,sha256=LTsg1PlsPvgaLShUaxpAKwTpyjXRr0l0qSREI7Q-fBc,26349
 jarvis/jarvis_tools/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_tools/cli/main.py,sha256=GsfZJ4OS4Hvxh0H2XiLkgbzm-ajBsb4c0LyjuIAAatE,7718
 jarvis/jarvis_utils/__init__.py,sha256=67h0ldisGlh3oK4DAeNEL2Bl_VsI3tSmfclasyVlueM,850
 jarvis/jarvis_utils/builtin_replace_map.py,sha256=4BurljGuiG_I93EBs7mlFlPm9wYC_4CmdTG5tQWpF6g,1712
 jarvis/jarvis_utils/clipboard.py,sha256=WgbQIQR2sh7_5ZzeX04eT3zXx_mxQbKyJOZXgGX_TcI,2907
-jarvis/jarvis_utils/config.py,sha256=HmQfPe05rLZ4e1R_qv40rTHsiCNYtPLzi12UndR01i0,15380
+jarvis/jarvis_utils/config.py,sha256=HwMd5_JgdqubIo050BDG0kfQ_7ySzzZRPgiGEAWxT8s,16083
 jarvis/jarvis_utils/embedding.py,sha256=oEOEM2qf16DMYwPsQe6srET9BknyjOdY2ef0jsp3Or8,2714
 jarvis/jarvis_utils/file_processors.py,sha256=XiM248SHS7lLgQDCbORVFWqinbVDUawYxWDOsLXDxP8,3043
 jarvis/jarvis_utils/git_utils.py,sha256=AkczUiRcGcOnPfz2v3mdLwV1S41IopiAYD2tjeMTDrE,23586
@@ -119,9 +119,9 @@ jarvis/jarvis_utils/methodology.py,sha256=IIMU17WVSunsWXsnXROd4G77LxgYs4xEC_xm_0
 jarvis/jarvis_utils/output.py,sha256=QRLlKObQKT0KuRSeZRqYb7NlTQvsd1oZXZ41WxeWEuU,10894
 jarvis/jarvis_utils/tag.py,sha256=f211opbbbTcSyzCDwuIK_oCnKhXPNK-RknYyGzY1yD0,431
 jarvis/jarvis_utils/utils.py,sha256=LiVui9RMsbfUdzbvBBwbGNC4uniGnLp3LFsk7LXGrQE,47370
-jarvis_ai_assistant-0.3.10.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.3.10.dist-info/METADATA,sha256=rp-slMeLj1Yk803AxEoLzwNSvSfH0QUSeja5zdq8_Vs,18216
-jarvis_ai_assistant-0.3.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.3.10.dist-info/entry_points.txt,sha256=4GcWKFxRJD-QU14gw_3ZaW4KuEVxOcZK9i270rwPdjA,1395
-jarvis_ai_assistant-0.3.10.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.3.10.dist-info/RECORD,,
+jarvis_ai_assistant-0.3.11.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.3.11.dist-info/METADATA,sha256=oUuaxxRov1QSVuHlazfqRNpS5mZe3RU31xNJaD1kVTo,18216
+jarvis_ai_assistant-0.3.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.3.11.dist-info/entry_points.txt,sha256=4GcWKFxRJD-QU14gw_3ZaW4KuEVxOcZK9i270rwPdjA,1395
+jarvis_ai_assistant-0.3.11.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.3.11.dist-info/RECORD,,