tariochbctools 0.36__py2.py3-none-any.whl → 0.38__py2.py3-none-any.whl

tariochbctools/importers/general/priceLookup.py

@@ -1,16 +1,25 @@
 from datetime import date
 
 from beancount.core import amount, prices
+from beancount.core.number import D
 
 
 class PriceLookup:
     def __init__(self, existing_entries, baseCcy: str):
-        self.priceMap = prices.build_price_map(existing_entries)
+        if existing_entries:
+            self.priceMap = prices.build_price_map(existing_entries)
+        else:
+            self.priceMap = None
         self.baseCcy = baseCcy
 
     def fetchPriceAmount(self, instrument: str, date: date):
-        price = prices.get_price(self.priceMap, tuple([instrument, self.baseCcy]), date)
-        return price[1]
+        if self.priceMap:
+            price = prices.get_price(
+                self.priceMap, tuple([instrument, self.baseCcy]), date
+            )
+            return price[1]
+        else:
+            return D(1)
 
     def fetchPrice(self, instrument: str, date: date):
         if instrument == self.baseCcy:

tariochbctools/importers/netbenefits/importer.py

@@ -0,0 +1,173 @@
+import csv
+from collections.abc import Iterable
+from datetime import date
+from io import StringIO
+
+from beancount.core import amount, data
+from beancount.core.number import D
+from beancount.core.position import CostSpec
+from beancount.ingest import importer
+from beancount.ingest.importers.mixins import identifier
+from dateutil.parser import parse
+
+from tariochbctools.importers.general.priceLookup import PriceLookup
+
+
+class Importer(identifier.IdentifyMixin, importer.ImporterProtocol):
+    """An importer for Fidelity Netbenefits Activity CSV files."""
+
+    def __init__(
+        self,
+        regexps: str | Iterable[str],
+        cashAccount: str,
+        investmentAccount: str,
+        dividendAccount: str,
+        taxAccount: str,
+        capGainAccount: str,
+        symbol: str,
+        ignoreTypes: Iterable[str],
+        baseCcy: str,
+    ):
+        identifier.IdentifyMixin.__init__(self, matchers=[("filename", regexps)])
+        self.cashAccount = cashAccount
+        self.investmentAccount = investmentAccount
+        self.dividendAccount = dividendAccount
+        self.taxAccount = taxAccount
+        self.capGainAccount = capGainAccount
+        self.symbol = symbol
+        self.ignoreTypes = ignoreTypes
+        self.baseCcy = baseCcy
+
+    def name(self):
+        return super().name() + self.cashAccount
+
+    def file_account(self, file):
+        return self.cashAccount
+
+    def extract(self, file, existing_entries):
+        entries = []
+
+        self.priceLookup = PriceLookup(existing_entries, self.baseCcy)
+
+        with StringIO(file.contents()) as csvfile:
+            reader = csv.DictReader(
+                csvfile,
+                [
+                    "Transaction date",
+                    "Transaction type",
+                    "Investment name",
+                    "Shares",
+                    "Amount",
+                ],
+                delimiter=",",
+                skipinitialspace=True,
+            )
+            next(reader)
+            for row in reader:
+                if not row["Transaction type"]:
+                    break
+
+                if row["Transaction type"] in self.ignoreTypes:
+                    continue
+
+                book_date = parse(row["Transaction date"].strip()).date()
+                amt = amount.Amount(D(row["Amount"].replace("$", "")), "USD")
+                shares = None
+                if row["Shares"] != "-":
+                    shares = amount.Amount(D(row["Shares"]), self.symbol)
+
+                metakv = {}
+
+                if not amt and not shares:
+                    continue
+
+                meta = data.new_metadata(file.name, 0, metakv)
+                description = row["Transaction type"].strip()
+
+                if "TAX" in description:
+                    postings = self.__createDividend(amt, book_date, self.taxAccount)
+                elif "DIVIDEND" in description:
+                    postings = self.__createDividend(
+                        amt, book_date, self.dividendAccount
+                    )
+                elif "YOU BOUGHT" in description:
+                    postings = self.__createBuy(amt, shares, book_date)
+                elif "YOU SOLD" in description:
+                    postings = self.__createSell(amt, shares, book_date)
+                else:
+                    postings = [
+                        data.Posting(self.cashAccount, amt, None, None, None, None),
+                    ]
+
+                    if shares is not None:
+                        postings.append(
+                            data.Posting(
+                                self.investmentAccount, shares, None, None, None, None
+                            ),
+                        )
+
+                entry = data.Transaction(
+                    meta,
+                    book_date,
+                    "*",
+                    "",
+                    description,
+                    data.EMPTY_SET,
+                    data.EMPTY_SET,
+                    postings,
+                )
+                entries.append(entry)
+
+        return entries
+
+    def __createBuy(self, amt: amount, shares: amount, book_date: date):
+        price = self.priceLookup.fetchPrice("USD", book_date)
+        cost = CostSpec(
+            number_per=None,
+            number_total=round(-amt.number * price.number, 2),
+            currency=self.baseCcy,
+            date=None,
+            label=None,
+            merge=None,
+        )
+        postings = [
+            data.Posting(self.investmentAccount, shares, cost, None, None, None),
+            data.Posting(self.cashAccount, amt, None, price, None, None),
+        ]
+
+        return postings
+
+    def __createSell(self, amt: amount, shares: amount, book_date: date):
+        price = self.priceLookup.fetchPrice("USD", book_date)
+        cost = CostSpec(
+            number_per=None,
+            number_total=None,
+            currency=None,
+            date=None,
+            label=None,
+            merge=None,
+        )
+        postings = [
+            data.Posting(self.investmentAccount, shares, cost, None, None, None),
+            data.Posting(self.cashAccount, amt, None, price, None, None),
+            data.Posting(self.capGainAccount, None, None, None, None, None),
+        ]
+
+        return postings
+
+    def __createDividend(self, amt: amount, book_date: date, incomeAccount: str):
+        price = self.priceLookup.fetchPrice("USD", book_date)
+        postings = [
+            data.Posting(
+                self.investmentAccount,
+                amount.Amount(D(0), self.symbol),
+                None,
+                None,
+                None,
+                None,
+            ),
+            data.Posting(self.cashAccount, amt, None, price, None, None),
+            data.Posting(incomeAccount, None, None, None, None, None),
+        ]
+
+        return postings

