jarvis-ai-assistant 0.1.126__py3-none-any.whl → 0.1.129__py3-none-any.whl

jarvis/jarvis_tools/read_webpage.py

@@ -1,6 +1,7 @@
 from typing import Dict, Any
 import requests
 from bs4 import BeautifulSoup
+from yaspin import yaspin
 
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
@@ -29,48 +30,67 @@ class WebpageTool:
             }
             
             # Send request
-            PrettyOutput.print(f"正在读取网页：{url}", OutputType.INFO)
-            response = requests.get(url, headers=headers, timeout=10)
-            response.raise_for_status()
+            with yaspin(text="正在读取网页...", color="cyan") as spinner:
+                response = requests.get(url, headers=headers, timeout=10)
+                response.raise_for_status()
+                spinner.text = "网页读取完成"
+                spinner.ok("✅")
+                
             
             # Use correct encoding
+
             response.encoding = response.apparent_encoding
             
             # Parse HTML
-            soup = BeautifulSoup(response.text, 'html.parser')
+            with yaspin(text="正在解析网页...", color="cyan") as spinner:
+                soup = BeautifulSoup(response.text, 'html.parser')
+                spinner.text = "网页解析完成"
+                spinner.ok("✅")
             
             # Remove script and style tags
-            for script in soup(["script", "style"]):
-                script.decompose()
+            with yaspin(text="正在移除脚本和样式...", color="cyan") as spinner:
+                for script in soup(["script", "style"]):
+                    script.decompose()
+                spinner.text = "脚本和样式移除完成"
+                spinner.ok("✅")
             
             # Extract title
-            title = soup.title.string if soup.title else ""
-            title = title.strip() if title else "No title"
-            
-            # Extract text and links
-            text_parts = []
-            links = []
+            with yaspin(text="正在提取标题...", color="cyan") as spinner:
+                title = soup.title.string if soup.title else ""
+                title = title.strip() if title else "No title"
+                spinner.text = "标题提取完成"
+                spinner.ok("✅")
             
-            # Process content and collect links
-            for element in soup.descendants:
-                if element.name == 'a' and element.get('href'): # type: ignore
-                    href = element.get('href') # type: ignore
-                    text = element.get_text(strip=True)
-                    if text and href:
-                        links.append(f"[{text}]({href})")
-                elif isinstance(element, str) and element.strip():
-                    text_parts.append(element.strip())
+            with yaspin(text="正在提取文本和链接...", color="cyan") as spinner:
+                # Extract text and links
+                text_parts = []
+                links = []
+                
+                # Process content and collect links
+                for element in soup.descendants:
+                    if element.name == 'a' and element.get('href'): # type: ignore
+                        href = element.get('href') # type: ignore
+                        text = element.get_text(strip=True)
+                        if text and href:
+                            links.append(f"[{text}]({href})")
+                    elif isinstance(element, str) and element.strip():
+                        text_parts.append(element.strip())
+                spinner.text = "文本和链接提取完成"
+                spinner.ok("✅")
             
             # Build output
