jarvis-ai-assistant 0.7.16__py3-none-any.whl → 1.0.2__py3-none-any.whl

jarvis/jarvis_tools/read_symbols.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 按需读取 symbols.jsonl 的工具。
 
@@ -15,11 +14,17 @@
 - stdout (str): JSON文本，包含查询结果
 - stderr (str)
 """
+
 import json
 import os
-from pathlib import Path
-from typing import Any, Dict, List
 
+from jarvis.jarvis_utils.output import PrettyOutput
+
+# -*- coding: utf-8 -*-
+from pathlib import Path
+from typing import Any
+from typing import Dict
+from typing import List
 
 
 class ReadSymbolsTool:
@@ -46,9 +51,9 @@ class ReadSymbolsTool:
     def check() -> bool:
         """
         检查工具是否可用。
-        仅在 c2rust 环境中启用（通过环境变量 JARVIS_C2RUST_ENABLED 判断）。
+        仅在 c2rust 环境中启用（通过环境变量 c2rust_enabled 判断）。
         """
-        return os.environ.get("JARVIS_C2RUST_ENABLED") == "1"
+        return os.environ.get("c2rust_enabled") == "1"
 
     @staticmethod
     def _resolve_symbols_jsonl_path(path_hint: str) -> Path:
@@ -69,22 +74,44 @@ class ReadSymbolsTool:
             symbols_arg = args.get("symbols")
 
             if not isinstance(symbols_file_arg, str) or not symbols_file_arg.strip():
-                return {"success": False, "stdout": "", "stderr": "缺少或无效的 symbols_file 参数"}
-
-            if not isinstance(symbols_arg, list) or not all(isinstance(s, str) for s in symbols_arg):
-                return {"success": False, "stdout": "", "stderr": "symbols 参数必须是字符串列表"}
+                return {
+                    "success": False,
+                    "stdout": "",
+                    "stderr": "缺少或无效的 symbols_file 参数",
+                }
+
+            if not isinstance(symbols_arg, list) or not all(
+                isinstance(s, str) for s in symbols_arg
+            ):
+                return {
+                    "success": False,
+                    "stdout": "",
+                    "stderr": "symbols 参数必须是字符串列表",
+                }
 
             symbols_path = self._resolve_symbols_jsonl_path(symbols_file_arg)
-            print(f"[read_symbols] Resolved symbols file path: {symbols_path}")
+            PrettyOutput.auto_print(
+                f"[read_symbols] Resolved symbols file path: {symbols_path}"
+            )
             if not symbols_path.exists():
-                return {"success": False, "stdout": "", "stderr": f"符号表文件不存在: {symbols_path}"}
+                return {
+                    "success": False,
+                    "stdout": "",
+                    "stderr": f"符号表文件不存在: {symbols_path}",
+                }
             if not symbols_path.is_file():
-                return {"success": False, "stdout": "", "stderr": f"符号表路径不是文件: {symbols_path}"}
+                return {
+                    "success": False,
+                    "stdout": "",
+                    "stderr": f"符号表路径不是文件: {symbols_path}",
+                }
 
             # 使用集合提升匹配效率；保持原请求顺序以便输出
             requested: List[str] = [s.strip() for s in symbols_arg if s and s.strip()]
             wanted_set = set(requested)
-            print(f"[read_symbols] Requested {len(wanted_set)} unique symbols.")
+            PrettyOutput.auto_print(
+                f"[read_symbols] Requested {len(wanted_set)} unique symbols."
+            )
 
             results: Dict[str, List[Dict[str, Any]]] = {s: [] for s in requested}
 
@@ -110,7 +137,9 @@ class ReadSymbolsTool:
 
             not_found = [s for s in requested if not results.get(s)]
             if not_found:
-                print(f"[read_symbols] Symbols not found: {not_found}")
+                PrettyOutput.auto_print(
+                    f"[read_symbols] Symbols not found: {not_found}"
+                )
             found_counts = {s: len(results.get(s, [])) for s in requested}
 
             out_obj: Dict[str, Any] = {
@@ -129,12 +158,16 @@ class ReadSymbolsTool:
                     cnt = found_counts.get(s, 0)
                     status_lines.append(f"[read_symbols] {s}: {cnt} 条匹配")
                 if status_lines:
-                    print("\n".join(status_lines), end="\n")
+                    PrettyOutput.auto_print("\n".join(status_lines), end="\n")
             except Exception:
                 pass
 
             return {"success": True, "stdout": stdout, "stderr": ""}
 
         except Exception as e:
-            print(f"❌ {str(e)}")
-            return {"success": False, "stdout": "", "stderr": f"读取符号表失败: {str(e)}"}
+            PrettyOutput.auto_print(f"❌ {str(e)}")
+            return {
+                "success": False,
+                "stdout": "",
+                "stderr": f"读取符号表失败: {str(e)}",
+            }

jarvis/jarvis_tools/read_webpage.py

@@ -1,14 +1,15 @@
 # -*- coding: utf-8 -*-
-from typing import Any, Dict
+from typing import Any
+from typing import Dict
+
+import requests
+from markdownify import markdownify as md
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_utils.config import (
-    get_web_search_platform_name,
-    get_web_search_model_name,
-)
+from jarvis.jarvis_utils.config import get_web_search_model_name
+from jarvis.jarvis_utils.config import get_web_search_platform_name
 from jarvis.jarvis_utils.http import get as http_get
-from markdownify import markdownify as md  # type: ignore
-import requests  # type: ignore[import-untyped]
+from jarvis.jarvis_utils.output import PrettyOutput
 
 
 class WebpageTool:
@@ -47,32 +48,30 @@ class WebpageTool:
                 if model:
                     model.set_model_name(web_search_model)
                     if model.support_web():
-
                         model.set_web(True)
-                        model.set_suppress_output(False)  # type: ignore
+                        model.set_suppress_output(False)
                         prompt = f"""请帮我处理这个网页：{url}
 用户的具体需求是：{want}
 请按照以下要求输出结果：
 1. 使用Markdown格式
 2. 包含网页标题
 3. 根据用户需求提供准确、完整的信息"""
-                        response = model.chat_until_success(prompt)  # type: ignore
+                        response = model.chat_until_success(prompt)
                         if response and response.strip():
                             return {"success": True, "stdout": response, "stderr": ""}
 
             # 2) 然后尝试使用cheap平台的 web 能力（适用于网页读取等简单任务）
             model = PlatformRegistry().get_cheap_platform()
             if model.support_web():
-
                 model.set_web(True)
-                model.set_suppress_output(False)  # type: ignore
+                model.set_suppress_output(False)
                 prompt = f"""请帮我处理这个网页：{url}
 用户的具体需求是：{want}
 请按照以下要求输出结果：
 1. 使用Markdown格式
 2. 包含网页标题
 3. 根据用户需求提供准确、完整的信息"""
-                response = model.chat_until_success(prompt)  # type: ignore
+                response = model.chat_until_success(prompt)
                 if response and response.strip():
                     return {"success": True, "stdout": response, "stderr": ""}
 
@@ -82,14 +81,16 @@ 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:
-                print(f"⚠️ HTTP错误 {e.response.status_code} 访问 {url}")
+                PrettyOutput.auto_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:
-                print(f"⚠️ 请求错误: {e}")
+                PrettyOutput.auto_print(f"⚠️ 请求错误: {e}")
                 return {"success": False, "stdout": "", "stderr": f"请求错误：{e}"}
 
             if not content_md or not content_md.strip():
@@ -110,13 +111,13 @@ class WebpageTool:
 
             # 使用cheap平台进行网页内容总结（简单任务）
             model = PlatformRegistry().get_cheap_platform()
-            model.set_suppress_output(False)  # type: ignore
-            summary = model.chat_until_success(summary_prompt)  # type: ignore
+            model.set_suppress_output(False)
+            summary = model.chat_until_success(summary_prompt)
 
             return {"success": True, "stdout": summary, "stderr": ""}
 
         except Exception as e:
-            print(f"❌ 读取网页失败: {str(e)}")
+            PrettyOutput.auto_print(f"❌ 读取网页失败: {str(e)}")
             return {
                 "success": False,
                 "stdout": "",