jarvis-ai-assistant 0.1.157__py3-none-any.whl → 0.1.158__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.157"
+__version__ = "0.1.158"

jarvis/jarvis_methodology/main.py

@@ -180,6 +180,8 @@ def extract_methodology_from_url(url):
     try:
         # 获取平台实例
         platform = PlatformRegistry().get_normal_platform()
+
+        platform.web = True
         
         # 构建提取提示
         prompt = f"""请从以下URL内容中提取方法论：

jarvis/jarvis_platform/base.py

@@ -13,6 +13,7 @@ class BasePlatform(ABC):
     def __init__(self):
         """Initialize model"""
         self.suppress_output = True  # 添加输出控制标志
+        self.web = False  # 添加web属性，默认false
 
     def __del__(self):
         """Destroy model"""
@@ -92,3 +93,7 @@ class BasePlatform(ABC):
     def set_suppress_output(self, suppress: bool):
         """Set whether to suppress output"""
         self.suppress_output = suppress
+
+    def set_web(self, web: bool):
+        """Set web flag"""
+        self.web = web

jarvis/jarvis_platform/kimi.py

@@ -54,7 +54,6 @@ class KimiModel(BasePlatform):
         self.first_chat = True  # 添加标记，用于判断是否是第一次对话
         self.system_message = ""
         self.model_name = "kimi"
-        self.web = os.getenv("KIMI_WEB", "false") == "true"
 
     def set_system_message(self, message: str):
         """Set system message"""

jarvis/jarvis_platform/yuanbao.py

@@ -33,7 +33,6 @@ class YuanbaoPlatform(BasePlatform):
         # 从环境变量中获取必要参数
         self.cookies = os.getenv("YUANBAO_COOKIES")  # 认证cookies
         self.agent_id = os.getenv("YUANBAO_AGENT_ID")  # 代理ID
-        self.web = os.getenv("YUANBAO_WEB", "false") == "true"  # 是否启用网页功能
 
         if not self.cookies:
             message = (

jarvis/jarvis_tools/execute_script.py

@@ -23,11 +23,6 @@ class ScriptTool:
                 "type": "string",
                 "description": "脚本解释器: 如bash, python3, expect, perl, ruby等任意解释器。如需直接执行shell命令, 可使用bash作为解释器"
             },
-            "script_type": {
-                "type": "string",
-                "enum": ["shell_command", "shell_script", "python_script"],
-                "description": "已废弃，请使用interpreter参数。脚本类型: shell_command (Shell命令), shell_script (Shell脚本), python_script (Python脚本)"
-            },
             "script_content": {
                 "type": "string",
                 "description": "要执行的脚本内容"
@@ -142,23 +137,8 @@ class ScriptTool:
                     "stderr": "Missing or empty script_content parameter"
                 }
             
-            # Get interpreter, with fallback to script_type for backward compatibility
-            interpreter = args.get("interpreter")
-            script_type = args.get("script_type")
-            
-            # Handle backward compatibility
-            if interpreter is None and script_type is not None:
-                if script_type == "shell_command":
-                    # For direct shell commands, use bash -c
-                    return self._execute_script_with_interpreter("bash -c", script_content)
-                elif script_type == "shell_script":
-                    interpreter = "bash"
-                elif script_type == "python_script":
-                    interpreter = "python"
-            
-            # Default to bash if nothing specified
-            if interpreter is None:
-                interpreter = "bash"
+            # Get interpreter, default to bash if not specified
+            interpreter = args.get("interpreter", "bash")
                 
             # Execute the script with the specified interpreter
             return self._execute_script_with_interpreter(interpreter, script_content)

jarvis/jarvis_tools/read_webpage.py

@@ -22,19 +22,6 @@ class WebpageTool:
         "required": ["url"]
     }
 
-    def __init__(self):
-        if os.getenv("YUANBAO_COOKIES", "") != "" and os.getenv("YUANBAO_AGENT_ID", "") != "":
-            self.platform = "yuanbao"
-            self.model = "deep_seek"
-        elif os.getenv("KIMI_API_KEY", "") != "":
-            self.platform = "kimi"
-            self.model = "k1"
-        else:
-            self.platform = ""
-
-    @staticmethod
-    def check() -> bool:
-        return os.getenv("YUANBAO_COOKIES", "") != "" and os.getenv("YUANBAO_AGENT_ID", "") != "" or os.getenv("KIMI_API_KEY", "") != ""
 
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
         """Read webpage content using Yuanbao model"""
@@ -43,9 +30,9 @@ class WebpageTool:
             want = args.get("want", "请总结这个网页的主要内容")
             
             # Create Yuanbao model instance
-            model = PlatformRegistry().create_platform(self.platform)
+            model = PlatformRegistry().get_normal_platform()
+            model.web = True
             model.set_suppress_output(False)  # type: ignore
-            model.set_model_name(self.model)  # type: ignore
 
             # Construct prompt based on want parameter
             prompt = f"""请帮我处理这个网页：{url}

