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

tariochbctools/importers/awardwalletimp/config.py

@@ -5,7 +5,7 @@ from typing import Any
 
 import yaml
 from awardwallet import AwardWalletClient
-from awardwallet.api import AccessLevel
+from awardwallet.client import AccessLevel
 
 
 def get_link_url(client):
@@ -33,19 +33,18 @@ def generate(client):
     connected_users = client.list_connected_users()
 
     for user in connected_users:
-        user_id = user["userId"]
-        user_details = client.get_connected_user_details(user_id)
+        user_details = client.get_connected_user_details(user.user_id)
         account_config = {}
 
-        for account in user_details.get("accounts", []):
-            account_config[account["accountId"]] = {
-                "provider": account["displayName"],
+        for account in user_details.accounts:
+            account_config[account.account_id] = {
+                "provider": account.display_name,
                 "account": "Assets:Current:Points",  # Placeholder, user should adjust
                 "currency": "POINTS",
             }
 
-        config["users"][user_id] = {
-            "name": user["userName"],
+        config["users"][user.user_id] = {
+            "name": user.user_name,
             "all_history": False,
             "accounts": account_config,
         }

tariochbctools/importers/awardwalletimp/importer.py

@@ -1,11 +1,13 @@
+import datetime
 import logging
+import re
+from operator import attrgetter
 from os import path
-from typing import Any
 
 import beangulp
 import dateutil.parser
 import yaml
-from awardwallet import AwardWalletClient
+from awardwallet import AwardWalletClient, model
 from beancount.core import amount, data
 from beancount.core.number import D
 
@@ -46,27 +48,33 @@ class Importer(beangulp.Importer):
         return entries
 
     def _extract_user_history(
-        self, user: dict, user_details: dict
+        self, user: dict, user_details: model.GetConnectedUserDetailsResponse
     ) -> list[data.Transaction]:
         """
         User history is limited to the last 10 history elements per account
         """
         entries = []
-        for account in user_details["accounts"]:
-            account_id = account["accountId"]
-
-            if account_id in user["accounts"]:
-                logging.info("Extracting account ID %s", account_id)
-                account_config = user["accounts"][account_id]
+        for account in user_details.accounts:
+            if account.account_id in user["accounts"]:
+                logging.info("Extracting account ID %s", account.account_id)
+                account_config = user["accounts"][account.account_id]
 
                 entries.extend(
                     self._extract_transactions(
-                        account["history"], account_config, account_id
+                        account.history, account_config, account.account_id
                     )
                 )
+
+                # we fudge the date by using the latest txn (across *all* accounts)
+                latest_txn = max(entries, key=attrgetter("date"), default=None)
+                entries.extend(
+                    self._extract_balance(account, account_config, latest_txn)
+                )
             else:
                 logging.warning(
-                    "Ignoring account ID %s: %s", account_id, account["displayName"]
+                    "Ignoring account ID %s: %s",
+                    account.account_id,
+                    account.display_name,
                 )
         return entries
 
@@ -76,13 +84,15 @@ class Importer(beangulp.Importer):
         entries = []
         for account_id, account_config in user["accounts"].items():
             logging.info("Extracting account ID %s", account_id)
-            account = client.get_account_details(account_id)["account"]
+            account = client.get_account_details(account_id).account
 
             entries.extend(
-                self._extract_transactions(
-                    account["history"], account_config, account_id
-                )
+                self._extract_transactions(account.history, account_config, account_id)
             )
+
+            # we fudge the date by using the latest txn (across *all* accounts)
+            latest_txn = max(entries, key=attrgetter("date"), default=None)
+            entries.extend(self._extract_balance(account, account_config, latest_txn))
         return entries
 
     def _extract_transactions(
@@ -109,7 +119,7 @@ class Importer(beangulp.Importer):
 
     def _extract_transaction(
         self,
-        trx: dict[str, Any],
+        trx: model.HistoryItem,
         local_account: data.Account,
         currency: str,
         account_id: str,
@@ -121,20 +131,23 @@ class Importer(beangulp.Importer):
         trx_description = None
         trx_amount = None
 
-        for f in trx.get("fields", []):
-            if f["code"] == "PostingDate":
-                trx_date = dateutil.parser.parse(f["value"]["value"]).date()
-            if f["code"] == "Description":
-                trx_description = f["value"]["value"].replace("\n", " ")
-            if f["code"] == "Miles":
-                trx_amount = D(f["value"]["value"])
-            if f["code"] == "Info":
-                name = f["name"].lower().replace(" ", "-")
-                metakv[name] = f["value"]["value"].replace("\n", " ")
+        for f in trx.fields:
+            if f.code == "PostingDate":
+                trx_date = dateutil.parser.parse(f.value.value).date()
+            if f.code == "Description":
+                trx_description = f.value.value.replace("\n", " ")
+            if f.code == "Miles":
+                trx_amount = D(f.value.value)
+            if f.code == "Info":
+                name = re.sub(r"\W", "-", f.name).lower()
+                metakv[name] = f.value.value.replace("\n", " ")
 
         assert trx_date
         assert trx_description
-        assert trx_amount is not None, f"No amount in trx: {trx}"
+
+        if trx_amount is None:
+            logging.warning("Skipping transaction with no amount: %s", trx)
+            return []
 
         meta = data.new_metadata("", 0, metakv)
         entry = data.Transaction(
@@ -158,3 +171,36 @@ class Importer(beangulp.Importer):
         )
         entries.append(entry)
         return entries
+
+    def _extract_balance(
+        self,
+        account: model.Account,
+        account_config: dict,
+        latest_txn: data.Transaction | None,
+    ) -> list[data.Transaction]:
+        local_account = account_config["account"]
+        currency = account_config["currency"]
+        balance = amount.Amount(D(account.balance_raw), currency)
+        metakv = {"account-id": str(account.account_id)}
+
+        optional_date = account.last_change_date or account.last_retrieve_date
+        if optional_date:
+            date = optional_date.date()
+        elif latest_txn:
+            date = latest_txn.date
+        else:
+            logging.warning(
+                "No date information available for balance of account %s, using today",
+                account.account_id,
+            )
+            date = datetime.date.today()
+
+        entry = data.Balance(
+            data.new_metadata("", 0, metakv),
+            date + datetime.timedelta(days=1),
+            local_account,
+            balance,
+            None,
+            None,
+        )
+        return [entry]

tariochbctools/importers/radicant/importer.py

@@ -1,5 +1,5 @@
 import re
-from datetime import datetime
+from datetime import datetime, timedelta
 
 import beangulp
 import camelot
@@ -46,6 +46,11 @@ class Importer(beangulp.Importer):
         if conversionOriginal and conversionRate:
             kv = {"original": conversionOriginal, "rate": conversionRate}
             text = text.replace("Amount: " + conversionOriginal, "")
+            # handle decimal seperated original amounts
+            [originalCcy, originalAmt] = conversionOriginal.split(" ")
+            text = text.replace(
+                "Amount: " + f"{originalCcy} {float(originalAmt):,}", ""
+            )
         else:
             kv = None
 
@@ -63,17 +68,34 @@ class Importer(beangulp.Importer):
             ],
         )
 
+    def createBalance(
+        self,
+        filepath: str,
+        date: str,
+        amt: amount.Amount,
+    ) -> data.Balance:
+        meta = data.new_metadata(filepath, 0, None)
+        return data.Balance(
+            meta,
+            datetime.strptime(date, "%d.%m.%Y").date() + timedelta(days=1),
+            self._account,
+            amt,
+            None,
+            None,
+        )
+
     def extract(self, filepath: str, existing: data.Entries) -> data.Entries:
         entries = []
 
         conversionPattern = re.compile(r"(?P<original>.+) at the rate of (?P<rate>.+)")
+        balancePattern = re.compile(r"Balance as of (?P<date>\d\d\.\d\d\.\d\d\d\d)")
 
         tables = camelot.read_pdf(
             filepath,
             flavor="stream",
             pages="all",
-            table_regions=["40,470,580,32"],
-            columns=["110,300,370,440,500"],
+            table_regions=["40,600,580,32"],
+            columns=["110,305,370,440,500"],
             strip_text="\n",
             layout_kwargs={"word_margin": 0.50},
             split_text=True,
@@ -89,7 +111,7 @@ class Importer(beangulp.Importer):
             conversionOriginal = None
             conversionRate = None
             for _, row in df.iterrows():
-                date, text, _, debit, credit, _ = tuple(row)
+                date, text, _, debit, credit, bal = tuple(row)
 
                 # skip stuff before
                 if beforeStart and "Date" != date:
@@ -98,8 +120,16 @@ class Importer(beangulp.Importer):
                     beforeStart = False
                     continue
 
-                # skip stuff after
-                if "Balance as of" in text:
+                # create balance and skip stuff after
+                balanceMatch = balancePattern.match(text)
+                if balanceMatch:
+                    entries.append(
+                        self.createBalance(
+                            filepath,
+                            balanceMatch.group("date"),
+                            amount.Amount(D(bal.replace("'", "")), self.currency),
+                        )
+                    )
                     break
 
                 trxDate = date

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.4.1.dist-info → tariochbctools-1.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tariochbctools
-Version: 1.4.1
+Version: 1.5.1
 Summary: Importers, plugins and price fetchers for Beancount
 Home-page: https://github.com/tarioch/beancounttools/
 Author: Patrick Ruckstuhl
@@ -19,7 +19,7 @@ Classifier: Topic :: Office/Business :: Financial :: Investment
 Description-Content-Type: text/x-rst; charset=UTF-8
 License-File: LICENSE.txt
 Requires-Dist: importlib-metadata; python_version < "3.8"
-Requires-Dist: awardwallet
+Requires-Dist: awardwallet>=0.2
 Requires-Dist: beancount>=3
 Requires-Dist: beangulp
 Requires-Dist: beanprice

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

@@ -1,8 +1,8 @@
 tariochbctools/__init__.py,sha256=pH5i4Fj1tbXLqLtTVIdoojiplZssQn0nnud8-HXodRE,577
 tariochbctools/importers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tariochbctools/importers/awardwalletimp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tariochbctools/importers/awardwalletimp/config.py,sha256=EPwvUE9WBdCk9xxleJ8qDLfPy8GwcgAtG1uGSShyt4w,2460
-tariochbctools/importers/awardwalletimp/importer.py,sha256=0G3DcxYP_chy1zUYMCijDOwNZBBBdX8hR2sPKiVHZS8,5071
+tariochbctools/importers/awardwalletimp/config.py,sha256=OEhKKkA-lJqyT6QImqlsJVAT4iiNeGwX2DKNPZN6cic,2423
+tariochbctools/importers/awardwalletimp/importer.py,sha256=Z4GeK3xqQTbdNDFQVObDXqL3SWX-KPjhbZ25TtBD-cg,6754
 tariochbctools/importers/bcge/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tariochbctools/importers/bcge/importer.py,sha256=bAQpkBLURatdsfSoMQdiha-8QfExAXXvpzAgnFFMwoE,1176
 tariochbctools/importers/bitst/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -30,7 +30,7 @@ tariochbctools/importers/postfinance/importer.py,sha256=PLBbnswb_tHt8wzd7yCC4UAW
 tariochbctools/importers/quickfile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tariochbctools/importers/quickfile/importer.py,sha256=HgS7lSi7egxkj-IWd77MS-vhepYNCRXZwVbeCornkzg,6479
 tariochbctools/importers/radicant/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tariochbctools/importers/radicant/importer.py,sha256=d2AKncK4-5PMDJ-98gqgWYubMWpO46LJ7eY8koa6y90,4490
+tariochbctools/importers/radicant/importer.py,sha256=chjHX25YoU7jaonegJ8gaV2QzvSm7sdH8a7cj-rUmPA,5602
 tariochbctools/importers/raiffeisench/importer.py,sha256=5r7hHEG0ZtEp-ePlsF4aHapBv9DJgjeVxE1m_G62bLU,912
 tariochbctools/importers/revolut/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tariochbctools/importers/revolut/importer.py,sha256=5jI91gGIDcP2TMFcauKkA9OWCTqCIl5Phz9n6r9kOeI,3953
@@ -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.4.1.dist-info/licenses/LICENSE.txt,sha256=VR2hkz3p9Sw4hSXc7S5iZTOXGeV4h-i8AO_q0zEmtkE,1074
-tariochbctools-1.4.1.dist-info/METADATA,sha256=x5jAZ6K1do4OMGOoJYbteq1nf3Qw4dW1DR7693B1XCk,2175
-tariochbctools-1.4.1.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-tariochbctools-1.4.1.dist-info/entry_points.txt,sha256=bo7wO1u-PIDHNuqsTEekC56VCAmn2i2vTRcKXxqc770,158
-tariochbctools-1.4.1.dist-info/top_level.txt,sha256=CiA_NepCI6zDNsaORA55zmpuJFSnTvLESraIL13xiOQ,15
-tariochbctools-1.4.1.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,,