uno-cli 1.0.3__tar.gz → 1.0.4__tar.gz

{uno_cli-1.0.3 → uno_cli-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: uno-cli
-Version: 1.0.3
+Version: 1.0.4
 Summary: Uno CLI — Agent tool gateway by ClawdChat. Access 2000+ real-world tools from the command line.
 Project-URL: Homepage, https://agentools.uno
 Project-URL: Documentation, https://agentools.uno/docs

{uno_cli-1.0.3 → uno_cli-1.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "uno-cli"
-version = "1.0.3"
+version = "1.0.4"
 description = "Uno CLI — Agent tool gateway by ClawdChat. Access 2000+ real-world tools from the command line."
 readme = "README.md"
 requires-python = ">=3.8"

{uno_cli-1.0.3 → uno_cli-1.0.4}/tests/test_cli.py

@@ -137,6 +137,22 @@ class TestErrorHints:
     def test_format_api_error_str_body(self):
         out = cli._format_api_error(500, "server exploded")
         assert out["error"] == "server exploded"
+        assert out["success"] is False
+
+    def test_format_api_error_keeps_gateway_meta(self):
+        body = {
+            "error": "tool_not_found",
+            "message": "Tool not found: x.y",
+            "meta": {
+                "request_id": "abc",
+                "credits_used": 0,
+                "charged": False,
+            },
+        }
+        out = cli._format_api_error(404, body)
+        assert out["error"] == "tool_not_found"
+        assert out["meta"]["request_id"] == "abc"
+        assert out["meta"]["charged"] is False
 
     def test_missing_credentials_points_to_login_start(self, capsys, monkeypatch, tmp_path):
         cred_dir = tmp_path / ".uno"
@@ -155,6 +171,91 @@ class TestErrorHints:
             hint = cli._match_hint(msg)
             assert "uno login --start" in hint
 
+    def test_auth_required_fallback_hint_is_generic_oauth(self):
+        """``_ERROR_HINTS`` keeps a generic OAuth fallback; call path overrides."""
+        hint = cli._match_hint("auth_required")
+        assert "OAuth required" in hint
+        assert "auth_url" in hint
+
+
+# ── cmd_call auth_type hint overrides ──────────────────────────────
+
+
+class _CallArgs:
+    def __init__(self, tool="demo.tool", args_json=None):
+        self.tool = tool
+        self.args = args_json
+        self.timeout = 60
+        self.base_url = "https://clawdtools.uno"
+        self.dry_run = False
+
+
+class TestCmdCallAuthHints:
+    """``cmd_call`` must override the generic auth_required hint by auth_type."""
+
+    def _run_auth_error(self, monkeypatch, capsys, payload):
+        monkeypatch.delenv("UNO_ALLOWED_TOOLS", raising=False)
+
+        class _FakeAPI:
+            def post(self, path, data, timeout=60):
+                return payload
+
+        monkeypatch.setattr(cli, "_get_api", lambda args: _FakeAPI())
+        with pytest.raises(SystemExit) as ei:
+            cli.cmd_call(_CallArgs())
+        assert ei.value.code == 1
+        return json.loads(capsys.readouterr().out)
+
+    @pytest.mark.parametrize("auth_type", ["oauth_device", "oauth_device_code", "device_code_api"])
+    def test_device_code_auth_hint(self, monkeypatch, capsys, auth_type):
+        out = self._run_auth_error(
+            monkeypatch,
+            capsys,
+            {
+                "error": "auth_required",
+                "auth_type": auth_type,
+                "auth_url": "https://example.com/device",
+                "get_key_url": "https://example.com/get-key",
+            },
+        )
+        assert out["error"] == "auth_required"
+        assert out["auth_type"] == auth_type
+        hint = out["hint"]
+        assert "Device-code" in hint
+        assert "user code" in hint
+        assert "get_key_url" in hint  # tells agent NOT to follow it
+        assert "Do not ask for a key" in hint
+        # Must not steer toward applying for / showing a key.
+        assert "Show get_key_url" not in hint
+        assert "申请" not in hint
+
+    def test_generic_oauth_auth_url_hint(self, monkeypatch, capsys):
+        out = self._run_auth_error(
+            monkeypatch,
+            capsys,
+            {
+                "error": "auth_required",
+                "auth_type": "oauth",
+                "auth_url": "https://example.com/oauth",
+            },
+        )
+        assert out["hint"] == "OAuth required. Open auth_url in a browser to authorize."
+        assert "Device-code" not in out["hint"]
+        assert "user code" not in out["hint"]
+
+    def test_api_key_auth_hint(self, monkeypatch, capsys):
+        out = self._run_auth_error(
+            monkeypatch,
+            capsys,
+            {
+                "error": "auth_required",
+                "auth_type": "api_key",
+                "get_key_url": "https://example.com/get-key",
+            },
+        )
+        assert "API key required" in out["hint"]
+        assert "Show get_key_url" in out["hint"]
+
 
 # ── JSON output shape of _out ──────────────────────────────────────
 

uno_cli-1.0.4/uno_cli/_version.py

@@ -0,0 +1 @@
+__version__ = "1.0.4"

{uno_cli-1.0.3 → uno_cli-1.0.4}/uno_cli/cli.py

@@ -494,8 +494,19 @@ def _format_api_error(status, body):
                 msgs.append(str(err))
         detail = "; ".join(msgs) if msgs else str(detail)
 
-    result = {"error": str(detail), "status": status}
-    hint = _match_hint(str(detail))
+    result = {"success": False, "error": str(detail), "status": status}
+    if isinstance(body, dict):
+        if body.get("message") and str(body.get("message")) != result["error"]:
+            result["message"] = body["message"]
+        if body.get("meta"):
+            result["meta"] = body["meta"]
+        if body.get("error") and result["error"] != str(body.get("error")):
+            # Prefer the stable gateway code when FastAPI wrapped it.
+            code = body.get("error")
+            if isinstance(code, str) and code and " " not in code:
+                result["error"] = code
+                result["message"] = str(detail)
+    hint = _match_hint(str(result.get("error") or detail))
     if hint:
         result["hint"] = hint
     return result
@@ -506,7 +517,7 @@ def _ok(data):
 
 
 def _fail(msg, **extra):
-    out = {"error": msg}
+    out = {"success": False, "error": msg}
     hint = _match_hint(msg)
     if hint:
         out["hint"] = hint
@@ -650,6 +661,14 @@ def cmd_tool(args):
             _fail("Tool slug required. Usage: uno tool get <slug>")
         try:
             result = api.get(f"/v1/tools/{slug}")
+            if isinstance(result, dict) and result.get("error"):
+                out = {"success": False, "error": result["error"]}
+                if result.get("message"):
+                    out["message"] = result["message"]
+                if result.get("meta"):
+                    out["meta"] = result["meta"]
+                _out(out)
+                sys.exit(1)
             if isinstance(result, dict) and "data" in result and "error" in result:
                 result = result["data"]
             if result is None:
@@ -725,8 +744,19 @@ def cmd_call(args):
                     out[key] = result[key]
             if result.get("meta"):
                 out["meta"] = result["meta"]
+            else:
+                out["meta"] = {
+                    "credits_used": 0,
+                    "credits_from": {"free": 0, "paid": 0.0},
+                    "charged": False,
+                }
             auth_type = result.get("auth_type", "")
-            if result.get("auth_url"):
+            if auth_type in ("oauth_device", "oauth_device_code", "device_code_api"):
+                out["hint"] = (
+                    "Device-code OAuth. Open auth_url, enter the user code. "
+                    "Do not ask for a key or follow get_key_url."
+                )
+            elif result.get("auth_url"):
                 out["hint"] = "OAuth required. Open auth_url in a browser to authorize."
             elif auth_type == "api_key":
                 out["hint"] = "API key required. Show get_key_url to the user."

uno_cli-1.0.3/uno_cli/_version.py

@@ -1 +0,0 @@
-__version__ = "1.0.3"