Moves input dir up a level

Also imports utils in correspondent __init__.py file.

pfbudget/__init__.py

@@ -3,5 +3,5 @@ __author__ = "Luís Murta"
 __version__ = "0.1"
 
 from pfbudget.core.categories import categorize_data
-from pfbudget.core.input.parsers import parse_data
 from pfbudget.cli.runnable import run
+from pfbudget.input.parsers import parse_data

pfbudget/cli/runnable.py

@@ -4,14 +4,13 @@ import re
 
 from pfbudget.core.categories import categorize_data
 from pfbudget.core.manager import Manager
-from pfbudget.core.input.json import JsonParser
+from pfbudget.input.json import JsonParser
+from pfbudget.input.nordigen import Client
 from pfbudget.db.client import DatabaseClient
 import pfbudget.reporting.graph
 import pfbudget.reporting.report
 import pfbudget.utils
 
-from pfbudget.core.input.nordigen import Client
-
 
 DEFAULT_DB = "stub.db"
 

pfbudget/core/categories.py

@@ -8,8 +8,8 @@ import yaml
 
 
 if TYPE_CHECKING:
+    from pfbudget.common.types import Transaction
     from pfbudget.db.client import DatabaseClient
-    from pfbudget.core.transactions import Transaction
 
 
 Options = namedtuple(

pfbudget/core/manager.py

@@ -1,9 +1,8 @@
-from pfbudget.core.input.input import Input
+from pfbudget.input.input import Input
-from pfbudget.core.input.parsers import parse_data
+from pfbudget.input.parsers import parse_data
-from pfbudget.core.transactions import Transaction
+from pfbudget.common.types import Bank, Transaction
 from pfbudget.db.client import DatabaseClient
-from pfbudget.db.schema import Bank
+from pfbudget.utils import convert
-from pfbudget.utils.converters import convert
 
 
 class Manager:

pfbudget/db/client.py

@@ -7,7 +7,7 @@ import logging.config
 import pathlib
 import sqlite3
 
-from pfbudget.core.transactions import Transaction
+from pfbudget.common.types import Transaction
 import pfbudget.db.schema as Q
 
 

pfbudget/input/input.py

@@ -1,6 +1,6 @@
 from abc import ABC, abstractmethod
 
-from pfbudget.core.transactions import Transactions
+from pfbudget.common.types import Transactions
 
 
 class Input(ABC):

pfbudget/input/json.py

@@ -1,9 +1,8 @@
 import json
 
-from pfbudget.core.input.input import Input
+from .input import Input
-from pfbudget.core.transactions import Transactions
+from pfbudget.common.types import Transactions
-from pfbudget.utils.converters import convert
+from pfbudget.utils import convert, parse_decimal
-from pfbudget.utils.utils import parse_decimal
 
 
 class JsonParser(Input):

pfbudget/input/nordigen.py

@@ -5,9 +5,8 @@ import os
 import webbrowser
 
 from .input import Input
-from pfbudget.core.transactions import Transactions
+from pfbudget.common.types import Transactions
-from pfbudget.utils.converters import convert
+from pfbudget.utils import convert, parse_decimal
-from pfbudget.utils.utils import parse_decimal
 
 load_dotenv()
 

pfbudget/input/parsers.py

@@ -4,7 +4,7 @@ from importlib import import_module
 import datetime as dt
 import yaml
 
-from pfbudget.core.transactions import Transaction
+from pfbudget.common.types import Transaction
 from pfbudget.utils import utils
 
 Index = namedtuple(

pfbudget/utils/__init__.py

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

pfbudget/utils/converters.py

@@ -1,6 +1,6 @@
 from functools import singledispatch
 
-from pfbudget.core.transactions import Transaction, TransactionError, Transactions
+from pfbudget.common.types import Transaction, Transactions, TransactionError
 from pfbudget.db.schema import DbTransaction, DbTransactions