hermes-plugin-tinyfish 0.3.2__tar.gz → 0.3.3__tar.gz

{hermes_plugin_tinyfish-0.3.2 → hermes_plugin_tinyfish-0.3.3}/CHANGELOG.md

@@ -7,6 +7,14 @@ and this project uses semantic versioning.
 
 ## Unreleased
 
+## [0.3.3] - 2026-08-12
+
+### Fixed
+
+- Replaced the unreadable raw dictionary output from `hermes tinyfish usage`
+  with labeled Search and Fetch histories, pagination summaries, and clear
+  partial-failure reporting while preserving `--json` for automation.
+
 ## [0.3.2] - 2026-08-11
 
 ### Added

{hermes_plugin_tinyfish-0.3.2 → hermes_plugin_tinyfish-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: hermes-plugin-tinyfish
-Version: 0.3.2
+Version: 0.3.3
 Summary: TinyFish Search, Fetch, plain-language routing, update awareness, and optional Browser for Hermes Agent
 Project-URL: Homepage, https://github.com/gabeosx/hermes-plugin-tinyfish
 Project-URL: Documentation, https://github.com/gabeosx/hermes-plugin-tinyfish#readme
@@ -301,8 +301,9 @@ hermes tinyfish doctor --live-paid
 - `/tinyfish-status` shows non-networked status inside CLI or gateway sessions;
   `/tinyfish-status live` explicitly runs Search and Fetch checks.
 - `usage` reads TinyFish Search and Fetch operation history independently and
-  reports per-surface success or failure; it is not Agent or Browser billing
-  data.
+  prints a labeled, paginated history for people. Use `usage --json` for the raw
+  machine-readable response. It reports per-surface success or failure and is
+  not Agent or Browser billing data.
 - `doctor --live-paid` only creates and closes a TinyFish Browser session. It
   refuses under `deny`, requests approval under `request`, and never prints
   connection URLs or credentials.

{hermes_plugin_tinyfish-0.3.2 → hermes_plugin_tinyfish-0.3.3}/README.md

@@ -269,8 +269,9 @@ hermes tinyfish doctor --live-paid
 - `/tinyfish-status` shows non-networked status inside CLI or gateway sessions;
   `/tinyfish-status live` explicitly runs Search and Fetch checks.
 - `usage` reads TinyFish Search and Fetch operation history independently and
-  reports per-surface success or failure; it is not Agent or Browser billing
-  data.
+  prints a labeled, paginated history for people. Use `usage --json` for the raw
+  machine-readable response. It reports per-surface success or failure and is
+  not Agent or Browser billing data.
 - `doctor --live-paid` only creates and closes a TinyFish Browser session. It
   refuses under `deny`, requests approval under `request`, and never prints
   connection URLs or credentials.

{hermes_plugin_tinyfish-0.3.2 → hermes_plugin_tinyfish-0.3.3}/hermes_plugin_tinyfish/setup_cli.py

@@ -603,14 +603,6 @@ def tinyfish_status_command(
     return "\n".join(_status_lines(status))
 
 
-def _print_json_or_text(payload: dict[str, Any], *, as_json: bool) -> None:
-    if as_json:
-        print(json.dumps(payload, indent=2, sort_keys=True))
-    else:
-        for key, value in payload.items():
-            print(f"{key}: {value}")
-
-
 def _api_key_or_error() -> str | None:
     api_key = _get_env("TINYFISH_API_KEY")
     if not api_key:
@@ -721,6 +713,125 @@ def _usage_surface(
         return {"success": False, "error": str(exc)}
 
 
+_USAGE_FIELD_ORDER = (
+    "created_at",
+    "status",
+    "query",
+    "url",
+    "final_url",
+    "title",
+    "description",
+    "domain_type",
+    "location",
+    "language",
+    "author",
+    "published_date",
+    "format",
+    "results_count",
+    "total_results",
+    "text_length",
+    "links_count",
+    "image_links_count",
+    "latency_ms",
+    "request_origin",
+    "id",
+    "request_id",
+    "error",
+)
+
+_USAGE_FIELD_LABELS = {
+    "id": "ID",
+    "url": "URL",
+    "final_url": "Final URL",
+    "latency_ms": "Latency (ms)",
+    "request_id": "Request ID",
+}
+
+
+def _usage_field_label(key: str) -> str:
+    return _USAGE_FIELD_LABELS.get(key, key.replace("_", " ").capitalize())
+
+
+def _usage_value_lines(value: Any) -> list[str]:
+    if value is None:
+        return ["-"]
+    if isinstance(value, bool):
+        return ["yes" if value else "no"]
+    if isinstance(value, list) and all(
+        item is None or isinstance(item, (str, int, float, bool)) for item in value
+    ):
+        return [", ".join(str(item) for item in value) if value else "-"]
+    if isinstance(value, (dict, list)):
+        return json.dumps(value, indent=2, sort_keys=True, ensure_ascii=False).splitlines()
+    return [str(value)]
+
+
+def _usage_items(data: dict[str, Any]) -> list[Any]:
+    for key in ("items", "operations"):
+        value = data.get(key)
+        if isinstance(value, list):
+            return value
+    return []
+
+
+def _usage_summary(data: dict[str, Any], *, shown: int) -> str:
+    noun = "operation" if shown == 1 else "operations"
+    parts = [f"{shown} {noun}"]
+    total = data.get("total")
+    if isinstance(total, int) and not isinstance(total, bool):
+        parts[0] = f"{shown} shown / {total} total"
+    page = data.get("page")
+    total_pages = data.get("total_pages")
+    if isinstance(page, int) and isinstance(total_pages, int):
+        parts.append(f"page {page} of {total_pages}")
+    limit = data.get("limit")
+    if isinstance(limit, int) and not isinstance(limit, bool):
+        parts.append(f"limit {limit}")
+    if isinstance(data.get("has_more"), bool):
+        parts.append(f"more: {'yes' if data['has_more'] else 'no'}")
+    return " | ".join(parts)
+
+
+def _usage_text_lines(payload: dict[str, Any]) -> list[str]:
+    lines = ["TinyFish usage"]
+    surfaces = payload.get("surfaces")
+    if not isinstance(surfaces, dict):
+        return [*lines, "  Invalid usage response."]
+
+    for surface_name in ("search", "fetch"):
+        lines.extend(("", surface_name.capitalize()))
+        result = surfaces.get(surface_name)
+        if not isinstance(result, dict):
+            lines.append("  No response.")
+            continue
+        if not result.get("success"):
+            lines.append(f"  Error: {result.get('error') or 'Unknown error'}")
+            continue
+
+        data = result.get("data")
+        if not isinstance(data, dict):
+            lines.append("  Invalid usage response.")
+            continue
+        items = _usage_items(data)
+        lines.append(f"  {_usage_summary(data, shown=len(items))}")
+        if not items:
+            lines.append("  No operations found on this page.")
+            continue
+
+        for index, item in enumerate(items, start=1):
+            lines.extend(("", f"  Operation {index}"))
+            if not isinstance(item, dict):
+                lines.append(f"    Value: {_usage_value_lines(item)[0]}")
+                continue
+            ordered_keys = [key for key in _USAGE_FIELD_ORDER if key in item]
+            ordered_keys.extend(sorted(str(key) for key in item if key not in ordered_keys))
+            for key in ordered_keys:
+                value_lines = _usage_value_lines(item[key])
+                lines.append(f"    {_usage_field_label(key)}: {value_lines[0]}")
+                lines.extend(f"      {line}" for line in value_lines[1:])
+    return lines
+
+
 def cmd_usage(args: argparse.Namespace) -> int:
     api_key = _api_key_or_error()
     if not api_key:
@@ -733,5 +844,8 @@ def cmd_usage(args: argparse.Namespace) -> int:
         "success": all(result["success"] for result in surfaces.values()),
         "surfaces": surfaces,
     }
-    _print_json_or_text(payload, as_json=bool(getattr(args, "json", False)))
+    if bool(getattr(args, "json", False)):
+        print(json.dumps(payload, indent=2, sort_keys=True))
+    else:
+        print("\n".join(_usage_text_lines(payload)))
     return 0 if payload["success"] else 1

{hermes_plugin_tinyfish-0.3.2 → hermes_plugin_tinyfish-0.3.3}/plugin.yaml

@@ -1,5 +1,5 @@
 name: web-tinyfish
-version: 0.3.2
+version: 0.3.3
 description: "Independent TinyFish provider plugin for Hermes Agent. Adds MCP-first Search/Fetch, plain-language tool routing, update awareness, and optional default-deny Browser infrastructure."
 author: gabeosx
 kind: backend

{hermes_plugin_tinyfish-0.3.2 → hermes_plugin_tinyfish-0.3.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "hermes-plugin-tinyfish"
-version = "0.3.2"
+version = "0.3.3"
 description = "TinyFish Search, Fetch, plain-language routing, update awareness, and optional Browser for Hermes Agent"
 readme = "README.md"
 requires-python = ">=3.10"

{hermes_plugin_tinyfish-0.3.2 → hermes_plugin_tinyfish-0.3.3}/tests/test_setup_cli.py

@@ -753,6 +753,103 @@ def test_usage_calls_search_and_fetch_usage(
     assert "tf_secret" not in json.dumps(payload)
 
 
+def test_usage_text_output_formats_operation_history_for_people(
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
+) -> None:
+    monkeypatch.setattr(cli, "_get_env", lambda name: "tf_secret")
+    monkeypatch.setattr(
+        cli.rest_client,
+        "search_usage",
+        lambda *, api_key: {
+            "items": [
+                {
+                    "id": "search-1",
+                    "query": "Hermes Agent",
+                    "status": "completed",
+                    "results_count": 10,
+                    "latency_ms": 125,
+                    "created_at": "2026-08-12T20:00:00Z",
+                }
+            ],
+            "total": 3,
+            "limit": 1,
+            "page": 1,
+            "total_pages": 3,
+            "has_more": True,
+        },
+    )
+    monkeypatch.setattr(
+        cli.rest_client,
+        "fetch_usage",
+        lambda *, api_key: {
+            "operations": [
+                {
+                    "url": "https://example.com",
+                    "status": "failed",
+                    "error": "timeout",
+                    "created_at": "2026-08-12T20:01:00Z",
+                }
+            ],
+            "total": 1,
+            "limit": 100,
+            "page": 1,
+            "total_pages": 1,
+            "has_more": False,
+        },
+    )
+
+    result = cli.cmd_usage(argparse.Namespace(json=False))
+    output = capsys.readouterr().out
+
+    assert result == 0
+    assert (
+        output
+        == """TinyFish usage
+
+Search
+  1 shown / 3 total | page 1 of 3 | limit 1 | more: yes
+
+  Operation 1
+    Created at: 2026-08-12T20:00:00Z
+    Status: completed
+    Query: Hermes Agent
+    Results count: 10
+    Latency (ms): 125
+    ID: search-1
+
+Fetch
+  1 shown / 1 total | page 1 of 1 | limit 100 | more: no
+
+  Operation 1
+    Created at: 2026-08-12T20:01:00Z
+    Status: failed
+    URL: https://example.com
+    Error: timeout
+"""
+    )
+    assert "{'" not in output
+    assert "tf_secret" not in output
+
+
+def test_usage_text_output_keeps_partial_failure_readable(
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
+) -> None:
+    monkeypatch.setattr(cli, "_get_env", lambda name: "tf_secret")
+    monkeypatch.setattr(cli.rest_client, "search_usage", lambda *, api_key: {"items": []})
+
+    def fail_usage(*, api_key: str) -> dict[str, Any]:
+        raise RuntimeError("usage unavailable")
+
+    monkeypatch.setattr(cli.rest_client, "fetch_usage", fail_usage)
+
+    result = cli.cmd_usage(argparse.Namespace(json=False))
+    output = capsys.readouterr().out
+
+    assert result == 1
+    assert "Search\n  0 operations\n  No operations found on this page." in output
+    assert "Fetch\n  Error: usage unavailable" in output
+
+
 def test_usage_partial_failure_returns_both_surface_results_and_failure(
     monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None: