jarvis-ai-assistant 0.1.217__tar.gz → 0.1.219__tar.gz

{jarvis_ai_assistant-0.1.217/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.219}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.217
+Version: 0.1.219
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -56,6 +56,9 @@ Requires-Dist: tabulate==0.9.0
 Requires-Dist: pyte==0.8.2
 Requires-Dist: httpx>=0.28.1
 Requires-Dist: pyyaml>=5.3.1
+Requires-Dist: ddgs==6.1.8
+Requires-Dist: beautifulsoup4==4.12.3
+Requires-Dist: lxml==5.2.2
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"

{jarvis_ai_assistant-0.1.217 → jarvis_ai_assistant-0.1.219}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.217"
+version = "0.1.219"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]
@@ -38,6 +38,9 @@ dependencies = [
     "pyte==0.8.2",
     "httpx>=0.28.1",
     "pyyaml>=5.3.1",
+    "ddgs==6.1.8",
+    "beautifulsoup4==4.12.3",
+    "lxml==5.2.2",
 ]
 requires-python = ">=3.8"
 

{jarvis_ai_assistant-0.1.217 → jarvis_ai_assistant-0.1.219}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.217",
+    version="0.1.219",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -31,8 +31,11 @@ setup(
         "openai==1.78.1",
         "tabulate==0.9.0",
         "pyte==0.8.2",
-        "pyyaml>=5.3.1",
         "httpx>=0.28.1",
+        "pyyaml>=5.3.1",
+        "ddgs==6.1.8",
+        "beautifulsoup4==4.12.3",
+        "lxml==5.2.2",
     ],
     extras_require={"dev": ["pytest", "black",
                             "isort", "mypy", "build", "twine"]},

{jarvis_ai_assistant-0.1.217 → jarvis_ai_assistant-0.1.219}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.1.217 → jarvis_ai_assistant-0.1.219}/src/jarvis/jarvis_agent/__init__.py

@@ -2,7 +2,6 @@
 # 标准库导入
 import datetime
 import os
-from pathlib import Path
 import platform
 from typing import Any, Callable, Dict, List, Optional, Protocol, Tuple, Union
 
@@ -29,11 +28,10 @@ from jarvis.jarvis_utils.globals import (
     set_agent,
     set_interrupt,
 )
-from jarvis.jarvis_utils.input import get_multiline_input
+from jarvis.jarvis_utils.input import get_multiline_input, user_confirm
 from jarvis.jarvis_utils.methodology import load_methodology, upload_methodology
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
-from jarvis.jarvis_utils.utils import user_confirm
 
 origin_agent_system_prompt = f"""
 <role>

{jarvis_ai_assistant-0.1.217 → jarvis_ai_assistant-0.1.219}/src/jarvis/jarvis_agent/shell_input_handler.py

@@ -2,7 +2,7 @@
 from typing import Any, Tuple
 
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.utils import user_confirm
+from jarvis.jarvis_utils.input import user_confirm
 
 
 def shell_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:

{jarvis_ai_assistant-0.1.217 → jarvis_ai_assistant-0.1.219}/src/jarvis/jarvis_code_agent/code_agent.py

@@ -30,9 +30,9 @@ from jarvis.jarvis_utils.git_utils import (
     handle_commit_workflow,
     has_uncommitted_changes,
 )
-from jarvis.jarvis_utils.input import get_multiline_input
+from jarvis.jarvis_utils.input import get_multiline_input, user_confirm
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.utils import get_loc_stats, init_env, user_confirm
+from jarvis.jarvis_utils.utils import get_loc_stats, init_env
 
 
 class CodeAgent:
@@ -359,7 +359,9 @@ class CodeAgent:
 
                 # 添加提交信息到final_ret
                 if commits:
-                    final_ret += f"\n\n代码已修改完成\n补丁内容:\n```diff\n{diff}\n```\n"
+                    final_ret += (
+                        f"\n\n代码已修改完成\n补丁内容:\n```diff\n{diff}\n```\n"
+                    )
                     # 修改后的提示逻辑
                     lint_tools_info = "\n".join(
                         f"   - {file}: 使用 {'、'.join(get_lint_tools(file))}"
@@ -378,7 +380,7 @@ class CodeAgent:
 {file_list}
 {tool_info}
 如果本次修改引入了警告和错误，请根据警告和错误信息修复代码
-注意：如果要进行静态检查，需要在所有的修改都完成之后进行集中检查
+注意：如果要进行静态检查，需要在所有的修改都完成之后进行集中检查，如果文件有多个检查工具，尽量一次全部调用，不要分多次调用
                     """
                         agent.set_addon_prompt(addon_prompt)
                 else:
