pfbudget/__main__.py

@@ -25,12 +25,6 @@ if __name__ == "__main__":
             Interactive(Manager(db, verbosity)).start()
             exit()
 
-        case Operation.Categorize:
-            keys = {"no_nulls"}
-            assert args.keys() >= keys, f"missing {args.keys() - keys}"
-
-            params = [args["no_nulls"]]
-
         case Operation.Parse:
             keys = {"path", "bank", "creditcard"}
             assert args.keys() >= keys, f"missing {args.keys() - keys}"

pfbudget/cli/argparser.py

@@ -78,10 +78,7 @@ def argparser() -> argparse.ArgumentParser:
 
     # Automatic/manual categorization
     categorize = subparsers.add_parser("categorize").add_subparsers(required=True)
-    auto = categorize.add_parser("auto")
+    categorize.add_parser("auto").set_defaults(op=Operation.Categorize)
-    auto.set_defaults(op=Operation.Categorize)
-    auto.add_argument("--no-nulls", action="store_false")
-
     categorize.add_parser("manual").set_defaults(op=Operation.ManualCategorization)
 
     """
@@ -132,7 +129,7 @@ def argparser() -> argparse.ArgumentParser:
     # Nordigen requisition id
     requisition = subparsers.add_parser("eua")
     requisition.set_defaults(op=Operation.RequisitionId)
-    requisition.add_argument("id", nargs=1, type=str)
+    requisition.add_argument("name", nargs=1, type=str)
     requisition.add_argument("country", nargs=1, type=str)
 
     # Download through the Nordigen API

pfbudget/core/categorizer.py

@@ -16,7 +16,6 @@ class Categorizer:
         transactions: Sequence[t.BankTransaction],
         categories: Sequence[t.Category],
         tags: Sequence[t.Tag],
-        nullify: bool = True
     ):
         """Overarching categorization tool
 
@@ -29,17 +28,15 @@ class Categorizer:
             tags (Sequence[Tag]): currently available tags
         """
 
-        if nullify:
         try:
             null = next(cat for cat in categories if cat.name == "null")
             print("Nullifying")
             self._nullify(transactions, null)
 
+            categories = [cat for cat in categories if cat.name != "null"]
         except StopIteration:
             print("Null category not defined")
 
-        categories = [cat for cat in categories if cat.name != "null"]
-
         self._rule_based_categories(transactions, categories)
         self._rule_based_tags(transactions, tags)
 

pfbudget/core/manager.py

@@ -97,7 +97,7 @@ class Manager:
                     )
                     categories = session.get(Category)
                     tags = session.get(Tag)
-                    Categorizer().rules(uncategorized, categories, tags, params[0])
+                    Categorizer().rules(uncategorized, categories, tags)
 
             case Operation.BankMod:
                 with self.db.session() as session:

pfbudget/db/model.py

@@ -106,7 +106,6 @@ class Transaction(Base, Export):
     @property
     def format(self) -> dict[str, Any]:
         return dict(
-            id=self.id,
             date=self.date,
             description=self.description,
             amount=self.amount,

pfbudget/input/nordigen.py

@@ -86,7 +86,8 @@ class NordigenInput(Input):
         print(f"New access token: {token}")
         return token
 
-    def requisition(self, id: str, country: str = "PT"):
+    def requisition(self, institution: str, country: str = "PT"):
+        id = self._client.institution.get_institution_id_by_name(country, institution)
         requisition = self._client.initialize_session(
             redirect_uri=self.redirect_url,
             institution_id=id,