jarvis-ai-assistant 0.1.6__py3-none-any.whl → 0.1.8__py3-none-any.whl

jarvis/tools/base.py

@@ -13,12 +13,9 @@ class Tool:
     def to_dict(self) -> Dict:
         """转换为Ollama工具格式"""
         return {
-            "type": "function",
-            "function": {
-                "name": self.name,
-                "description": self.description,
-                "parameters": self.parameters
-            }
+            "name": self.name,
+            "description": self.description,
+            "parameters": json.dumps(self.parameters)
         }
 
     def execute(self, arguments: Dict) -> Dict[str, Any]:
@@ -38,14 +35,13 @@ class ToolRegistry:
         from .file_ops import FileOperationTool
         from .webpage import WebpageTool
         from .sub_agent import SubAgentTool
-        from .user_input import UserInputTool
 
         tools = [
-            SearchTool(),
+            SearchTool(self.model),
             ShellTool(),
             FileOperationTool(),
             WebpageTool(),
-            UserInputTool(),
+            SubAgentTool(self.model)
         ]
 
         for tool in tools:
@@ -56,14 +52,6 @@ class ToolRegistry:
                 func=tool.execute
             )
 
-        sub_agent_tool = SubAgentTool(self.model)
-        self.register_tool(
-            name=sub_agent_tool.name,
-            description=sub_agent_tool.description,
-            parameters=sub_agent_tool.parameters,
-            func=sub_agent_tool.execute
-        )
-
     def register_tool(self, name: str, description: str, parameters: Dict, func: Callable):
         """注册新工具"""
         self.tools[name] = Tool(name, description, parameters, func)
@@ -90,8 +78,8 @@ class ToolRegistry:
             
         # 只处理第一个工具调用
         tool_call = tool_calls[0]
-        name = tool_call["function"]["name"]
-        args = tool_call["function"]["arguments"]
+        name = tool_call["name"]
+        args = tool_call["arguments"]
         
         if isinstance(args, str):
             try:
@@ -121,6 +109,7 @@ class ToolRegistry:
             if stderr:
                 output_parts.append(f"错误:\n{stderr}")
             output = "\n\n".join(output_parts)
+            output = "没有输出和错误" if not output else output
             PrettyOutput.section("执行成功", OutputType.SUCCESS)
         else:
             error_msg = result["error"]

jarvis/tools/file_ops.py

@@ -5,7 +5,7 @@ from ..utils import PrettyOutput, OutputType
 
 class FileOperationTool:
     name = "file_operation"
