tariochbctools 1.5.0__py2.py3-none-any.whl → 1.5.1__py2.py3-none-any.whl

tariochbctools/importers/truelayer/importer.py

@@ -10,6 +10,8 @@ import yaml
 from beancount.core import amount, data
 from beancount.core.number import D
 
+from tariochbctools.importers.general.deduplication import ReferenceDuplicatesComparator
+
 # https://docs.truelayer.com/#retrieve-account-transactions
 
 TX_MANDATORY_ID_FIELDS = ("transaction_id",)
@@ -125,6 +127,17 @@ class Importer(beangulp.Importer):
                 logging.warning("Ignoring account ID %s", accountId)
                 continue
 
+            r = requests.get(
+                f"https://api.{self.domain}/data/v1/{endpoint}/{accountId}/balance",
+                headers=headers,
+            )
+            balances = r.json()["results"]
+
+            for balance in balances:
+                entries.extend(
+                    self._extract_balance(balance, local_account, invert_sign)
+                )
+
             r = requests.get(
                 f"https://api.{self.domain}/data/v1/{endpoint}/{accountId}/transactions",
                 headers=headers,
@@ -148,7 +161,7 @@ class Importer(beangulp.Importer):
         invert_sign: bool,
     ) -> data.Transaction:
         entries = []
-        metakv = {}
+        metakv: dict[str, Any] = {}
 
         id_meta_kvs = {
             k: trx["meta"][k] for k in TX_OPTIONAL_META_ID_FIELDS if trx["meta"].get(k)
@@ -193,37 +206,52 @@ class Importer(beangulp.Importer):
         )
         entries.append(entry)
 
