jarvis-ai-assistant 0.7.0__py3-none-any.whl → 0.7.6__py3-none-any.whl

jarvis/jarvis_tools/read_symbols.py

@@ -20,13 +20,12 @@ import os
 from pathlib import Path
 from typing import Any, Dict, List
 
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class ReadSymbolsTool:
     # 文件名必须与工具名一致，便于注册表自动加载
     name = "read_symbols"
-    description = "从symbols.jsonl按需读取指定符号的记录，避免完整加载大文件。参数包含符号表路径和符号名列表（匹配 name 与 qualified_name）（C2Rust工具专用）"
+    description = "从symbols.jsonl按需读取指定符号记录"
     parameters = {
         "type": "object",
         "properties": {
@@ -137,5 +136,5 @@ class ReadSymbolsTool:
             return {"success": True, "stdout": stdout, "stderr": ""}
 
         except Exception as e:
-            PrettyOutput.print(str(e), OutputType.ERROR)
+            print(f"❌ {str(e)}")
             return {"success": False, "stdout": "", "stderr": f"读取符号表失败: {str(e)}"}

jarvis/jarvis_tools/read_webpage.py

@@ -2,7 +2,6 @@
 from typing import Any, Dict
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.config import (
     get_web_search_platform_name,
     get_web_search_model_name,
@@ -61,8 +60,8 @@ class WebpageTool:
                         if response and response.strip():
                             return {"success": True, "stdout": response, "stderr": ""}
 
-            # 2) 然后尝试使用默认平台（normal）的 web 能力
-            model = PlatformRegistry().get_normal_platform()
+            # 2) 然后尝试使用cheap平台的 web 能力（适用于网页读取等简单任务）
+            model = PlatformRegistry().get_cheap_platform()
             if model.support_web():
 
                 model.set_web(True)
@@ -83,17 +82,14 @@ class WebpageTool:
                 resp = http_get(url, timeout=10.0, allow_redirects=True)
                 content_md = md(resp.text, strip=["script", "style"])
             except requests.exceptions.HTTPError as e:
-                PrettyOutput.print(
-                    f"⚠️ HTTP错误 {e.response.status_code} 访问 {url}",
-                    OutputType.WARNING,
-                )
+                print(f"⚠️ HTTP错误 {e.response.status_code} 访问 {url}")
                 return {
                     "success": False,
                     "stdout": "",
                     "stderr": f"HTTP错误：{e.response.status_code}",
                 }
             except requests.exceptions.RequestException as e:
-                PrettyOutput.print(f"⚠️ 请求错误: {e}", OutputType.WARNING)
+                print(f"⚠️ 请求错误: {e}")
                 return {"success": False, "stdout": "", "stderr": f"请求错误：{e}"}
 
             if not content_md or not content_md.strip():
@@ -112,14 +108,15 @@ class WebpageTool:
 - 包含网页标题（若可推断）
 - 提供准确、完整的信息"""
 
-            model = PlatformRegistry().get_normal_platform()
+            # 使用cheap平台进行网页内容总结（简单任务）
+            model = PlatformRegistry().get_cheap_platform()
             model.set_suppress_output(False)  # type: ignore
             summary = model.chat_until_success(summary_prompt)  # type: ignore
 
             return {"success": True, "stdout": summary, "stderr": ""}
 
         except Exception as e:
-            PrettyOutput.print(f"读取网页失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 读取网页失败: {str(e)}")
             return {
                 "success": False,
                 "stdout": "",