@@ -420,7 +422,10 @@ def main() -> None:
         "-r", "--requirement", type=str, help="Requirement to process", default=None
     )
     parser.add_argument(
-        "--restore-session", action="store_true", help="Restore session from .jarvis/saved_session.json", default=False
+        "--restore-session",
+        action="store_true",
+        help="Restore session from .jarvis/saved_session.json",
+        default=False,
     )
     args = parser.parse_args()
 

{jarvis_ai_assistant-0.1.217 → jarvis_ai_assistant-0.1.219}/src/jarvis/jarvis_git_squash/main.py

@@ -6,7 +6,8 @@ from typing import Dict
 
 from jarvis.jarvis_git_utils.git_commiter import GitCommitTool
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.utils import init_env, user_confirm
+from jarvis.jarvis_utils.utils import init_env
+from jarvis.jarvis_utils.input import user_confirm
 
 
 class GitSquashTool:

{jarvis_ai_assistant-0.1.217 → jarvis_ai_assistant-0.1.219}/src/jarvis/jarvis_platform/human.py

@@ -12,6 +12,7 @@ from typing import Generator, List, Tuple
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.utils import copy_to_clipboard
 
 
 class HumanPlatform(BasePlatform):
@@ -57,13 +58,7 @@ class HumanPlatform(BasePlatform):
             prompt = f"{message} {session_info}"
 
         # 将prompt复制到剪贴板
-        import subprocess
-
-        try:
-            subprocess.run(["xsel", "-ib"], input=prompt.encode("utf-8"), check=True)
-            PrettyOutput.print("提示已复制到剪贴板", OutputType.INFO)
-        except subprocess.CalledProcessError as e:
-            PrettyOutput.print(f"无法复制到剪贴板: {e}", OutputType.WARNING)
+        copy_to_clipboard(prompt)
 
         response = get_multiline_input(prompt + "\n\n请回复:")
         yield response

{jarvis_ai_assistant-0.1.217 → jarvis_ai_assistant-0.1.219}/src/jarvis/jarvis_tools/edit_file.py

@@ -32,8 +32,8 @@ class FileSearchReplaceTool:
 1. 指定需要修改的文件路径（单个或多个）
 2. 提供一组或多组修改，每个修改包含:
    - reason: 修改原因描述
-   - search: 需要查找的原始代码(必须包含足够上下文)
-   - replace: 替换后的新代码
+   - SEARCH: 需要查找的原始代码(必须包含足够上下文)
+   - REPLACE: 替换后的新代码
 3. 工具会自动选择最适合的编辑模式
 
 ## 核心原则
@@ -64,11 +64,11 @@ class FileSearchReplaceTool:
                                         "type": "string",
                                         "description": "修改的原因",
                                     },
