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

jarvis/jarvis_tools/read_symbols.py

@@ -0,0 +1,140 @@
+# -*- coding: utf-8 -*-
+"""
+按需读取 symbols.jsonl 的工具。
+
+用途:
+- 避免Agent直接完整读取体积较大的符号表文件；
+- 通过提供符号表路径与符号名称列表，仅返回匹配的符号记录。
+
+参数:
+- symbols_file (str): 符号表文件路径（.jsonl），或项目根目录/包含 .jarvis/c2rust 的目录
+- symbols (List[str]): 需要读取的符号名称列表（支持 name 与 qualified_name 匹配）
+
+返回:
+- success (bool)
+- stdout (str): JSON文本，包含查询结果
+- stderr (str)
+"""
+import json
+import os
+from pathlib import Path
+from typing import Any, Dict, List
+
+
+
+class ReadSymbolsTool:
+    # 文件名必须与工具名一致，便于注册表自动加载
+    name = "read_symbols"
+    description = "从symbols.jsonl按需读取指定符号记录"
+    parameters = {
+        "type": "object",
+        "properties": {
+            "symbols_file": {
+                "type": "string",
+                "description": "符号表文件路径（.jsonl）。若为目录，则解析为 <dir>/.jarvis/c2rust/symbols.jsonl",
+            },
+            "symbols": {
+                "type": "array",
+                "items": {"type": "string"},
+                "description": "要检索的符号名称列表（支持 name 或 qualified_name 完全匹配）",
+            },
+        },
+        "required": ["symbols_file", "symbols"],
+    }
+
+    @staticmethod
+    def check() -> bool:
+        """
+        检查工具是否可用。
+        仅在 c2rust 环境中启用（通过环境变量 JARVIS_C2RUST_ENABLED 判断）。
+        """
+        return os.environ.get("JARVIS_C2RUST_ENABLED") == "1"
+
+    @staticmethod
+    def _resolve_symbols_jsonl_path(path_hint: str) -> Path:
+        """
+        解析符号表路径：
+        - 若为目录，返回 <dir>/.jarvis/c2rust/symbols.jsonl
+        - 若为文件，直接返回
+        """
+        p = Path(os.path.abspath(os.path.expanduser(path_hint)))
+        if p.is_dir():
+            candidate = p / ".jarvis" / "c2rust" / "symbols.jsonl"
+            return candidate
+        return p
+
+    def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
+        try:
+            symbols_file_arg = args.get("symbols_file")
+            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 参数必须是字符串列表"}
+
+            symbols_path = self._resolve_symbols_jsonl_path(symbols_file_arg)
+            print(f"[read_symbols] Resolved symbols file path: {symbols_path}")
+            if not symbols_path.exists():
+                return {"success": False, "stdout": "", "stderr": f"符号表文件不存在: {symbols_path}"}
+            if not symbols_path.is_file():
+                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.")
+
+            results: Dict[str, List[Dict[str, Any]]] = {s: [] for s in requested}
+
+            # 流式读取，避免载入整个大文件
+            with open(symbols_path, "r", encoding="utf-8") as f:
+                for line in f:
+                    line = line.strip()
+                    if not line:
+                        continue
+                    try:
+                        obj = json.loads(line)
+                    except Exception:
+                        continue
+
+                    name = obj.get("name") or ""
+                    qname = obj.get("qualified_name") or ""
+
+                    # 仅当命中请求的符号时才记录
+                    if name in wanted_set:
+                        results[name].append(obj)
+                    if qname in wanted_set and qname != name:
+                        results[qname].append(obj)
+
+            not_found = [s for s in requested if not results.get(s)]
+            if not_found:
+                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] = {
+                "symbols_file": str(symbols_path),
+                "requested": requested,
+                "found_counts": found_counts,
+                "not_found": not_found,
+                "items": results,
+            }
+
+            stdout = json.dumps(out_obj, ensure_ascii=False, indent=2)
+            # 简要状态打印（不包含具体内容）
+            try:
+                status_lines = []
+                for s in requested:
+                    cnt = found_counts.get(s, 0)
+                    status_lines.append(f"[read_symbols] {s}: {cnt} 条匹配")
+                if status_lines:
+                    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)}"}

jarvis/jarvis_tools/read_webpage.py

@@ -2,14 +2,13 @@
 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,
 )
 from jarvis.jarvis_utils.http import get as http_get
 from markdownify import markdownify as md  # type: ignore
-import requests
+import requests  # type: ignore[import-untyped]
 
 
 class WebpageTool:
@@ -58,10 +57,11 @@ class WebpageTool:
 2. 包含网页标题
 3. 根据用户需求提供准确、完整的信息"""
                         response = model.chat_until_success(prompt)  # type: ignore
-                        return {"success": True, "stdout": response, "stderr": ""}
+                        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)
@@ -73,7 +73,8 @@ class WebpageTool:
 2. 包含网页标题
 3. 根据用户需求提供准确、完整的信息"""
                 response = model.chat_until_success(prompt)  # type: ignore
-                return {"success": True, "stdout": response, "stderr": ""}
+                if response and response.strip():
+                    return {"success": True, "stdout": response, "stderr": ""}
 
             # 3) 回退：使用 requests 抓取网页，再用模型分析
 
@@ -81,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():
@@ -110,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": "",