albus-cli 0.2.0__tar.gz → 0.3.0__tar.gz

{albus_cli-0.2.0 → albus_cli-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: albus-cli
-Version: 0.2.0
+Version: 0.3.0
 Summary: Command-line client for the Albus REST API
 Project-URL: Homepage, https://github.com/albusgroup/albus-cli
 Project-URL: Repository, https://github.com/albusgroup/albus-cli
@@ -9,7 +9,7 @@ Author: Albus
 License-Expression: MIT
 License-File: LICENSE
 Requires-Python: >=3.11
-Requires-Dist: albus-sdk==0.6.0
+Requires-Dist: albus-sdk==0.8.0
 Requires-Dist: typer<0.28,>=0.26.8
 Description-Content-Type: text/markdown
 

{albus_cli-0.2.0 → albus_cli-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "albus-cli"
-version = "0.2.0"
+version = "0.3.0"
 description = "Command-line client for the Albus REST API"
 readme = "README.md"
 license = "MIT"
@@ -13,7 +13,7 @@ authors = [{ name = "Albus" }]
 dependencies = [
     # Pinned, not floated: the published CLI states the one SDK version it was
     # tested against, and bumping it is a reviewed edit made when releasing.
-    "albus-sdk==0.6.0",
+    "albus-sdk==0.8.0",
     "typer>=0.26.8,<0.28",
 ]
 

{albus_cli-0.2.0 → albus_cli-0.3.0}/src/albus_cli/client.py

@@ -10,7 +10,7 @@ import time
 from dataclasses import dataclass
 
 import httpx
-from albus_sdk import Albus, models
+from albus_sdk import Albus
 from albus_sdk.sdkconfiguration import SERVERS
 
 from albus_cli import credentials, oauth
@@ -59,9 +59,7 @@ def client(base_url: str, timeout: float | None) -> Albus:
     if key:
         # The environment wins over a stored session deliberately, so CI
         # and agent harnesses inject a credential without touching disk.
-        return _client(
-            base_url, timeout, models.Security(api_key_auth=key), True
-        )
+        return _client(base_url, timeout, api_key=key)
 
     stored = credentials.load(base_url)
     if stored is None:
@@ -96,7 +94,7 @@ def public_client(base_url: str, timeout: float | None) -> Albus:
     sign-in changes."""
     global _used
     _used = None
-    return _built(base_url, timeout, models.Security())
+    return _built(base_url, timeout)
 
 
 def bearer_client(
@@ -104,12 +102,7 @@ def bearer_client(
 ) -> Albus:
     """A client on one credential, for `login` reading back the session
     it just stored rather than whatever precedence would pick."""
-    return _client(
-        base_url,
-        timeout,
-        models.Security(bearer_auth=credential.access_token),
-        False,
-    )
+    return _client(base_url, timeout, access_token=credential.access_token)
 
 
 def credential(tokens: oauth.Tokens, replacing: Credential | None) -> Credential:
@@ -213,19 +206,30 @@ def _shadowing(consequence: str) -> str | None:
 def _client(
     base_url: str,
     timeout: float | None,
-    security: models.Security,
-    api_key: bool,
+    *,
+    api_key: str | None = None,
+    access_token: str | None = None,
 ) -> Albus:
     global _used
-    _used = _Used(base_url=base_url, api_key=api_key)
-    return _built(base_url, timeout, security)
+    _used = _Used(base_url=base_url, api_key=api_key is not None)
+    return _built(
+        base_url,
+        timeout,
+        api_key=api_key,
+        access_token=access_token,
+    )
 
 
 def _built(
-    base_url: str, timeout: float | None, security: models.Security
+    base_url: str,
+    timeout: float | None,
+    *,
+    api_key: str | None = None,
+    access_token: str | None = None,
 ) -> Albus:
     return Albus(
-        security=security,
+        api_key=api_key,
+        access_token=access_token,
         server_url=base_url,
         client=httpx.Client(follow_redirects=True, timeout=timeout),
     )

{albus_cli-0.2.0 → albus_cli-0.3.0}/tests/test_auth.py

@@ -74,9 +74,8 @@ def test_api_key_wins_over_a_stored_session(
     result = runner.invoke(app, ["sessions", "list"])
 
     assert result.exit_code == 0, result.output
-    security = albus.init_kwargs[0]["security"]
-    assert security.api_key_auth == "env-key"
-    assert security.bearer_auth is None
+    assert albus.init_kwargs[0]["api_key"] == "env-key"
+    assert albus.init_kwargs[0]["access_token"] is None
 
 
 def test_stored_session_authenticates_with_a_bearer_token(
@@ -87,9 +86,8 @@ def test_stored_session_authenticates_with_a_bearer_token(
     result = runner.invoke(app, ["sessions", "list"])
 
     assert result.exit_code == 0, result.output
-    security = signed_out.init_kwargs[0]["security"]
-    assert security.bearer_auth == "stored-access"
-    assert security.api_key_auth is None
+    assert signed_out.init_kwargs[0]["access_token"] == "stored-access"
+    assert signed_out.init_kwargs[0]["api_key"] is None
 
 
 def test_expired_session_is_refreshed_and_stored(
@@ -113,7 +111,7 @@ def test_expired_session_is_refreshed_and_stored(
 
     assert result.exit_code == 0, result.output
     assert grants == ["refresh"]
-    assert signed_out.init_kwargs[0]["security"].bearer_auth == "renewed-access"
+    assert signed_out.init_kwargs[0]["access_token"] == "renewed-access"
     saved = credentials.load(BASE_URL)
     assert saved is not None
     assert saved.access_token == "renewed-access"
@@ -159,8 +157,7 @@ def test_a_session_expiring_within_the_leeway_is_refreshed(
     )
 
     assert runner.invoke(app, ["sessions", "list"]).exit_code == 0
-    security = signed_out.init_kwargs[0]["security"]
-    assert security.bearer_auth == "renewed-access"
+    assert signed_out.init_kwargs[0]["access_token"] == "renewed-access"
 
 
 def test_rejected_refresh_reports_an_expired_session(
@@ -242,7 +239,7 @@ def test_login_stores_the_session_and_names_the_account(
     # The account is resolved over the API with the new credential,
     # never by reading the token.
     assert signed_out.calls[-1].name == "whoami"
-    assert signed_out.init_kwargs[-1]["security"].bearer_auth == "fresh-access"
+    assert signed_out.init_kwargs[-1]["access_token"] == "fresh-access"
 
 
 def signs_in(
@@ -273,7 +270,7 @@ def test_login_names_the_account_it_just_signed_in_as(
 
     assert result.exit_code == 0, result.output
     assert "as carlo@albus.sh" in result.output
-    assert albus.init_kwargs[-1]["security"].bearer_auth == "fresh-access"
+    assert albus.init_kwargs[-1]["access_token"] == "fresh-access"
 
 
 def test_login_says_an_api_key_shadows_the_new_session(
@@ -441,9 +438,8 @@ def test_whoami_uses_the_session_over_an_api_key(
     stored(expires_in=3600)
 
     assert runner.invoke(app, ["whoami"]).exit_code == 0
-    security = albus.init_kwargs[0]["security"]
-    assert security.bearer_auth == "stored-access"
-    assert security.api_key_auth is None
+    assert albus.init_kwargs[0]["access_token"] == "stored-access"
+    assert albus.init_kwargs[0]["api_key"] is None
 
 
 def test_whoami_with_only_an_api_key_asks_for_a_sign_in(

{albus_cli-0.2.0 → albus_cli-0.3.0}/tests/test_health.py

@@ -25,15 +25,14 @@ def test_health_needs_no_credential(
 
     assert result.exit_code == 0, result.output
     assert json.loads(result.stdout) == {"status": "ok"}
-    security = albus.init_kwargs[0]["security"]
-    assert security.bearer_auth is None
-    assert security.api_key_auth is None
+    assert albus.init_kwargs[0]["access_token"] is None
+    assert albus.init_kwargs[0]["api_key"] is None
 
 
 def test_health_sends_no_api_key_either(albus: FakeAlbus) -> None:
     """The `albus` fixture exports an API key, which `/health` ignores."""
     assert runner.invoke(app, ["health"]).exit_code == 0
-    assert albus.init_kwargs[0]["security"].api_key_auth is None
+    assert albus.init_kwargs[0]["api_key"] is None
 
 
 def test_rejected_health_names_no_credential(albus: FakeAlbus) -> None:

{albus_cli-0.2.0 → albus_cli-0.3.0}/tests/test_invites.py

@@ -58,6 +58,5 @@ def test_the_session_is_used_over_an_api_key(
     result = runner.invoke(app, ["invites", "create", "new@example.com"])
 
     assert result.exit_code == 0, result.output
-    security = signed_in.init_kwargs[0]["security"]
-    assert security.bearer_auth == "stored-access"
-    assert security.api_key_auth is None
+    assert signed_in.init_kwargs[0]["access_token"] == "stored-access"
+    assert signed_in.init_kwargs[0]["api_key"] is None

{albus_cli-0.2.0 → albus_cli-0.3.0}/tests/test_tokens.py

@@ -85,9 +85,8 @@ def test_the_session_is_used_over_an_api_key(
     monkeypatch.setenv(client.API_KEY_ENV, "env-key")
 
     assert runner.invoke(app, ["tokens", "list"]).exit_code == 0
-    security = signed_in.init_kwargs[0]["security"]
-    assert security.bearer_auth == "stored-access"
-    assert security.api_key_auth is None
+    assert signed_in.init_kwargs[0]["access_token"] == "stored-access"
+    assert signed_in.init_kwargs[0]["api_key"] is None
 
 
 def test_only_an_api_key_asks_for_a_sign_in(

{albus_cli-0.2.0 → albus_cli-0.3.0}/uv.lock

@@ -8,7 +8,7 @@ resolution-markers = [
 
 [[package]]
 name = "albus-cli"
-version = "0.2.0"
+version = "0.3.0"
 source = { editable = "." }
 dependencies = [
     { name = "albus-sdk" },
@@ -24,7 +24,7 @@ dev = [
 
 [package.metadata]
 requires-dist = [
-    { name = "albus-sdk", specifier = "==0.6.0" },
+    { name = "albus-sdk", specifier = "==0.8.0" },
     { name = "typer", specifier = ">=0.26.8,<0.28" },
 ]
 
@@ -37,16 +37,16 @@ dev = [
 
 [[package]]
 name = "albus-sdk"
-version = "0.6.0"
+version = "0.8.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "httpcore" },
     { name = "httpx" },
     { name = "pydantic" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/86/e8/a32e84c6274d2825c04250c502e6c1b73a9dd7de0d385c7653f59c741402/albus_sdk-0.6.0.tar.gz", hash = "sha256:d795d6b96aefc70109110020e8064fed33eca9cf808e9d4f9e99844cfd231ad8", size = 67071, upload-time = "2026-08-11T21:26:51.128Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/ca/86/c891c6fdd1ad4c34e4f49af973af09c23058288ae36e4ed89f58542cd3d3/albus_sdk-0.8.0.tar.gz", hash = "sha256:18609e42cbdbbd80fa27bd78e951cfff6da208f61b31b54a3c3efc8ae8a37856", size = 66873, upload-time = "2026-08-12T22:08:58.186Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/62/9b/b3676d7969453f2a743f9d4e3e1a8f6c17e987ed2190a973941728ba011a/albus_sdk-0.6.0-py3-none-any.whl", hash = "sha256:ba67d07eea8df9b2914f181f45fa9fb46ef4cf3ab64f296148f58e5fd2771fd4", size = 97977, upload-time = "2026-08-11T21:26:50.087Z" },
+    { url = "https://files.pythonhosted.org/packages/43/5a/4392771345d808c5f44a78cffef7532d486fa976bc00072df6b6b3b69365/albus_sdk-0.8.0-py3-none-any.whl", hash = "sha256:1226da9d23f3530e060a0081ce5e1d7de1f023e2b9e2056b66784757996a028c", size = 95910, upload-time = "2026-08-12T22:08:57.18Z" },
 ]
 
 [[package]]