-                                    "search": {
+                                    "SEARCH": {
                                         "type": "string",
                                         "description": "需要查找的原始代码",
                                     },
-                                    "replace": {
+                                    "REPLACE": {
                                         "type": "string",
                                         "description": "替换后的新代码",
                                     },
@@ -99,8 +99,8 @@ class FileSearchReplaceTool:
                     - path: 要修改的文件路径
                     - changes: 修改列表，每个修改包含:
                         - reason: 修改原因描述
-                        - search: 需要查找的原始代码(必须包含足够上下文)
-                        - replace: 替换后的新代码
+                        - SEARCH: 需要查找的原始代码(必须包含足够上下文)
+                        - REPLACE: 替换后的新代码
 
         返回:
             Dict[str, Any] 包含:

jarvis_ai_assistant-0.1.219/src/jarvis/jarvis_tools/search_web.py

@@ -0,0 +1,145 @@
+# -*- coding: utf-8 -*-
+"""A tool for searching the web."""
+from typing import Any, Dict
+
+import httpx
+from bs4 import BeautifulSoup
+from ddgs import DDGS
+
+from jarvis.jarvis_agent import Agent
+from jarvis.jarvis_platform.registry import PlatformRegistry
+from jarvis.jarvis_utils.http import get as http_get
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
+
+class SearchWebTool:
+    """A class to handle web searches."""
+
+    name = "search_web"
+    description = "搜索互联网上的信息"
+    parameters = {
+        "type": "object",
+        "properties": {"query": {"type": "string", "description": "具体的问题"}},
+    }
+
+    def _search_with_ddgs(self, query: str, agent: Agent) -> Dict[str, Any]:
+        # pylint: disable=too-many-locals, broad-except
+        """Performs a web search, scrapes content, and summarizes the results."""
+        try:
+            PrettyOutput.print("▶️ 使用 DuckDuckGo 开始网页搜索...", OutputType.INFO)
+            results = list(DDGS().text(query, max_results=5))
+
+            if not results:
+                return {
+                    "stdout": "未找到搜索结果。",
+                    "stderr": "未找到搜索结果。",
+                    "success": False,
+                }
+
+            urls = [r["href"] for r in results]
+            full_content = ""
+            visited_urls = []
+
+            for url in urls:
+                try:
+                    PrettyOutput.print(f"📄 正在抓取内容: {url}", OutputType.INFO)
+                    response = http_get(url, timeout=10.0, follow_redirects=True)
+                    soup = BeautifulSoup(response.text, "lxml")
+                    body = soup.find("body")
+                    if body:
+                        full_content += body.get_text(" ", strip=True) + "\n\n"
+                        visited_urls.append(url)
+                except httpx.HTTPStatusError as e:
+                    PrettyOutput.print(
+                        f"⚠️ HTTP错误 {e.response.status_code} 访问 {url}",
+                        OutputType.WARNING,
+                    )
+                except httpx.RequestError as e:
+                    PrettyOutput.print(f"⚠️ 请求错误: {e}", OutputType.WARNING)
+
+            if not full_content.strip():
+                return {
+                    "stdout": "无法从任何URL抓取有效内容。",
+                    "stderr": "抓取内容失败。",
+                    "success": False,
+                }
+
+            url_list_str = "\n".join(f"  - {u}" for u in visited_urls)
+            PrettyOutput.print(
+                f"🔍 已成功访问并处理以下URL:\n{url_list_str}", OutputType.INFO
+            )
+
+            PrettyOutput.print("🧠 正在总结内容...", OutputType.INFO)
+            summary_prompt = f"请为查询“{query}”总结以下内容：\n\n{full_content}"
+
+            if not agent.model:
+                return {
+                    "stdout": "",
+                    "stderr": "用于总结的Agent模型未找到。",
+                    "success": False,
+                }
+
+            platform_name = agent.model.platform_name()
+            model_name = agent.model.name()
+
+            model = PlatformRegistry().create_platform(platform_name)
+            if not model:
+                return {
+                    "stdout": "",
+                    "stderr": "无法创建用于总结的模型。",
+                    "success": False,
+                }
+
+            model.set_model_name(model_name)
+            model.set_suppress_output(False)
+            summary = model.chat_until_success(summary_prompt)
+
+            return {"stdout": summary, "stderr": "", "success": True}
+
+        except Exception as e:
+            PrettyOutput.print(f"❌ 网页搜索过程中发生错误: {e}", OutputType.ERROR)
+            return {
+                "stdout": "",
+                "stderr": f"网页搜索过程中发生错误: {e}",
+                "success": False,
+            }
+
+    def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
+        """
+        Executes the web search.
+
+        If the agent's model supports a native web search, it uses it.
+        Otherwise, it falls back to using DuckDuckGo Search and scraping pages.
+        """
+        query = args.get("query")
+        agent = args.get("agent")
+
+        if not query:
+            return {"stdout": "", "stderr": "缺少查询参数。", "success": False}
+
+        if not isinstance(agent, Agent) or not agent.model:
+            return {
+                "stdout": "",
+                "stderr": "Agent或Agent模型未找到。",
+                "success": False,
+            }
+
+        if agent.model.support_web():
+            model = PlatformRegistry().create_platform(agent.model.platform_name())
+            if not model:
+                return {"stdout": "", "stderr": "无法创建模型。", "success": False}
+            model.set_model_name(agent.model.name())
+            model.set_web(True)
+            model.set_suppress_output(False)
+            return {
+                "stdout": model.chat_until_success(query),
+                "stderr": "",
+                "success": True,
+            }
+
+        return self._search_with_ddgs(query, agent)
+
+    @staticmethod
+    def check() -> bool:
+        """Check if the tool is available."""
+        return True

{jarvis_ai_assistant-0.1.217 → jarvis_ai_assistant-0.1.219}/src/jarvis/jarvis_utils/git_utils.py

@@ -18,7 +18,7 @@ from typing import Any, Dict, List, Set, Tuple
 
 from jarvis.jarvis_utils.config import is_confirm_before_apply_patch
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.utils import user_confirm
+from jarvis.jarvis_utils.input import user_confirm
 
 
 def find_git_root_and_cd(start_dir: str = ".") -> str:
@@ -408,48 +408,51 @@ def check_and_update_git_repo(repo_path: str) -> bool:
                 f"Jarvis已更新到tag {remote_tag_result.stdout.strip()}",
                 OutputType.SUCCESS,
             )
-            
+
             # 执行pip安装更新代码
             try:
                 PrettyOutput.print("正在安装更新后的代码...", OutputType.INFO)
-                
+
                 # 检查是否在虚拟环境中
-                in_venv = hasattr(sys, 'real_prefix') or (
-                    hasattr(sys, 'base_prefix') and sys.base_prefix != sys.prefix
+                in_venv = hasattr(sys, "real_prefix") or (
+                    hasattr(sys, "base_prefix") and sys.base_prefix != sys.prefix
                 )
-                
+
                 # 尝试普通安装
                 install_cmd = [sys.executable, "-m", "pip", "install", "-e", "."]
                 result = subprocess.run(
-                    install_cmd,
-                    cwd=git_root,
-                    capture_output=True,
-                    text=True
+                    install_cmd, cwd=git_root, capture_output=True, text=True
                 )
-                
+
                 if result.returncode == 0:
                     PrettyOutput.print("代码更新安装成功", OutputType.SUCCESS)
                     return True
-                
+
                 # 处理权限错误
                 error_msg = result.stderr.strip()
-                if not in_venv and ("Permission denied" in error_msg or "not writeable" in error_msg):
-                    if user_confirm("检测到权限问题，是否尝试用户级安装(--user)？", True):
+                if not in_venv and (
+                    "Permission denied" in error_msg or "not writeable" in error_msg
+                ):
+                    if user_confirm(
+                        "检测到权限问题，是否尝试用户级安装(--user)？", True
+                    ):
                         user_result = subprocess.run(
                             install_cmd + ["--user"],
                             cwd=git_root,
                             capture_output=True,
-                            text=True
+                            text=True,
                         )
                         if user_result.returncode == 0:
                             PrettyOutput.print("用户级代码安装成功", OutputType.SUCCESS)
                             return True
                         error_msg = user_result.stderr.strip()
-                
+
                 PrettyOutput.print(f"代码安装失败: {error_msg}", OutputType.ERROR)
                 return False
             except Exception as e:
-                PrettyOutput.print(f"安装过程中发生意外错误: {str(e)}", OutputType.ERROR)
+                PrettyOutput.print(
+                    f"安装过程中发生意外错误: {str(e)}", OutputType.ERROR
+                )
                 return False
         return False
     except Exception as e:
@@ -522,7 +525,13 @@ def get_recent_commits_with_files() -> List[Dict[str, Any]]:
 
         # 获取当前用户最近5次提交的基本信息
         result = subprocess.run(
-            ["git", "log", "-5", "--author=" + current_author, "--pretty=format:%H%n%s%n%an%n%ad"],
+            [
+                "git",
+                "log",
+                "-5",
+                "--author=" + current_author,
+                "--pretty=format:%H%n%s%n%an%n%ad",
+            ],
             capture_output=True,
             text=True,
         )

{jarvis_ai_assistant-0.1.217 → jarvis_ai_assistant-0.1.219}/src/jarvis/jarvis_utils/input.py

@@ -26,6 +26,7 @@ from prompt_toolkit.styles import Style as PromptStyle  # type: ignore
 from jarvis.jarvis_utils.config import get_replace_map
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ot
+from jarvis.jarvis_utils.utils import copy_to_clipboard
 
 
 def get_single_line_input(tip: str) -> str:
@@ -179,6 +180,24 @@ class FileCompleter(Completer):
         return tag
 
 
+def user_confirm(tip: str, default: bool = True) -> bool:
+    """提示用户确认是/否问题
+
+    参数:
+        tip: 显示给用户的消息
+        default: 用户直接回车时的默认响应
+
+    返回:
+        bool: 用户确认返回True，否则返回False
+    """
+    try:
+        suffix = "[Y/n]" if default else "[y/N]"
+        ret = get_single_line_input(f"{tip} {suffix}: ")
+        return default if ret == "" else ret.lower() == "y"
+    except KeyboardInterrupt:
+        return False
+
+
 def get_multiline_input(tip: str) -> str:
     """
     获取带有增强补全和确认功能的多行输入。
@@ -217,21 +236,16 @@ def get_multiline_input(tip: str) -> str:
     def _(event):
         """处理Ctrl+O以复制最后一条消息到剪贴板。"""
         from jarvis.jarvis_utils.globals import get_last_message
-        import subprocess
 
         last_msg = get_last_message()
         if last_msg:
-            try:
-                # 使用xsel将内容复制到剪贴板
-                subprocess.run(
-                    ["xsel", "-b", "-i"], input=last_msg.encode("utf-8"), check=True
-                )
-                PrettyOutput.print("已将最后一条消息复制到剪贴板", OutputType.INFO)
-            except subprocess.CalledProcessError as e:
-                PrettyOutput.print(f"复制到剪贴板失败: {e}", OutputType.ERROR)
+            print(f"{last_msg}")
+            copy_to_clipboard(last_msg)
         else:
             PrettyOutput.print("没有可复制的消息", OutputType.INFO)
 
+        event.app.invalidate()
+
     # 配置提示会话
     style = PromptStyle.from_dict(
         {

{jarvis_ai_assistant-0.1.217 → jarvis_ai_assistant-0.1.219}/src/jarvis/jarvis_utils/utils.py

@@ -5,7 +5,6 @@ import os
 import signal
 import subprocess
 import sys
-import tarfile
 import time
 from pathlib import Path
 from typing import Any, Callable, Dict, Optional
@@ -20,7 +19,6 @@ from jarvis.jarvis_utils.config import (
 )
 from jarvis.jarvis_utils.embedding import get_context_token_count
 from jarvis.jarvis_utils.globals import get_in_chat, get_interrupt, set_interrupt
-from jarvis.jarvis_utils.input import get_single_line_input
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 g_config_file = None
@@ -371,24 +369,6 @@ def get_file_md5(filepath: str) -> str:
     return hashlib.md5(open(filepath, "rb").read(100 * 1024 * 1024)).hexdigest()
 
 
-def user_confirm(tip: str, default: bool = True) -> bool:
-    """提示用户确认是/否问题
-
-    参数:
-        tip: 显示给用户的消息
-        default: 用户直接回车时的默认响应
-
-    返回:
-        bool: 用户确认返回True，否则返回False
-    """
-    try:
-        suffix = "[Y/n]" if default else "[y/N]"
-        ret = get_single_line_input(f"{tip} {suffix}: ")
-        return default if ret == "" else ret.lower() == "y"
-    except KeyboardInterrupt:
-        return False
-
-
 def get_file_line_count(filename: str) -> int:
     """计算文件中的行数
 
@@ -451,3 +431,46 @@ def get_loc_stats() -> str:
         return result.stdout if result.returncode == 0 else ""
     except FileNotFoundError:
         return ""
+
+
+def copy_to_clipboard(text: str) -> None:
+    """将文本复制到剪贴板，依次尝试xsel和xclip (非阻塞)
+
+    参数:
+        text: 要复制的文本
+    """
+    # 尝试使用 xsel
+    try:
+        process = subprocess.Popen(
+            ["xsel", "-b", "-i"],
+            stdin=subprocess.PIPE,
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+        )
+        if process.stdin:
+            process.stdin.write(text.encode("utf-8"))
+            process.stdin.close()
+        return
+    except FileNotFoundError:
+        pass  # xsel 未安装，继续尝试下一个
+    except Exception as e:
+        PrettyOutput.print(f"使用xsel时出错: {e}", OutputType.WARNING)
+
+    # 尝试使用 xclip
+    try:
+        process = subprocess.Popen(
+            ["xclip", "-selection", "clipboard"],
+            stdin=subprocess.PIPE,
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+        )
+        if process.stdin:
+            process.stdin.write(text.encode("utf-8"))
+            process.stdin.close()
+        return
+    except FileNotFoundError:
+        PrettyOutput.print(
+            "xsel 和 xclip 均未安装, 无法复制到剪贴板", OutputType.WARNING
+        )
+    except Exception as e:
+        PrettyOutput.print(f"使用xclip时出错: {e}", OutputType.WARNING)

{jarvis_ai_assistant-0.1.217 → jarvis_ai_assistant-0.1.219/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.217
+Version: 0.1.219
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -56,6 +56,9 @@ Requires-Dist: tabulate==0.9.0
 Requires-Dist: pyte==0.8.2
 Requires-Dist: httpx>=0.28.1
 Requires-Dist: pyyaml>=5.3.1
+Requires-Dist: ddgs==6.1.8
+Requires-Dist: beautifulsoup4==4.12.3
+Requires-Dist: lxml==5.2.2
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"

{jarvis_ai_assistant-0.1.217 → jarvis_ai_assistant-0.1.219}/src/jarvis_ai_assistant.egg-info/requires.txt

@@ -14,6 +14,9 @@ tabulate==0.9.0
 pyte==0.8.2
 httpx>=0.28.1
 pyyaml>=5.3.1
+ddgs==6.1.8
+beautifulsoup4==4.12.3
+lxml==5.2.2
 
 [dev]
 pytest

jarvis_ai_assistant-0.1.217/src/jarvis/jarvis_tools/search_web.py

@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-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.set_web(True)
-        model.set_suppress_output(False)  # type: ignore
-        return {
-            "stdout": model.chat_until_success(query),  # type: ignore
-            "stderr": "",
-            "success": True,
-        }
-
-    @staticmethod
-    def check() -> bool:
-        """检查当前平台是否支持web功能"""
-        return PlatformRegistry().get_normal_platform().support_web()