-        if trx["transaction_id"] == transactions[-1]["transaction_id"]:
-            balDate = trxDate + timedelta(days=1)
-            metakv = {}
-            if self.existing is not None:
-                for exEntry in self.existing:
-                    if (
-                        isinstance(exEntry, data.Balance)
-                        and exEntry.date == balDate
-                        and exEntry.account == local_account
-                    ):
-                        metakv["__duplicate__"] = True
-
-            meta = data.new_metadata("", 0, metakv)
-
-            # Only if the 'balance' permission is present
-            if "running_balance" in trx:
-                tx_balance = D(str(trx["running_balance"]["amount"]))
-                # avoid pylint invalid-unary-operand-type
-                signed_balance = -1 * tx_balance if invert_sign else tx_balance
-
-                entries.append(
-                    data.Balance(
-                        meta,
-                        balDate,
-                        local_account,
-                        amount.Amount(
-                            signed_balance, trx["running_balance"]["currency"]
-                        ),
-                        None,
-                        None,
-                    )
+        return entries
+
+    def _extract_balance(
+        self,
+        result: dict[str, Any],
+        local_account: data.Account,
+        invert_sign: bool,
+    ) -> data.Transaction:
+        entries = []
+
+        meta = data.new_metadata("", 0)
+
+        balance = D(str(result["current"]))
+        # avoid pylint invalid-unary-operand-type
+        signed_balance = -1 * balance if invert_sign else balance
+        balance_date = dateutil.parser.parse(result["update_timestamp"]).date()
+
+        entries.append(
+            data.Balance(
+                meta,
+                balance_date + timedelta(days=1),
+                local_account,
+                amount.Amount(signed_balance, result["currency"]),
+                None,
+                None,
+            )
+        )
+
+        if "last_statement_balance" in result:
+            statement_balance = D(str(result["last_statement_balance"]))
+            signed_statement_balance = (
+                -1 * statement_balance if invert_sign else statement_balance
+            )
+            statement_date = dateutil.parser.parse(result["last_statement_date"]).date()
+
+            entries.append(
+                data.Balance(
+                    meta,
+                    statement_date,
+                    local_account,
+                    amount.Amount(signed_statement_balance, result["currency"]),
+                    None,
+                    None,
                 )
+            )
 
         return entries
+
+    cmp = ReferenceDuplicatesComparator(TX_MANDATORY_ID_FIELDS)

{tariochbctools-1.5.0.dist-info → tariochbctools-1.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tariochbctools
-Version: 1.5.0
+Version: 1.5.1
 Summary: Importers, plugins and price fetchers for Beancount
 Home-page: https://github.com/tarioch/beancounttools/
 Author: Patrick Ruckstuhl

{tariochbctools-1.5.0.dist-info → tariochbctools-1.5.1.dist-info}/RECORD

@@ -41,7 +41,7 @@ tariochbctools/importers/swisscard/importer.py,sha256=84nyAHzz5Y8mHw-zCkoUE0CsaE
 tariochbctools/importers/transferwise/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tariochbctools/importers/transferwise/importer.py,sha256=IdtNmrLHKxrBBBVLf8Qgysw0Mx8XswF4cZv9iRl2b3g,6312
 tariochbctools/importers/truelayer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tariochbctools/importers/truelayer/importer.py,sha256=fkASr_cqxkGPf45Eltl4rwKdwoMN0ild3HbCPLk_r1U,7172
+tariochbctools/importers/truelayer/importer.py,sha256=rHJdbqP9wT1BackBq7lIoLAT04D-MM0Bc3-YtQSZF1c,7875
 tariochbctools/importers/viseca/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tariochbctools/importers/viseca/importer.py,sha256=U9HHmRyIutJYuAtS-W3gHW4kJYEfnyJmnrOVVMmZQAY,3346
 tariochbctools/importers/zak/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -53,9 +53,9 @@ tariochbctools/plugins/check_portfolio_sum.py,sha256=naJ2j6BFpQhJhT2c-gfjyIdcYe0
 tariochbctools/plugins/generate_base_ccy_prices.py,sha256=4CDzUosjMWCZfsBJMLrf-i5WNCHexI2rdm5vIDYW-AI,1314
 tariochbctools/plugins/prices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tariochbctools/plugins/prices/ibkr.py,sha256=GYCjnlF-MK-ZFPEr0M6T4iO3Etq0tMmrMlsHGInXUO8,1405
-tariochbctools-1.5.0.dist-info/licenses/LICENSE.txt,sha256=VR2hkz3p9Sw4hSXc7S5iZTOXGeV4h-i8AO_q0zEmtkE,1074
-tariochbctools-1.5.0.dist-info/METADATA,sha256=WAKAVrIPoRzgeLpoIT5-UtSvJXRPpu5V9l4HA3Ad448,2180
-tariochbctools-1.5.0.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-tariochbctools-1.5.0.dist-info/entry_points.txt,sha256=bo7wO1u-PIDHNuqsTEekC56VCAmn2i2vTRcKXxqc770,158
-tariochbctools-1.5.0.dist-info/top_level.txt,sha256=CiA_NepCI6zDNsaORA55zmpuJFSnTvLESraIL13xiOQ,15
-tariochbctools-1.5.0.dist-info/RECORD,,
+tariochbctools-1.5.1.dist-info/licenses/LICENSE.txt,sha256=VR2hkz3p9Sw4hSXc7S5iZTOXGeV4h-i8AO_q0zEmtkE,1074
+tariochbctools-1.5.1.dist-info/METADATA,sha256=ByXtYGQYJRS1tEQFArWce0cdpm13CHQmQBH-r7yJ8zY,2180
+tariochbctools-1.5.1.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+tariochbctools-1.5.1.dist-info/entry_points.txt,sha256=bo7wO1u-PIDHNuqsTEekC56VCAmn2i2vTRcKXxqc770,158
+tariochbctools-1.5.1.dist-info/top_level.txt,sha256=CiA_NepCI6zDNsaORA55zmpuJFSnTvLESraIL13xiOQ,15
+tariochbctools-1.5.1.dist-info/RECORD,,