personal-finance/budget
2
1
Fork 0
Code Issues 11 Pull Requests Projects 6 Releases 2 Wiki Activity

Remove unnecessary __init__.pys

Browse Source 
and import using submodules in __main__.py
This commit is contained in:
Luís Murta 2023-01-23 23:49:16 +00:00
parent 36e7f84bd9
commit fd24ac3318
Signed by: satprog
GPG Key ID: 169EF1BBD7049F94
10 changed files with 72 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pfbudget/__init__.py
View File

@ -1,12 +1,2 @@
__all__ = ["argparser", "Manager", "parse_data", "categorize_data"]
__author__ = "Luís Murta" __author__ = "Luís Murta"
__version__ = "0.1" __version__ = "0.1"
from pfbudget.common.types import Operation
from pfbudget.core.categories import categorize_data
from pfbudget.core.manager import Manager
from pfbudget.cli.runnable import argparser
from pfbudget.input.parsers import parse_data
from pfbudget.utils.utils import parse_args_period
import pfbudget.db.model as t

136
pfbudget/__main__.py
View File

@ -1,14 +1,16 @@
import pfbudget from pfbudget.cli.runnable import argparser
from pfbudget.common.types import Operation
from pfbudget.core.manager import Manager
import pfbudget.db.model as type
from pfbudget.utils.utils import parse_args_period
def interactive(manager: pfbudget.Manager): def interactive(manager: Manager):
with manager.db.session() as session: with manager.db.session() as session:
categories = session.get(pfbudget.t.Category) categories = session.get(type.Category)
print(f"Available categories: {categories}") print(f"Available categories: {categories}")
print(f"Available tags: {session.get(pfbudget.t.Tag)}") print(f"Available tags: {session.get(type.Tag)}")
transactions = session.get( transactions = session.get(type.Transaction, ~type.Transaction.category.has())
pfbudget.t.Transaction, ~pfbudget.t.Transaction.category.has()
)
print(f"{len(transactions)} transactions left to categorize") print(f"{len(transactions)} transactions left to categorize")
for transaction in sorted(transactions): for transaction in sorted(transactions):
@ -23,20 +25,20 @@ def interactive(manager: pfbudget.Manager):
case "tag": case "tag":
tag = input("tag: ") tag = input("tag: ")
transaction.tags.add(pfbudget.t.TransactionTag(tag)) transaction.tags.add(type.TransactionTag(tag))
case "note": case "note":
note = input("note: ") note = input("note: ")
transaction.note = pfbudget.t.Note(note) transaction.note = type.Note(note)
case other: case other:
if other not in [c.name for c in categories]: if other not in [c.name for c in categories]:
print(f"{other} is not a valid category") print(f"{other} is not a valid category")
continue continue
transaction.category = pfbudget.t.TransactionCategory( transaction.category = type.TransactionCategory(
other, other,
pfbudget.t.CategorySelector(pfbudget.t.Selector_T.manual), type.CategorySelector(type.Selector_T.manual),
) )
next = False next = False
@ -45,11 +47,11 @@ def interactive(manager: pfbudget.Manager):
if __name__ == "__main__": if __name__ == "__main__":
argparser = pfbudget.argparser() argparser = argparser()
args = vars(argparser.parse_args()) args = vars(argparser.parse_args())
assert "op" in args, "No pfbudget.Operation selected" assert "op" in args, "No Operation selected"
op: pfbudget.Operation = args.pop("op") op: Operation = args.pop("op")
assert "database" in args, "No database selected" assert "database" in args, "No database selected"
db = args.pop("database") db = args.pop("database")
@ -59,27 +61,27 @@ if __name__ == "__main__":
params = [] params = []
match (op): match (op):
case pfbudget.Operation.ManualCategorization: case Operation.ManualCategorization:
interactive(pfbudget.Manager(db, verbosity)) interactive(Manager(db, verbosity))
exit() exit()
case pfbudget.Operation.Parse: case Operation.Parse:
keys = {"path", "bank", "creditcard"} keys = {"path", "bank", "creditcard"}
assert args.keys() >= keys, f"missing {args.keys() - keys}" assert args.keys() >= keys, f"missing {args.keys() - keys}"
params = [args["path"], args["bank"], args["creditcard"]] params = [args["path"], args["bank"], args["creditcard"]]
case pfbudget.Operation.RequisitionId: case Operation.RequisitionId:
keys = {"name", "country"} keys = {"name", "country"}
assert args.keys() >= keys, f"missing {args.keys() - keys}" assert args.keys() >= keys, f"missing {args.keys() - keys}"
params = [args["name"][0], args["country"][0]] params = [args["name"][0], args["country"][0]]
case pfbudget.Operation.Download: case Operation.Download:
keys = {"all", "banks", "interval", "start", "end", "year", "dry_run"} keys = {"all", "banks", "interval", "start", "end", "year", "dry_run"}
assert args.keys() >= keys, f"missing {args.keys() - keys}" assert args.keys() >= keys, f"missing {args.keys() - keys}"
start, end = pfbudget.parse_args_period(args) start, end = parse_args_period(args)
params = [start, end, args["dry_run"]] params = [start, end, args["dry_run"]]
if not args["all"]: if not args["all"]:
@ -87,19 +89,19 @@ if __name__ == "__main__":
else: else:
params.append([]) params.append([])
case pfbudget.Operation.BankAdd: case Operation.BankAdd:
keys = {"bank", "bic", "type"} keys = {"bank", "bic", "type"}
assert args.keys() >= keys, f"missing {args.keys() - keys}" assert args.keys() >= keys, f"missing {args.keys() - keys}"
params = [ params = [
pfbudget.t.Bank( type.Bank(
args["bank"][0], args["bank"][0],
args["bic"][0], args["bic"][0],
args["type"][0], args["type"][0],
) )
] ]
case pfbudget.Operation.BankMod: case Operation.BankMod:
keys = {"bank", "bic", "type", "remove"} keys = {"bank", "bic", "type", "remove"}
assert args.keys() >= keys, f"missing {args.keys() - keys}" assert args.keys() >= keys, f"missing {args.keys() - keys}"
@ -111,16 +113,16 @@ if __name__ == "__main__":
params = [param] params = [param]
case pfbudget.Operation.BankDel: case Operation.BankDel:
assert len(args["bank"]) > 0, "argparser ill defined" assert len(args["bank"]) > 0, "argparser ill defined"
params = args["bank"] params = args["bank"]
case pfbudget.Operation.NordigenAdd: case Operation.NordigenAdd:
keys = {"bank", "bank_id", "requisition_id", "invert"} keys = {"bank", "bank_id", "requisition_id", "invert"}
assert args.keys() >= keys, f"missing {args.keys() - keys}" assert args.keys() >= keys, f"missing {args.keys() - keys}"
params = [ params = [
pfbudget.t.Nordigen( type.Nordigen(
args["bank"][0], args["bank"][0],
args["bank_id"][0] if args["bank_id"] else None, args["bank_id"][0] if args["bank_id"] else None,
args["requisition_id"][0] if args["requisition_id"] else None, args["requisition_id"][0] if args["requisition_id"] else None,
@ -128,7 +130,7 @@ if __name__ == "__main__":
) )
] ]
case pfbudget.Operation.NordigenMod: case Operation.NordigenMod:
keys = {"bank", "bank_id", "requisition_id", "invert", "remove"} keys = {"bank", "bank_id", "requisition_id", "invert", "remove"}
assert args.keys() >= keys, f"missing {args.keys() - keys}" assert args.keys() >= keys, f"missing {args.keys() - keys}"
@ -142,52 +144,50 @@ if __name__ == "__main__":
params = [param] params = [param]
case pfbudget.Operation.NordigenDel: case Operation.NordigenDel:
assert len(args["bank"]) > 0, "argparser ill defined" assert len(args["bank"]) > 0, "argparser ill defined"
params = args["bank"] params = args["bank"]
case pfbudget.Operation.NordigenCountryBanks: case Operation.NordigenCountryBanks:
keys = {"country"} keys = {"country"}
assert args.keys() >= keys, f"missing {args.keys() - keys}" assert args.keys() >= keys, f"missing {args.keys() - keys}"
params = [args["country"][0]] params = [args["country"][0]]
case pfbudget.Operation.CategoryAdd: case Operation.CategoryAdd:
keys = {"category", "group"} keys = {"category", "group"}
assert args.keys() >= keys, f"missing {args.keys() - keys}" assert args.keys() >= keys, f"missing {args.keys() - keys}"
params = [ params = [type.Category(cat, args["group"]) for cat in args["category"]]
pfbudget.t.Category(cat, args["group"]) for cat in args["category"]
]
case pfbudget.Operation.CategoryUpdate: case Operation.CategoryUpdate:
keys = {"category", "group"} keys = {"category", "group"}
assert args.keys() >= keys, f"missing {args.keys() - keys}" assert args.keys() >= keys, f"missing {args.keys() - keys}"
params = [pfbudget.t.Category(cat) for cat in args["category"]] params = [type.Category(cat) for cat in args["category"]]
params.append(args["group"]) params.append(args["group"])
case pfbudget.Operation.CategoryRemove: case Operation.CategoryRemove:
assert "category" in args, "argparser ill defined" assert "category" in args, "argparser ill defined"
params = [pfbudget.t.Category(cat) for cat in args["category"]] params = [type.Category(cat) for cat in args["category"]]
case pfbudget.Operation.CategorySchedule: case Operation.CategorySchedule:
keys = {"category", "period", "frequency"} keys = {"category", "period", "frequency"}
assert args.keys() >= keys, f"missing {args.keys() - keys}" assert args.keys() >= keys, f"missing {args.keys() - keys}"
params = [ params = [
pfbudget.t.CategorySchedule( type.CategorySchedule(
cat, args["period"][0], args["frequency"][0], None cat, args["period"][0], args["frequency"][0], None
) )
for cat in args["category"] for cat in args["category"]
] ]
case pfbudget.Operation.RuleAdd: case Operation.RuleAdd:
keys = {"category", "date", "description", "bank", "min", "max"} keys = {"category", "date", "description", "bank", "min", "max"}
assert args.keys() >= keys, f"missing {args.keys() - keys}" assert args.keys() >= keys, f"missing {args.keys() - keys}"
params = [ params = [
pfbudget.t.CategoryRule( type.CategoryRule(
args["date"][0] if args["date"] else None, args["date"][0] if args["date"] else None,
args["description"][0] if args["description"] else None, args["description"][0] if args["description"] else None,
args["regex"][0] if args["regex"] else None, args["regex"][0] if args["regex"] else None,
@ -199,13 +199,13 @@ if __name__ == "__main__":
for cat in args["category"] for cat in args["category"]
] ]
case pfbudget.Operation.RuleRemove | pfbudget.Operation.TagRuleRemove: case Operation.RuleRemove | Operation.TagRuleRemove:
keys = {"id"} keys = {"id"}
assert args.keys() >= keys, f"missing {args.keys() - keys}" assert args.keys() >= keys, f"missing {args.keys() - keys}"
params = args["id"] params = args["id"]
case pfbudget.Operation.RuleModify: case Operation.RuleModify:
keys = { keys = {
"id", "id",
"category", "category",
@ -227,18 +227,18 @@ if __name__ == "__main__":
params.append(param) params.append(param)
case pfbudget.Operation.TagAdd: case Operation.TagAdd:
keys = {"tag"} keys = {"tag"}
assert args.keys() >= keys, f"missing {args.keys() - keys}" assert args.keys() >= keys, f"missing {args.keys() - keys}"
params = [pfbudget.t.Tag(tag) for tag in args["tag"]] params = [type.Tag(tag) for tag in args["tag"]]
case pfbudget.Operation.TagRuleAdd: case Operation.TagRuleAdd:
keys = {"tag", "date", "description", "bank", "min", "max"} keys = {"tag", "date", "description", "bank", "min", "max"}
assert args.keys() >= keys, f"missing {args.keys() - keys}" assert args.keys() >= keys, f"missing {args.keys() - keys}"
params = [ params = [
pfbudget.t.TagRule( type.TagRule(
args["date"][0] if args["date"] else None, args["date"][0] if args["date"] else None,
args["description"][0] if args["description"] else None, args["description"][0] if args["description"] else None,
args["regex"][0] if args["regex"] else None, args["regex"][0] if args["regex"] else None,
@ -250,7 +250,7 @@ if __name__ == "__main__":
for tag in args["tag"] for tag in args["tag"]
] ]
case pfbudget.Operation.TagRuleModify: case Operation.TagRuleModify:
keys = {"id", "tag", "date", "description", "bank", "min", "max", "remove"} keys = {"id", "tag", "date", "description", "bank", "min", "max", "remove"}
assert args.keys() >= keys, f"missing {args.keys() - keys}" assert args.keys() >= keys, f"missing {args.keys() - keys}"
@ -263,39 +263,37 @@ if __name__ == "__main__":
params.append(param) params.append(param)
case pfbudget.Operation.GroupAdd: case Operation.GroupAdd:
assert "group" in args, "argparser ill defined" assert "group" in args, "argparser ill defined"
params = [pfbudget.t.CategoryGroup(group) for group in args["group"]] params = [type.CategoryGroup(group) for group in args["group"]]
case pfbudget.Operation.GroupRemove: case Operation.GroupRemove:
assert "group" in args, "argparser ill defined" assert "group" in args, "argparser ill defined"
params = [pfbudget.t.CategoryGroup(group) for group in args["group"]] params = [type.CategoryGroup(group) for group in args["group"]]
case pfbudget.Operation.Forge | pfbudget.Operation.Dismantle: case Operation.Forge | Operation.Dismantle:
keys = {"original", "links"} keys = {"original", "links"}
assert args.keys() >= keys, f"missing {args.keys() - keys}" assert args.keys() >= keys, f"missing {args.keys() - keys}"
params = [ params = [type.Link(args["original"][0], link) for link in args["links"]]
pfbudget.t.Link(args["original"][0], link) for link in args["links"]
]
case ( case (
pfbudget.Operation.Export Operation.Export
| pfbudget.Operation.Import | Operation.Import
| pfbudget.Operation.ExportBanks | Operation.ExportBanks
| pfbudget.Operation.ImportBanks | Operation.ImportBanks
| pfbudget.Operation.ExportCategoryRules | Operation.ExportCategoryRules
| pfbudget.Operation.ImportCategoryRules | Operation.ImportCategoryRules
| pfbudget.Operation.ExportTagRules | Operation.ExportTagRules
| pfbudget.Operation.ImportTagRules | Operation.ImportTagRules
| pfbudget.Operation.ExportCategories | Operation.ExportCategories
| pfbudget.Operation.ImportCategories | Operation.ImportCategories
| pfbudget.Operation.ExportCategoryGroups | Operation.ExportCategoryGroups
| pfbudget.Operation.ImportCategoryGroups | Operation.ImportCategoryGroups
): ):
keys = {"file"} keys = {"file"}
assert args.keys() >= keys, f"missing {args.keys() - keys}" assert args.keys() >= keys, f"missing {args.keys() - keys}"
params = args["file"] params = args["file"]
pfbudget.Manager(db, verbosity).action(op, params) Manager(db, verbosity).action(op, params)

0
pfbudget/cli/__init__.py
View File

18
pfbudget/cli/runnable.py
View File

@ -11,25 +11,13 @@ from pfbudget.db.model import AccountType, Period
from pfbudget.db.sqlite import DatabaseClient from pfbudget.db.sqlite import DatabaseClient
import pfbudget.reporting.graph import pfbudget.reporting.graph
import pfbudget.reporting.report import pfbudget.reporting.report
import pfbudget.utils import pfbudget.utils.utils
load_dotenv() load_dotenv()
DEFAULT_DB = os.environ.get("DEFAULT_DB") DEFAULT_DB = os.environ.get("DEFAULT_DB")
class PfBudgetInitialized(Exception):
pass
class PfBudgetNotInitialized(Exception):
pass
class DataFileMissing(Exception):
pass
def argparser() -> argparse.ArgumentParser: def argparser() -> argparse.ArgumentParser:
universal = argparse.ArgumentParser(add_help=False) universal = argparse.ArgumentParser(add_help=False)
universal.add_argument( universal.add_argument(
@ -175,7 +163,7 @@ def graph(args):
Args: Args:
args (dict): argparse variables args (dict): argparse variables
""" """
start, end = pfbudget.utils.parse_args_period(args) start, end = pfbudget.utils.utils.parse_args_period(args)
if args.option == "monthly": if args.option == "monthly":
pfbudget.reporting.graph.monthly( pfbudget.reporting.graph.monthly(
DatabaseClient(args.database), vars(args), start, end DatabaseClient(args.database), vars(args), start, end
@ -196,7 +184,7 @@ def report(args):
Args: Args:
args (dict): argparse variables args (dict): argparse variables
""" """
start, end = pfbudget.utils.parse_args_period(args) start, end = pfbudget.utils.utils.parse_args_period(args)
if args.option == "net": if args.option == "net":
pfbudget.reporting.report.net(DatabaseClient(args.database), start, end) pfbudget.reporting.report.net(DatabaseClient(args.database), start, end)
elif args.option == "detailed": elif args.option == "detailed":

0
pfbudget/common/__init__.py
View File

0
pfbudget/core/__init__.py
View File

0
pfbudget/input/__init__.py
View File

4
pfbudget/input/nordigen.py
View File

@ -8,7 +8,7 @@ import time
import uuid import uuid
import pfbudget.db.model as t import pfbudget.db.model as t
import pfbudget.utils as utils from pfbudget.utils.converters import convert
from .input import Input from .input import Input
@ -72,7 +72,7 @@ class NordigenInput(Input):
json.dump(downloaded, f) json.dump(downloaded, f)
converted = [ converted = [
utils.convert(t, bank) for t in downloaded["transactions"]["booked"] convert(t, bank) for t in downloaded["transactions"]["booked"]
] ]
transactions.extend( transactions.extend(

0
pfbudget/reporting/__init__.py
View File

2
pfbudget/utils/__init__.py
View File

@ -1,2 +0,0 @@
from .converters import convert
from .utils import *