jarvis/jarvis_tools/search_web.py

@@ -13,26 +13,11 @@ class SearchWebTool:
         }
     }
 
-    def __init__(self):
-        if os.getenv("YUANBAO_COOKIES", "") != "" and os.getenv("YUANBAO_AGENT_ID", "") != "":
-            self.platform = "yuanbao"
-            self.model = "deep_seek"
-        elif os.getenv("KIMI_API_KEY", "") != "":
-            self.platform = "kimi"
-            self.model = "k1"
-        else:
-            self.platform = ""
-
-
-    @staticmethod
-    def check() -> bool:
-        return os.getenv("YUANBAO_COOKIES", "") != "" and os.getenv("YUANBAO_AGENT_ID", "") != "" or os.getenv("KIMI_API_KEY", "") != ""
-
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]: # type: ignore
         query = args.get("query")
-        model = PlatformRegistry().create_platform(self.platform)
+        model = PlatformRegistry().get_normal_platform()
+        model.web = True
         model.set_suppress_output(False) # type: ignore
-        model.set_model_name(self.model) # type: ignore
         return {
             "stdout": model.chat_until_success(query), # type: ignore
             "stderr": "",

{jarvis_ai_assistant-0.1.157.dist-info → jarvis_ai_assistant-0.1.158.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.157
+Version: 0.1.158
 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.1.157.dist-info → jarvis_ai_assistant-0.1.158.dist-info}/RECORD

@@ -1,4 +1,4 @@
-jarvis/__init__.py,sha256=G3q-Eq-Sc7_tQqFt7Wy1LscfH-HPPqGIAGkniVU5bXA,50
+jarvis/__init__.py,sha256=fJj9Z5D55H1onkVpg4D1Cvjzfk9M_sYvzmzi4v5NZGY,50
 jarvis/jarvis_agent/__init__.py,sha256=tii6khwfG971MJiMfKSLwlKTjB3iEv8ITE3JqYSkfQA,24824
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=3rRA-7v_VUSFG1s7tTKhriq9vv0nsa3t69ReV0xH5gs,1505
 jarvis/jarvis_agent/file_input_handler.py,sha256=auBbBfS4Ux5ksczeRe9LtsmMm4hKrPxinW5leE9Rtyc,3575
@@ -45,15 +45,15 @@ jarvis/jarvis_lsp/rust.py,sha256=ICmQs5UVdMZwn5KjaF1YRXBCLUMtGF8Z9IwE5rqWkrU,368
 jarvis/jarvis_mcp/__init__.py,sha256=gi74_Yz5nsEFhrAyCg1Ovxsj-hLweLjMGoOaceL2yx4,2090
 jarvis/jarvis_mcp/sse_mcp_client.py,sha256=Qd09ymgZmxQvaFUzz8I3AI46v6AqmMbGaF0iBbExAGY,23459
 jarvis/jarvis_mcp/stdio_mcp_client.py,sha256=DtRO4dqBoxI8W0H0rVR5zxZLR0theKxRAQ-qzQE9qPg,11806
-jarvis/jarvis_methodology/main.py,sha256=5PXHX_UmoAFWWxCZqY-iNt8cg8FkWa1CcXcRGPo_DUg,11753
+jarvis/jarvis_methodology/main.py,sha256=i0sOKeGf9-87M0jY4q6sgw4dAPt800PHiZjseLAQmO0,11782
 jarvis/jarvis_multi_agent/__init__.py,sha256=SX8lBErhltKyYRM-rymrMz3sJ0Zl3hBXrpsPdFgzkQc,4399
 jarvis/jarvis_multi_agent/main.py,sha256=aGuUC3YQmahabqwDwZXJjfQLYsZ3KIZdf8DZDlVNMe4,1543
 jarvis/jarvis_platform/__init__.py,sha256=oD9i4ugZ2q6Hys3noLOvzPUUHqE2PJ_Je1r2dLLTscw,80
-jarvis/jarvis_platform/base.py,sha256=AKsqWU7K4LdVw5JldFKpgTUyQc28mnWoRDQAUnDbihE,3263
+jarvis/jarvis_platform/base.py,sha256=um9_BZgOJSg0nlmywYGAxwFRL-8409OnlvfgQkh5RUo,3406
 jarvis/jarvis_platform/human.py,sha256=WCzvBtQUMN7ys4rQl6UT7Zdp4x5RaGv1U4vBx7ROxfo,2438
-jarvis/jarvis_platform/kimi.py,sha256=h1BP0vey30upZ9g-b8pU87rQGd3fHcgAQo_51Nv9DZY,16697
+jarvis/jarvis_platform/kimi.py,sha256=GgUekusFzx2842K-PrES3c2oprLbPCjQhbyjU0UKycg,16637
 jarvis/jarvis_platform/registry.py,sha256=wvXTKXqAoW6GPaLKCPYhRB9QhVe1xfoVbVPBZAxl_uA,7716
-jarvis/jarvis_platform/yuanbao.py,sha256=X2lYZ3SxBzdaCwd5ooq9fxYbu14RUpeDILYg0W5W7Xc,21902
+jarvis/jarvis_platform/yuanbao.py,sha256=9nIyg5Xx9rdUaJAK_Tj8HumOT5mwpa-V907dZGot-4E,21811
 jarvis/jarvis_platform_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_platform_manager/main.py,sha256=xJM86DQFyYDysMyQEJDAwB2oSYcWg_zi1mFld0zyquM,22572
 jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -66,16 +66,16 @@ jarvis/jarvis_tools/chdir.py,sha256=do_OdtabiH3lZcT_ynjSAX66XgH2gPl9mYiS7dMMDa8,
 jarvis/jarvis_tools/code_plan.py,sha256=jNa2rs4J3Fam8Q_RHE2_QvVch21TPp-Zfv-W6iQ3D_0,7729
 jarvis/jarvis_tools/create_code_agent.py,sha256=SRiQXZf57ViIDh6YSEmJkcoSKft0-y3iDfWF8f1bvZU,3387
 jarvis/jarvis_tools/create_sub_agent.py,sha256=wGiHukvi58wb1AKW5beP7R8VvApOn8TOeGmtXsmcETE,3001
-jarvis/jarvis_tools/execute_script.py,sha256=3sR_u6-SLbzmcUbXjHLN-rGjoelIj4uAefys5la_x7o,6759
+jarvis/jarvis_tools/execute_script.py,sha256=AeuC3yZIg-nBq_LTIyqxu-lG_uLG63lvwO28A6dRDYA,5715
 jarvis/jarvis_tools/file_analyzer.py,sha256=XCsFB4dZ9qy2q929hqi1rTngj6AtRtIaPx_W7lJAcpQ,4814
 jarvis/jarvis_tools/file_operation.py,sha256=sB1x0zI1dULXV7FG17wkiMQ7mQAEnXVd_5rakQ0Thik,9109
 jarvis/jarvis_tools/find_methodology.py,sha256=TIUrezAql6wY3-wqnOPfGrO0tqS5N_-eU6YimCzaepM,2268
 jarvis/jarvis_tools/lsp_get_diagnostics.py,sha256=IYqv8jQwSK71sZpDBRolSDnYii8t0M7fzLthhMYTeGk,5322
 jarvis/jarvis_tools/methodology.py,sha256=gnlJojY4Dg5v9AAB5xcpKqpPIHs0tOYVtzTHkwOrWk0,5214
 jarvis/jarvis_tools/read_code.py,sha256=_X6D3AIgRD9YplSDnFhXOm8wQAZMA3pkkXy31SG33l0,6041
-jarvis/jarvis_tools/read_webpage.py,sha256=2QF0zAyApl0bOr9604aml_uuqBZcPefVuHvRfWzrnzk,2598
+jarvis/jarvis_tools/read_webpage.py,sha256=1AXXEX69fPJsPL7PBZDM1G4Z-MM13pUt34JXitsAFM4,2022
 jarvis/jarvis_tools/registry.py,sha256=l1wHR76TQWB1iUKh9MGKIIMNKUpSLk3GfYH8rhD1N90,26322
-jarvis/jarvis_tools/search_web.py,sha256=kWW9K2QUR2AxPq6gcyx4Bgy-0Y4gzcdErq1DNT1EYM4,1333
+jarvis/jarvis_tools/search_web.py,sha256=hMrcSnKcjH6YcV8WY4tangEid7y1L-QbyeXDlBofoy8,756
 jarvis/jarvis_tools/virtual_tty.py,sha256=Rpn9VXUG17LQsY87F_O6UCjN_opXB05mpwozxYf-xVI,16372
 jarvis/jarvis_utils/__init__.py,sha256=KMg-KY5rZIhGTeOD5e2Xo5CU7DX1DUz4ULWAaTQ-ZNw,825
 jarvis/jarvis_utils/builtin_replace_map.py,sha256=Dt8YL4Sk5uALTMPT_n-lhshRWvFWPRPwV4stASOecQ8,4290
@@ -89,9 +89,9 @@ jarvis/jarvis_utils/methodology.py,sha256=XayEVGXP5RfDBWj4bMOVFWplyrSp4GsXHwOTWo
 jarvis/jarvis_utils/output.py,sha256=BmWdB1bmizv0xfU4Z___9p_xQodorriIcEgADVq9fk0,8416
 jarvis/jarvis_utils/tag.py,sha256=YtXBYuZWy8j8YbeQX2qRrHRQl6Gp2Vt7W4p-2yjo0a4,405
 jarvis/jarvis_utils/utils.py,sha256=fNZjDj-qP0cum1RfWmI8D5VVgqT-tBUPsc8n_XPGLQY,4246
-jarvis_ai_assistant-0.1.157.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.157.dist-info/METADATA,sha256=_dp4387zyCbUoj15sZ4OfJR9txTvI_E-d3au1jSyZjM,12669
-jarvis_ai_assistant-0.1.157.dist-info/WHEEL,sha256=ooBFpIzZCPdw3uqIQsOo4qqbA4ZRPxHnOH7peeONza0,91
-jarvis_ai_assistant-0.1.157.dist-info/entry_points.txt,sha256=cKz_9SEpOvElTubKPMZMAdskD4GHz-NyKWRNssIVAWE,973
-jarvis_ai_assistant-0.1.157.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.157.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.158.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.158.dist-info/METADATA,sha256=u0gWbBvTrAsaE7KhFHwOgrWwBZntpU62UGPqOx10dyM,12669
+jarvis_ai_assistant-0.1.158.dist-info/WHEEL,sha256=ooBFpIzZCPdw3uqIQsOo4qqbA4ZRPxHnOH7peeONza0,91
+jarvis_ai_assistant-0.1.158.dist-info/entry_points.txt,sha256=cKz_9SEpOvElTubKPMZMAdskD4GHz-NyKWRNssIVAWE,973
+jarvis_ai_assistant-0.1.158.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.158.dist-info/RECORD,,