beancount-gocardless 0.1.11__py3-none-any.whl → 0.1.13__py3-none-any.whl

beancount_gocardless/importer.py

@@ -400,32 +400,61 @@ class GoCardLessImporter(beangulp.Importer):
                     for b in balances.balances
                 ],
             )
-            expected_balance = None
-            other_balances = []
-            for bal in balances.balances:
-                if bal.balance_type == "expected":
-                    expected_balance = bal
-                else:
-                    other_balances.append(bal)
 
-            if expected_balance:
+            # Prioritized balance selection
+            PRIORITY = {
+                "expected": 0,
+                "closingBooked": 1,
+                "interimBooked": 2,
+                "interimAvailable": 3,
+                "openingBooked": 4,
+            }
+            if account.preferred_balance_type:
+                PRIORITY[account.preferred_balance_type] = -1
+
+            # Sort balances based on priority, with unknown types at the end
+            sorted_balances = sorted(
+                balances.balances, key=lambda b: PRIORITY.get(b.balance_type, 99)
+            )
+
+            if sorted_balances:
+                selected_balance = sorted_balances[0]
                 balance_amount = amount.Amount(
-                    D(str(expected_balance.balance_amount.amount)),
-                    expected_balance.balance_amount.currency,
+                    D(str(selected_balance.balance_amount.amount)),
+                    selected_balance.balance_amount.currency,
                 )
+
+                # Determine balance date
+                if selected_balance.reference_date:
+                    try:
+                        balance_date = date.fromisoformat(
+                            selected_balance.reference_date
+                        ) + timedelta(days=1)
+                    except ValueError:
+                        balance_date = date.today() + timedelta(days=1)
+                else:
+                    balance_date = date.today() + timedelta(days=1)
+
                 balance_meta = {}
-                detail_parts = [
-                    f"{b.balance_type}: {b.balance_amount.amount} {b.balance_amount.currency}"
-                    for b in balances.balances
-                ]
-                detail = " / ".join(detail_parts)
-                balance_meta["detail"] = detail
+
+                # Collect all distinct balance values for metadata
+                distinct_details = []
+                seen_values = set()
+                for b in sorted_balances:
+                    val_str = f"{b.balance_amount.amount} {b.balance_amount.currency}"
+                    if val_str not in seen_values:
+                        distinct_details.append(f"{b.balance_type}: {val_str}")
+                        seen_values.add(val_str)
+
+                balance_meta["detail"] = " / ".join(distinct_details)
+
                 # Include custom metadata from config for consistency with transactions
                 balance_meta.update(custom_metadata)
                 meta = data.new_metadata("", 0, balance_meta)
+
                 balance_entry = data.Balance(
                     meta=meta,
-                    date=date.today() + timedelta(days=1),
+                    date=balance_date,
                     account=asset_account,
                     amount=balance_amount,
                     tolerance=None,
@@ -433,26 +462,13 @@ class GoCardLessImporter(beangulp.Importer):
                 )
                 entries.append(balance_entry)
                 logger.debug(
-                    "Added balance assertion for account %s using expected balance: %s %s",
+                    "Added balance assertion for account %s using %s balance: %s %s",
                     account_id,
+                    selected_balance.balance_type,
                     balance_amount,
-                    date.today() + timedelta(days=1),
+                    balance_date,
                 )
 
-                # Log other balances if they differ from expected
-                expected_amount = D(str(expected_balance.balance_amount.amount))
-                for bal in other_balances:
-                    other_amount = D(str(bal.balance_amount.amount))
-                    if other_amount != expected_amount:
-                        logger.info(
-                            "Account %s has different balance for type %s: %s %s vs expected %s",
-                            account_id,
-                            bal.balance_type,
-                            other_amount,
-                            bal.balance_amount.currency,
-                            expected_amount,
-                        )
-
         logger.info(
             "Processed %d total transactions across %d accounts, created %d entries",
             total_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, validator
+from pydantic import BaseModel, Field, ConfigDict, field_validator
 from pydantic.alias_generators import to_camel
 from enum import Enum
 
@@ -166,6 +166,8 @@ class AccountDetail(BaseModel):
 class TransactionAmountSchema(BaseModel):
     """Transaction amount schema."""
 
+    model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)
+
     amount: str
     currency: str
 
