diffusr 0.1.0__tar.gz → 0.2.0__tar.gz

{diffusr-0.1.0 → diffusr-0.2.0}/.gitignore

@@ -32,3 +32,6 @@ docs/format-refs/format-templates-export/formats/*/refs/*.jpg
 
 # Machine notes for Jose's dev boxes (symlinked into worktrees by post-checkout)
 CLAUDE.local.md*
+
+# claude plugin eval output (JOS-465)
+agent-kit/evals/results/

{diffusr-0.1.0 → diffusr-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: diffusr
-Version: 0.1.0
+Version: 0.2.0
 Summary: The diffusr API client: make videos, images and music from code. Free price checks, idempotent starts, wait_for, signed callbacks.
 Project-URL: Homepage, https://diffusr.ai
 Project-URL: Documentation, https://diffusr.ai/docs
@@ -33,7 +33,7 @@ Mint keys on the Developers page in the app.
 ```python
 from diffusr import Diffusr
 
-diffusr = Diffusr()  # reads DIFFUSR_KEY
+diffusr = Diffusr()  # reads DIFFUSR_KEY, else the key `npx diffusr login` saved
 
 # 1. Ask the price. Free: nothing is made, nothing is spent.
 quote = diffusr.make_video(
@@ -81,6 +81,28 @@ def hook():
 constant-time compare, two signatures after a secret rotation, a 5-minute
 timestamp window, `whsec_` prefix handled.
 
+## Command line
+
+Install the `diffusr` command with npm (it needs Node 18+) and log in once:
+
+```sh
+npx diffusr login        # shows a code, opens your browser, saves a key
+npx diffusr whoami
+npx diffusr make_image "a mug on a sunlit table"
+```
+
+For scripts and agents add `--json` (only the JSON answer on stdout) and
+`--yes` (allow spending; without it nothing is made). `npx diffusr help` lists
+every command.
+
+**Where the key is saved.** `~/.config/diffusr/config.json` (or
+`$XDG_CONFIG_HOME/diffusr/config.json`; on Windows `%APPDATA%\diffusr\config.json`).
+Only you can read it. `Diffusr()` uses it when no key is given.
+
+**Which key wins.** The `api_key` argument, then the `DIFFUSR_KEY` variable,
+then the saved file. The API address: the `base_url` argument, then
+`DIFFUSR_BASE_URL`, then the saved file's `base_url`.
+
 ## Methods
 
 | Method | REST |

{diffusr-0.1.0 → diffusr-0.2.0}/README.md

@@ -18,7 +18,7 @@ Mint keys on the Developers page in the app.
 ```python
 from diffusr import Diffusr
 
-diffusr = Diffusr()  # reads DIFFUSR_KEY
+diffusr = Diffusr()  # reads DIFFUSR_KEY, else the key `npx diffusr login` saved
 
 # 1. Ask the price. Free: nothing is made, nothing is spent.
 quote = diffusr.make_video(
@@ -66,6 +66,28 @@ def hook():
 constant-time compare, two signatures after a secret rotation, a 5-minute
 timestamp window, `whsec_` prefix handled.
 
+## Command line
+
+Install the `diffusr` command with npm (it needs Node 18+) and log in once:
+
+```sh
+npx diffusr login        # shows a code, opens your browser, saves a key
+npx diffusr whoami
+npx diffusr make_image "a mug on a sunlit table"
+```
+
+For scripts and agents add `--json` (only the JSON answer on stdout) and
+`--yes` (allow spending; without it nothing is made). `npx diffusr help` lists
+every command.
+
+**Where the key is saved.** `~/.config/diffusr/config.json` (or
+`$XDG_CONFIG_HOME/diffusr/config.json`; on Windows `%APPDATA%\diffusr\config.json`).
+Only you can read it. `Diffusr()` uses it when no key is given.
+
+**Which key wins.** The `api_key` argument, then the `DIFFUSR_KEY` variable,
+then the saved file. The API address: the `base_url` argument, then
+`DIFFUSR_BASE_URL`, then the saved file's `base_url`.
+
 ## Methods
 
 | Method | REST |

{diffusr-0.1.0 → diffusr-0.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "diffusr"
-version = "0.1.0"
+version = "0.2.0"
 description = "The diffusr API client: make videos, images and music from code. Free price checks, idempotent starts, wait_for, signed callbacks."
 readme = "README.md"
 license = { text = "MIT" }

{diffusr-0.1.0 → diffusr-0.2.0}/src/diffusr/__init__.py

@@ -6,6 +6,7 @@
 """
 
 from ._client import DEFAULT_BASE_URL, TERMINAL_STATUSES, Diffusr
+from ._config import config_path, read_config
 from ._errors import DiffusrError
 from ._verify import SIGNATURE_TOLERANCE_SEC, verify_callback
 
@@ -13,8 +14,10 @@ __all__ = [
     "Diffusr",
     "DiffusrError",
     "verify_callback",
+    "config_path",
+    "read_config",
     "DEFAULT_BASE_URL",
     "TERMINAL_STATUSES",
     "SIGNATURE_TOLERANCE_SEC",
 ]
-__version__ = "0.1.0"
+__version__ = "0.2.0"

{diffusr-0.1.0 → diffusr-0.2.0}/src/diffusr/_client.py

@@ -11,11 +11,12 @@ import urllib.request
 import uuid
 from typing import Any, Callable, Dict, Mapping, Optional, Union
 
+from ._config import config_path, read_config  # noqa: F401
 from ._errors import DiffusrError
 from ._verify import verify_callback as _verify_callback
 
 DEFAULT_BASE_URL = "https://app.diffusr.ai/api/v2"
-SDK_VERSION = "0.1.0"
+SDK_VERSION = "0.2.0"
 TERMINAL_STATUSES = ("SUCCEEDED", "FAILED", "CANCELED")
 # Never sleep longer than this on one automatic retry; raise instead.
 MAX_AUTO_RETRY_WAIT_SEC = 30
@@ -30,7 +31,10 @@ _CONTENT_TYPES = {
 class Diffusr:
     """Client for the diffusr REST API (v2). Bodies and answers are the API's own snake_case JSON.
 
-    api_key   dfsr_live_... or dfsr_test_... (free). Default: the DIFFUSR_KEY environment variable.
+    api_key   dfsr_live_... or dfsr_test_... (free). Default: the DIFFUSR_KEY environment variable,
+              then the key `npx diffusr login` saved (see config_path()).
+    base_url  Default: DIFFUSR_BASE_URL, then the saved file's base_url (only when the key came
+              from the file), then https://app.diffusr.ai/api/v2.
     """
 
     def __init__(
@@ -43,10 +47,16 @@ class Diffusr:
         timeout: float = 60.0,
     ) -> None:
         key = api_key or os.environ.get("DIFFUSR_KEY")
+        file_base: Optional[str] = None
         if not key:
-            raise DiffusrError(0, "MISSING_API_KEY", "Pass an API key or set DIFFUSR_KEY.")
+            saved = read_config()
+            if saved:
+                key = saved["key"]
+                file_base = saved.get("base_url") or None
+        if not key:
+            raise DiffusrError(0, "MISSING_API_KEY", "Pass an API key, set DIFFUSR_KEY, or run `npx diffusr login`.")
         self._key = key
-        self._base = (base_url or DEFAULT_BASE_URL).rstrip("/")
+        self._base = (base_url or os.environ.get("DIFFUSR_BASE_URL") or file_base or DEFAULT_BASE_URL).rstrip("/")
         self._max_retries = max_retries
         self._retry_base = retry_base
         self._timeout = timeout
@@ -191,6 +201,21 @@ class Diffusr:
     def rotate_callback_secret(self) -> Dict[str, Any]:
         return self._request("POST", "/callbacks/secret/rotate", body={})
 
+    def call(
+        self,
+        method: str,
+        path: str,
+        query: Optional[Mapping[str, Any]] = None,
+        body: Optional[Dict[str, Any]] = None,
+        headers: Optional[Dict[str, str]] = None,
+    ) -> Dict[str, Any]:
+        """Call any API path the typed methods do not cover, e.g. call("GET", "/me").
+        Same retries and errors as every other call. Add your own Idempotency-Key
+        header for a make call."""
+        q = {k: (str(v).lower() if isinstance(v, bool) else v) for k, v in (query or {}).items() if v is not None}
+        suffix = f"?{urllib.parse.urlencode(q)}" if q else ""
+        return self._request(method, path + suffix, body=body, headers=headers)
+
     @staticmethod
     def verify_callback(
         raw_body: Union[str, bytes],

diffusr-0.2.0/src/diffusr/_config.py

@@ -0,0 +1,29 @@
+"""The key `npx diffusr login` saves, so Python code can use it too."""
+
+from __future__ import annotations
+
+import json
+import os
+import sys
+from typing import Any, Dict, Optional
+
+
+def config_path() -> str:
+    """$XDG_CONFIG_HOME/diffusr/config.json, else ~/.config/diffusr/config.json; on Windows %APPDATA%\\diffusr\\config.json."""
+    if sys.platform == "win32":
+        base = os.environ.get("APPDATA") or os.path.join(os.path.expanduser("~"), "AppData", "Roaming")
+    else:
+        base = os.environ.get("XDG_CONFIG_HOME") or os.path.join(os.path.expanduser("~"), ".config")
+    return os.path.join(base, "diffusr", "config.json")
+
+
+def read_config() -> Optional[Dict[str, Any]]:
+    """The saved config (it has a "key"), or None when there is none. Never raises."""
+    try:
+        with open(config_path(), "r", encoding="utf-8") as f:
+            data = json.load(f)
+    except (OSError, ValueError):
+        return None
+    if isinstance(data, dict) and isinstance(data.get("key"), str) and data["key"]:
+        return data
+    return None

{diffusr-0.1.0 → diffusr-0.2.0}/tests/test_client.py

@@ -1,4 +1,5 @@
 import base64
+import contextlib
 import hashlib
 import hmac
 import json
@@ -12,11 +13,37 @@ from http.server import BaseHTTPRequestHandler, HTTPServer
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "src"))
 
-from diffusr import Diffusr, DiffusrError  # noqa: E402
+from diffusr import Diffusr, DiffusrError, config_path  # noqa: E402
 
 VECTORS = os.path.join(os.path.dirname(__file__), "..", "..", "test-vectors", "callbacks.json")
 
 
+@contextlib.contextmanager
+def isolated_env():
+    """A temp HOME with no DIFFUSR_* or XDG_CONFIG_HOME set, so a real saved key never leaks in."""
+    names = ["HOME", "APPDATA", "XDG_CONFIG_HOME", "DIFFUSR_KEY", "DIFFUSR_BASE_URL"]
+    old = {n: os.environ.get(n) for n in names}
+    with tempfile.TemporaryDirectory() as home:
+        for n in names:
+            os.environ.pop(n, None)
+        os.environ["HOME"] = home
+        try:
+            yield home
+        finally:
+            for n, v in old.items():
+                if v is None:
+                    os.environ.pop(n, None)
+                else:
+                    os.environ[n] = v
+
+
+def save_config(home, data):
+    path = os.path.join(home, ".config", "diffusr")
+    os.makedirs(path, exist_ok=True)
+    with open(os.path.join(path, "config.json"), "w") as f:
+        json.dump(data, f)
+
+
 class Mock:
     """A local HTTP server; `handler(req, n)` returns (status, body, headers)."""
 
@@ -134,16 +161,45 @@ class ClientTests(unittest.TestCase):
         self.assertEqual(out["credits_estimated"], 12)
 
     def test_env_key(self):
-        old = os.environ.pop("DIFFUSR_KEY", None)
-        try:
-            with self.assertRaises(DiffusrError):
+        with isolated_env() as home:
+            with self.assertRaises(DiffusrError) as cm:
                 Diffusr()
+            self.assertIn("npx diffusr login", str(cm.exception))
             os.environ["DIFFUSR_KEY"] = "dfsr_test_env"
             Diffusr()
-        finally:
-            os.environ.pop("DIFFUSR_KEY", None)
-            if old is not None:
-                os.environ["DIFFUSR_KEY"] = old
+
+    def test_saved_key_lookup_order(self):
+        with isolated_env() as home:
+            save_config(home, {"key": "dfsr_live_file", "base_url": "http://file.example/api/v2"})
+            d = Diffusr()
+            self.assertEqual(d._key, "dfsr_live_file")
+            self.assertEqual(d._base, "http://file.example/api/v2")
+            os.environ["DIFFUSR_KEY"] = "dfsr_live_env"
+            d = Diffusr()
+            self.assertEqual(d._key, "dfsr_live_env")
+            self.assertEqual(d._base, "https://app.diffusr.ai/api/v2")  # the file's base_url goes with the file's key only
+            self.assertEqual(Diffusr("dfsr_live_arg")._key, "dfsr_live_arg")
+
+    def test_base_url_order(self):
+        with isolated_env() as home:
+            save_config(home, {"key": "dfsr_live_file", "base_url": "http://file.example/api/v2"})
+            os.environ["DIFFUSR_BASE_URL"] = "http://env.example/api/v2/"
+            self.assertEqual(Diffusr()._base, "http://env.example/api/v2")
+            self.assertEqual(Diffusr(base_url="http://arg.example/api/v2")._base, "http://arg.example/api/v2")
+
+    def test_xdg_config_home_and_bad_file(self):
+        with isolated_env() as home:
+            xdg = os.path.join(home, "xdg")
+            os.environ["XDG_CONFIG_HOME"] = xdg
+            self.assertEqual(config_path(), os.path.join(xdg, "diffusr", "config.json"))
+            os.makedirs(os.path.join(xdg, "diffusr"))
+            with open(config_path(), "w") as f:
+                f.write("not json")
+            with self.assertRaises(DiffusrError):
+                Diffusr()
+            with open(config_path(), "w") as f:
+                json.dump({"key": "dfsr_live_x"}, f)
+            self.assertEqual(Diffusr()._key, "dfsr_live_x")
 
     def test_error_mapping(self):
         self.mock.handler = lambda r, n: (
@@ -334,3 +390,34 @@ class VerifyTests(unittest.TestCase):
 
 if __name__ == "__main__":
     unittest.main()
+
+
+from unittest import mock  # noqa: E402
+
+
+class CallTests(unittest.TestCase):
+    def test_call_builds_the_path_and_query(self):
+        seen = {}
+
+        def fake(req, timeout=None):
+            seen["url"] = req.full_url
+            seen["method"] = req.get_method()
+
+            class R:
+                def read(self):
+                    return b'{"email": "a@b.c"}'
+
+                def __enter__(self):
+                    return self
+
+                def __exit__(self, *a):
+                    return False
+
+            return R()
+
+        d = Diffusr("dfsr_test_" + "0" * 48, base_url="https://x.test/api/v2")
+        with mock.patch("urllib.request.urlopen", fake):
+            out = d.call("GET", "/me", query={"limit": 5, "skip": None, "flag": True})
+        self.assertEqual(out, {"email": "a@b.c"})
+        self.assertEqual(seen["method"], "GET")
+        self.assertEqual(seen["url"], "https://x.test/api/v2/me?limit=5&flag=true")