tariochbctools/importers/revolut/importer.py

@@ -4,7 +4,7 @@ from datetime import timedelta
 from io import StringIO
 
 from beancount.core import amount, data
-from beancount.core.number import D
+from beancount.core.number import ZERO, D
 from beancount.ingest import importer
 from beancount.ingest.importers.mixins import identifier
 from dateutil.parser import parse
@@ -13,10 +13,11 @@ from dateutil.parser import parse
 class Importer(identifier.IdentifyMixin, importer.ImporterProtocol):
     """An importer for Revolut CSV files."""
 
-    def __init__(self, regexps, account, currency):
+    def __init__(self, regexps, account, currency, fee=None):
         identifier.IdentifyMixin.__init__(self, matchers=[("filename", regexps)])
         self.account = account
         self.currency = currency
+        self._fee = fee
 
     def name(self):
         return super().name() + self.account
@@ -46,6 +47,7 @@ class Importer(identifier.IdentifyMixin, importer.ImporterProtocol):
                 skipinitialspace=True,
             )
             next(reader)
+            is_fee_mode = self._fee is not None
             for row in reader:
                 try:
                     bal = D(row["Balance"].replace("'", "").strip())
@@ -53,37 +55,58 @@ class Importer(identifier.IdentifyMixin, importer.ImporterProtocol):
                     amt = amount.Amount(amount_raw, row["Currency"])
                     balance = amount.Amount(bal, self.currency)
                     book_date = parse(row["Completed Date"].strip()).date()
+                    fee_amt_raw = D(row["Fee"].replace("'", "").strip())
+                    fee = amount.Amount(-fee_amt_raw, row["Currency"])
                 except Exception as e:
                     logging.warning(e)
                     continue
 
+                if is_fee_mode and fee_amt_raw == ZERO:
+                    continue
+
+                postings = [
+                    data.Posting(self.account, amt, None, None, None, None),
+                ]
+                description = row["Description"].strip()
+                if is_fee_mode:
+                    postings = [
+                        data.Posting(self.account, fee, None, None, None, None),
+                        data.Posting(
+                            self._fee["account"], -fee, None, None, None, None
+                        ),
+                    ]
+                    description = f"Fees for {description}"
+
+                assert isinstance(
+                    description, str
+                ), "Actual type of description is " + str(type(description))
+
                 entry = data.Transaction(
                     data.new_metadata(file.name, 0, {}),
                     book_date,
                     "*",
                     "",
-                    row["Description"].strip(),
+                    description,
                     data.EMPTY_SET,
                     data.EMPTY_SET,
-                    [
-                        data.Posting(self.account, amt, None, None, None, None),
-                    ],
+                    postings,
                 )
                 entries.append(entry)
 
-            # only add balance after the last (newest) transaction
-            try:
-                book_date = book_date + timedelta(days=1)
-                entry = data.Balance(
-                    data.new_metadata(file.name, 0, {}),
-                    book_date,
-                    self.account,
-                    balance,
-                    None,
-                    None,
-                )
-                entries.append(entry)
-            except NameError:
-                pass
+            if not is_fee_mode:
+                # only add balance after the last (newest) transaction
+                try:
+                    book_date = book_date + timedelta(days=1)
+                    entry = data.Balance(
+                        data.new_metadata(file.name, 0, {}),
+                        book_date,
+                        self.account,
+                        balance,
+                        None,
+                        None,
+                    )
+                    entries.append(entry)
+                except NameError:
+                    pass
 
         return entries

tariochbctools/plugins/check_portfolio_sum.py

@@ -1,6 +1,7 @@
 """A plugin that verifies that on each transaction, all the "portfolios" have
 the same weight.
 """
+
 import collections
 from collections import defaultdict
 from decimal import Decimal

tariochbctools/plugins/generate_base_ccy_prices.py

@@ -1,6 +1,7 @@
 """A plugin that inserts an additional price to the base rate by applying
 fx rate to a price.
 """
+
 from beancount.core import amount, data, prices
 
 __plugins__ = ["generate"]