@@ -173,6 +175,8 @@ class TransactionAmountSchema(BaseModel):
 class InstructedAmount(BaseModel):
     """Instructed amount schema."""
 
+    model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)
+
     amount: str
     currency: str
 
@@ -180,6 +184,8 @@ class InstructedAmount(BaseModel):
 class CurrencyExchangeSchema(BaseModel):
     """Currency exchange schema."""
 
+    model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)
+
     source_currency: str
     exchange_rate: Optional[str] = None
     unit_currency: Optional[str] = None
@@ -192,6 +198,8 @@ class CurrencyExchangeSchema(BaseModel):
 class BalanceAfterTransactionSchema(BaseModel):
     """Balance after transaction schema."""
 
+    model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)
+
     balance_after_transaction: Optional[BalanceAmountSchema] = None
     balance_type: Optional[str] = None
 
@@ -206,6 +214,19 @@ class TransactionSchema(BaseModel):
     value_date_time: Optional[str] = Field(None, description="Value date and time.")
     transaction_amount: TransactionAmountSchema
     currency_exchange: Optional[List[CurrencyExchangeSchema]] = None
+
+    model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)
+
+    @field_validator("currency_exchange", mode="before")
+    @classmethod
+    def normalize_currency_exchange(cls, v):
+        """Normalize currency_exchange to always be a list."""
+        if v is None:
+            return None
+        if isinstance(v, dict):
+            return [v]
+        return v
+
     creditor_name: Optional[str] = Field(None, description="Creditor name.")
     creditor_account: Optional[AccountSchema] = None
     creditor_agent: Optional[str] = Field(None, description="Creditor agent.")
@@ -260,6 +281,17 @@ class BankTransaction(BaseModel):
     creditor_name: Optional[str] = Field(None, description="Creditor name.")
     creditor_account: Optional[AccountSchema] = None
     currency_exchange: Optional[List[CurrencyExchangeSchema]] = None
