jarvis-ai-assistant 0.1.7__tar.gz → 0.1.9__tar.gz

{jarvis_ai_assistant-0.1.7/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.7
+Version: 0.1.9
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -23,6 +23,7 @@ Requires-Dist: pyyaml>=5.1
 Requires-Dist: ollama>=0.1.6
 Requires-Dist: colorama>=0.4.6
 Requires-Dist: openai>=1.2.0
+Requires-Dist: playwright>=1.41.1
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"

{jarvis_ai_assistant-0.1.7 → jarvis_ai_assistant-0.1.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.7"
+version = "0.1.9"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "Your Name", email = "your.email@example.com" }]
@@ -27,6 +27,7 @@ dependencies = [
     "ollama>=0.1.6",
     "colorama>=0.4.6",
     "openai>=1.2.0",
+    "playwright>=1.41.1",
 ]
 requires-python = ">=3.8"
 

{jarvis_ai_assistant-0.1.7 → jarvis_ai_assistant-0.1.9}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.7",
+    version="0.1.9",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -20,6 +20,7 @@ setup(
         "ollama>=0.1.6",
         "colorama>=0.4.6",
         "openai>=1.2.0",
+        "playwright>=1.41.1",
     ],
     entry_points={
         "console_scripts": [

{jarvis_ai_assistant-0.1.7 → jarvis_ai_assistant-0.1.9}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.7" 
+__version__ = "0.1.9" 

jarvis_ai_assistant-0.1.9/src/jarvis/tools/bing_search.py

@@ -0,0 +1,38 @@
+from playwright.sync_api import sync_playwright
+from urllib.parse import quote
+
+def bing_search(query):
+    try:
+        with sync_playwright() as p:
+            browser = p.chromium.launch()
+            page = browser.new_page()
+            page.goto(
+                f"https://www.bing.com/search?form=QBRE&q={quote(query)}&cc=US"
+            )
+
+            page.wait_for_selector("#b_results", timeout=10000)
+            
+            summaries = page.evaluate("""() => {
+                const liElements = Array.from(
+                    document.querySelectorAll("#b_results > .b_algo")
+                );
+                return liElements.map((li) => {
+                    const abstractElement = li.querySelector(".b_caption > p");
+                    const linkElement = li.querySelector("a");
+                    const href = linkElement.getAttribute("href");
+                    const title = linkElement.textContent;
+                    const abstract = abstractElement ? abstractElement.textContent : "";
+                    return { href, title, abstract };
+                });
+            }""")
+            
+            browser.close()
+            print(summaries)
+            return summaries
+    except Exception as error:
+        print("An error occurred:", error)
+
+if __name__ == "__main__":
+    # results = bing_search("北京到西雅图的距离")
+    results = bing_search("北京到西雅图的距离")
+    print(results)

{jarvis_ai_assistant-0.1.7 → jarvis_ai_assistant-0.1.9}/src/jarvis/tools/search.py

@@ -1,11 +1,12 @@
+import os
 from typing import Dict, Any, List
-from duckduckgo_search import DDGS
 from ..utils import PrettyOutput, OutputType
 from .webpage import WebpageTool
+from .bing_search import bing_search
 
 class SearchTool:
     name = "search"
-    description = "使用DuckDuckGo搜索引擎搜索信息，并根据问题提取关键信息"
+    description = "使用Bing搜索引擎搜索信息，并根据问题提取关键信息"
     parameters = {
         "type": "object",
         "properties": {
@@ -31,6 +32,26 @@ class SearchTool:
         self.model = model
         self.webpage_tool = WebpageTool()
 
+    def _search(self, query: str, max_results: int) -> List[Dict]:
+        """执行搜索请求"""
+        try:
+            results = bing_search(query)
+            if not results:
+                return []
+            
+            # 格式化搜索结果
+            formatted_results = []
+            for result in results[:max_results]:
+                formatted_results.append({
+                    "title": result.get("title", ""),
+                    "href": result.get("href", ""),
+                    "body": result.get("abstract", "")
+                })
+            return formatted_results
+        except Exception as e:
+            PrettyOutput.print(f"搜索请求失败: {str(e)}", OutputType.ERROR)
+            return []
+
     def _extract_info(self, contents: List[str], question: str) -> str:
         """使用语言模型从网页内容中提取关键信息"""
         prompt = {
@@ -68,18 +89,18 @@ class SearchTool:
             PrettyOutput.print(f"相关问题: {question}", OutputType.INFO)
             
             # 获取搜索结果
-            search_results = []
-            with DDGS() as ddgs:
-                results = list(ddgs.text(
-                    keywords=query,
-                    max_results=max_results
-                ))
+            results = self._search(query, max_results)
+            if not results:
+                return {
+                    "success": False,
+                    "error": "未能获取任何搜索结果"
+                }
             
             # 收集网页内容
             contents = []
             for i, result in enumerate(results, 1):
                 try:
-                    PrettyOutput.print(f"正在读取第 {i}/{len(results)} 个结果... {result['title']} - {result['href']} - {result['body']}", OutputType.PROGRESS)
+                    PrettyOutput.print(f"正在读取第 {i}/{len(results)} 个结果... {result['title']} - {result['href']}", OutputType.PROGRESS)
                     webpage_result = self.webpage_tool.execute({"url": result["href"]})
                     if webpage_result["success"]:
                         contents.append(f"\n来源 {i}：{result['href']}\n")

{jarvis_ai_assistant-0.1.7 → jarvis_ai_assistant-0.1.9/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.7
+Version: 0.1.9
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -23,6 +23,7 @@ Requires-Dist: pyyaml>=5.1
 Requires-Dist: ollama>=0.1.6
 Requires-Dist: colorama>=0.4.6
 Requires-Dist: openai>=1.2.0
+Requires-Dist: playwright>=1.41.1
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"

{jarvis_ai_assistant-0.1.7 → jarvis_ai_assistant-0.1.9}/src/jarvis_ai_assistant.egg-info/SOURCES.txt

@@ -17,6 +17,7 @@ src/jarvis/__pycache__/utils.cpython-313.pyc
 src/jarvis/__pycache__/zte_llm.cpython-313.pyc
 src/jarvis/tools/__init__.py
 src/jarvis/tools/base.py
+src/jarvis/tools/bing_search.py
 src/jarvis/tools/file_ops.py
 src/jarvis/tools/search.py
 src/jarvis/tools/shell.py
@@ -24,6 +25,7 @@ src/jarvis/tools/sub_agent.py
 src/jarvis/tools/webpage.py
 src/jarvis/tools/__pycache__/__init__.cpython-313.pyc
 src/jarvis/tools/__pycache__/base.cpython-313.pyc
+src/jarvis/tools/__pycache__/bing_search.cpython-313.pyc
 src/jarvis/tools/__pycache__/file_ops.cpython-313.pyc
 src/jarvis/tools/__pycache__/python_script.cpython-313.pyc
 src/jarvis/tools/__pycache__/rag.cpython-313.pyc

{jarvis_ai_assistant-0.1.7 → jarvis_ai_assistant-0.1.9}/src/jarvis_ai_assistant.egg-info/requires.txt

@@ -5,6 +5,7 @@ pyyaml>=5.1
 ollama>=0.1.6
 colorama>=0.4.6
 openai>=1.2.0
+playwright>=1.41.1
 
 [dev]
 pytest