-            output = [
-                f"Title: {title}",
-                "",
-                "Text content:",
-                "\n".join(text_parts),
-                "",
-                "Links found:",
-                "\n".join(links) if links else "No links found"
-            ]
+            with yaspin(text="正在构建输出...", color="cyan") as spinner:
+                output = [
+                    f"Title: {title}",
+                    "",
+                    "Text content:",
+                    "\n".join(text_parts),
+                    "",
+                    "Links found:",
+                    "\n".join(links) if links else "No links found"
+                ]
+                spinner.text = "输出构建完成"
+                spinner.ok("✅")
             
             return {
                 "success": True,

jarvis/jarvis_tools/registry.py

@@ -5,6 +5,7 @@ import sys
 from typing import Any, Callable, Dict, List, Optional, Tuple
 
 import yaml
+from yaspin import yaspin
 
 from jarvis.jarvis_agent.output_handler import OutputHandler
 from jarvis.jarvis_platform.registry import PlatformRegistry
@@ -335,17 +336,6 @@ arguments:
                 except json.JSONDecodeError:
                     PrettyOutput.print(f"工具参数格式无效: {name} {tool_call_help}", OutputType.ERROR)
                     return ""
-
-            # Display tool call information
-            PrettyOutput.section(f"执行工具: {name}", OutputType.TOOL)
-            params = "参数:\n"
-            if isinstance(args, dict):
-                for key, value in args.items():
-                    params += f"{key} = {value}\n"
-            else:
-                params += f"{args}"
-
-            PrettyOutput.print(params, OutputType.INFO)
             
             # Execute tool call
             result = self.execute_tool(name, args)
@@ -362,15 +352,13 @@ arguments:
             
             # Process the result
             if result["success"]:
-                
-                PrettyOutput.section("执行成功", OutputType.SUCCESS)
-                
                 # If the output exceeds 4k characters, use a large model to summarize
                 if get_context_token_count(output) > self.max_token_count:
+                    PrettyOutput.section("输出过长，正在总结...", OutputType.SYSTEM)
                     try:
-                        PrettyOutput.print("输出过长，正在总结...", OutputType.PROGRESS)
-                        model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
                         
+                        model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
+                        model.set_suppress_output(False)
                         # If the output exceeds the maximum context length, only take the last part
                         max_count = self.max_token_count
                         if get_context_token_count(output) > max_count:
@@ -398,14 +386,9 @@ arguments:
 {summary}
 
 --- 总结结束 ---"""
-                        
                     except Exception as e:
                         PrettyOutput.print(f"总结失败: {str(e)}", OutputType.ERROR)
                         output = f"输出过长 ({len(output)} 字符)，建议查看原始输出。\n前300字符预览:\n{output[:300]}..."
-            
-            else:
-                PrettyOutput.section("执行失败", OutputType.WARNING)
-                PrettyOutput.print(result["stderr"], OutputType.WARNING)
             return output
             
         except Exception as e:

jarvis/jarvis_tools/search_web.py

@@ -1,4 +1,7 @@
 from typing import Dict, Any, List
+
+from regex import W
+from yaspin import yaspin
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.read_webpage import WebpageTool
 from playwright.sync_api import sync_playwright
@@ -12,52 +15,72 @@ def bing_search(query):
     try:
         with sync_playwright() as p:
             # Set parameters when starting the browser
-            browser = p.chromium.launch(
-                headless=True,  # Headless mode
-                args=['--disable-gpu', '--no-sandbox', '--disable-dev-shm-usage']
-            )
+            with yaspin(text="正在启动浏览器...", color="cyan") as spinner:
+                browser = p.chromium.launch(
+                    headless=True,  # Headless mode
+                    args=['--disable-gpu', '--no-sandbox', '--disable-dev-shm-usage']
+                )
+                spinner.text = "浏览器启动完成"
+                spinner.ok("✅")
             
             # Create a new page and set timeout
-            page = browser.new_page(
-                user_agent='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36',
-                viewport={'width': 1920, 'height': 1080}
-            )
+            with yaspin(text="正在创建新页面...", color="cyan") as spinner:
+                page = browser.new_page(
+                    user_agent='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36',
+                    viewport={'width': 1920, 'height': 1080}
+                )
+                spinner.text = "新页面创建完成"
+                spinner.ok("✅")
             
             # Set page timeout
-            page.set_default_timeout(60000)
+            with yaspin(text="正在设置页面超时...", color="cyan") as spinner:
+                page.set_default_timeout(60000)
+                spinner.text = "页面超时设置完成"
+                spinner.ok("✅")
             
             # Visit search page
-            url = f"https://www.bing.com/search?q={quote(query)}&form=QBLH&sp=-1"
-            page.goto(url, wait_until="networkidle")
+            with yaspin(text=f"正在搜索 {query}...", color="cyan") as spinner:
+                url = f"https://www.bing.com/search?q={quote(query)}&form=QBLH&sp=-1"
+                page.goto(url, wait_until="networkidle")
+                spinner.text = "搜索完成"
+                spinner.ok("✅")
             
             # Wait for search results to load
-            page.wait_for_selector("#b_results", state="visible", timeout=30000)
-            
-            # Wait for a moment to ensure the results are fully loaded
-            page.wait_for_timeout(1000)
+            with yaspin(text="正在等待搜索结果加载...", color="cyan") as spinner:
+                page.wait_for_selector("#b_results", state="visible", timeout=30000)
+                # Wait for a moment to ensure the results are fully loaded
+                page.wait_for_timeout(1000)
+                spinner.text = "搜索结果加载完成"
+                spinner.ok("✅")
             
             # Extract search results
-            summaries = page.evaluate("""() => {
-                const results = [];
-                const elements = document.querySelectorAll("#b_results > .b_algo");
-                
-                for (const el of elements) {
-                    const titleEl = el.querySelector("h2");
-                    const linkEl = titleEl ? titleEl.querySelector("a") : null;
-                    const abstractEl = el.querySelector(".b_caption p");
+            with yaspin(text="正在提取搜索结果...", color="cyan") as spinner:
+                summaries = page.evaluate("""() => {
+                    const results = [];
+                    const elements = document.querySelectorAll("#b_results > .b_algo");
                     
-                    if (linkEl) {
-                        results.push({
-                            title: titleEl.innerText.trim(),
-                            href: linkEl.href,
-                            abstract: abstractEl ? abstractEl.innerText.trim() : ""
-                        });
+                    for (const el of elements) {
+                        const titleEl = el.querySelector("h2");
+                        const linkEl = titleEl ? titleEl.querySelector("a") : null;
+                        const abstractEl = el.querySelector(".b_caption p");
+                        
+                        if (linkEl) {
+                            results.push({
+                                title: titleEl.innerText.trim(),
+                                href: linkEl.href,
+                                abstract: abstractEl ? abstractEl.innerText.trim() : ""
+                            });
+                        }
                     }
-                }
-                return results;
-            }""")
-            
-            browser.close()
+                    return results;
+                }""")
+                spinner.text = "搜索结果提取完成"
+                spinner.ok("✅")
+
+            with yaspin(text="正在关闭浏览器...", color="cyan") as spinner:
+                browser.close()
+                spinner.text = "浏览器关闭完成"
+                spinner.ok("✅")
             return summaries
             
     except Exception as error:
@@ -235,8 +258,10 @@ Please synthesize a final answer that:
                 }
             
             # Extract information
-            PrettyOutput.print("正在分析搜索结果...", OutputType.PROGRESS)
-            analysis = self._extract_info(contents, question)
+            with yaspin(text="正在提取信息...", color="cyan") as spinner:   
+                analysis = self._extract_info(contents, question)
+                spinner.text = "信息提取完成"
+                spinner.ok("✅")
             
             return {
                 "success": True,

jarvis/jarvis_tools/tool_generator.py

@@ -4,9 +4,13 @@ Tool Generator Tool - Automatically creates new tools using LLM
 from pathlib import Path
 import re
 from typing import Dict, Any
+
+from yaspin import yaspin
 from jarvis.jarvis_platform.registry import PlatformRegistry
 
 class ToolGenerator:
+    """工具生成器类，用于自动创建与Jarvis系统集成的新工具"""
+    
     name = "tool_generator"
     description = "使用LLM自动生成与系统集成的新工具"
     parameters = {
@@ -29,8 +33,14 @@ class ToolGenerator:
     }
     
     def execute(self, arguments: Dict[str, Any]) -> Dict[str, Any]:
-        """Generate and save a new tool using LLM"""
-        # Get fresh model instance for each execution
+        """
+        执行工具生成过程
+        Args:
+            arguments: 包含工具生成所需参数的字典
+        Returns:
+            包含执行结果的字典，包含success、stdout和stderr字段
+        """
+        # 获取代码生成平台实例
         model = PlatformRegistry.get_global_platform_registry().get_codegen_platform()
         
         try:
@@ -38,38 +48,50 @@ class ToolGenerator:
             description = arguments["description"]
             input_spec = arguments["input_spec"]
             
-            # Generate tool implementation using LLM
-            prompt = self._create_prompt(tool_name, description, input_spec)
-            llm_response = model.chat_until_success(prompt)
-            
-            # Extract implementation with more flexible parsing
-            implementation = self._extract_code(llm_response)
-            if not implementation:
-                return {
-                    "success": False,
-                    "stdout": "",
-                    "stderr": "Could not extract valid Python code from LLM response"
-                }
+            # 使用LLM生成工具实现代码
+            with yaspin(text="正在生成工具...", color="cyan") as spinner:
+                prompt = self._create_prompt(tool_name, description, input_spec)
+                llm_response = model.chat_until_success(prompt)
+                spinner.text = "工具生成完成"
+                spinner.ok("✅")
             
-            # Validate return value format
-            if not self._validate_return_value_format(implementation):
-                return {
-                    "success": False,
-                    "stdout": "",
-                    "stderr": "Generated tool does not follow required return value format"
-                }
+            # 从LLM响应中提取实现代码
+            with yaspin(text="正在提取工具实现...", color="cyan") as spinner:
+                implementation = self._extract_code(llm_response)
+                if not implementation:
+                    return {
+                        "success": False,
+                        "stdout": "",
+                        "stderr": "无法从LLM响应中提取有效的Python代码"
+                    }
+                spinner.text = "工具实现提取完成"
+                spinner.ok("✅")
             
-            # Save the new tool
-            tools_dir = Path.home() / ".jarvis" / "tools"
-            tools_dir.mkdir(parents=True, exist_ok=True)
-            tool_file = tools_dir / f"{tool_name}.py"
+            # 验证生成的工具代码是否符合返回值格式要求
+            with yaspin(text="正在验证工具返回值格式...", color="cyan") as spinner:
+                if not self._validate_return_value_format(implementation):
+                    return {
+                        "success": False,
+                        "stdout": "",
+                        "stderr": "生成的工具不符合要求的返回值格式"
+                    }
+                spinner.text = "工具返回值格式验证完成"
+                spinner.ok("✅")
             
-            with open(tool_file, "w") as f:
-                f.write(implementation)
+            # 保存生成的新工具
+            with yaspin(text="正在保存工具...", color="cyan") as spinner:
+                tools_dir = Path.home() / ".jarvis" / "tools"
+                tools_dir.mkdir(parents=True, exist_ok=True)
+                tool_file = tools_dir / f"{tool_name}.py"
+                
+                with open(tool_file, "w") as f:
+                    f.write(implementation)
+                spinner.text = "工具保存完成"
+                spinner.ok("✅")
             
             return {
                 "success": True,
-                "stdout": f"Tool successfully generated at: {tool_file}",
+                "stdout": f"工具成功生成于: {tool_file}",
                 "stderr": ""
             }
             
@@ -77,11 +99,19 @@ class ToolGenerator:
             return {
                 "success": False,
                 "stdout": "",
-                "stderr": f"Tool generation failed: {str(e)}"
+                "stderr": f"工具生成失败: {str(e)}"
             }
     
     def _create_prompt(self, tool_name: str, description: str, input_spec: str) -> str:
-        """创建用于工具生成的LLM提示"""
+        """
+        创建用于工具生成的LLM提示
+        Args:
+            tool_name: 工具名称
+            description: 工具描述
+            input_spec: 输入规范
+        Returns:
+            格式化后的提示字符串
+        """
         example_code = '''
 <TOOL>
 from typing import Dict, Any
@@ -162,20 +192,32 @@ class CustomTool:
 '''
     
     def _extract_code(self, response: str) -> str:
-        """Flexibly extract Python code from LLM response"""
-        # Find the first occurrence of <TOOL> and </TOOL>
+        """
+        从LLM响应中提取Python代码
+        Args:
+            response: LLM的响应字符串
+        Returns:
+            提取到的Python代码字符串
+        """
+        # 查找第一个<TOOL>和</TOOL>标签之间的内容
         sm = re.search(r'<TOOL>(.*?)</TOOL>', response, re.DOTALL)
         if sm:
             return sm.group(1)
         return ""
     
     def _validate_return_value_format(self, code: str) -> bool:
-        """Validate that execute method returns correct format"""
+        """
+        验证execute方法的返回值格式是否正确
+        Args:
+            code: 要验证的代码字符串
+        Returns:
+            布尔值，表示格式是否正确
+        """
         required_fields = ["success", "stdout", "stderr"]
-        # Look for execute method
+        # 检查execute方法是否存在
         if "def execute(self, args: Dict) -> Dict:" not in code and \
            "def execute(self, args: Dict) -> Dict[str, Any]:" not in code:
             return False
         
-        # Check for required fields in return statement
-        return all(field in code for field in required_fields)
+        # 检查返回值中是否包含所有必需字段
+        return all(field in code for field in required_fields)

jarvis/jarvis_utils/__init__.py

@@ -1,24 +1,24 @@
 """
-Jarvis Utils Module
-This module provides utility functions and classes used throughout the Jarvis system.
-It includes various helper functions, configuration management, and common operations.
-The module is organized into several submodules:
-- config: Configuration management
-- embedding: Text embedding utilities
-- git_utils: Git repository operations
-- input: User input handling
-- methodology: Methodology management
-- output: Output formatting
-- utils: General utilities
+Jarvis工具模块
+该模块提供了Jarvis系统中使用的各种实用函数和类。
+包含多种辅助函数、配置管理和常见操作。
+该模块组织为以下几个子模块：
+- config: 配置管理
+- embedding: 文本嵌入工具
+- git_utils: Git仓库操作
+- input: 用户输入处理
+- methodology: 方法论管理
+- output: 输出格式化
+- utils: 通用工具
 """
 import os
 import colorama
 from rich.traceback import install as install_rich_traceback
-# Re-export from new modules
-# These imports are required for project functionality and may be used dynamically
-# Initialize colorama for cross-platform colored text
+# 从新模块重新导出
+# 这些导入是项目功能所必需的，可能会被动态使用
+# 初始化colorama以支持跨平台的彩色文本
 colorama.init()
-# Disable tokenizers parallelism to avoid issues with multiprocessing
+# 禁用tokenizers并行以避免多进程问题
 os.environ["TOKENIZERS_PARALLELISM"] = "false"
-# Install rich traceback handler for better error messages
-install_rich_traceback()
+# 安装rich traceback处理器以获得更好的错误信息
+install_rich_traceback()