mirror of
https://github.com/hansjone/oclaw.git
synced 2026-10-16 17:50:45 +08:00
精简 attachment_local_url 默认返回字段,降低路径噪音。
默认仅返回 attachment_id 与 file_url 等核心信息,并将 exists/local_path/preferred_url 调整为 verbose 模式输出,补齐对应测试。 Made-with: Cursor
This commit is contained in:
parent
2edd78ac3b
commit
726e043a3a
2 changed files with 25 additions and 7 deletions
|
|
@ -13,6 +13,7 @@ _ATTACHMENT_ID_RE = re.compile(r"^[a-f0-9]{64}$")
|
||||||
def attachment_local_url_tool() -> ToolSpec:
|
def attachment_local_url_tool() -> ToolSpec:
|
||||||
def _handler(args: dict[str, Any]) -> dict[str, Any]:
|
def _handler(args: dict[str, Any]) -> dict[str, Any]:
|
||||||
attachment_id = str(args.get("attachment_id") or "").strip().lower()
|
attachment_id = str(args.get("attachment_id") or "").strip().lower()
|
||||||
|
verbose = bool(args.get("verbose"))
|
||||||
if not attachment_id:
|
if not attachment_id:
|
||||||
return {"ok": False, "error": "attachment_id_required"}
|
return {"ok": False, "error": "attachment_id_required"}
|
||||||
if not _ATTACHMENT_ID_RE.fullmatch(attachment_id):
|
if not _ATTACHMENT_ID_RE.fullmatch(attachment_id):
|
||||||
|
|
@ -24,18 +25,20 @@ def attachment_local_url_tool() -> ToolSpec:
|
||||||
local_path_text = str(local_path) if local_path else ""
|
local_path_text = str(local_path) if local_path else ""
|
||||||
file_url = Path(local_path).resolve().as_uri() if local_path else ""
|
file_url = Path(local_path).resolve().as_uri() if local_path else ""
|
||||||
|
|
||||||
return {
|
out = {
|
||||||
"ok": True,
|
"ok": True,
|
||||||
"attachment_id": attachment_id,
|
"attachment_id": attachment_id,
|
||||||
"exists": bool(meta or local_path),
|
|
||||||
# For direct rendering in desktop/electron contexts, prefer file URL first.
|
|
||||||
"preferred_url": file_url or local_path_text,
|
|
||||||
"mime": str(getattr(meta, "mime", "") or ""),
|
"mime": str(getattr(meta, "mime", "") or ""),
|
||||||
"name": str(getattr(meta, "name", "") or ""),
|
"name": str(getattr(meta, "name", "") or ""),
|
||||||
"bytes": int(getattr(meta, "bytes", 0) or 0),
|
"bytes": int(getattr(meta, "bytes", 0) or 0),
|
||||||
"local_path": local_path_text,
|
|
||||||
"file_url": file_url,
|
"file_url": file_url,
|
||||||
}
|
}
|
||||||
|
if verbose:
|
||||||
|
# Keep debug/context fields opt-in to reduce response noise.
|
||||||
|
out["exists"] = bool(meta or local_path)
|
||||||
|
out["local_path"] = local_path_text
|
||||||
|
out["preferred_url"] = file_url or local_path_text
|
||||||
|
return out
|
||||||
|
|
||||||
return ToolSpec(
|
return ToolSpec(
|
||||||
name="attachment_local_url",
|
name="attachment_local_url",
|
||||||
|
|
@ -44,6 +47,10 @@ def attachment_local_url_tool() -> ToolSpec:
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
"attachment_id": {"type": "string", "description": "Stored attachment id."},
|
"attachment_id": {"type": "string", "description": "Stored attachment id."},
|
||||||
|
"verbose": {
|
||||||
|
"type": "boolean",
|
||||||
|
"description": "When true, include extra debug fields (exists/local_path/preferred_url).",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
"required": ["attachment_id"],
|
"required": ["attachment_id"],
|
||||||
"additionalProperties": False,
|
"additionalProperties": False,
|
||||||
|
|
|
||||||
|
|
@ -36,11 +36,22 @@ def test_attachment_local_url_builds_absolute_url(monkeypatch) -> None:
|
||||||
aid = "a" * 64
|
aid = "a" * 64
|
||||||
out = spec.handler({"attachment_id": aid})
|
out = spec.handler({"attachment_id": aid})
|
||||||
assert out.get("ok") is True
|
assert out.get("ok") is True
|
||||||
|
assert str(out.get("file_url") or "").startswith("file:///")
|
||||||
|
assert out.get("mime") == "image/png"
|
||||||
|
assert "exists" not in out
|
||||||
|
assert "local_path" not in out
|
||||||
|
assert "preferred_url" not in out
|
||||||
|
|
||||||
|
|
||||||
|
def test_attachment_local_url_verbose_includes_debug_fields(monkeypatch) -> None:
|
||||||
|
monkeypatch.setattr("oclaw.runtime.tools.public.attachment_local_url_tool.AttachmentAssetStore", _FakeStore)
|
||||||
|
spec = attachment_local_url_tool()
|
||||||
|
aid = "a" * 64
|
||||||
|
out = spec.handler({"attachment_id": aid, "verbose": True})
|
||||||
|
assert out.get("ok") is True
|
||||||
assert out.get("exists") is True
|
assert out.get("exists") is True
|
||||||
assert str(out.get("local_path") or "").endswith("cat.png")
|
assert str(out.get("local_path") or "").endswith("cat.png")
|
||||||
assert str(out.get("file_url") or "").startswith("file:///")
|
|
||||||
assert out.get("preferred_url") == out.get("file_url")
|
assert out.get("preferred_url") == out.get("file_url")
|
||||||
assert out.get("mime") == "image/png"
|
|
||||||
|
|
||||||
|
|
||||||
def test_attachment_local_url_is_visible_in_public_registry() -> None:
|
def test_attachment_local_url_is_visible_in_public_registry() -> None:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue