Reformat to reduce line length

handler/sinks/__init__.py

@@ -37,7 +37,6 @@ class Sinks(util.Base):
         # setattr(self.truelayer, "sinks", self)
 
     def got_transactions(self, subclass, account_id, transactions):
-        print("GOT TX", transactions[0:10])
         if not transactions:
             return False
         transaction_ids = [x["transaction_id"] for x in transactions]
@@ -96,11 +95,14 @@ class Sinks(util.Base):
         """
         Get the total balance of our accounts in USD.
         """
-        total_nordigen = self.nordigen.get_total_map()
-        total_truelayer = self.truelayer.get_total_map()
+        total = 0
+        if settings.Nordigen.enabled == "1":
+            total_nordigen = self.nordigen.get_total_map()
+            total_nordigen_usd = self.money.multiple_to_usd(total_nordigen)
+            total += total_nordigen_usd
+        if settings.TrueLayer.enabled == "1":
+            total_truelayer = self.truelayer.get_total_map()
+            total_truelayer_usd = self.money.multiple_to_usd(total_truelayer)
+            total += total_truelayer_usd
 
-        # Yes, we can save an API call by merging but I think this is clearer
-        total_nordigen_usd = self.money.multiple_to_usd(total_nordigen)
-        total_truelayer_usd = self.money.multiple_to_usd(total_truelayer)
-
-        return total_truelayer_usd + total_nordigen_usd
+        return total

handler/sinks/nordigen.py

@@ -49,7 +49,10 @@ class Nordigen(util.Base):
 
         # Filter for added accounts since we only do that for TrueLayer
         account_infos = {
-            bank: accounts for bank, accounts in account_infos.items() for account in accounts if account["account_id"] in self.banks
+            bank: accounts
+            for bank, accounts in account_infos.items()
+            for account in accounts
+            if account["account_id"] in self.banks
         }
 
         self.sinks.got_account_info("nordigen", account_infos)
@@ -68,7 +71,10 @@ class Nordigen(util.Base):
         :return: True or False
         :rtype: bool
         """
-        headers = {"accept": "application/json", "Content-Type": "application/json"}
+        headers = {
+            "accept": "application/json",
+            "Content-Type": "application/json",
+        }
         data = {
             "secret_id": settings.Nordigen.ID,
             "secret_key": settings.Nordigen.Key,
@@ -97,7 +103,10 @@ class Nordigen(util.Base):
         """
         if not len(country) == 2:
             return False
-        headers = {"accept": "application/json", "Authorization": f"Bearer {self.token}"}
+        headers = {
+            "accept": "application/json",
+            "Authorization": f"Bearer {self.token}",
+        }
         path = f"{settings.Nordigen.Base}/institutions/?country={country}"
         r = requests.get(path, headers=headers)
         try:
@@ -124,9 +133,15 @@ class Nordigen(util.Base):
         """Create a link to access an institution.
         :param institution_id: ID of the institution
         """
-        headers = {"accept": "application/json", "Authorization": f"Bearer {self.token}"}
+        headers = {
+            "accept": "application/json",
+            "Authorization": f"Bearer {self.token}",
+        }
         path = f"{settings.Nordigen.Base}/requisitions/"
-        data = {"institution_id": institution_id, "redirect": settings.Nordigen.CallbackURL}
+        data = {
+            "institution_id": institution_id,
+            "redirect": settings.Nordigen.CallbackURL,
+        }
         r = requests.post(path, headers=headers, data=data)
         try:
             obj = Agreement.from_json(r.content)
@@ -156,7 +171,10 @@ class Nordigen(util.Base):
         """
         Get a list of active accounts.
         """
-        headers = {"accept": "application/json", "Authorization": f"Bearer {self.token}"}
+        headers = {
+            "accept": "application/json",
+            "Authorization": f"Bearer {self.token}",
+        }
         path = f"{settings.Nordigen.Base}/requisitions"
         r = requests.get(path, headers=headers)
         try:
@@ -176,7 +194,10 @@ class Nordigen(util.Base):
         """
         Delete a requisision ID.
         """
-        headers = {"accept": "application/json", "Authorization": f"Bearer {self.token}"}
+        headers = {
+            "accept": "application/json",
+            "Authorization": f"Bearer {self.token}",
+        }
         path = f"{settings.Nordigen.Base}/requisitions/{requisition_id}/"
         r = requests.delete(path, headers=headers)
         try:
@@ -191,7 +212,10 @@ class Nordigen(util.Base):
         """
         Get a list of accounts for a requisition.
         :param requisition: requisition ID"""
-        headers = {"accept": "application/json", "Authorization": f"Bearer {self.token}"}
+        headers = {
+            "accept": "application/json",
+            "Authorization": f"Bearer {self.token}",
+        }
         path = f"{settings.Nordigen.Base}/requisitions/{requisition}/"
         r = requests.get(path, headers=headers)
         try:
@@ -208,7 +232,10 @@ class Nordigen(util.Base):
         """
         Get details of an account.
         :param requisition: requisition ID"""
-        headers = {"accept": "application/json", "Authorization": f"Bearer {self.token}"}
+        headers = {
+            "accept": "application/json",
+            "Authorization": f"Bearer {self.token}",
+        }
         path = f"{settings.Nordigen.Base}/accounts/{account_id}/details/"
         r = requests.get(path, headers=headers)
         try:
@@ -317,7 +344,10 @@ class Nordigen(util.Base):
         :return: list of transactions
         :rtype: dict
         """
-        headers = {"accept": "application/json", "Authorization": f"Bearer {self.token}"}
+        headers = {
+            "accept": "application/json",
+            "Authorization": f"Bearer {self.token}",
+        }
         path = f"{settings.Nordigen.Base}/accounts/{account_id}/transactions/"
         r = requests.get(path, headers=headers)
         try:
@@ -336,7 +366,10 @@ class Nordigen(util.Base):
         :return: tuple of (currency, amount)
         :rtype: tuple
         """
-        headers = {"accept": "application/json", "Authorization": f"Bearer {self.token}"}
+        headers = {
+            "accept": "application/json",
+            "Authorization": f"Bearer {self.token}",
+        }
         path = f"{settings.Nordigen.Base}/accounts/{account_id}/balances/"
         r = requests.get(path, headers=headers)
         try:

handler/sinks/truelayer.py

@@ -160,7 +160,11 @@ class TrueLayer(util.Base):
             "client_id": settings.TrueLayer.ID,
             "client_secret": settings.TrueLayer.Key,
         }
-        r = requests.post(f"{settings.TrueLayer.AuthBase}/connect/token", data=data, headers=headers)
+        r = requests.post(
+            f"{settings.TrueLayer.AuthBase}/connect/token",
+            data=data,
+            headers=headers,
+        )
         try:
             parsed = r.json()
         except JSONDecodeError: