beancount-gocardless 0.1.9__py3-none-any.whl → 0.1.10__py3-none-any.whl

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/cli.py

@@ -2,7 +2,7 @@ import argparse
 import sys
 import os
 import logging
-from beancount_gocardless.client import GoCardlessClient
+
 from beancount_gocardless.models import AccountInfo
 
 
@@ -83,21 +83,7 @@ def main():
     try:
         logger.debug("Initializing GoCardlessClient")
 
-        # Build cache options
-        cache_options = None
-        if args.cache:
-            cache_options = {
-                "cache_name": args.cache_name,
-                "backend": args.cache_backend,
-                "expire_after": args.cache_expire,
-                "old_data_on_error": True,
-                "match_headers": False,
-                "cache_control": False,
-            }
-
-        # client = GoCardlessClient(
-        #     args.secret_id, args.secret_key, cache_options=cache_options
-        # )
+        # TODO: Implement client initialization with cache options
 
     except Exception as e:
         logger.error(f"Error: {e}")

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/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
 
@@ -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/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,7 +107,10 @@ 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)}"
@@ -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"))
@@ -205,7 +205,7 @@ 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()
             if not accounts:
                 self.accounts_table.update("No accounts found.")
                 self.status_message.update("")
@@ -260,7 +260,7 @@ 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"))
@@ -294,6 +294,7 @@ class BalanceView(BaseSubView):
             # The initial Static message that was here is removed
             id="balance_content_area",
         )
+        yield Button("Back to Menu", id="back_to_menu", classes="back_button")
 
     async def on_mount(self) -> None:
         # Query elements only after they are mounted
@@ -309,7 +310,7 @@ class BalanceView(BaseSubView):
     ):
         try:
             # status_message.update("Loading accounts...") # Message set by on_mount or can be refined here
-            self.accounts_data = self.client.list_accounts()
+            self.accounts_data = self.client.get_all_accounts()
             await (
                 content_area.remove_children()
             )  # Clear "Loading..." or previous content from content_area
@@ -391,7 +392,7 @@ class BalanceView(BaseSubView):
                     return
 
                 account_to_check = self.accounts_data[idx]
-                acct_id = account_to_check["account_id"]
+                acct_id = account_to_check["id"]
 
                 status_message.update(
                     f"Fetching balances for {account_to_check['name']} ({acct_id})..."
@@ -399,7 +400,7 @@ class BalanceView(BaseSubView):
                 # 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)
+                balances_data = self.client.get_account_balances(acct_id)
                 await content_area.remove_children()  # Clear "Fetching..." message
 
                 table = Table(
@@ -408,13 +409,12 @@ class BalanceView(BaseSubView):
                 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", {})
+                if balances_data.balances:
+                    for b in balances_data.balances:
                         table.add_row(
-                            b.get("balanceType", "N/A"),
-                            str(balance_amount_info.get("amount", "N/A")),
-                            balance_amount_info.get("currency", "N/A"),
+                            b.balance_type,
+                            b.balance_amount.amount,
+                            b.balance_amount.currency,
                         )
                 else:
                     table.add_row("N/A", "No balance data found", "N/A")
@@ -496,9 +496,10 @@ class LinkView(BaseSubView):
             Static(id="link_result_message", classes="result_message_area"),
             id="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("#bank_id_input", Input).focus()
+        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":
@@ -527,7 +528,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 +591,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 +622,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 +785,5 @@ def main():
     app.run()
 
 
-# if __name__ == "__main__":
-# main()
+if __name__ == "__main__":
+    main()

{beancount_gocardless-0.1.9.dist-info → beancount_gocardless-0.1.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beancount-gocardless
-Version: 0.1.9
+Version: 0.1.10
 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.10.dist-info/RECORD

@@ -0,0 +1,12 @@
+beancount_gocardless/__init__.py,sha256=JVJivGs-o5yY8YGqTYwn1cXY7aiA76lUyc95s1Ye-j0,253
+beancount_gocardless/cli.py,sha256=VDtOhhY5wyuxtXokKlbl1RKZteLR919lParyyspE_qk,2850
+beancount_gocardless/client.py,sha256=eBr3VVrnQIFMwRBmoIC8VN9JvtsDhGZge75nYW7Fyns,15402
+beancount_gocardless/importer.py,sha256=4sh66Vmi8eWEXcmkUIq3UJcqjyZNUitZpkp1-ZcNyCU,16688
+beancount_gocardless/models.py,sha256=H6sqkheJUVpmNaB1U5C6EL0j0y1xfiHC-msq5F2uWBk,18283
+beancount_gocardless/tui.py,sha256=fPI60Tu9n44ZBYLjWbdx88EX4i3kp6S4BQ9p5L9Wtjw,30659
+beancount_gocardless/openapi/swagger.json,sha256=t8TLbt0l2UOyorZX8JyoG4XO2qtXDRYUlsllM3ckyG4,264957
+beancount_gocardless-0.1.10.dist-info/METADATA,sha256=htZDSUk8ne4wb33NSzmHGAsXxBG2tlmhu3kVqxZvOLY,4124
+beancount_gocardless-0.1.10.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+beancount_gocardless-0.1.10.dist-info/entry_points.txt,sha256=_l8n11k9nGPaSDou4atu5NkV0Ojf-qjW2zIIGPzmmgA,128
+beancount_gocardless-0.1.10.dist-info/licenses/LICENSE,sha256=awOCsWJ58m_2kBQwBUGWejVqZm6wuRtCL2hi9rfa0X4,1211
+beancount_gocardless-0.1.10.dist-info/RECORD,,

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()

beancount_gocardless-0.1.9.dist-info/RECORD

@@ -1,13 +0,0 @@
-beancount_gocardless/__init__.py,sha256=HNLcqMQMk27W16-tkWfU31C_1lDfwRHj6PR1j1UYs_M,275
-beancount_gocardless/cli.py,sha256=OLfpesyTQLIqhdtipoGW9gZ2sdC6_BuMvOIs8Zf5yvw,3358
-beancount_gocardless/client.py,sha256=eBr3VVrnQIFMwRBmoIC8VN9JvtsDhGZge75nYW7Fyns,15402
-beancount_gocardless/importer.py,sha256=JRkuc40ux49y3UKVx-HgwxGkbmxROSIXuiSwFT9Obi0,16621
-beancount_gocardless/models.py,sha256=RlqUitg2kaykP4WQVhHkhtF187NFFOLjrxpC3ncWCB8,17661
-beancount_gocardless/tui.py,sha256=qAPL9zSNF5lJ43PiBRWRJ7nyrRdtziSgVoDoXDsCsq8,29947
-beancount_gocardless/tui2.py,sha256=eQWh-KbqsoiqgZKLvDDpPov1DX1w9aV2cdIHZzvrJck,350
-beancount_gocardless/openapi/swagger.json,sha256=t8TLbt0l2UOyorZX8JyoG4XO2qtXDRYUlsllM3ckyG4,264957
-beancount_gocardless-0.1.9.dist-info/METADATA,sha256=AuaDbJLfw0f1sXNtsXF4P79-ARlEtjnALxQFUedBrLg,3937
-beancount_gocardless-0.1.9.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-beancount_gocardless-0.1.9.dist-info/entry_points.txt,sha256=_l8n11k9nGPaSDou4atu5NkV0Ojf-qjW2zIIGPzmmgA,128
-beancount_gocardless-0.1.9.dist-info/licenses/LICENSE,sha256=awOCsWJ58m_2kBQwBUGWejVqZm6wuRtCL2hi9rfa0X4,1211
-beancount_gocardless-0.1.9.dist-info/RECORD,,