{tariochbctools-0.36.dist-info → tariochbctools-0.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tariochbctools
-Version: 0.36
+Version: 0.38
 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
 Classifier: License :: OSI Approved :: MIT License
 Description-Content-Type: text/x-rst; charset=UTF-8
 License-File: LICENSE.txt
-Requires-Dist: beancount <3,>=2
+Requires-Dist: beancount<3,>=2
 Requires-Dist: bitstampclient
 Requires-Dist: mt-940
 Requires-Dist: pyyaml
@@ -30,14 +30,14 @@ Requires-Dist: opencv-python
 Requires-Dist: blockcypher
 Requires-Dist: imap-tools
 Requires-Dist: undictify
-Requires-Dist: importlib-metadata ; python_version < "3.8"
+Requires-Dist: importlib-metadata; python_version < "3.8"
 Provides-Extra: testing
-Requires-Dist: pytest ; extra == 'testing'
-Requires-Dist: pytest-cov ; extra == 'testing'
-Requires-Dist: pytest-mock ; extra == 'testing'
-Requires-Dist: flake8 ; extra == 'testing'
-Requires-Dist: black ; extra == 'testing'
-Requires-Dist: isort ; extra == 'testing'
+Requires-Dist: pytest; extra == "testing"
+Requires-Dist: pytest-cov; extra == "testing"
+Requires-Dist: pytest-mock; extra == "testing"
+Requires-Dist: flake8; extra == "testing"
+Requires-Dist: black; extra == "testing"
+Requires-Dist: isort; extra == "testing"
 
 .. image:: https://img.shields.io/pypi/l/tariochbctools.svg
    :target: https://pypi.python.org/pypi/tariochbctools

{tariochbctools-0.36.dist-info → tariochbctools-0.38.dist-info}/RECORD

@@ -11,11 +11,13 @@ tariochbctools/importers/cembrastatement/importer.py,sha256=fqfJxcU1SDiyyV3iDvfv
 tariochbctools/importers/general/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tariochbctools/importers/general/mailAdapterImporter.py,sha256=B6r9ycPY1ZiWFPNnl2-h73OgMZAMaq_QSdURW6gxR3c,1805
 tariochbctools/importers/general/mt940importer.py,sha256=gLE77YhMaQdHE3nDg344eLh-hSofGKHTW5O_h6kmUdM,2102
-tariochbctools/importers/general/priceLookup.py,sha256=k0HikFeQcP83CvCwTT3Clpi640VAAGKohU1PQ-3Vi9w,621
+tariochbctools/importers/general/priceLookup.py,sha256=2nqDcSHC2BMmfSaJtgdmZKNejvTglmAj4oMqOf-SLXg,839
 tariochbctools/importers/ibkr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tariochbctools/importers/ibkr/importer.py,sha256=ie8LjnIpok8bWGGItxfin_aBSyqe5DXpGSdg3kcNID0,8616
 tariochbctools/importers/neon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tariochbctools/importers/neon/importer.py,sha256=SNG6podG1PI3gABy6eYfv1-mRnPwRjK-j5_GoNz2-Wc,2547
+tariochbctools/importers/netbenefits/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tariochbctools/importers/netbenefits/importer.py,sha256=V1C9t9LU09osxBDOz-V8DL4LxhtnuhLRj6WV_idxrTM,5816
 tariochbctools/importers/nordigen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tariochbctools/importers/nordigen/importer.py,sha256=pHRs1WyvNmb_zIUsq1O6tcUq2xMDt7AFpIbok4R1B9A,3633
 tariochbctools/importers/nordigen/nordigen_config.py,sha256=jT4vgEKc35qgXqF8_bRbXLHUrkgsSDKHfhDbEw5OXD4,4903
@@ -25,7 +27,7 @@ tariochbctools/importers/quickfile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 tariochbctools/importers/quickfile/importer.py,sha256=0HRVl-OXkCq8T5Uz04gGCGlkRXZ3Mp1y8AldW8ezBHg,6544
 tariochbctools/importers/raiffeisench/importer.py,sha256=L6X0vlAuL8__DmZbs_T-r-A8SH9VH05KLkL7SubFouA,995
 tariochbctools/importers/revolut/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tariochbctools/importers/revolut/importer.py,sha256=TUjTnvvnYgc0j4z86KIohoMmw13UdNYjapNGPC63ILI,2886
+tariochbctools/importers/revolut/importer.py,sha256=TtGzHl5v_i7IYBNFkdNosIvpBRO6_p5i_7qU2Cml2L0,3885
 tariochbctools/importers/schedule/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tariochbctools/importers/schedule/importer.py,sha256=g1q7NwGzwkj25LknOguf3b7iJ0v4JXET01a8N3cWu2U,1526
 tariochbctools/importers/swisscard/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -41,13 +43,13 @@ tariochbctools/importers/zak/importer.py,sha256=9HyFhsavUHLAlO1Pi3eJ7qlNmPsmKzC0
 tariochbctools/importers/zkb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tariochbctools/importers/zkb/importer.py,sha256=yrUck3DL2uyuliw0OTBGqBLYl8WBHxgTNnmaG_vA68o,1421
 tariochbctools/plugins/__init__.py,sha256=DSZtoTVosmExbFmMlHVrZAxKewEILDZlGh_7-uWcc_w,26
-tariochbctools/plugins/check_portfolio_sum.py,sha256=bIAZRq7u0Up61siQVvfrBj8-ug7qKtd1IA85aOeTUQM,2339
-tariochbctools/plugins/generate_base_ccy_prices.py,sha256=CpT7A3UPZMHU6z-__uEueAMvzJcDO3LKyVEiYdyl1oI,1235
+tariochbctools/plugins/check_portfolio_sum.py,sha256=naJ2j6BFpQhJhT2c-gfjyIdcYe0l_ZzpdlqgwrsIv2g,2340
+tariochbctools/plugins/generate_base_ccy_prices.py,sha256=Phw314qox3jpNgC5-GcnmyYcLkMkrd8xsWS-wYwdj6o,1236
 tariochbctools/plugins/prices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tariochbctools/plugins/prices/ibkr.py,sha256=9OwaZvI55bCj7H80K2iLZVsGLpuCyaoCnyuTS9e1_-c,1294
-tariochbctools-0.36.dist-info/LICENSE.txt,sha256=VR2hkz3p9Sw4hSXc7S5iZTOXGeV4h-i8AO_q0zEmtkE,1074
-tariochbctools-0.36.dist-info/METADATA,sha256=R0HMqz7ndNUCgnZlTyyAfOefUDaFiV1RLYddYnil-Pw,2110
-tariochbctools-0.36.dist-info/WHEEL,sha256=0XQbNV6JE5ziJsWjIU8TRRv0N6SohNonLWgP86g5fiI,109
-tariochbctools-0.36.dist-info/entry_points.txt,sha256=9xrCCY1wx2zCIsQUOWZelLHDmHw9Oc-ZBAKUIY9lKTA,88
-tariochbctools-0.36.dist-info/top_level.txt,sha256=CiA_NepCI6zDNsaORA55zmpuJFSnTvLESraIL13xiOQ,15
-tariochbctools-0.36.dist-info/RECORD,,
+tariochbctools-0.38.dist-info/LICENSE.txt,sha256=VR2hkz3p9Sw4hSXc7S5iZTOXGeV4h-i8AO_q0zEmtkE,1074
+tariochbctools-0.38.dist-info/METADATA,sha256=mJlkfUq-CmYt8LqpxguxQaUesNmH_zVQlY9wUexmLlI,2102
+tariochbctools-0.38.dist-info/WHEEL,sha256=XRxW4r1PNiVhMpP4bT9oWtu3HyndxpJ84SkubFgzp_Y,109
+tariochbctools-0.38.dist-info/entry_points.txt,sha256=9xrCCY1wx2zCIsQUOWZelLHDmHw9Oc-ZBAKUIY9lKTA,88
+tariochbctools-0.38.dist-info/top_level.txt,sha256=CiA_NepCI6zDNsaORA55zmpuJFSnTvLESraIL13xiOQ,15
+tariochbctools-0.38.dist-info/RECORD,,

{tariochbctools-0.36.dist-info → tariochbctools-0.38.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.2.0)
+Generator: setuptools (72.1.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any