ynab-cli 0.6.0__tar.gz → 0.6.2__tar.gz

{ynab_cli-0.6.0 → ynab_cli-0.6.2}/CHANGELOG.md

@@ -5,6 +5,22 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v0.6.2 (2025-07-09)
+
+### Fix
+
+- **tui**: update client token when settings are changed
+
+## v0.6.1 (2025-07-09)
+
+### Fix
+
+- fix issue with providing new token
+
+### Refactor
+
+- work towards using dependency injection container
+
 ## v0.6.0 (2025-06-28)
 
 ### Feat

{ynab_cli-0.6.0 → ynab_cli-0.6.2}/Makefile

@@ -10,7 +10,7 @@ lint: .venv # run linters and type checkers
 	uv run mypy .
 
 test: .venv lint # run tests with coverage
-	uv run pytest --cov=src tests
+	uv run pytest --cov-report term-missing:skip-covered --cov=src tests
 
 clean: # clean up build artifacts and caches
 	rm -f .coverage

{ynab_cli-0.6.0 → ynab_cli-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ynab-cli
-Version: 0.6.0
+Version: 0.6.2
 Summary: YNAB Command Line Interface
 Project-URL: Changelog, https://github.com/jeffsawatzky/ynab-cli/blob/main/CHANGELOG.md
 Project-URL: Documentation, https://jeffsawatzky.github.io/ynab-cli/
@@ -24,12 +24,13 @@ Requires-Dist: attrs~=25.3
 Requires-Dist: click-default-group~=1.2
 Requires-Dist: click~=8.2
 Requires-Dist: httpx~=0.28
+Requires-Dist: lagom~=2.7
 Requires-Dist: python-dotenv~=1.1
 Requires-Dist: rapidfuzz~=3.13
 Requires-Dist: rich~=14.0
 Requires-Dist: rule-engine~=4.5
 Requires-Dist: textual-fspicker~=0.4
-Requires-Dist: textual~=3.5
+Requires-Dist: textual~=3.6
 Requires-Dist: typing-extensions~=4.14
 Requires-Dist: uvloop~=0.21
 Description-Content-Type: text/markdown

{ynab_cli-0.6.0 → ynab_cli-0.6.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ynab-cli"
-version = "0.6.0"
+version = "0.6.2"
 description = "YNAB Command Line Interface"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -38,12 +38,13 @@ dependencies = [
   "click-default-group~=1.2",
   "click~=8.2",
   "httpx~=0.28",
+  "lagom~=2.7",
   "python-dotenv~=1.1",
   "rapidfuzz~=3.13",
   "rich~=14.0",
   "rule-engine~=4.5",
   "textual-fspicker~=0.4",
-  "textual~=3.5",
+  "textual~=3.6",
   "typing-extensions~=4.14",
   "uvloop~=0.21",
 ]

{ynab_cli-0.6.0 → ynab_cli-0.6.2}/src/ynab_cli/adapters/rich/io.py

@@ -6,8 +6,9 @@ from ynab_cli.domain.ports.io import IO, Progress
 
 
 class RichProgress(Progress):
-    def __init__(self, progress_info: tuple[rich_progress.Progress, rich_progress.TaskID]) -> None:
-        self._progress, self._task_id = progress_info
+    def __init__(self, progress: rich_progress.Progress) -> None:
+        self._progress = progress
+        self._task_id = progress.add_task("Loading...")
 
     @override
     async def update(
@@ -20,10 +21,9 @@ class RichProgress(Progress):
 
 
 class RichIO(IO):
-    def __init__(self, progress_info: tuple[rich_progress.Progress, rich_progress.TaskID]) -> None:
-        progress, _ = progress_info
+    def __init__(self, progress: rich_progress.Progress) -> None:
         self._progress = progress
-        self.progress = RichProgress(progress_info)
+        self.progress = RichProgress(self._progress)
 
     @override
     async def prompt(self, prompt: str, password: bool = False) -> str:

{ynab_cli-0.6.0 → ynab_cli-0.6.2}/src/ynab_cli/adapters/ynab/client.py

@@ -203,6 +203,16 @@ class AuthenticatedClient:
             self._async_client.timeout = timeout
         return evolve(self, timeout=timeout)
 
+    def update_token(self, token: str) -> None:
+        """Update the token used for authentication"""
+        self.token = token
+
+        auth_header = f"{self.prefix} {self.token}" if self.prefix else self.token
+        if self._client is not None:
+            self._client.headers[self.auth_header_name] = auth_header
+        if self._async_client is not None:
+            self._async_client.headers[self.auth_header_name] = auth_header
+
     def set_httpx_client(self, client: httpx.Client) -> "AuthenticatedClient":
         """Manually set the underlying httpx.Client
 

{ynab_cli-0.6.0 → ynab_cli-0.6.2}/src/ynab_cli/adapters/ynab/util.py

@@ -58,7 +58,8 @@ async def run_asyncio_detailed(
             if not new_access_token:
                 raise e
 
-            client.token = new_access_token
+            client.update_token(new_access_token)
+
             response = await asyncio_detailed(*args, **kwargs)
             parsed_data = get_parsed_response_data(response)
         else:

ynab_cli-0.6.2/src/ynab_cli/domain/use_cases/budgets.py

@@ -0,0 +1,47 @@
+from collections.abc import AsyncIterator
+from typing import TypedDict
+
+from ynab_cli.adapters import ynab
+from ynab_cli.adapters.ynab import models, util
+from ynab_cli.adapters.ynab.api.budgets import get_budgets
+from ynab_cli.domain import ports
+from ynab_cli.domain.settings import Settings
+
+
+class ListAllParams(TypedDict):
+    pass
+
+
+class ListAll:
+    """Use case for listing all budgets."""
+
+    def __init__(self, io: ports.IO, client: ynab.AuthenticatedClient):
+        self._io = io
+        self._client = client
+
+    async def __call__(self, settings: Settings, params: ListAllParams) -> AsyncIterator[models.BudgetSummary]:
+        try:
+            progress_total = 0
+
+            budgets = (
+                await util.get_asyncio_detailed(
+                    self._io, get_budgets.asyncio_detailed, include_accounts=False, client=self._client
+                )
+            ).data.budgets
+            budgets.sort(key=lambda b: b.name)
+
+            progress_total = len(budgets)
+            await self._io.progress.update(total=progress_total)
+            for budget in budgets:
+                await self._io.progress.update(advance=1)
+                yield budget
+
+        except Exception as e:
+            if isinstance(e, util.ApiError) and e.status_code == 401:
+                await self._io.print("Invalid or expired access token. Please update your settings.")
+            elif isinstance(e, util.ApiError) and e.status_code == 429:
+                await self._io.print("API rate limit exceeded. Try again later, or get a new access token.")
+            else:
+                await self._io.print(f"Exception when calling YNAB: {e}")
+        finally:
+            await self._io.progress.update(total=progress_total, completed=progress_total)

{ynab_cli-0.6.0 → ynab_cli-0.6.2}/src/ynab_cli/domain/use_cases/categories.py

@@ -6,7 +6,6 @@ from ynab_cli.adapters.ynab import models, util
 from ynab_cli.adapters.ynab.api.categories import get_categories
 from ynab_cli.adapters.ynab.api.transactions import get_transactions_by_category
 from ynab_cli.domain import ports
-from ynab_cli.domain.constants import YNAB_API_URL
 from ynab_cli.domain.settings import Settings
 
 
@@ -20,47 +19,48 @@ class ListUnusedParams(TypedDict):
     pass
 
 
-async def list_unused(
-    settings: Settings, io: ports.IO, params: ListUnusedParams, *, client: ynab.AuthenticatedClient | None = None
-) -> AsyncIterator[models.Category]:
-    try:
-        progress_total = 0
+class ListUnused:
+    """Use case for listing unused categories."""
 
-        if client is None:
-            client = ynab.AuthenticatedClient(base_url=YNAB_API_URL, token=settings.ynab.access_token)
+    def __init__(self, io: ports.IO, client: ynab.AuthenticatedClient):
+        self._io = io
+        self._client = client
+
+    async def __call__(self, settings: Settings, params: ListUnusedParams) -> AsyncIterator[models.Category]:
+        try:
+            progress_total = 0
 
-        async with client:
             category_groups = (
                 await util.get_asyncio_detailed(
-                    io, get_categories.asyncio_detailed, settings.ynab.budget_id, client=client
+                    self._io, get_categories.asyncio_detailed, settings.ynab.budget_id, client=self._client
                 )
             ).data.category_groups
             category_groups.sort(key=lambda cg: cg.name)
 
             progress_total = len(category_groups)
-            await io.progress.update(total=progress_total)
+            await self._io.progress.update(total=progress_total)
             for category_group in category_groups:
-                await io.progress.update(advance=1)
+                await self._io.progress.update(advance=1)
 
                 if _should_skip_category_or_group(category_or_group=category_group):
                     continue
 
                 progress_total += len(category_group.categories)
-                await io.progress.update(total=progress_total)
+                await self._io.progress.update(total=progress_total)
                 category_group.categories.sort(key=lambda c: c.name)
                 for category in category_group.categories:
-                    await io.progress.update(advance=1)
+                    await self._io.progress.update(advance=1)
 
                     if _should_skip_category_or_group(category_or_group=category):
                         continue
 
                     transactions = (
                         await util.get_asyncio_detailed(
-                            io,
+                            self._io,
                             get_transactions_by_category.asyncio_detailed,
                             settings.ynab.budget_id,
                             str(category.id),
-                            client=client,
+                            client=self._client,
                         )
                     ).data.transactions
                     num_transactions = len(transactions)
@@ -69,63 +69,64 @@ async def list_unused(
                     if not num_transactions:
                         yield category
 
-    except Exception as e:
-        if isinstance(e, util.ApiError) and e.status_code == 401:
-            await io.print("Invalid or expired access token. Please update your settings.")
-        elif isinstance(e, util.ApiError) and e.status_code == 429:
-            await io.print("API rate limit exceeded. Try again later, or get a new access token.")
-        else:
-            await io.print(f"Exception when calling YNAB: {e}")
-    finally:
-        await io.progress.update(total=progress_total, completed=progress_total)
+        except Exception as e:
+            if isinstance(e, util.ApiError) and e.status_code == 401:
+                await self._io.print("Invalid or expired access token. Please update your settings.")
+            elif isinstance(e, util.ApiError) and e.status_code == 429:
+                await self._io.print("API rate limit exceeded. Try again later, or get a new access token.")
+            else:
+                await self._io.print(f"Exception when calling YNAB: {e}")
+        finally:
+            await self._io.progress.update(total=progress_total, completed=progress_total)
 
 
 class ListAllParams(TypedDict):
     pass
 
 
-async def list_all(
-    settings: Settings, io: ports.IO, params: ListAllParams, *, client: ynab.AuthenticatedClient | None = None
-) -> AsyncIterator[models.Category]:
-    try:
-        progress_total = 0
+class ListAll:
+    """Use case for listing all categories."""
+
+    def __init__(self, io: ports.IO, client: ynab.AuthenticatedClient):
+        self._io = io
+        self._client = client
 
-        if client is None:
-            client = ynab.AuthenticatedClient(base_url=YNAB_API_URL, token=settings.ynab.access_token)
+    async def __call__(self, settings: Settings, params: ListAllParams) -> AsyncIterator[models.Category]:
+        try:
+            progress_total = 0
 
-        async with client:
             category_groups = (
                 await util.get_asyncio_detailed(
-                    io, get_categories.asyncio_detailed, settings.ynab.budget_id, client=client
+                    self._io, get_categories.asyncio_detailed, settings.ynab.budget_id, client=self._client
                 )
             ).data.category_groups
             category_groups.sort(key=lambda cg: cg.name)
 
             progress_total = len(category_groups)
-            await io.progress.update(total=progress_total)
+            await self._io.progress.update(total=progress_total)
             for category_group in category_groups:
-                await io.progress.update(advance=1)
+                await self._io.progress.update(advance=1)
 
                 if _should_skip_category_or_group(category_or_group=category_group):
                     continue
 
                 progress_total += len(category_group.categories)
-                await io.progress.update(total=progress_total)
+                await self._io.progress.update(total=progress_total)
                 category_group.categories.sort(key=lambda c: c.name)
                 for category in category_group.categories:
-                    await io.progress.update(advance=1)
+                    await self._io.progress.update(advance=1)
 
                     if _should_skip_category_or_group(category_or_group=category):
                         continue
 
                     yield category
 
-    except Exception as e:
-        if isinstance(e, util.ApiError) and e.status_code == 401:
-            await io.print("Invalid or expired access token. Please update your settings.")
-        elif isinstance(e, util.ApiError) and e.status_code == 429:
-            await io.print("API rate limit exceeded. Try again later, or get a new access token.")
-        else:
-            await io.print(f"Exception when calling YNAB: {e}")
-    finally:
-        await io.progress.update(total=progress_total, completed=progress_total)
+        except Exception as e:
+            if isinstance(e, util.ApiError) and e.status_code == 401:
+                await self._io.print("Invalid or expired access token. Please update your settings.")
+            elif isinstance(e, util.ApiError) and e.status_code == 429:
+                await self._io.print("API rate limit exceeded. Try again later, or get a new access token.")
+            else:
+                await self._io.print(f"Exception when calling YNAB: {e}")
+        finally:
+            await self._io.progress.update(total=progress_total, completed=progress_total)

{ynab_cli-0.6.0 → ynab_cli-0.6.2}/src/ynab_cli/domain/use_cases/payees.py

@@ -10,7 +10,7 @@ from ynab_cli.adapters.ynab import models, util
 from ynab_cli.adapters.ynab.api.payees import get_payees, update_payee
 from ynab_cli.adapters.ynab.api.transactions import get_transactions_by_payee
 from ynab_cli.domain import ports
-from ynab_cli.domain.constants import UNUSED_PREFIX, YNAB_API_URL
+from ynab_cli.domain.constants import UNUSED_PREFIX
 from ynab_cli.domain.settings import Settings
 
 
@@ -44,25 +44,30 @@ class NormalizeNamesParams(TypedDict):
     pass
 
 
-async def normalize_names(
-    settings: Settings, io: ports.IO, params: NormalizeNamesParams, *, client: ynab.AuthenticatedClient | None = None
-) -> AsyncIterator[tuple[models.Payee, str]]:
-    try:
-        progress_total = 0
+class NormalizeNames:
+    """Use case for normalizing payee names."""
 
-        if client is None:
-            client = ynab.AuthenticatedClient(base_url=YNAB_API_URL, token=settings.ynab.access_token)
+    def __init__(self, io: ports.IO, client: ynab.AuthenticatedClient):
+        self._io = io
+        self._client = client
+
+    async def __call__(
+        self, settings: Settings, params: NormalizeNamesParams
+    ) -> AsyncIterator[tuple[models.Payee, str]]:
+        try:
+            progress_total = 0
 
-        async with client:
             payees = (
-                await util.get_asyncio_detailed(io, get_payees.asyncio_detailed, settings.ynab.budget_id, client=client)
+                await util.get_asyncio_detailed(
+                    self._io, get_payees.asyncio_detailed, settings.ynab.budget_id, client=self._client
+                )
             ).data.payees
             payees.sort(key=lambda p: p.name)
 
             progress_total = len(payees)
-            await io.progress.update(total=progress_total)
+            await self._io.progress.update(total=progress_total)
             for payee in payees:
-                await io.progress.update(advance=1)
+                await self._io.progress.update(advance=1)
 
                 if _should_skip_payee(payee=payee):
                     continue
@@ -73,50 +78,55 @@ async def normalize_names(
 
                     if not settings.dry_run:
                         await util.run_asyncio_detailed(
-                            io,
+                            self._io,
                             update_payee.asyncio_detailed,
                             settings.ynab.budget_id,
                             str(payee.id),
-                            client=client,
+                            client=self._client,
                             body=models.PatchPayeeWrapper(payee=models.SavePayee(name=normalized_name)),
                         )
 
-    except Exception as e:
-        if isinstance(e, util.ApiError) and e.status_code == 401:
-            await io.print("Invalid or expired access token. Please update your settings.")
-        elif isinstance(e, util.ApiError) and e.status_code == 429:
-            await io.print("API rate limit exceeded. Try again later, or get a new access token.")
-        else:
-            await io.print(f"Exception when calling YNAB: {e}")
-    finally:
-        await io.progress.update(total=progress_total, completed=progress_total)
+        except Exception as e:
+            if isinstance(e, util.ApiError) and e.status_code == 401:
+                await self._io.print("Invalid or expired access token. Please update your settings.")
+            elif isinstance(e, util.ApiError) and e.status_code == 429:
+                await self._io.print("API rate limit exceeded. Try again later, or get a new access token.")
+            else:
+                await self._io.print(f"Exception when calling YNAB: {e}")
+        finally:
+            await self._io.progress.update(total=progress_total, completed=progress_total)
 
 
 class ListDuplicatesParams(TypedDict):
     pass
 
 
-async def list_duplicates(
-    settings: Settings, io: ports.IO, params: ListDuplicatesParams, *, client: ynab.AuthenticatedClient | None = None
-) -> AsyncIterator[tuple[models.Payee, models.Payee]]:
-    try:
-        progress_total = 0
+class ListDuplicates:
+    """Use case for listing duplicate payees."""
+
+    def __init__(self, io: ports.IO, client: ynab.AuthenticatedClient):
+        self._io = io
+        self._client = client
 
-        if client is None:
-            client = ynab.AuthenticatedClient(base_url=YNAB_API_URL, token=settings.ynab.access_token)
+    async def __call__(
+        self, settings: Settings, params: ListDuplicatesParams
+    ) -> AsyncIterator[tuple[models.Payee, models.Payee]]:
+        try:
+            progress_total = 0
 
-        async with client:
             possible_duplicates: dict[tuple[UUID, str], list[tuple[UUID, str]]] = {}
 
             payees = (
-                await util.get_asyncio_detailed(io, get_payees.asyncio_detailed, settings.ynab.budget_id, client=client)
+                await util.get_asyncio_detailed(
+                    self._io, get_payees.asyncio_detailed, settings.ynab.budget_id, client=self._client
+                )
             ).data.payees
             payees.sort(key=lambda p: p.name)
 
             progress_total = len(payees)
-            await io.progress.update(total=progress_total)
+            await self._io.progress.update(total=progress_total)
             for idx, payee in enumerate(payees):
-                await io.progress.update(advance=1)
+                await self._io.progress.update(advance=1)
 
                 if _should_skip_payee(payee=payee):
                     continue
@@ -144,51 +154,54 @@ async def list_duplicates(
 
                         yield (payee, filtered_payee)
 
-    except Exception as e:
-        if isinstance(e, util.ApiError) and e.status_code == 401:
-            await io.print("Invalid or expired access token. Please update your settings.")
-        elif isinstance(e, util.ApiError) and e.status_code == 429:
-            await io.print("API rate limit exceeded. Try again later, or get a new access token.")
-        else:
-            await io.print(f"Exception when calling YNAB: {e}")
-    finally:
-        await io.progress.update(total=progress_total, completed=progress_total)
+        except Exception as e:
+            if isinstance(e, util.ApiError) and e.status_code == 401:
+                await self._io.print("Invalid or expired access token. Please update your settings.")
+            elif isinstance(e, util.ApiError) and e.status_code == 429:
+                await self._io.print("API rate limit exceeded. Try again later, or get a new access token.")
+            else:
+                await self._io.print(f"Exception when calling YNAB: {e}")
+        finally:
+            await self._io.progress.update(total=progress_total, completed=progress_total)
 
 
 class ListUnusedParams(TypedDict):
     prefix_unused: bool
 
 
-async def list_unused(
-    settings: Settings, io: ports.IO, params: ListUnusedParams, *, client: ynab.AuthenticatedClient | None = None
-) -> AsyncIterator[models.Payee]:
-    try:
-        progress_total = 0
+class ListUnused:
+    """Use case for listing unused payees."""
 
-        if client is None:
-            client = ynab.AuthenticatedClient(base_url=YNAB_API_URL, token=settings.ynab.access_token)
+    def __init__(self, io: ports.IO, client: ynab.AuthenticatedClient):
+        self._io = io
+        self._client = client
+
+    async def __call__(self, settings: Settings, params: ListUnusedParams) -> AsyncIterator[models.Payee]:
+        try:
+            progress_total = 0
 
-        async with client:
             payees = (
-                await util.get_asyncio_detailed(io, get_payees.asyncio_detailed, settings.ynab.budget_id, client=client)
+                await util.get_asyncio_detailed(
+                    self._io, get_payees.asyncio_detailed, settings.ynab.budget_id, client=self._client
+                )
             ).data.payees
             payees.sort(key=lambda p: p.name)
 
             progress_total = len(payees)
-            await io.progress.update(total=progress_total)
+            await self._io.progress.update(total=progress_total)
             for payee in payees:
-                await io.progress.update(advance=1)
+                await self._io.progress.update(advance=1)
 
                 if _should_skip_payee(payee=payee):
                     continue
 
                 transactions = (
                     await util.get_asyncio_detailed(
-                        io,
+                        self._io,
                         get_transactions_by_payee.asyncio_detailed,
                         settings.ynab.budget_id,
                         str(payee.id),
-                        client=client,
+                        client=self._client,
                     )
                 ).data.transactions
                 num_transactions = len(transactions)
@@ -201,60 +214,63 @@ async def list_unused(
                     if not settings.dry_run and params.get("prefix_unused", False):
                         new_name = f"{UNUSED_PREFIX} {payee.name}"
                         await util.run_asyncio_detailed(
-                            io,
+                            self._io,
                             update_payee.asyncio_detailed,
                             settings.ynab.budget_id,
                             str(payee.id),
-                            client=client,
+                            client=self._client,
                             body=models.PatchPayeeWrapper(payee=models.SavePayee(name=new_name)),
                         )
 
-    except Exception as e:
-        if isinstance(e, util.ApiError) and e.status_code == 401:
-            await io.print("Invalid or expired access token. Please update your settings.")
-        elif isinstance(e, util.ApiError) and e.status_code == 429:
-            await io.print("API rate limit exceeded. Try again later, or get a new access token.")
-        else:
-            await io.print(f"Exception when calling YNAB: {e}")
-    finally:
-        await io.progress.update(total=progress_total, completed=progress_total)
+        except Exception as e:
+            if isinstance(e, util.ApiError) and e.status_code == 401:
+                await self._io.print("Invalid or expired access token. Please update your settings.")
+            elif isinstance(e, util.ApiError) and e.status_code == 429:
+                await self._io.print("API rate limit exceeded. Try again later, or get a new access token.")
+            else:
+                await self._io.print(f"Exception when calling YNAB: {e}")
+        finally:
+            await self._io.progress.update(total=progress_total, completed=progress_total)
 
 
 class ListAllParams(TypedDict):
     pass
 
 
-async def list_all(
-    settings: Settings, io: ports.IO, params: ListAllParams, *, client: ynab.AuthenticatedClient | None = None
-) -> AsyncIterator[models.Payee]:
-    try:
-        progress_total = 0
+class ListAll:
+    """Use case for listing all payees."""
+
+    def __init__(self, io: ports.IO, client: ynab.AuthenticatedClient):
+        self._io = io
+        self._client = client
 
-        if client is None:
-            client = ynab.AuthenticatedClient(base_url=YNAB_API_URL, token=settings.ynab.access_token)
+    async def __call__(self, settings: Settings, params: ListAllParams) -> AsyncIterator[models.Payee]:
+        try:
+            progress_total = 0
 
-        async with client:
             payees = (
-                await util.get_asyncio_detailed(io, get_payees.asyncio_detailed, settings.ynab.budget_id, client=client)
+                await util.get_asyncio_detailed(
+                    self._io, get_payees.asyncio_detailed, settings.ynab.budget_id, client=self._client
+                )
             ).data.payees
             payees.sort(key=lambda p: p.name)
 
             progress_total = len(payees)
-            await io.progress.update(total=progress_total)
+            await self._io.progress.update(total=progress_total)
             for payee in payees:
-                await io.progress.update(advance=1)
+                await self._io.progress.update(advance=1)
 
                 if _should_skip_payee(payee=payee):
                     continue
 
                 yield payee
 
-    except Exception as e:
-        if isinstance(e, util.ApiError) and e.status_code == 401:
-            await io.print("Invalid or expired access token. Please update your settings.")
-        elif isinstance(e, util.ApiError) and e.status_code == 429:
-            await io.print("API rate limit exceeded. Try again later, or get a new access token.")
-        else:
-            await io.print(f"Exception when calling YNAB: {e}")
-    finally:
-        await io.progress.update(total=progress_total, completed=progress_total)
+        except Exception as e:
+            if isinstance(e, util.ApiError) and e.status_code == 401:
+                await self._io.print("Invalid or expired access token. Please update your settings.")
+            elif isinstance(e, util.ApiError) and e.status_code == 429:
+                await self._io.print("API rate limit exceeded. Try again later, or get a new access token.")
+            else:
+                await self._io.print(f"Exception when calling YNAB: {e}")
+        finally:
+            await self._io.progress.update(total=progress_total, completed=progress_total)