diff --git a/__init__.py b/src/__init__.py similarity index 100% rename from __init__.py rename to src/__init__.py diff --git a/classes/__init__.py b/src/classes/__init__.py similarity index 100% rename from classes/__init__.py rename to src/classes/__init__.py diff --git a/classes/boardgame_classes.py b/src/classes/boardgame_classes.py similarity index 100% rename from classes/boardgame_classes.py rename to src/classes/boardgame_classes.py diff --git a/modules/__init__.py b/src/config/__init__.py similarity index 100% rename from modules/__init__.py rename to src/config/__init__.py diff --git a/src/config/definitions.py b/src/config/definitions.py new file mode 100644 index 0000000..8e97a59 --- /dev/null +++ b/src/config/definitions.py @@ -0,0 +1,3 @@ +import os + +ROOT_PATH = project_root = os.path.dirname(os.path.dirname(os.path.dirname(__file__))) \ No newline at end of file diff --git a/main.py b/src/main.py similarity index 91% rename from main.py rename to src/main.py index 313787f..d779105 100644 --- a/main.py +++ b/src/main.py @@ -1,9 +1,8 @@ from typing import Union from fastapi import FastAPI -from classes import boardgame_classes -from modules import bgg_connection - +from src.classes import boardgame_classes +from src.modules import bgg_connection app = FastAPI() diff --git a/src/modules/__init__.py b/src/modules/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/modules/auth_manager.py b/src/modules/auth_manager.py similarity index 70% rename from modules/auth_manager.py rename to src/modules/auth_manager.py index d6bdc2c..f54f4b4 100644 --- a/modules/auth_manager.py +++ b/src/modules/auth_manager.py @@ -1,11 +1,16 @@ -#Can only be imported on main.py +#Can only be imported on bgg_connection.py import yaml +from src.config import definitions + username: str = None password: str = None -auth_secret_file_location = './secrets/auth.yaml' + +auth_secret_file_location = definitions.ROOT_PATH + '/secrets/auth.yaml' + +auth_secret_file_location def load_username_password_from_secrets(): global username diff --git a/modules/bgg_connection.py b/src/modules/bgg_connection.py similarity index 97% rename from modules/bgg_connection.py rename to src/modules/bgg_connection.py index be9924b..a5f6c2a 100644 --- a/modules/bgg_connection.py +++ b/src/modules/bgg_connection.py @@ -4,10 +4,9 @@ from pydantic import HttpUrl import requests from datetime import datetime -from classes import boardgame_classes -from modules import auth_manager +from src.classes import boardgame_classes +from src.modules import auth_manager -#from classes.boardgame import BoardGame, BoardGameExpansion, CollectionBoardGame, CollectionBoardGameExpansion, WishlistBoardGame, BoardgameType authenticated_session: requests.Session = requests.Session() diff --git a/tests/test_main.py b/tests/test_main.py index f76c793..ba68f38 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -1,11 +1,9 @@ from fastapi.testclient import TestClient from datetime import date -from ..main import app +from src.main import app -#from classes.boardgame_classes import BoardGame, CollectionBoardGame -#from classes import boardgame_classes -from ..classes import boardgame_classes +from src.classes import boardgame_classes client = TestClient(app)