-    description = "Execute file operations (read/write/append/exists)"
+    description = "文件操作 (read/write/append/exists)"
     parameters = {
         "type": "object",
         "properties": {

jarvis/tools/search.py

@@ -1,43 +1,139 @@
-from typing import Dict, Any
-from duckduckgo_search import DDGS
+import os
+import requests
+from typing import Dict, Any, List
 from ..utils import PrettyOutput, OutputType
+from .webpage import WebpageTool
 
 class SearchTool:
     name = "search"
-    description = "Search for information using DuckDuckGo search engine"
+    description = "使用搜索引擎搜索信息，并根据问题提取关键信息"
     parameters = {
         "type": "object",
         "properties": {
             "query": {
                 "type": "string",
-                "description": "Search query string"
+                "description": "搜索关键词"
+            },
+            "question": {
+                "type": "string",
+                "description": "需要回答的具体问题，用于从搜索结果中提取相关信息"
             },
             "max_results": {
                 "type": "integer",
-                "description": "Maximum number of results to return",
-                "default": 5
+                "description": "最大搜索结果数量",
+                "default": 3
             }
         },
-        "required": ["query"]
+        "required": ["query", "question"]
     }
 
+    def __init__(self, model):
+        """初始化搜索工具，需要传入语言模型用于信息提取"""
+        self.model = model
+        self.webpage_tool = WebpageTool()
+        self.api_key = os.getenv("SEARCH_API_KEY")
+        self.engine = os.getenv("SEARCH_ENGINE", "bing")
+        if not self.api_key:
+            raise ValueError("未设置SEARCH_API_KEY环境变量")
+
+    def _search(self, query: str, max_results: int) -> List[Dict]:
+        """执行搜索请求"""
+        url = "https://serpapi.webscrapingapi.com/v2"
+        params = {
+            "engine": self.engine,
+            "api_key": self.api_key,
+            "q": query
+        }
+        
+        try:
+            response = requests.get(url, params=params)
+            response.raise_for_status()
+            data = response.json()
+            
+            # 从搜索结果中提取有机结果
+            results = []
+            if "organic" in data:
+                for result in data["organic"][:max_results]:
+                    results.append({
+                        "title": result.get("title", ""),
+                        "href": result.get("link", ""),
+                        "body": result.get("description", "")
+                    })
+            return results
+        except Exception as e:
+            PrettyOutput.print(f"搜索请求失败: {str(e)}", OutputType.ERROR)
+            return []
+
+    def _extract_info(self, contents: List[str], question: str) -> str:
+        """使用语言模型从网页内容中提取关键信息"""
+        prompt = {
+            "role": "user",
+            "content": f"""请根据以下搜索结果内容，回答问题：{question}
+
+搜索结果内容：
+{'-' * 40}
+{''.join(contents)}
+{'-' * 40}
+
+请提供一个简洁、准确的答案，重点关注与问题直接相关的信息。如果搜索结果中没有相关信息，请明确说明。
+回答时注意：
+1. 保持客观性，只基于搜索结果提供信息
+2. 如果不同来源有冲突，请指出差异
+3. 适当引用信息来源
+4. 如果信息不完整或不确定，请说明"""
+        }
+
+        try:
+            response = self.model.chat([prompt])
+            return response
+        except Exception as e:
+            return f"信息提取失败: {str(e)}"
+
     def execute(self, args: Dict) -> Dict[str, Any]:
-        """使用DuckDuckGo进行搜索"""
+        """执行搜索并提取信息"""
         try:
-            # 打印搜索查询
-            PrettyOutput.print(f"搜索查询: {args['query']}", OutputType.INFO)
+            query = args["query"]
+            question = args["question"]
+            max_results = args.get("max_results", 3)
+            
+            # 打印搜索信息
+            PrettyOutput.print(f"搜索查询: {query}", OutputType.INFO)
+            PrettyOutput.print(f"相关问题: {question}", OutputType.INFO)
             
             # 获取搜索结果
-            with DDGS() as ddgs:
-                results = ddgs.text(
-                    keywords=args["query"],
-                    max_results=args.get("max_results", 5)
-                )
+            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']}", OutputType.PROGRESS)
+                    webpage_result = self.webpage_tool.execute({"url": result["href"]})
+                    if webpage_result["success"]:
+                        contents.append(f"\n来源 {i}：{result['href']}\n")
+                        contents.append(webpage_result["stdout"])
+                except Exception as e:
+                    PrettyOutput.print(f"读取结果 {i} 失败: {str(e)}", OutputType.WARNING)
+                    continue
+            
+            if not contents:
+                return {
+                    "success": False,
+                    "error": "未能获取任何有效的搜索结果"
+                }
             
+            # 提取信息
+            PrettyOutput.print("正在分析搜索结果...", OutputType.PROGRESS)
+            analysis = self._extract_info(contents, question)
             
             return {
                 "success": True,
-                "stdout": results,
+                "stdout": f"搜索分析结果：\n\n{analysis}",
                 "stderr": ""
             }
 

jarvis/tools/shell.py

@@ -7,26 +7,7 @@ from ..utils import PrettyOutput, OutputType
 
 class ShellTool:
     name = "execute_shell"
-    description = """Execute shell commands and return the results.
-
-Guidelines:
-1. Filter outputs
-   - Use grep/sed for specific data
-   - Use head/tail to limit lines
-   - Use -q for status checks
-
-Examples:
-✓ <START_TOOL_CALL>
-name: execute_shell
-arguments:
-    command: ls -l file.txt  # specific file
-<END_TOOL_CALL>
-
-✗ <START_TOOL_CALL>
-name: execute_shell
-arguments:
-    command: ps aux  # too much output
-<END_TOOL_CALL>"""
+    description = """执行shell命令并返回结果"""
 
     parameters = {
         "type": "object",

jarvis/tools/sub_agent.py

@@ -6,78 +6,22 @@ from .base import ToolRegistry
 
 class SubAgentTool:
     name = "create_sub_agent"
-    description = """Create a sub-agent to handle independent tasks.
-    
-IMPORTANT: Sub-agents start with NO context!
-Must provide complete steps and context.
-
-Required:
-1. Context
-   - Project background
-   - File locations
-   - Current standards
-   - Requirements
-
-2. Steps
-   - Clear actions
-   - Success criteria
-   - Expected output
-
-Example (Good):
-<START_TOOL_CALL>
-name: create_sub_agent
-arguments:
-    name: CodeAnalyzer
-    task: Analyze error handling
-    context: |
-        Project: Python 3.8+
-        File: src/utils.py
-        
-        Steps:
-        1. Read file content
-        2. Find error patterns
-        3. Check consistency
-        4. Verify logging
-        
-        Expected:
-        - Pattern list
-        - Issues found
-        - Suggestions
-        
-        Standards:
-        - Dict[str, Any] returns
-        - PrettyOutput logging
-<END_TOOL_CALL>
-
-Example (Bad):
-<START_TOOL_CALL>
-name: create_sub_agent
-arguments:
-    name: Analyzer
-    task: Check code
-    context: Look at utils.py
-<END_TOOL_CALL>
-
-Use for:
-✓ Clear, independent tasks
-✓ Well-defined goals
-✗ Vague tasks
-✗ Simple operations"""
+    description = """创建一个子代理来处理独立任务。（重要：子代理启动时没有任何上下文！必须提供完整的步骤和上下文。）"""
 
     parameters = {
         "type": "object",
         "properties": {
             "name": {
                 "type": "string",
-                "description": "Sub-agent name (e.g., 'FileAnalyzer')"
+                "description": "子代理名称（例如：'文件分析器'）"
             },
             "task": {
                 "type": "string",
-                "description": "Task with clear steps and goals"
+                "description": "需要明确步骤和目标的任务"
             },
             "context": {
                 "type": "string",
-                "description": "REQUIRED: Background, steps, and expected results",
+                "description": "必填：背景信息、执行步骤和预期结果",
                 "default": ""
             }
         },
@@ -98,44 +42,42 @@ Use for:
             if not context:
                 return {
                     "success": False,
-                    "error": "Context is required. Please provide complete background and steps."
+                    "error": "必须提供上下文信息，包括完整的背景和执行步骤。"
                 }
 
-            PrettyOutput.print(f"Creating sub-agent '{name}'...", OutputType.INFO)
+            PrettyOutput.print(f"正在创建子代理 '{name}'...", OutputType.INFO)
             
             # Create a new tool registry for the sub-agent
             tool_registry = ToolRegistry(self.model)
             
             # Create the sub-agent with the specified name
-            sub_agent = Agent(self.model, tool_registry, name=name)
+            sub_agent = Agent(self.model, tool_registry, name=name, is_sub_agent=True)
             
             # Prepare the task with context
-            full_task = f"""Background and Steps:
+            full_task = f"""背景和步骤：
 {context}
 
-Primary Task:
+主要任务：
 {task}
 
-Requirements:
-1. Follow the provided steps exactly
-2. Report progress after each step
-3. Highlight any issues or unclear points
-4. Provide detailed results matching expected output"""
+要求：
+1. 严格按照提供的步骤执行
+2. 每完成一个步骤都要报告进度
+3. 突出显示任何问题或不明确的点
+4. 提供符合预期输出的详细结果"""
             
-            PrettyOutput.print(f"Sub-agent '{name}' executing task...", OutputType.INFO)
+            PrettyOutput.print(f"子代理 '{name}' 正在执行任务...", OutputType.INFO)
             
-         
             # Execute the task and get the summary
             summary = sub_agent.run(full_task)
             return {
                 "success": True,
-                "stdout": f"Sub-agent '{name}' completed.\n\nResults:\n{summary}",
+                "stdout": f"子代理 '{name}' 已完成。\n\n结果：\n{summary}",
                 "stderr": ""
             }
 
-
         except Exception as e:
             return {
                 "success": False,
-                "error": f"Sub-agent failed: {str(e)}"
+                "error": f"子代理执行失败：{str(e)}"
             } 

jarvis/tools/webpage.py

@@ -5,19 +5,13 @@ from ..utils import PrettyOutput, OutputType
 
 class WebpageTool:
     name = "read_webpage"
-    description = "Read webpage content, supporting extraction of main text, title, and other information"
+    description = "读取网页内容，提取标题和正文文本"
     parameters = {
         "type": "object",
         "properties": {
             "url": {
                 "type": "string",
-                "description": "URL of the webpage to read"
-            },
-            "extract_type": {
-                "type": "string",
-                "description": "Type of content to extract: 'text', 'title', or 'all'",
-                "enum": ["text", "title", "all"],
-                "default": "all"
+                "description": "需要读取的网页URL"
             }
         },
         "required": ["url"]
@@ -27,7 +21,6 @@ class WebpageTool:
         """读取网页内容"""
         try:
             url = args["url"]
-            extract_type = args.get("extract_type", "all")
             
             # 设置请求头
             headers = {
@@ -49,28 +42,21 @@ class WebpageTool:
             for script in soup(["script", "style"]):
                 script.decompose()
             
-            result = {}
-            
             # 提取标题
-            if extract_type in ["title", "all"]:
-                title = soup.title.string if soup.title else ""
-                result["title"] = title.strip() if title else "无标题"
+            title = soup.title.string if soup.title else ""
+            title = title.strip() if title else "无标题"
             
             # 提取正文
-            if extract_type in ["text", "all"]:
-                text = soup.get_text(separator='\n', strip=True)
-                lines = [line.strip() for line in text.splitlines() if line.strip()]
-                result["text"] = "\n".join(lines)
+            text = soup.get_text(separator='\n', strip=True)
+            lines = [line.strip() for line in text.splitlines() if line.strip()]
             
             # 构建输出
-            output = []
-            if "title" in result:
-                output.append(f"标题: {result['title']}")
-                output.append("")
-            
-            if "text" in result:
-                output.append("正文内容:")
-                output.append(result["text"])
+            output = [
+                f"标题: {title}",
+                "",
+                "正文内容:",
+                "\n".join(lines)
+            ]
             
             return {
                 "success": True,

jarvis/zte_llm.py

@@ -37,20 +37,34 @@ class ZteLLM(BaseModel):
         response = requests.post(
             f"{self.base_url}/{endpoint}",
             headers=headers,
-            json=data
+            json=data,
+            stream=True  # 启用流式传输
         )
         
         response.raise_for_status()
-        result = response.json()
         
-        if result["code"]["code"] != "0000":
-            raise Exception(f"API Error: {result['code']['msg']}")
-            
-        ret = result["bo"]
-        PrettyOutput.print_stream(ret, OutputType.SYSTEM)
-        return ret
+        full_content = []
+        for line in response.iter_lines():
+            if line:
+                # 解析 SSE 数据
+                line = line.decode('utf-8')
+                if line.startswith('data: '):
+                    try:
+                        data = json.loads(line[6:])  # 跳过 "data: " 前缀
+                        if "result" in data:
+                            result = data["result"]
+                            if result:  # 只处理非空结果
+                                full_content.append(result)
+                                PrettyOutput.print_stream(result, OutputType.SYSTEM)
+                            if data.get("finishReason") == "stop":
+                                break
+                    except json.JSONDecodeError:
+                        continue
+        PrettyOutput.print_stream_end()
+        
+        return "".join(full_content)
 
-    def chat(self, messages: List[Dict[str, Any]], tools: Optional[List[Dict]] = None) -> Dict[str, Any]:
+    def chat(self, messages: List[Dict[str, Any]]) -> str:
         """Chat with ZTE LLM"""
         # Convert messages to prompt
         prompt = self._convert_messages_to_prompt(messages)
@@ -59,30 +73,15 @@ class ZteLLM(BaseModel):
         data = {
             "chatUuid": "",
             "chatName": "",
-            "stream": False,
+            "stream": True,  # 启用流式响应
             "keep": False,
             "text": prompt,
             "model": self.model
         }
         
-        # If tools are provided, add them to the prompt
-        if tools:
-            tools_desc = "Available tools:\n\n" + json.dumps(tools, indent=2, ensure_ascii=False)
-            data["text"] = tools_desc + "\n\n" + data["text"]
-        
         try:
-            result = self._make_request("chat", data)
-            
-            # Parse the response to extract potential tool calls
-            response_text = result["result"]
-            tool_calls = BaseModel.extract_tool_calls(response_text)
-            
-            return {
-                "message": {
-                    "content": response_text,
-                    "tool_calls": tool_calls
-                }
-            }
+            return self._make_request("chat", data)
+
             
         except Exception as e:
             raise Exception(f"ZTE LLM chat failed: {str(e)}")

{jarvis_ai_assistant-0.1.6.dist-info → jarvis_ai_assistant-0.1.8.dist-info}/METADATA

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

jarvis_ai_assistant-0.1.8.dist-info/RECORD

@@ -0,0 +1,38 @@
+jarvis/__init__.py,sha256=QIcBZBFMcOFbIudbA0VykyqY4RphA3fWQlRP_kUMcPM,49
+jarvis/agent.py,sha256=ePgdOCWdkw35KITvZOqcrJOGl-F4wzvrltHTw7N4p88,11014
+jarvis/main.py,sha256=4IqebMKGoBGJMSNFE6E6GQ_Ay-uuOT-BLsQPnQVW47k,6705
+jarvis/models.py,sha256=G9QkUqoyOyUx6eSqwbn3hCSwHguN0bUm7Nbd6Ql0IQs,3771
+jarvis/utils.py,sha256=3hLtv-HcBL8Ngw69cowhARuIFrjcQ6yRP3Y1o9CvtsI,5992
+jarvis/zte_llm.py,sha256=Us5D6zMdZT6SoSnUgKWQbxthGadXkulLs_oSmW5MPDo,4666
+jarvis/__pycache__/__init__.cpython-313.pyc,sha256=lGXFfeYKcGsFZjgHY8y4zLca1xBIkr2zKSQv06rhoBY,208
+jarvis/__pycache__/agent.cpython-313.pyc,sha256=itbFLk6qJ9FTjbiyj6DsQhu5NbdxVaP4g-SygRguvSc,11625
+jarvis/__pycache__/main.cpython-313.pyc,sha256=6hWRW-RG_bZrqwhSQXyhKaJBXexgLqKa-_SZzAk6_eo,8479
+jarvis/__pycache__/models.cpython-313.pyc,sha256=uWuRIjGrY4YDB3dGW5PGDLWaS03et8g11O725TjY_eU,5960
+jarvis/__pycache__/tools.cpython-313.pyc,sha256=lAD4LrnnWzNZQmHXGfZ_2l7oskOpr2_2OC-gdFhxQY8,33933
+jarvis/__pycache__/utils.cpython-313.pyc,sha256=k4jyAlx4tlW0MKLMLzV7OOH9zsKrK0H955kY6M2SuFU,8772
+jarvis/__pycache__/zte_llm.cpython-313.pyc,sha256=R_HT_Gc6OQelxRLRQ-yB8Tf0sYHcb18dh9E4RF6ivbE,5662
+jarvis/tools/__init__.py,sha256=tH6YaApKpqs1YSjEllRzOZZUd-OTFKSZ5oA0zs7HdSE,297
+jarvis/tools/base.py,sha256=zK-JteBwj9d2BD_7BSAp-zD7wgJbVBppAWyfFxaPObI,4114
+jarvis/tools/file_ops.py,sha256=zTksx45NZm3iz9itN5iQGZ8DoxnSeTHdrnF08_ix7PU,3770
+jarvis/tools/search.py,sha256=HJQ1_-CXB9M4wiq4wbLYdI-Vz92JiA6LGnog3b1dDd4,5293
+jarvis/tools/shell.py,sha256=7q52lA3slf0TdjBjP1bkwugoO5pB0eqh6cYjAzAXNtI,2547
+jarvis/tools/sub_agent.py,sha256=QJYWdil1goZfo95CQkuhkjZBl-Rx6UvyeFMiGnDyjOA,2832
+jarvis/tools/webpage.py,sha256=DBnh9gye6oL2nVjzU2SU4Jupsck8x9g9On-rbjV6d8Y,2386
+jarvis/tools/__pycache__/__init__.cpython-313.pyc,sha256=1d1eUI0FlaydGB8TFBln6s7cBKd6gcPdER2_DIfX2Aw,443
+jarvis/tools/__pycache__/base.cpython-313.pyc,sha256=2OJWYNsGJjKJs6Vdj9NcN_Snjd2bA_OLlB-zr2j4wfs,6462
+jarvis/tools/__pycache__/bing_search.cpython-313.pyc,sha256=t4OZJrEgP35xdidDjVypxsDN07JAlh5PcpTkauFyllA,7029
+jarvis/tools/__pycache__/file_ops.cpython-313.pyc,sha256=LbOp31JUzoRp5XVazy1VBqCQhpFg0qQYmVftFVY90V4,3628
+jarvis/tools/__pycache__/python_script.cpython-313.pyc,sha256=8JpryqTovEiTvBlWAK1KjZmPvHUuPc9GT9rTXBEQoJc,6693
+jarvis/tools/__pycache__/rag.cpython-313.pyc,sha256=JH6-PSZRMKAvTZqCwlRXJGClxYXNMs-vetU0q7hBLz0,6064
+jarvis/tools/__pycache__/search.cpython-313.pyc,sha256=7lS5jDmClpHJXKnbBaUCys8CmW1YBJtZAa4c64JGO6I,6624
+jarvis/tools/__pycache__/shell.cpython-313.pyc,sha256=QMaLUc1MtZXWod3msv_x7iMq2IybwMwz1OoaKsbm6U4,3271
+jarvis/tools/__pycache__/sub_agent.cpython-313.pyc,sha256=qzNLnQxqFZoAiYOPH4GrCGxaQVs-QWfTLspW5a1Xa6c,3144
+jarvis/tools/__pycache__/user_confirmation.cpython-313.pyc,sha256=wK3Ev10lHSUSRvoYmi7A0GzxYkzU-C4Wfhs5qW_HBqs,2271
+jarvis/tools/__pycache__/user_input.cpython-313.pyc,sha256=JjTFOhObKsKF4Pn8KBRuKfV1_Ssj083fjU7Mfc_5z7c,2531
+jarvis/tools/__pycache__/user_interaction.cpython-313.pyc,sha256=RuVZ-pmiPBDywY3efgXSfohMAciC1avMGPmBK5qlnew,3305
+jarvis/tools/__pycache__/webpage.cpython-313.pyc,sha256=BjzSfnNzsKCrLETCcWjt32lNDLzwnjqcVGg4JfWd9OM,3008
+jarvis_ai_assistant-0.1.8.dist-info/METADATA,sha256=3zrOu0XJCW5EO4UbCeRIK0xNw6JcW60tFr6b6VdWET4,3719
+jarvis_ai_assistant-0.1.8.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.8.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
+jarvis_ai_assistant-0.1.8.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.8.dist-info/RECORD,,