avios-cli 0.1.5__tar.gz → 0.2.0__tar.gz

{avios_cli-0.1.5 → avios_cli-0.2.0}/CHANGELOG.md

@@ -6,6 +6,39 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [0.2.0] - 2026-07-24
+
+### Added
+- **`transactions`, `pending` and `overview` now work.** The manage-avios API
+  only needed an `x-avios-opco` header (not a separate session, as previously
+  thought) — it's now sent automatically. `transactions` renders date /
+  description / Avios (coloured +/-) / type and respects `--limit`; the TUI shows
+  real transactions too.
+- Typed `Transaction` model (identifier, dateProcessed, description, type,
+  partner, amount, categories) and a `NamedRef` helper.
+- `AVIOS_OPCO` setting (default `BAEC` = British Airways Executive Club) for other
+  Avios programmes.
+
+## [0.1.6] - 2026-07-24
+
+### Fixed
+- **`balance` finally works after login.** It (and `whoami`) were querying the
+  `manage-avios`/`spend-avios` micro-app APIs, which need a separate per-app
+  session and returned 401 ("Session expired") even when you were logged in.
+  Probing a real session showed the balance is served by
+  `/shell/api/users/current/accounts` (`{balance, individual, household}`) and the
+  profile by `/auth-gateway/user` — both of which authenticate with the browser
+  session. `balance`/`whoami` now use those.
+
+### Changed
+- `balance` shows total / individual / household; `whoami` shows name, tier,
+  membership and email.
+- The TUI shows your balance even if transactions are unavailable.
+- `transactions`, `pending` and `overview` are marked **experimental** — they need
+  the `manage-avios` app session, which the cookie/SSO login can't yet establish.
+- Removed the `accounts` command (its endpoint is the balance source, now shown by
+  `balance`).
+
 ## [0.1.5] - 2026-07-24
 
 ### Fixed
@@ -87,7 +120,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 - Reward-flight **availability** search is not yet implemented (needs a British
   Airways capture).
 
-[Unreleased]: https://github.com/alexechoi/avios-cli/compare/v0.1.5...HEAD
+[Unreleased]: https://github.com/alexechoi/avios-cli/compare/v0.2.0...HEAD
+[0.2.0]: https://github.com/alexechoi/avios-cli/compare/v0.1.6...v0.2.0
+[0.1.6]: https://github.com/alexechoi/avios-cli/compare/v0.1.5...v0.1.6
 [0.1.5]: https://github.com/alexechoi/avios-cli/compare/v0.1.4...v0.1.5
 [0.1.4]: https://github.com/alexechoi/avios-cli/compare/v0.1.3...v0.1.4
 [0.1.3]: https://github.com/alexechoi/avios-cli/compare/v0.1.2...v0.1.3

