diff --git a/mint/__main__.py b/mint/__main__.py index 3681527..90e97df 100644 --- a/mint/__main__.py +++ b/mint/__main__.py @@ -1,7 +1,6 @@ -from .app import create_app, main +from .main import main print("main") -app = create_app() -# main() +main() diff --git a/mint/app.py b/mint/app.py index e79d433..e3a9cbd 100644 --- a/mint/app.py +++ b/mint/app.py @@ -1,19 +1,14 @@ import asyncio import logging import sys -from typing import Union from fastapi import FastAPI from loguru import logger -from secp256k1 import PublicKey -import core.settings as settings -from core.settings import ( - CASHU_DIR, -) +from core.settings import CASHU_DIR, DEBUG + from lightning import WALLET -from mint.ledger import Ledger from mint.migrations import m001_initial from . import ledger @@ -43,7 +38,7 @@ def create_app(config_object="core.settings") -> FastAPI: def __init__(self): self.padding = 0 self.minimal_fmt: str = "{time:YYYY-MM-DD HH:mm:ss.SS} | {level} | {message}\n" - if settings.DEBUG: + if DEBUG: self.fmt: str = "{time:YYYY-MM-DD HH:mm:ss.SS} | {level: <4} | {name}:{function}:{line} | {message}\n" else: self.fmt: str = self.minimal_fmt @@ -87,3 +82,5 @@ def create_app(config_object="core.settings") -> FastAPI: # if __name__ == "__main__": # main() + +app = create_app() diff --git a/mint/main.py b/mint/main.py index 3eafd4c..7f70c5b 100644 --- a/mint/main.py +++ b/mint/main.py @@ -41,7 +41,7 @@ def main( d[a.strip("--")] = True # argument like --key config = uvicorn.Config( - "mint.__main__:app", + "mint.app:app", port=port, host=host, ssl_keyfile=ssl_keyfile,