+
+    @field_validator("currency_exchange", mode="before")
+    @classmethod
+    def normalize_currency_exchange(cls, v):
+        """Normalize currency_exchange to always be a list."""
+        if v is None:
+            return None
+        if isinstance(v, dict):
+            return [v]
+        return v
+
     balance_after_transaction: Optional[BalanceAfterTransactionSchema] = None
     bank_transaction_code: Optional[str] = Field(
         None, description="Bank transaction code."
@@ -543,8 +575,10 @@ class AccountConfig(BaseModel):
     asset_account: str
     metadata: Dict[str, Any] = {}
     transaction_types: List[str] = ["booked", "pending"]
+    preferred_balance_type: Optional[str] = None
 
-    @validator("transaction_types")
+    @field_validator("transaction_types")
+    @classmethod
     def validate_transaction_types(cls, v):
         allowed = {"booked", "pending"}
         if not set(v).issubset(allowed):

{beancount_gocardless-0.1.11.dist-info → beancount_gocardless-0.1.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beancount-gocardless
-Version: 0.1.11
+Version: 0.1.13
 License-Expression: Unlicense
 License-File: LICENSE
 Requires-Python: <4,>=3.12
@@ -52,30 +52,8 @@ You'll need to create a GoCardLess account on https://bankaccountdata.gocardless
 
 ### API Coverage
 
-The GoCardless client provides **complete API coverage** with Pydantic models for all endpoints and data structures:
-
-**🏦 Core Banking:**
-- **Accounts**: Full account metadata, balances, details, and transactions
-- **Institutions**: Bank/institution information and capabilities
-- **Requisitions**: Bank link management with full lifecycle support
-
-**📋 Agreements & Permissions:**
-- **End User Agreements**: Complete agreement lifecycle management
-- **Access Scopes**: Granular permission control
-- **Reconfirmations**: Agreement renewal workflows
-
-**🔧 Advanced Features:**
-- **Integrations**: Institution capability discovery
-- **Token Management**: JWT token handling (internal)
-- **Pagination**: Full paginated response support
-- **Error Handling**: Error response models
-
-**📊 Rich Data Models:**
-- **Transactions**: Complete transaction details with currency exchange, balances, and metadata
-- **Balances**: Multi-currency balance information with transaction impact
-- **Account Details**: Extensive account information including ownership and addresses
-
-Models manually recreated from the swagger spec, providing type-safe access to every API feature.
+The GoCardless client tries to provide complete API coverage with Pydantic models for all endpoints and data structures.
+Models are manually recreated from the swagger spec, providing type-safe access to every API feature.
 
 **Installation:**
 
@@ -98,7 +76,8 @@ cache_options: # by default, no caching if cache_options is not provided
 accounts:
     - id: <REDACTED_UUID>
       asset_account: "Assets:Banks:Revolut:Checking"
-      transaction_types: ["booked", "pending"]  # optional, defaults to both
+      transaction_types: ["booked", "pending"]  # optional list, defaults to both
+      preferred_balance_type: "interimAvailable"  # optional, use specific balance type
 ```
 
 ```python
@@ -107,20 +86,19 @@ accounts:
 
 import beangulp
 from beancount_gocardless import GoCardLessImporter
-from smart_importer import apply_hooks, PredictPostings, PredictPayees
+from smart_importer import PredictPostings, PredictPayees
 
 importers = [
-    apply_hooks(
-        GoCardLessImporter(),
-        [
-            PredictPostings(),
-            PredictPayees(),
-        ],
-    )
+    GoCardLessImporter()
+]
+
+hooks = [
+    PredictPostings().hook,
+    PredictPayees().hook,
 ]
 
 if __name__ == "__main__":
-    ingest = beangulp.Ingest(importers)
+    ingest = beangulp.Ingest(importers, hooks=hooks)
     ingest()
 ```
 

{beancount_gocardless-0.1.11.dist-info → beancount_gocardless-0.1.13.dist-info}/RECORD

@@ -1,12 +1,12 @@
 beancount_gocardless/__init__.py,sha256=JVJivGs-o5yY8YGqTYwn1cXY7aiA76lUyc95s1Ye-j0,253
 beancount_gocardless/cli.py,sha256=EDa01K1-E7e_Y0mHyISR4oimlo_nh5mLlE0RbhEFDAQ,4775
 beancount_gocardless/client.py,sha256=2Sl8yeS7Lb1Y9qH8lZfGYrIVI_wkKy7ckZHG0GLE30Y,15572
-beancount_gocardless/importer.py,sha256=4sh66Vmi8eWEXcmkUIq3UJcqjyZNUitZpkp1-ZcNyCU,16688
-beancount_gocardless/models.py,sha256=UuuX8mj8X2_kS17Q3CeJ68J960h0Nq1-fN7kT06oiYg,18269
+beancount_gocardless/importer.py,sha256=RHKvhB1VA7WHpk_Az-HXxUfFIsycz8dRvdsrKoJqAMI,17068
+beancount_gocardless/models.py,sha256=tQyzEvqs9_7NmyCi3fZdEUxy5_rTo8VSoFsg7mupLh8,19351
 beancount_gocardless/tui.py,sha256=Tk5AN0PeZZfXlQqm81P5Bmtdx-_whUyuKSsBv4eiF5w,26409
 beancount_gocardless/openapi/swagger.json,sha256=t8TLbt0l2UOyorZX8JyoG4XO2qtXDRYUlsllM3ckyG4,264957
-beancount_gocardless-0.1.11.dist-info/METADATA,sha256=Vwqq9Mr99heobkJwihJIc8qY2rIMjFpov4mgU2wICNo,4124
-beancount_gocardless-0.1.11.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-beancount_gocardless-0.1.11.dist-info/entry_points.txt,sha256=_l8n11k9nGPaSDou4atu5NkV0Ojf-qjW2zIIGPzmmgA,128
-beancount_gocardless-0.1.11.dist-info/licenses/LICENSE,sha256=awOCsWJ58m_2kBQwBUGWejVqZm6wuRtCL2hi9rfa0X4,1211
-beancount_gocardless-0.1.11.dist-info/RECORD,,
+beancount_gocardless-0.1.13.dist-info/METADATA,sha256=6Bocz1344DLizkXbivAS_b_fRnnw29hj5DeAPPzoqX8,3229
+beancount_gocardless-0.1.13.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+beancount_gocardless-0.1.13.dist-info/entry_points.txt,sha256=_l8n11k9nGPaSDou4atu5NkV0Ojf-qjW2zIIGPzmmgA,128
+beancount_gocardless-0.1.13.dist-info/licenses/LICENSE,sha256=awOCsWJ58m_2kBQwBUGWejVqZm6wuRtCL2hi9rfa0X4,1211
+beancount_gocardless-0.1.13.dist-info/RECORD,,