beancount-gocardless 0.1.9__tar.gz → 0.1.11__tar.gz

{beancount_gocardless-0.1.9 → beancount_gocardless-0.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beancount-gocardless
-Version: 0.1.9
+Version: 0.1.11
 License-Expression: Unlicense
 License-File: LICENSE
 Requires-Python: <4,>=3.12
@@ -20,6 +20,9 @@ Requires-Dist: sphinx; extra == 'dev'
 Requires-Dist: sphinx-rtd-theme; extra == 'dev'
 Provides-Extra: lint
 Requires-Dist: ruff>=0.9.8; extra == 'lint'
+Provides-Extra: test
+Requires-Dist: pytest; extra == 'test'
+Requires-Dist: pytest-asyncio; extra == 'test'
 Description-Content-Type: text/markdown
 
 beancount-gocardless
@@ -94,7 +97,8 @@ cache_options: # by default, no caching if cache_options is not provided
 
 accounts:
     - id: <REDACTED_UUID>
-    asset_account: "Assets:Banks:Revolut:Checking"
+      asset_account: "Assets:Banks:Revolut:Checking"
+      transaction_types: ["booked", "pending"]  # optional, defaults to both
 ```
 
 ```python

{beancount_gocardless-0.1.9 → beancount_gocardless-0.1.11}/README.md

@@ -70,7 +70,8 @@ cache_options: # by default, no caching if cache_options is not provided
 
 accounts:
     - id: <REDACTED_UUID>
-    asset_account: "Assets:Banks:Revolut:Checking"
+      asset_account: "Assets:Banks:Revolut:Checking"
+      transaction_types: ["booked", "pending"]  # optional, defaults to both
 ```
 
 ```python

{beancount_gocardless-0.1.9 → beancount_gocardless-0.1.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "beancount-gocardless"
-version = "0.1.9"
+version = "0.1.11"
 description = ""
 authors = []
 readme = "README.md"
@@ -33,6 +33,10 @@ dev = [
 lint = [
     "ruff>=0.9.8",
 ]
+test = [
+    "pytest",
+    "pytest-asyncio",
+]
 
 [build-system]
 requires = ["hatchling"]

{beancount_gocardless-0.1.9 → beancount_gocardless-0.1.11}/src/beancount_gocardless/__init__.py

@@ -5,6 +5,5 @@ Generated from swagger.json to provide a clean, typed interface.
 
 from .client import GoCardlessClient
 from .importer import GoCardLessImporter
-from .models import *
 
 __all__ = ["GoCardlessClient", "GoCardLessImporter"]

{beancount_gocardless-0.1.9 → beancount_gocardless-0.1.11}/src/beancount_gocardless/cli.py

@@ -2,8 +2,9 @@ import argparse
 import sys
 import os
 import logging
-from beancount_gocardless.client import GoCardlessClient
+
 from beancount_gocardless.models import AccountInfo
+from beancount_gocardless.client import GoCardlessClient
 
 
 logging.basicConfig(level=os.environ.get("LOGLEVEL", logging.INFO))
@@ -83,21 +84,52 @@ def main():
     try:
         logger.debug("Initializing GoCardlessClient")
 
-        # Build cache options
-        cache_options = None
-        if args.cache:
-            cache_options = {
-                "cache_name": args.cache_name,
+        cache_options = (
+            {
                 "backend": args.cache_backend,
                 "expire_after": args.cache_expire,
-                "old_data_on_error": True,
-                "match_headers": False,
-                "cache_control": False,
+                "cache_name": args.cache_name,
             }
+            if args.cache
+            else {}
+        )
 
-        # client = GoCardlessClient(
-        #     args.secret_id, args.secret_key, cache_options=cache_options
-        # )
+        client = GoCardlessClient(args.secret_id, args.secret_key, cache_options)
+
+        if args.mode == "list_banks":
+            banks = client.list_banks(args.country)
+            for bank in banks:
+                logger.info(bank)
+        elif args.mode == "create_link":
+            if not args.bank:
+                logger.error("Error: --bank is required for create_link")
+                sys.exit(1)
+            link = client.create_bank_link(args.reference, args.bank)
+            if link:
+                logger.info(f"Bank link created: {link}")
+            else:
+                logger.info(f"Link already exists for reference '{args.reference}'")
+        elif args.mode == "list_accounts":
+            accounts = client.list_accounts()
+            for i, account in enumerate(accounts, 1):
+                display_account(i, account)
+        elif args.mode == "delete_link":
+            req = client.find_requisition_by_reference(args.reference)
+            if req:
+                client.delete_requisition(req.id)
+                logger.info(f"Deleted requisition '{args.reference}'")
+            else:
+                logger.error(f"No requisition found with reference '{args.reference}'")
+                sys.exit(1)
+        elif args.mode == "balance":
+            if not args.account:
+                logger.error("Error: --account is required for balance")
+                sys.exit(1)
+            balances = client.get_account_balances(args.account)
+            for balance in balances.balances:
+                logger.info(
+                    f"{balance.balance_type}: {balance.balance_amount.amount} {balance.balance_amount.currency}"
+                )
 
     except Exception as e:
         logger.error(f"Error: {e}")

{beancount_gocardless-0.1.9 → beancount_gocardless-0.1.11}/src/beancount_gocardless/client.py

@@ -239,9 +239,9 @@ class GoCardlessClient:
         """Get institutions for a country"""
         logger.debug("Getting institutions for country %s", country)
         params = {"country": country} if country else {}
-        data = self.get("/institutions/", params=params)
-        logger.debug("Fetched %d institutions", len(data))
-        return [Institution(**inst) for inst in data]
+        institutions_data = self.get("/institutions/", params=params)
+        logger.debug("Fetched %d institutions", len(institutions_data))
+        return [Institution(**inst) for inst in institutions_data]
 
     def get_institution(self, institution_id: str) -> Institution:
         """Get specific institution"""
@@ -422,3 +422,7 @@ class GoCardlessClient:
                     # Skip accounts that can't be accessed
                     continue
         return accounts
+
+    def list_accounts(self) -> List[AccountInfo]:
+        """Alias for get_all_accounts"""
+        return self.get_all_accounts()

{beancount_gocardless-0.1.9 → beancount_gocardless-0.1.11}/src/beancount_gocardless/importer.py

@@ -8,7 +8,7 @@ from beancount.core import amount, data, flags
 from beancount.core.number import D
 
 from .client import GoCardlessClient
-from .models import BankTransaction
+from .models import BankTransaction, GoCardlessConfig
 
 logger = logging.getLogger(__name__)
 
@@ -34,14 +34,14 @@ class GoCardLessImporter(beangulp.Importer):
     An importer for GoCardless API with improved structure and extensibility.
 
     Attributes:
-        config (Optional[Dict[str, Any]]): Configuration loaded from the YAML file.
+        config (Optional[GoCardlessConfig]): Configuration loaded from the YAML file.
         _client (Optional[GoCardlessClient]): Instance of the GoCardless API client.
     """
 
     def __init__(self) -> None:
         """Initialize the GoCardLessImporter."""
         logger.debug("Initializing GoCardLessImporter")
-        self.config: Optional[Dict[str, Any]] = None
+        self.config: Optional[GoCardlessConfig] = None
         self._client: Optional[GoCardlessClient] = None
 
     @property
@@ -59,9 +59,9 @@ class GoCardLessImporter(beangulp.Importer):
             if not self.config:
                 raise ValueError("Config not loaded. Call load_config() first.")
             self._client = GoCardlessClient(
-                self.config["secret_id"],
-                self.config["secret_key"],
-                cache_options=self.config.get("cache_options", None),
+                self.config.secret_id,
+                self.config.secret_key,
+                cache_options=self.config.cache_options or None,
             )
 
         return self._client
@@ -93,7 +93,7 @@ class GoCardLessImporter(beangulp.Importer):
         logger.debug("Returning account for %s: ''", filepath)
         return ""  # We get the account from the config file
 
-    def load_config(self, filepath: str) -> Optional[Dict[str, Any]]:
+    def load_config(self, filepath: str) -> Optional[GoCardlessConfig]:
         """
         Loads configuration from the specified YAML file.
 
@@ -101,35 +101,35 @@ class GoCardLessImporter(beangulp.Importer):
             filepath (str): The path to the YAML configuration file.
 
         Returns:
-            Dict[str, Any]: The loaded configuration dictionary. Also sets the `self.config` attribute.
+            GoCardlessConfig: The loaded configuration. Also sets the `self.config` attribute.
         """
         logger.debug("Loading config from %s", filepath)
         with open(filepath, "r") as f:
             raw_config = f.read()
-            expanded_config = path.expandvars(
-                raw_config
-            )  # Handle environment variables
-            self.config = yaml.safe_load(expanded_config)
+            expanded_config = path.expandvars(raw_config)
+            self.config = GoCardlessConfig(**yaml.safe_load(expanded_config))
 
         return self.config
 
     def get_all_transactions(
-        self, booked: List[BankTransaction], pending: List[BankTransaction]
+        self, transactions_dict: Dict[str, List[BankTransaction]], types: List[str]
     ) -> List[Tuple[BankTransaction, str]]:
         """
-        Combines booked and pending transactions and sorts them by date.
+        Combines transactions of specified types and sorts them by date.
 
         Args:
-            booked (List[BankTransaction]): The booked transaction data from the API.
-            pending (List[BankTransaction]): The pending transaction data from the API.
+            transactions_dict (Dict[str, List[BankTransaction]]): Transactions by type.
+            types (List[str]): Types to include.
 
         Returns:
-            List[Tuple[BankTransaction, str]]: A sorted list of tuples, where each tuple contains
-                a transaction and its status ('booked' or 'pending').
+            List[Tuple[BankTransaction, str]]: Sorted list of (transaction, type) tuples.
         """
-        all_transactions = [(tx, "booked") for tx in booked] + [
-            (tx, "pending") for tx in pending
-        ]
+        all_transactions = []
+        for tx_type in types:
+            if tx_type in transactions_dict:
+                all_transactions.extend(
+                    [(tx, tx_type) for tx in transactions_dict[tx_type]]
+                )
         return sorted(
             all_transactions,
             key=lambda x: x[0].value_date or x[0].booking_date or "",
@@ -348,27 +348,31 @@ class GoCardLessImporter(beangulp.Importer):
             raise ValueError("No config loaded from YAML file")
 
         entries: data.Entries = []
-        accounts = self.config.get("accounts", [])
+        accounts = self.config.accounts
         total_transactions = 0
         logger.info("Processing %d accounts", len(accounts))
         for account in accounts:
-            account_id = account["id"]
-            asset_account = account["asset_account"]
-            # Use get() with a default empty dict for custom_metadata
-            custom_metadata = account.get("metadata", {})
+            account_id = account.id
+            asset_account = account.asset_account
+            custom_metadata = account.metadata
 
             logger.debug("Fetching transactions for account %s", account_id)
             account_transactions = self.client.get_account_transactions(account_id)
-            booked = account_transactions.transactions.get("booked", [])
-            pending = account_transactions.transactions.get("pending", [])
-            all_transactions = self.get_all_transactions(booked, pending)
+            transactions_dict = account_transactions.transactions
+            all_transactions = self.get_all_transactions(
+                transactions_dict, account.transaction_types
+            )
+            booked_count = len(transactions_dict.get("booked", []))
+            pending_count = len(transactions_dict.get("pending", []))
             logger.debug(
                 "Fetched %d booked and %d pending transactions for account %s",
-                len(booked),
-                len(pending),
+                booked_count,
+                pending_count,
                 account_id,
             )
-            total_transactions += len(booked) + len(pending)
+            total_transactions += sum(
+                len(transactions_dict.get(t, [])) for t in account.transaction_types
+            )
 
             skipped = 0
             for transaction, status in all_transactions:

{beancount_gocardless-0.1.9 → beancount_gocardless-0.1.11}/src/beancount_gocardless/models.py

@@ -4,7 +4,7 @@ Complete coverage of all schemas from swagger.json
 """
 
 from typing import Optional, List, Dict, Any, TypedDict
-from pydantic import BaseModel, Field, ConfigDict
+from pydantic import BaseModel, Field, ConfigDict, validator
 from pydantic.alias_generators import to_camel
 from enum import Enum
 
@@ -351,7 +351,7 @@ class Requisition(BaseModel):
     id: str
     created: str
     redirect: str
-    status: StatusEnum
+    status: str
     institution_id: str
     agreement: Optional[str] = None
     reference: str
@@ -376,7 +376,7 @@ class SpectacularRequisition(BaseModel):
     id: str
     created: str
     redirect: str
-    status: StatusEnum
+    status: str
     institution_id: str
     agreement: Optional[str] = None
     reference: str
@@ -536,3 +536,26 @@ class IntegrationRetrieve(BaseModel):
     supported_payments: Optional[Dict[str, Any]] = None
     supported_features: Optional[List[str]] = None
     identification_codes: Optional[List[str]] = None
+
+
+class AccountConfig(BaseModel):
+    id: str
+    asset_account: str
+    metadata: Dict[str, Any] = {}
+    transaction_types: List[str] = ["booked", "pending"]
+
+    @validator("transaction_types")
+    def validate_transaction_types(cls, v):
+        allowed = {"booked", "pending"}
+        if not set(v).issubset(allowed):
+            raise ValueError(
+                f"Invalid transaction types: {v}. Must be subset of {allowed}"
+            )
+        return v
+
+
+class GoCardlessConfig(BaseModel):
+    secret_id: str
+    secret_key: str
+    cache_options: Dict[str, Any] = {}
+    accounts: List[AccountConfig]

{beancount_gocardless-0.1.9 → beancount_gocardless-0.1.11}/src/beancount_gocardless/tui.py

@@ -18,7 +18,7 @@ logger = logging.getLogger(__name__)
 class ActionMessage(Message):
     """Custom message to signal actions within the TUI."""
 
-    def __init__(self, action: str, payload: dict = None) -> None:
+    def __init__(self, action: str, payload: Optional[dict] = None) -> None:
         super().__init__()
         self.action = action
         self.payload = payload or {}
@@ -47,16 +47,13 @@ class BaseSubView(Static):
     """Base class for sub-views with a back button."""
 
     def compose(self) -> ComposeResult:
-        yield Vertical(
-            self.compose_content(),
-            Button("Back to Menu", id="back_to_menu", classes="back_button"),
-        )
+        yield from self.compose_content()
 
     def compose_content(self) -> ComposeResult:
         # To be overridden by subclasses
         yield Static("Content goes here")
 
-    def on_button_pressed(self, event: Button.Pressed) -> None:
+    async def on_button_pressed(self, event: Button.Pressed) -> None:
         if event.button.id == "back_to_menu":
             self.post_message(ActionMessage("show_menu"))
         else:
@@ -110,10 +107,13 @@ class BanksView(BaseSubView):
         try:
             if not self.all_banks:
                 self.status_message.update("Loading all banks...")
-                self.all_banks = self.client.list_banks(country=None)
+                self.all_banks = [
+                    inst.model_dump()
+                    for inst in self.client.get_institutions(country=None)
+                ]
 
             self.banks_table.update(
-                f"Loading accounts... {name_filter} {country_code} {len(self.all_banks)}"
+                f"Loading banks... {name_filter} {country_code} {len(self.all_banks)}"
             )
 
             name_filtered = [
@@ -164,7 +164,7 @@ class BanksView(BaseSubView):
                 country_code=country_code if not omit_country else None,
             )
 
-    def on_button_pressed(self, event: Button.Pressed) -> None:
+    async def on_button_pressed(self, event: Button.Pressed) -> None:
         """Handle button presses within this view."""
         if event.button.id == "back_to_menu":
             self.post_message(ActionMessage("show_menu"))
@@ -180,6 +180,8 @@ class AccountsView(BaseSubView):
             "Loading accounts...", id="accounts_status_message"
         )
         self.accounts_table = Static("", id="accounts_table")
+        self.pending_delete_ref = None
+        self.accounts_list = []
 
     def compose_content(self) -> ComposeResult:
         yield Label("Linked Accounts", classes="view_title")
@@ -189,6 +191,23 @@ class AccountsView(BaseSubView):
             id="accounts_scrollable_area",
             classes="horizontal-scroll",
         )
+        yield Vertical(
+            Label("Select Account by # and Delete Link"),
+            Input(placeholder="Enter account #", id="select_account_input"),
+            Button("Select", id="select_account_button"),
+            Input(placeholder="Reference", id="delete_ref_input", disabled=True),
+            Button(
+                "Delete Link", id="delete_link_button", variant="error", disabled=True
+            ),
+            Button(
+                "Confirm Delete",
+                id="confirm_delete_button",
+                variant="error",
+                disabled=True,
+            ),
+            Button("Cancel", id="cancel_delete_button", disabled=True),
+            id="delete_section",
+        )
         yield Button("Back to Menu", id="back_to_menu", classes="back_button")
 
     # Override the base class compose to avoid duplicate back button
@@ -205,7 +224,8 @@ class AccountsView(BaseSubView):
         """Loads and displays the linked accounts with detailed information."""
         try:
             self.status_message.update("Loading accounts...")
-            accounts = self.client.list_accounts()
+            accounts = self.client.get_all_accounts()
+            self.accounts_list = accounts
             if not accounts:
                 self.accounts_table.update("No accounts found.")
                 self.status_message.update("")
@@ -215,7 +235,7 @@ class AccountsView(BaseSubView):
             table = Table(title=None, expand=True, min_width=100)
             table.add_column("#", style="dim", width=3)
             table.add_column("Bank", overflow="ellipsis", min_width=20)
-            table.add_column("Name", overflow="crop", min_width=20)
+            table.add_column("Name", overflow="ellipsis", min_width=20)
             table.add_column("ID", overflow="ellipsis", min_width=20)
             table.add_column("IBAN", overflow="ellipsis", min_width=20)
             table.add_column("Reference", overflow="ellipsis", min_width=15)
@@ -224,14 +244,12 @@ class AccountsView(BaseSubView):
 
             # Format and add accounts to the table
             for idx, account in enumerate(accounts, start=1):
-                # import pdb
-                # pdb.set_trace()
                 # Get values with fallbacks for any missing keys
                 institution_id = account.get("institution_id", "N/A")
                 name = account.get("name", account.get("owner_name", "N/A"))
                 iban = account.get("iban", "N/A")
-                account_id = account.get("account_id", "N/A")
-                reference = account.get("reference", "N/A")
+                account_id = account.get("id", "N/A")
+                reference = account.get("requisition_reference", "N/A")
                 status = account.get("status", "N/A")
                 last_accessed = account.get("last_accessed", "")
                 if last_accessed:
@@ -253,6 +271,39 @@ class AccountsView(BaseSubView):
 
             # Update the table content
             self.accounts_table.update(table)
+            if not accounts:
+                self.accounts_table.add_row(
+                    "No accounts found.", "", "", "", "", "", "", ""
+                )
+                self.status_message.update("")
+                return
+
+            # Format and add accounts to the table
+            for idx, account in enumerate(accounts, start=1):
+                # Get values with fallbacks for any missing keys
+                institution_id = account.get("institution_id", "N/A")
+                name = account.get("name", account.get("owner_name", "N/A"))
+                iban = account.get("iban", "N/A")
+                account_id = account.get("id", "N/A")
+                reference = account.get("requisition_reference", "N/A")
+                status = account.get("status", "N/A")
+                last_accessed = account.get("last_accessed", "")
+                if last_accessed:
+                    try:
+                        last_accessed = last_accessed.split("T")[0]
+                    except Exception:
+                        pass
+
+                self.accounts_table.add_row(
+                    str(idx),
+                    institution_id,
+                    name,
+                    account_id,
+                    iban,
+                    reference,
+                    status,
+                    last_accessed,
+                )
             self.status_message.update("")
 
         except HttpServiceException as e:
@@ -260,249 +311,79 @@ class AccountsView(BaseSubView):
         except Exception as e:
             self.status_message.update(Text(f"Unexpected error: {e}", style="bold red"))
 
-    def on_button_pressed(self, event: Button.Pressed) -> None:
+    async def on_button_pressed(self, event: Button.Pressed) -> None:
         """Handle button presses within this view."""
         if event.button.id == "back_to_menu":
             self.post_message(ActionMessage("show_menu"))
 
-
-# ... existing code ...
-
-
-class BalanceView(BaseSubView):
-    """View to get and display account balance."""
-
-    def __init__(
-        self, client: "GoCardlessClient"
-    ):  # Forward reference GoCardlessClient if not imported yet
-        super().__init__()
-        self.client = client
-        self.accounts_data = []
-
-    def compose(self) -> ComposeResult:
-        """Override compose to yield widgets from compose_content."""
-        for widget in self.compose_content():
-            yield widget
-
-    def compose_content(self) -> ComposeResult:
-        yield Label("Account Balance", classes="view_title")
-        # Moved status message to be a direct child of BalanceView, and sibling to content_area
-        yield Static(
-            "", id="balance_status_message"
-        )  # Initialize empty or with a generic placeholder
-        yield Vertical(
-            # The initial Static message that was here is removed
-            id="balance_content_area",
-        )
-
-    async def on_mount(self) -> None:
-        # Query elements only after they are mounted
-        content_area = self.query_one("#balance_content_area", Vertical)
-        status_message = self.query_one("#balance_status_message", Static)
-        status_message.update(
-            "Loading accounts for selection..."
-        )  # Set initial operational message
-        await self.load_accounts_for_selection(content_area, status_message)
-
-    async def load_accounts_for_selection(
-        self, content_area: Vertical, status_message: Static
-    ):
-        try:
-            # status_message.update("Loading accounts...") # Message set by on_mount or can be refined here
-            self.accounts_data = self.client.list_accounts()
-            await (
-                content_area.remove_children()
-            )  # Clear "Loading..." or previous content from content_area
-
-            if not self.accounts_data:
-                await content_area.mount(
-                    Static("No accounts linked. Cannot fetch balance.")
-                )
-                status_message.update(
-                    "No accounts available to display."
-                )  # Update persistent status
-                return
-
-            table = Table(title="Select Account by Index for Balance", expand=True)
-            table.add_column("#", style="dim")
-            table.add_column("Name", overflow="fold")
-            table.add_column("Institution ID", overflow="fold")
-            for idx, a in enumerate(self.accounts_data):
-                table.add_row(str(idx), a["name"], a["institution_id"])
-
-            await content_area.mount(table)  # Mount Table widget directly
-            idx_input = Input(
-                placeholder="Enter account # and press Enter", id="acct_idx_input"
-            )
-            await content_area.mount(idx_input)
-            idx_input.focus()
-            status_message.update(
-                "Please select an account from the list."
-            )  # Clear or update status message
-        except HttpServiceException as e:  # Make sure HttpServiceException is defined
-            status_message.update(
-                Text(f"Error loading accounts: {e}", style="bold red")
-            )
-            await content_area.remove_children()
-            await content_area.mount(
-                Static(
-                    Text(
-                        "Failed to load accounts. Check connection or try again later.",
-                        style="yellow",
-                    )
-                )
-            )
-        except Exception as e:
-            status_message.update(Text(f"Unexpected error: {e}", style="bold red"))
-            await content_area.remove_children()
-            await content_area.mount(
-                Static(
-                    Text(
-                        "An unexpected error occurred while loading accounts.",
-                        style="yellow",
-                    )
-                )
-            )
-
-    async def on_input_submitted(self, event: Input.Submitted) -> None:
-        if event.input.id == "acct_idx_input":
-            content_area = self.query_one("#balance_content_area", Vertical)
-            # status_message is now persistent and queried once
-            status_message = self.query_one("#balance_status_message", Static)
-
-            await (
-                content_area.remove_children()
-            )  # Clear account list and input from content_area
-
+    async def on_button_pressed(self, event: Button.Pressed) -> None:
+        """Handle button presses within this view."""
+        if event.button.id == "back_to_menu":
+            self.post_message(ActionMessage("show_menu"))
+        elif event.button.id == "select_account_button":
+            select_input = self.query_one("#select_account_input", Input)
             try:
-                idx = int(event.value)
-                if not (0 <= idx < len(self.accounts_data)):
-                    # Display temporary error message in content_area
-                    await content_area.mount(
-                        Static(Text("Invalid account index.", style="bold red"))
+                idx = int(select_input.value.strip()) - 1  # 1-based to 0-based
+                if 0 <= idx < len(self.accounts_list):
+                    reference = self.accounts_list[idx].get("requisition_reference", "")
+                    ref_input = self.query_one("#delete_ref_input", Input)
+                    ref_input.value = reference
+                    delete_btn = self.query_one("#delete_link_button", Button)
+                    delete_btn.disabled = False
+                    self.status_message.update(
+                        f"Selected account {idx + 1}, reference: {reference}"
                     )
-                    status_message.update(
-                        Text(
-                            "Selection out of range. Please try again.", style="yellow"
-                        )
-                    )
-                    # Reload account selection UI
-                    await self.load_accounts_for_selection(content_area, status_message)
-                    return
-
-                account_to_check = self.accounts_data[idx]
-                acct_id = account_to_check["account_id"]
-
-                status_message.update(
-                    f"Fetching balances for {account_to_check['name']} ({acct_id})..."
-                )
-                # Optionally, display a "Fetching..." message in content_area as well
-                await content_area.mount(Static("Fetching balances..."))
-
-                balances_data = self.client.get_balances(account_id=acct_id)
-                await content_area.remove_children()  # Clear "Fetching..." message
-
-                table = Table(
-                    title=f"Balances for {account_to_check['name']}", expand=True
-                )
-                table.add_column("Type", overflow="fold")
-                table.add_column("Amount")
-                table.add_column("Currency")
-                if "balances" in balances_data and balances_data["balances"]:
-                    for b in balances_data["balances"]:
-                        balance_amount_info = b.get("balanceAmount", {})
-                        table.add_row(
-                            b.get("balanceType", "N/A"),
-                            str(balance_amount_info.get("amount", "N/A")),
-                            balance_amount_info.get("currency", "N/A"),
-                        )
                 else:
-                    table.add_row("N/A", "No balance data found", "N/A")
-
-                await content_area.mount(table)  # Mount the results table
-                status_message.update(
-                    f"Balances for {account_to_check['name']} displayed."
-                )
-                # Consider how the user navigates back to account selection (e.g., a button, or re-selecting the view)
-
+                    self.status_message.update("Invalid account number.")
             except ValueError:
-                # Display temporary error message in content_area
-                await content_area.mount(
-                    Static(
-                        Text("Invalid input. Please enter a number.", style="bold red")
-                    )
-                )
-                status_message.update(
-                    Text("Numeric input required for account index.", style="yellow")
-                )
-                await self.load_accounts_for_selection(
-                    content_area, status_message
-                )  # Reload selection
-            except (
-                HttpServiceException
-            ) as e:  # Make sure HttpServiceException is defined
-                status_message.update(
-                    Text(f"API Error fetching balances: {e}", style="bold red")
-                )
-                await content_area.mount(
-                    Static(
-                        Text(
-                            "Could not retrieve balances due to an API error.",
-                            style="red",
-                        )
+                self.status_message.update("Please enter a valid number.")
+        elif event.button.id == "delete_link_button":
+            ref_input = self.query_one("#delete_ref_input", Input)
+            reference = ref_input.value.strip()
+            if reference:
+                self.pending_delete_ref = reference
+                self.status_message.update(
+                    Text(
+                        f"Are you sure to delete link with reference '{reference}'?",
+                        style="bold yellow",
                     )
                 )
-                # Optionally, reload selection UI so user can try again or select a different account
-                # await self.load_accounts_for_selection(content_area, status_message)
-            except Exception as e:
-                status_message.update(
-                    Text(f"Error processing balance request: {e}", style="bold red")
-                )
-                await content_area.mount(
-                    Static(
-                        Text(
-                            "An unexpected error occurred while fetching balances.",
-                            style="red",
-                        )
-                    )
+                confirm_btn = self.query_one("#confirm_delete_button", Button)
+                cancel_btn = self.query_one("#cancel_delete_button", Button)
+                confirm_btn.disabled = False
+                cancel_btn.disabled = False
+            else:
+                self.status_message.update(
+                    Text("No reference selected.", style="bold yellow")
                 )
-                # Optionally, reload selection UI
-                # await self.load_accounts_for_selection(content_area, status_message)
-
-
-class LinkView(BaseSubView):
-    """View to create a new bank link."""
-
-    def __init__(self, client: GoCardlessClient):
-        super().__init__()
-        self.client = client
-
-    def compose(self) -> ComposeResult:
-        """Override compose to yield widgets from compose_content."""
-        for widget in self.compose_content():
-            yield widget
-
-    def compose_content(self) -> ComposeResult:
-        yield Label("Create New Bank Link", classes="view_title")
-        yield Vertical(
-            Input(
-                placeholder="Bank ID (e.g., SANDBOXFINANCE_SFIN0000)",
-                id="bank_id_input",
-            ),
-            Input(
-                placeholder="Unique Reference (e.g., mypc-savings-ref)", id="ref_input"
-            ),
-            Button("Create Link", id="do_create_link_button", variant="success"),
-            Static(id="link_result_message", classes="result_message_area"),
-            id="link_form_area",
-        )
-
-    async def on_mount(self) -> None:
-        await self.query_one("#bank_id_input", Input).focus()
-
-    async def on_button_pressed(self, event: Button.Pressed) -> None:
-        if event.button.id == "back_to_menu":
-            self.post_message(ActionMessage("show_menu"))
+        elif event.button.id == "confirm_delete_button":
+            if self.pending_delete_ref:
+                await self.process_delete_link(self.pending_delete_ref)
+                select_input = self.query_one("#select_account_input", Input)
+                ref_input = self.query_one("#delete_ref_input", Input)
+                select_input.value = ""
+                ref_input.value = ""
+                delete_btn = self.query_one("#delete_link_button", Button)
+                delete_btn.disabled = True
+                self.pending_delete_ref = None
+                confirm_btn = self.query_one("#confirm_delete_button", Button)
+                cancel_btn = self.query_one("#cancel_delete_button", Button)
+                confirm_btn.disabled = True
+                cancel_btn.disabled = True
+        elif event.button.id == "cancel_delete_button":
+            self.pending_delete_ref = None
+            self.status_message.update("Delete cancelled.")
+            confirm_btn = self.query_one("#confirm_delete_button", Button)
+            cancel_btn = self.query_one("#cancel_delete_button", Button)
+            confirm_btn.disabled = True
+            cancel_btn.disabled = True
+        elif event.button.id == "cancel_delete_button":
+            self.pending_delete_ref = None
+            self.status_message.update("Delete cancelled.")
+            confirm_btn = self.query_one("#confirm_delete_button", Button)
+            cancel_btn = self.query_one("#cancel_delete_button", Button)
+            confirm_btn.disabled = True
+            cancel_btn.disabled = True
         elif event.button.id == "do_create_link_button":
             await self.process_create_link()
 
@@ -527,7 +408,20 @@ class LinkView(BaseSubView):
             create_button.disabled = True
             result_message_widget.update("Creating link...")
 
-            link_info = self.client.create_link(reference, bank_id)  # API call
+            link_url = self.client.create_bank_link(reference, bank_id)  # API call
+
+            if link_url:
+                link_info = {
+                    "status": "created",
+                    "message": "Link created successfully",
+                    "link": link_url,
+                }
+            else:
+                link_info = {
+                    "status": "exists",
+                    "message": "Link already exists for this reference",
+                    "link": None,
+                }
 
             msg_parts = [
                 Text(f"Status: {link_info.get('status', 'N/A')}\n", style="bold")
@@ -577,9 +471,10 @@ class DeleteLinkView(BaseSubView):
             Static(id="delete_link_result_message", classes="result_message_area"),
             id="delete_link_form_area",
         )
+        yield Button("Back to Menu", id="back_to_menu", classes="back_button")
 
     async def on_mount(self) -> None:
-        await self.query_one("#del_ref_input", Input).focus()
+        self.query_one("#del_ref_input", Input).focus()
 
     async def on_button_pressed(self, event: Button.Pressed) -> None:
         if event.button.id == "back_to_menu":
@@ -607,14 +502,17 @@ class DeleteLinkView(BaseSubView):
                 f"Deleting link with reference '{reference}'..."
             )
 
-            response = self.client.delete_link(reference)  # API call
+            req = self.client.find_requisition_by_reference(reference)
+            if req:
+                self.client.delete_requisition(req.id)  # API call
+                result = {"status": "deleted", "message": "Link deleted successfully"}
+            else:
+                result = {"status": "not_found", "message": "Link not found"}
 
-            style = (
-                "bold green" if response.get("status") == "deleted" else "bold yellow"
-            )
+            style = "bold green" if result["status"] == "deleted" else "bold yellow"
             result_message_widget.update(
                 Text(
-                    f"Status: {response.get('status', 'N/A')}\nMessage: {response.get('message', 'N/A')}",
+                    f"Status: {result['status']}\nMessage: {result['message']}",
                     style=style,
                 )
             )
@@ -767,5 +665,5 @@ def main():
     app.run()
 
 
-# if __name__ == "__main__":
-# main()
+if __name__ == "__main__":
+    main()

beancount_gocardless-0.1.11/tests/test_tui.py

@@ -0,0 +1,85 @@
+import pytest
+from unittest.mock import Mock
+from beancount_gocardless.tui import (
+    GoCardLessApp,
+    MenuView,
+    AccountsView,
+    BalanceView,
+    LinkView,
+    DeleteLinkView,
+)
+from beancount_gocardless.client import GoCardlessClient
+
+
+@pytest.fixture
+def mock_client():
+    client = Mock(spec=GoCardlessClient)
+    client.get_institutions.return_value = [
+        Mock(name="Test Bank", id="BANK1", countries=["GB"])
+    ]
+    client.get_all_accounts.return_value = [
+        {
+            "id": "ACC1",
+            "name": "Test Account",
+            "institution_id": "BANK1",
+            "iban": "GB123",
+        }
+    ]
+    client.get_account_balances.return_value = Mock(
+        balances=[
+            Mock(
+                balance_type="closingAvailable",
+                balance_amount=Mock(amount="100.00", currency="GBP"),
+            )
+        ]
+    )
+    client.create_bank_link.return_value = "http://link.com"
+    client.find_requisition_by_reference.return_value = Mock(id="REQ1")
+    return client
+
+
+def test_app_initialization(mock_client):
+    app = GoCardLessApp(secret_id="test", secret_key="test")
+    app.client = mock_client
+    assert app.client == mock_client
+
+
+def test_menu_view_compose():
+    view = MenuView()
+    # Just check compose doesn't fail
+    content = list(view.compose())
+    assert len(content) == 1
+
+
+@pytest.mark.skip(reason="Hard to mock Textual context")
+def test_banks_view_load(mock_client):
+    pass
+
+
+def test_accounts_view_load(mock_client):
+    view = AccountsView(mock_client)
+    # Mock the table update
+    view.accounts_table = Mock()
+    view.status_message = Mock()
+    import asyncio
+
+    asyncio.run(view.load_accounts())
+    view.accounts_table.update.assert_called()
+
+
+def test_balance_view(mock_client):
+    view = BalanceView(mock_client)
+    content = list(view.compose_content())
+    assert len(content) == 4  # label, static, vertical, button
+
+
+def test_link_view(mock_client):
+    view = LinkView(mock_client)
+    content = list(view.compose_content())
+    assert len(content) == 3  # label, vertical, button
+
+
+def test_delete_link_view(mock_client):
+    view = DeleteLinkView(mock_client)
+    content = list(view.compose_content())
+    assert len(content) == 3  # label, vertical, button

beancount_gocardless-0.1.9/src/beancount_gocardless/tui2.py

@@ -1,17 +0,0 @@
-from textual.app import App, ComposeResult
-from textual.widgets import Header, Footer, Label
-
-
-raise Exception
-
-
-class MinimalApp(App):
-    TITLE = "Minimal Test App"
-
-    def compose(self) -> ComposeResult:
-        yield Header()
-        yield Label("If you see this, MinimalApp from tui.py is running!")
-        yield Footer()
-
-
-app = MinimalApp()