jarvis-ai-assistant 0.1.157__tar.gz → 0.1.158__tar.gz

{jarvis_ai_assistant-0.1.157/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.158}/PKG-INFO

@@ -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 → jarvis_ai_assistant-0.1.158}/pyproject.toml

@@ -8,7 +8,7 @@ default = true
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.157"
+version = "0.1.158"
 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.1.157 → jarvis_ai_assistant-0.1.158}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.157",
+    version="0.1.158",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.1.157 → jarvis_ai_assistant-0.1.158}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.1.157 → jarvis_ai_assistant-0.1.158}/src/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_ai_assistant-0.1.157 → jarvis_ai_assistant-0.1.158}/src/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_ai_assistant-0.1.157 → jarvis_ai_assistant-0.1.158}/src/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_ai_assistant-0.1.157 → jarvis_ai_assistant-0.1.158}/src/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_ai_assistant-0.1.157 → jarvis_ai_assistant-0.1.158}/src/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_ai_assistant-0.1.157 → jarvis_ai_assistant-0.1.158}/src/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_ai_assistant-0.1.158/src/jarvis/jarvis_tools/search_web.py

@@ -0,0 +1,25 @@
+import os
+from typing import Any, Dict
+from jarvis.jarvis_platform.registry import PlatformRegistry
+
+
+class SearchWebTool:
+    name = "search_web"
+    description = "搜索互联网上的信息"
+    parameters = {
+        "type": "object",
+        "properties": {
+            "query": {"type": "string", "description": "具体的问题"}
+        }
+    }
+
+    def execute(self, args: Dict[str, Any]) -> Dict[str, Any]: # type: ignore
+        query = args.get("query")
+        model = PlatformRegistry().get_normal_platform()
+        model.web = True
+        model.set_suppress_output(False) # type: ignore
+        return {
+            "stdout": model.chat_until_success(query), # type: ignore
+            "stderr": "",
+            "success": True,
+        }

{jarvis_ai_assistant-0.1.157 → jarvis_ai_assistant-0.1.158/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -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/src/jarvis/jarvis_tools/search_web.py

@@ -1,40 +0,0 @@
-import os
-from typing import Any, Dict
-from jarvis.jarvis_platform.registry import PlatformRegistry
-
-
-class SearchWebTool:
-    name = "search_web"
-    description = "搜索互联网上的信息"
-    parameters = {
-        "type": "object",
-        "properties": {
-            "query": {"type": "string", "description": "具体的问题"}
-        }
-    }
-
-    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.set_suppress_output(False) # type: ignore
-        model.set_model_name(self.model) # type: ignore
-        return {
-            "stdout": model.chat_until_success(query), # type: ignore
-            "stderr": "",
-            "success": True,
-        }