{avios_cli-0.1.5 → avios_cli-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: avios-cli
-Version: 0.1.5
+Version: 0.2.0
 Summary: A CLI and TUI for avios.com — view your Avios balance and transactions from the terminal.
 Project-URL: Homepage, https://github.com/alexechoi/avios-cli
 Project-URL: Repository, https://github.com/alexechoi/avios-cli
@@ -119,17 +119,16 @@ expires after ~a day; just run `avios login` again. Run `avios logout` to remove
 ## Usage
 
 ```bash
-avios balance                  # your Avios balance
-avios transactions --limit 20  # recent transactions
+avios balance                  # total / individual / household Avios
+avios transactions --limit 20  # recent transactions (date, description, Avios, type)
 avios pending                  # pending Avios
-avios accounts                 # linked loyalty accounts
-avios overview                 # dashboard summary (raw JSON)
-avios whoami                   # your profile (raw JSON)
-avios raw /manage-avios/api/user/current   # hit any endpoint directly
+avios overview                 # dashboard summary
+avios whoami                   # name, tier, membership, email
+avios raw /shell/api/users/current/accounts   # hit any endpoint directly
 ```
 
-Add `--json` to `balance`, `transactions`, `pending` or `accounts` for scriptable
-output.
+Add `--json` to `balance`, `transactions`, `pending` or `whoami` for scriptable
+output. Non-BA Avios programmes can set `AVIOS_OPCO` (default `BAEC`).
 
 ## TUI
 

{avios_cli-0.1.5 → avios_cli-0.2.0}/README.md

@@ -84,17 +84,16 @@ expires after ~a day; just run `avios login` again. Run `avios logout` to remove
 ## Usage
 
 ```bash
-avios balance                  # your Avios balance
-avios transactions --limit 20  # recent transactions
+avios balance                  # total / individual / household Avios
+avios transactions --limit 20  # recent transactions (date, description, Avios, type)
 avios pending                  # pending Avios
-avios accounts                 # linked loyalty accounts
-avios overview                 # dashboard summary (raw JSON)
-avios whoami                   # your profile (raw JSON)
-avios raw /manage-avios/api/user/current   # hit any endpoint directly
+avios overview                 # dashboard summary
+avios whoami                   # name, tier, membership, email
+avios raw /shell/api/users/current/accounts   # hit any endpoint directly
 ```
 
-Add `--json` to `balance`, `transactions`, `pending` or `accounts` for scriptable
-output.
+Add `--json` to `balance`, `transactions`, `pending` or `whoami` for scriptable
+output. Non-BA Avios programmes can set `AVIOS_OPCO` (default `BAEC`).
 
 ## TUI
 

{avios_cli-0.1.5 → avios_cli-0.2.0}/src/avios/__init__.py

@@ -3,4 +3,4 @@
 View your Avios balance, transactions and account details from the terminal.
 """
 
-__version__ = "0.1.5"
+__version__ = "0.2.0"

{avios_cli-0.1.5 → avios_cli-0.2.0}/src/avios/auth.py

@@ -149,7 +149,9 @@ def _wait_for_auth(ctx: Any, page: Any, base_url: str, timeout_ms: int) -> bool:
 
 def _is_authenticated(ctx: Any, base_url: str) -> bool:
     try:
-        return bool(ctx.request.get(f"{base_url}{endpoints.AUTH_USER}").ok)
+        # Use the same endpoint `balance` reads, so a successful login guarantees
+        # the balance command will work.
+        return bool(ctx.request.get(f"{base_url}{endpoints.ACCOUNTS}").ok)
     except Exception:
         return False
 
@@ -257,7 +259,7 @@ def _cookies_authenticate(settings: Settings, cookies: list[dict[str, Any]]) ->
                 "cookie": header,
             },
         ) as client:
-            return client.get(endpoints.AUTH_USER).status_code == 200
+            return client.get(endpoints.ACCOUNTS).status_code == 200
     except httpx.HTTPError:
         return False
 

{avios_cli-0.1.5 → avios_cli-0.2.0}/src/avios/cli.py

@@ -20,7 +20,7 @@ from rich.table import Table
 from avios import __version__
 from avios.auth import LoginError, import_from_browser, login_via_browser
 from avios.client import AviosClient
-from avios.models import Balance
+from avios.models import Balance, Transaction
 from avios.session import NotAuthenticated, Session, SessionExpired
 
 app = typer.Typer(
@@ -78,19 +78,6 @@ def _print_json(data: Any) -> None:
     console.print_json(data=data)
 
 
-def _render_records(records: list[dict[str, Any]], title: str) -> None:
-    if not records:
-        console.print(f"[dim]No {title.lower()}.[/]")
-        return
-    keys = [k for k, v in records[0].items() if not isinstance(v, dict | list)][:6]
-    table = Table(title=title)
-    for key in keys:
-        table.add_column(key)
-    for record in records:
-        table.add_row(*[str(record.get(key, "")) for key in keys])
-    console.print(table)
-
-
 # -- auth commands -----------------------------------------------------------
 @app.command()
 def login(
@@ -165,8 +152,29 @@ def balance(json_out: bool = JSON_OPTION) -> None:
 def _render_balance(result: Balance) -> None:
     table = Table(show_header=False, box=None)
     table.add_row("[bold]Avios[/]", f"[bold cyan]{result.balance:,}[/]")
-    if result.household_avios_balance is not None:
-        table.add_row("Household", f"{result.household_avios_balance:,}")
+    if result.individual is not None:
+        table.add_row("Individual", f"{result.individual:,}")
+    if result.household is not None:
+        table.add_row("Household", f"{result.household:,}")
+    console.print(table)
+
+
+def _render_transactions(items: list[Transaction], title: str) -> None:
+    if not items:
+        console.print(f"[dim]No {title.lower()}.[/]")
+        return
+    table = Table(title=title)
+    table.add_column("Date")
+    table.add_column("Description")
+    table.add_column("Avios", justify="right")
+    table.add_column("Type")
+    for txn in items:
+        date = (txn.date_processed or "")[:10]
+        desc = (txn.description or "").splitlines()[0][:44] if txn.description else ""
+        amount = f"{txn.amount:+,}" if txn.amount is not None else ""
+        colour = "green" if (txn.amount or 0) >= 0 else "red"
+        kind = txn.type.value if txn.type else ""
+        table.add_row(date, desc, f"[{colour}]{amount}[/]", kind or "")
     console.print(table)
 
 
@@ -178,11 +186,10 @@ def transactions(
     """List recent Avios transactions."""
     with _handle_errors():
         items = _client().get_transactions(limit=limit)
-    records = [item.as_dict() for item in items]
     if json_out:
-        _print_json(records)
+        _print_json([item.as_dict() for item in items])
         return
-    _render_records(records, "Transactions")
+    _render_transactions(items, "Transactions")
 
 
 @app.command()
@@ -190,39 +197,47 @@ def pending(json_out: bool = JSON_OPTION) -> None:
     """List pending Avios transactions."""
     with _handle_errors():
         items = _client().get_pending_transactions()
-    records = [item.as_dict() for item in items]
     if json_out:
-        _print_json(records)
+        _print_json([item.as_dict() for item in items])
         return
-    _render_records(records, "Pending")
-
-
-@app.command()
-def accounts(json_out: bool = JSON_OPTION) -> None:
-    """List linked loyalty accounts."""
-    with _handle_errors():
-        items = _client().get_accounts()
-    records = [item.as_dict() for item in items]
-    if json_out:
-        _print_json(records)
-        return
-    _render_records(records, "Accounts")
+    _render_transactions(items, "Pending")
 
 
 @app.command()
 def overview() -> None:
-    """Show the dashboard overview (raw JSON; shape not yet finalised)."""
+    """Show the dashboard overview (raw JSON)."""
     with _handle_errors():
         result = _client().get_overview()
     _print_json(result.as_dict())
 
 
 @app.command()
-def whoami() -> None:
-    """Show your profile (raw JSON; shape not yet finalised)."""
+def whoami(json_out: bool = JSON_OPTION) -> None:
+    """Show your profile (name, tier, membership)."""
     with _handle_errors():
-        result = _client().get_profile()
-    _print_json(result.as_dict())
+        data = _client().get_profile().as_dict()
+    if json_out:
+        _print_json(data)
+        return
+    claims = data.get("tokenContent", {})
+
+    def claim(key: str) -> str:
+        return str(claims.get(f"https://avios.com/{key}", "") or "")
+
+    table = Table(show_header=False, box=None)
+    name = claims.get("name") or f"{claims.get('given_name', '')} {claims.get('family_name', '')}"
+    for label, value in (
+        ("Name", str(name).strip()),
+        ("Tier", claim("customer_tier_name")),
+        ("Membership", claim("membership_id")),
+        ("Email", str(claims.get("email", "") or "")),
+    ):
+        if value:
+            table.add_row(f"[bold]{label}[/]", value)
+    if table.row_count:
+        console.print(table)
+    else:
+        _print_json(data)
 
 
 @app.command()

{avios_cli-0.1.5 → avios_cli-0.2.0}/src/avios/client.py

@@ -10,7 +10,7 @@ from __future__ import annotations
 from typing import Any
 
 from avios import endpoints
-from avios.models import Account, Balance, Overview, Profile, Transaction
+from avios.models import Balance, Overview, Profile, Transaction
 from avios.session import Session
 
 
@@ -36,23 +36,27 @@ class AviosClient:
         self.session = session or Session()
 
     def get_balance(self) -> Balance:
-        return Balance.model_validate(self.session.get_json(endpoints.BALANCE))
+        # /shell/api/users/current/accounts authenticates with the SSO session and
+        # returns {balance, individual, household}.
+        return Balance.model_validate(self.session.get_json(endpoints.ACCOUNTS))
 
     def get_profile(self) -> Profile:
-        return Profile.model_validate(self.session.get_json(endpoints.PROFILE))
+        # /auth-gateway/user returns the SSO user (idToken + tokenContent claims).
+        return Profile.model_validate(self.session.get_json(endpoints.AUTH_USER))
 
     def get_overview(self) -> Overview:
         return Overview.model_validate(self.session.get_json(endpoints.OVERVIEW))
 
-    def get_accounts(self) -> list[Account]:
-        payload = self.session.get_json(endpoints.ACCOUNTS)
-        return [Account.model_validate(item) for item in _extract_list(payload)]
-
-    def get_transactions(self, limit: int | None = None) -> list[Transaction]:
-        payload = self.session.get_json(endpoints.TRANSACTIONS)
-        items = _extract_list(payload)
+    def get_transactions(self, limit: int = 50) -> list[Transaction]:
+        # `offset` is a server-side page hint; slice to `limit` for an exact count.
+        offset = limit if limit and limit > 0 else 1000
+        path = f"{endpoints.TRANSACTIONS}?startRecord=1&offset={offset}&status=completed"
+        payload = self.session.get_json(path)
+        items = (
+            payload.get("transactions", []) if isinstance(payload, dict) else _extract_list(payload)
+        )
         transactions = [Transaction.model_validate(item) for item in items]
-        return transactions[:limit] if limit is not None else transactions
+        return transactions[:limit] if limit and limit > 0 else transactions
 
     def get_pending_transactions(self) -> list[Transaction]:
         payload = self.session.get_json(endpoints.TRANSACTIONS_PENDING)

{avios_cli-0.1.5 → avios_cli-0.2.0}/src/avios/config.py

@@ -39,6 +39,9 @@ class Settings(BaseSettings):
     user_agent: str = DEFAULT_USER_AGENT
     config_dir: Path = Field(default_factory=_default_config_dir)
     request_timeout: float = 20.0
+    # Operating company code sent as `x-avios-opco`; required by the manage-avios
+    # API. "BAEC" = British Airways Executive Club (override with AVIOS_OPCO).
+    opco: str = "BAEC"
 
     @property
     def state_path(self) -> Path:

{avios_cli-0.1.5 → avios_cli-0.2.0}/src/avios/models.py

@@ -25,18 +25,34 @@ class AviosModel(BaseModel):
 
 
 class Balance(AviosModel):
-    """Avios balance (from ``/en-GB/spend-avios/api/avios-balance``)."""
+    """Avios balance (from ``/shell/api/users/current/accounts``).
+
+    Shape: ``{"balance": N, "individual": N, "household": N}``.
+    """
 
     balance: int
-    household_avios_balance: int | None = Field(default=None, alias="householdAviosBalance")
+    individual: int | None = None
+    household: int | None = None
 
 
-class Transaction(AviosModel):
-    """A single Avios statement entry.
+class NamedRef(AviosModel):
+    """A ``{value, id}`` reference (transaction type, partner, ...)."""
 
-    Concrete fields are pinned once live transaction payloads are observed; until
-    then every key is preserved via ``extra='allow'``.
-    """
+    value: str | None = None
+    id: str | None = None
+
+
+class Transaction(AviosModel):
+    """A single Avios statement entry (from the manage-avios transactions API)."""
+
+    identifier: str | None = None
+    date_processed: str | None = Field(default=None, alias="dateProcessed")
+    description: str | None = None
+    type: NamedRef | None = None
+    partner: NamedRef | None = None
+    amount: int | None = None
+    categories: list[str] = Field(default_factory=list)
+    record_index: int | None = Field(default=None, alias="recordIndex")
 
 
 class Account(AviosModel):

{avios_cli-0.1.5 → avios_cli-0.2.0}/src/avios/session.py

@@ -95,6 +95,8 @@ class Session:
             "accept": "application/json, text/plain, */*",
             "user-agent": self.settings.user_agent,
             "referer": f"{self.settings.base_url}/manage-avios/dashboard",
+            # Required by the manage-avios API (401 without it).
+            "x-avios-opco": self.settings.opco,
             "cookie": cookie,
         }
         return httpx.Client(

{avios_cli-0.1.5 → avios_cli-0.2.0}/src/avios/tui/app.py

@@ -21,7 +21,6 @@ from avios.tui.art import banner_text
 from avios.tui.widgets import BalanceDisplay
 
 TRANSACTIONS_TO_SHOW = 50
-MAX_COLUMNS = 6
 
 
 class AviosApp(App[None]):
@@ -61,9 +60,6 @@ class AviosApp(App[None]):
     async def _load(self) -> None:
         try:
             balance = await asyncio.to_thread(self._client.get_balance)
-            transactions = await asyncio.to_thread(
-                self._client.get_transactions, TRANSACTIONS_TO_SHOW
-            )
         except (NotAuthenticated, SessionExpired) as exc:
             self._show_error(f"{exc}  —  run `avios login`")
             return
@@ -71,6 +67,15 @@ class AviosApp(App[None]):
             self._show_error(f"Request failed: {exc}")
             return
         self.query_one("#balance", BalanceDisplay).update_balance(balance)
+
+        # Transactions are experimental (manage-avios session); degrade gracefully
+        # so the balance still shows if they're unavailable.
+        try:
+            transactions = await asyncio.to_thread(
+                self._client.get_transactions, TRANSACTIONS_TO_SHOW
+            )
+        except (NotAuthenticated, SessionExpired, httpx.HTTPError):
+            transactions = []
         self._populate_transactions(transactions)
 
     def _show_error(self, message: str) -> None:
@@ -81,15 +86,17 @@ class AviosApp(App[None]):
         table = self.query_one("#transactions", DataTable)
         table.loading = False
         table.clear(columns=True)
-        records = [txn.as_dict() for txn in transactions]
-        if not records:
+        if not transactions:
             table.add_column("info")
             table.add_row("No transactions")
             return
-        keys = [k for k, v in records[0].items() if not isinstance(v, dict | list)][:MAX_COLUMNS]
-        table.add_columns(*keys)
-        for record in records:
-            table.add_row(*[str(record.get(key, "")) for key in keys])
+        table.add_columns("Date", "Description", "Avios", "Type")
+        for txn in transactions:
+            date = (txn.date_processed or "")[:10]
+            desc = (txn.description or "").splitlines()[0][:44] if txn.description else ""
+            amount = f"{txn.amount:+,}" if txn.amount is not None else ""
+            kind = txn.type.value if txn.type else ""
+            table.add_row(date, desc, amount, kind)
 
 
 def run(client: AviosClient | None = None) -> None:

{avios_cli-0.1.5 → avios_cli-0.2.0}/src/avios/tui/widgets.py

@@ -20,8 +20,8 @@ class BalanceDisplay(Static):
         text = Text()
         text.append("Avios  ", style="bold")
         text.append(f"{balance.balance:,}", style="bold cyan")
-        if balance.household_avios_balance is not None:
-            text.append(f"     Household  {balance.household_avios_balance:,}", style="dim")
+        if balance.household is not None:
+            text.append(f"     Household  {balance.household:,}", style="dim")
         self.last_text = text.plain
         self.update(text)
 

avios_cli-0.2.0/tests/fixtures/balance.json

@@ -0,0 +1 @@
+{"balance": 75751, "individual": 75751, "household": 112430}

avios_cli-0.2.0/tests/fixtures/transactions.json

@@ -0,0 +1,25 @@
+{
+  "totalRecords": 2,
+  "transactions": [
+    {
+      "identifier": "2139440378",
+      "dateProcessed": "2026-07-21T11:37:35.000Z",
+      "description": "UBER",
+      "type": {"value": "Collection", "id": "DV_COL"},
+      "partner": {"value": "UBER", "id": "UBR"},
+      "amount": 50,
+      "categories": ["collectingAvios"],
+      "recordIndex": 1
+    },
+    {
+      "identifier": "2023965591",
+      "dateProcessed": "2025-12-10T21:37:04.000Z",
+      "description": "Tokyo Haneda to London Heathrow\nClass: Club World\nBA0008",
+      "type": {"value": "Reward Flight", "id": "FLT_RWD"},
+      "partner": {"value": "British Airways", "id": "BA"},
+      "amount": -52000,
+      "categories": ["flights"],
+      "recordIndex": 2
+    }
+  ]
+}

{avios_cli-0.1.5 → avios_cli-0.2.0}/tests/test_cli.py

@@ -15,7 +15,7 @@ from typer.testing import CliRunner
 from avios import __version__
 from avios.auth import ImportResult, LoginError
 from avios.cli import app
-from avios.models import Account, Balance, Overview, Profile, Transaction
+from avios.models import Balance, Overview, Profile, Transaction
 from avios.session import NotAuthenticated, SessionExpired
 
 runner = CliRunner()
@@ -28,26 +28,46 @@ class FakeClient:
         pass
 
     def get_balance(self) -> Balance:
-        return Balance(balance=100, household_avios_balance=200)
+        return Balance(balance=100, individual=100, household=200)
 
-    def get_transactions(self, limit: int | None = None) -> list[Transaction]:
+    def get_transactions(self, limit: int = 50) -> list[Transaction]:
         items = [
-            Transaction.model_validate({"date": "2026-07-01", "avios": 100}),
-            Transaction.model_validate({"date": "2026-06-01", "avios": 50}),
+            Transaction.model_validate(
+                {
+                    "dateProcessed": "2026-07-01T09:00:00.000Z",
+                    "description": "UBER",
+                    "type": {"value": "Collection", "id": "DV_COL"},
+                    "amount": 100,
+                }
+            ),
+            Transaction.model_validate(
+                {
+                    "dateProcessed": "2026-06-01T09:00:00.000Z",
+                    "description": "Deliveroo UK",
+                    "type": {"value": "BA Avios eStore", "id": "BA_AV_ESTORE"},
+                    "amount": 50,
+                }
+            ),
         ]
-        return items[:limit] if limit is not None else items
+        return items[:limit]
 
     def get_pending_transactions(self) -> list[Transaction]:
         return []
 
-    def get_accounts(self) -> list[Account]:
-        return [Account.model_validate({"programme": "BAEC", "balance": 100})]
-
     def get_overview(self) -> Overview:
         return Overview.model_validate({"tier": "Blue"})
 
     def get_profile(self) -> Profile:
-        return Profile.model_validate({"firstName": "Alex"})
+        return Profile.model_validate(
+            {
+                "idToken": "jwt",
+                "tokenContent": {
+                    "name": "Alex Choi",
+                    "https://avios.com/customer_tier_name": "Gold",
+                    "https://avios.com/membership_id": "BA123",
+                },
+            }
+        )
 
     def raw(self, path: str) -> dict[str, str]:
         return {"path": path}
@@ -81,7 +101,7 @@ def test_balance_json(fake_client: None) -> None:
     result = runner.invoke(app, ["balance", "--json"])
     assert result.exit_code == 0
     assert '"balance"' in result.stdout
-    assert '"householdAviosBalance"' in result.stdout
+    assert '"household"' in result.stdout
 
 
 def test_transactions_respects_limit(fake_client: None) -> None:
@@ -94,13 +114,16 @@ def test_transactions_respects_limit(fake_client: None) -> None:
 def test_transactions_json(fake_client: None) -> None:
     result = runner.invoke(app, ["transactions", "--json"])
     assert result.exit_code == 0
-    assert '"avios"' in result.stdout
+    assert '"amount"' in result.stdout
+    assert '"dateProcessed"' in result.stdout
 
 
-def test_accounts(fake_client: None) -> None:
-    result = runner.invoke(app, ["accounts"])
+def test_whoami(fake_client: None) -> None:
+    result = runner.invoke(app, ["whoami"])
     assert result.exit_code == 0
-    assert "BAEC" in result.stdout
+    out = " ".join(result.stdout.split())
+    assert "Alex Choi" in out
+    assert "Gold" in out
 
 
 def test_raw(fake_client: None) -> None:

avios_cli-0.2.0/tests/test_client.py

@@ -0,0 +1,81 @@
+"""Tests for the typed API client (balance, transactions, profile, ...)."""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+from typing import Any
+
+import httpx
+import pytest
+
+from avios import endpoints
+from avios.client import AviosClient, _extract_list
+from avios.config import Settings
+from avios.session import Session, SessionExpired
+
+
+def _client(
+    settings: Settings, routes: dict[str, Any], captured: list[httpx.Request] | None = None
+) -> AviosClient:
+    def handler(request: httpx.Request) -> httpx.Response:
+        if captured is not None:
+            captured.append(request)
+        if request.url.path not in routes:
+            return httpx.Response(404, json={})
+        body = routes[request.url.path]
+        if isinstance(body, int):  # treat an int as a status code (e.g. 302)
+            return httpx.Response(body, headers={"location": "/auth-gateway/login"})
+        return httpx.Response(200, json=body)
+
+    session = Session(settings, transport=httpx.MockTransport(handler))
+    session.save_cookies([{"name": "appSession", "value": "x", "domain": "www.avios.com"}])
+    return AviosClient(session)
+
+
+def test_get_balance(settings: Settings, load_fixture: Callable[[str], Any]) -> None:
+    client = _client(settings, {endpoints.ACCOUNTS: load_fixture("balance.json")})
+    balance = client.get_balance()
+    assert balance.balance == 75751
+    assert balance.household == 112430
+
+
+def test_get_transactions(settings: Settings, load_fixture: Callable[[str], Any]) -> None:
+    captured: list[httpx.Request] = []
+    client = _client(
+        settings, {endpoints.TRANSACTIONS: load_fixture("transactions.json")}, captured
+    )
+    txns = client.get_transactions(limit=2)
+    assert len(txns) == 2
+    assert txns[0].type is not None and txns[0].type.value == "Collection"
+    assert txns[0].amount == 50
+    assert txns[1].amount == -52000
+    # Sends the required opco header and the limit as offset.
+    req = captured[-1]
+    assert req.headers["x-avios-opco"] == "BAEC"
+    assert "offset=2" in str(req.url)
+    assert "status=completed" in str(req.url)
+
+
+def test_get_profile(settings: Settings) -> None:
+    payload = {"idToken": "jwt", "tokenContent": {"name": "Alex"}}
+    client = _client(settings, {endpoints.AUTH_USER: payload})
+    profile = client.get_profile()
+    assert profile.as_dict()["tokenContent"]["name"] == "Alex"
+
+
+def test_raw_normalises_leading_slash(settings: Settings) -> None:
+    client = _client(settings, {"/manage-avios/api/user/current": {"id": 1}})
+    assert client.raw("manage-avios/api/user/current") == {"id": 1}
+
+
+def test_expired_session_propagates(settings: Settings) -> None:
+    client = _client(settings, {endpoints.ACCOUNTS: 302})
+    with pytest.raises(SessionExpired):
+        client.get_balance()
+
+
+def test_extract_list_variants() -> None:
+    assert _extract_list([1, 2]) == [1, 2]
+    assert _extract_list({"items": [1]}) == [1]
+    assert _extract_list({"nope": 1}) == []
+    assert _extract_list("string") == []

avios_cli-0.2.0/tests/test_models.py

@@ -0,0 +1,53 @@
+"""Tests for the pydantic models."""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+from typing import Any
+
+from avios.models import Balance, Transaction
+
+
+def test_balance_parses_shell_shape(load_fixture: Callable[[str], Any]) -> None:
+    balance = Balance.model_validate(load_fixture("balance.json"))
+    assert balance.balance == 75751
+    assert balance.individual == 75751
+    assert balance.household == 112430
+
+
+def test_balance_round_trips() -> None:
+    balance = Balance(balance=100, individual=100, household=200)
+    assert balance.as_dict() == {"balance": 100, "individual": 100, "household": 200}
+
+
+def test_balance_extras_are_optional() -> None:
+    balance = Balance.model_validate({"balance": 42})
+    assert balance.individual is None
+    assert balance.household is None
+
+
+def test_extra_fields_are_preserved() -> None:
+    txn = Transaction.model_validate({"date": "2026-07-01", "avios": 500, "unknown": "x"})
+    dumped = txn.as_dict()
+    assert dumped["unknown"] == "x"
+
+
+def test_transaction_parses_real_shape() -> None:
+    txn = Transaction.model_validate(
+        {
+            "identifier": "2139440378",
+            "dateProcessed": "2026-07-21T11:37:35.000Z",
+            "description": "UBER",
+            "type": {"value": "Collection", "id": "DV_COL"},
+            "partner": {"value": "UBER", "id": "UBR"},
+            "amount": 50,
+            "categories": ["collectingAvios"],
+            "recordIndex": 1,
+        }
+    )
+    assert txn.identifier == "2139440378"
+    assert txn.date_processed == "2026-07-21T11:37:35.000Z"
+    assert txn.type is not None and txn.type.value == "Collection"
+    assert txn.partner is not None and txn.partner.id == "UBR"
+    assert txn.amount == 50
+    assert txn.categories == ["collectingAvios"]

{avios_cli-0.1.5 → avios_cli-0.2.0}/tests/test_session.py

@@ -67,6 +67,7 @@ def test_client_requires_authentication(settings: Settings) -> None:
 def test_get_json_returns_parsed_body(settings: Settings) -> None:
     def handler(request: httpx.Request) -> httpx.Response:
         assert request.headers["cookie"] == "appSession=abc"
+        assert request.headers["x-avios-opco"] == "BAEC"
         return httpx.Response(200, json={"balance": 75751})
 
     session = _session(settings, httpx.MockTransport(handler))

{avios_cli-0.1.5 → avios_cli-0.2.0}/tests/test_tui.py

@@ -15,12 +15,16 @@ from avios.tui.widgets import BalanceDisplay
 
 class FakeClient:
     def get_balance(self) -> Balance:
-        return Balance(balance=100, household_avios_balance=200)
+        return Balance(balance=100, individual=100, household=200)
 
-    def get_transactions(self, limit: int | None = None) -> list[Transaction]:
+    def get_transactions(self, limit: int = 50) -> list[Transaction]:
         return [
-            Transaction.model_validate({"date": "2026-07-01", "avios": 100}),
-            Transaction.model_validate({"date": "2026-06-01", "avios": 50}),
+            Transaction.model_validate(
+                {"dateProcessed": "2026-07-01T09:00:00Z", "description": "UBER", "amount": 100}
+            ),
+            Transaction.model_validate(
+                {"dateProcessed": "2026-06-01T09:00:00Z", "description": "Flight", "amount": -5000}
+            ),
         ]
 
 

avios_cli-0.1.5/tests/fixtures/accounts.json

@@ -1,3 +0,0 @@
-[
-  {"programme": "British Airways Executive Club", "balance": 75751}
-]

avios_cli-0.1.5/tests/fixtures/balance.json

@@ -1 +0,0 @@
-{"balance": 75751, "householdAviosBalance": 75752}

avios_cli-0.1.5/tests/fixtures/transactions.json

@@ -1,5 +0,0 @@
-[
-  {"date": "2026-07-01", "description": "Flight BA286 SFO-LHR", "avios": 4200},
-  {"date": "2026-06-15", "description": "Tesco groceries", "avios": 150},
-  {"date": "2026-06-02", "description": "Redemption: LHR-JFK", "avios": -50000}
-]

avios_cli-0.1.5/tests/test_client.py

@@ -1,89 +0,0 @@
-"""Tests for the typed API client.
-
-The transactions/accounts fixtures are representative, not confirmed shapes, so
-these tests assert on counts and field pass-through (via ``extra='allow'``) rather
-than a rigid schema. The balance shape is confirmed.
-"""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from typing import Any
-
-import httpx
-import pytest
-
-from avios import endpoints
-from avios.client import AviosClient, _extract_list
-from avios.config import Settings
-from avios.session import Session, SessionExpired
-
-
-def _client(settings: Settings, routes: dict[str, Any]) -> AviosClient:
-    def handler(request: httpx.Request) -> httpx.Response:
-        if request.url.path not in routes:
-            return httpx.Response(404, json={})
-        body = routes[request.url.path]
-        if isinstance(body, int):  # treat an int as a status code (e.g. 302)
-            return httpx.Response(body, headers={"location": "/auth-gateway/login"})
-        return httpx.Response(200, json=body)
-
-    session = Session(settings, transport=httpx.MockTransport(handler))
-    session.save_cookies([{"name": "appSession", "value": "x", "domain": "www.avios.com"}])
-    return AviosClient(session)
-
-
-def test_get_balance(settings: Settings, load_fixture: Callable[[str], Any]) -> None:
-    client = _client(settings, {endpoints.BALANCE: load_fixture("balance.json")})
-    balance = client.get_balance()
-    assert balance.balance == 75751
-    assert balance.household_avios_balance == 75752
-
-
-def test_get_transactions_from_bare_list(
-    settings: Settings, load_fixture: Callable[[str], Any]
-) -> None:
-    client = _client(settings, {endpoints.TRANSACTIONS: load_fixture("transactions.json")})
-    txns = client.get_transactions()
-    assert len(txns) == 3
-    assert txns[0].as_dict()["description"] == "Flight BA286 SFO-LHR"
-
-
-def test_get_transactions_respects_limit(
-    settings: Settings, load_fixture: Callable[[str], Any]
-) -> None:
-    client = _client(settings, {endpoints.TRANSACTIONS: load_fixture("transactions.json")})
-    assert len(client.get_transactions(limit=2)) == 2
-
-
-def test_get_transactions_from_wrapped_object(settings: Settings) -> None:
-    payload = {"total": 1, "transactions": [{"date": "2026-07-01", "avios": 100}]}
-    client = _client(settings, {endpoints.TRANSACTIONS: payload})
-    txns = client.get_transactions()
-    assert len(txns) == 1
-    assert txns[0].as_dict()["avios"] == 100
-
-
-def test_get_accounts(settings: Settings, load_fixture: Callable[[str], Any]) -> None:
-    client = _client(settings, {endpoints.ACCOUNTS: load_fixture("accounts.json")})
-    accounts = client.get_accounts()
-    assert len(accounts) == 1
-    assert accounts[0].as_dict()["programme"] == "British Airways Executive Club"
-
-
-def test_raw_normalises_leading_slash(settings: Settings) -> None:
-    client = _client(settings, {"/manage-avios/api/user/current": {"id": 1}})
-    assert client.raw("manage-avios/api/user/current") == {"id": 1}
-
-
-def test_expired_session_propagates(settings: Settings) -> None:
-    client = _client(settings, {endpoints.BALANCE: 302})
-    with pytest.raises(SessionExpired):
-        client.get_balance()
-
-
-def test_extract_list_variants() -> None:
-    assert _extract_list([1, 2]) == [1, 2]
-    assert _extract_list({"items": [1]}) == [1]
-    assert _extract_list({"nope": 1}) == []
-    assert _extract_list("string") == []

avios_cli-0.1.5/tests/test_models.py

@@ -1,32 +0,0 @@
-"""Tests for the pydantic models."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from typing import Any
-
-from avios.models import Balance, Transaction
-
-
-def test_balance_parses_confirmed_shape(load_fixture: Callable[[str], Any]) -> None:
-    balance = Balance.model_validate(load_fixture("balance.json"))
-    assert balance.balance == 75751
-    assert balance.household_avios_balance == 75752
-
-
-def test_balance_alias_round_trips() -> None:
-    balance = Balance(balance=100, household_avios_balance=200)
-    assert balance.as_dict() == {"balance": 100, "householdAviosBalance": 200}
-
-
-def test_balance_household_is_optional() -> None:
-    balance = Balance.model_validate({"balance": 42})
-    assert balance.household_avios_balance is None
-
-
-def test_extra_fields_are_preserved() -> None:
-    txn = Transaction.model_validate({"date": "2026-07-01", "avios": 500, "unknown": "x"})
-    dumped = txn.as_dict()
-    assert dumped["date"] == "2026-07-01"
-    assert dumped["avios"] == 500
-    assert dumped["unknown"] == "x"