[app] Use HalfAPI class to be able to use custom configuration

à

halfapi/app.py

@@ -23,7 +23,6 @@ from timing_asgi import TimingMiddleware
 from timing_asgi.integrations import StarletteScopeToName
 
 # module libraries
-from halfapi.conf import CONFIG, SECRET, PRODUCTION, DOMAINSDICT
 
 from .lib.domain_middleware import DomainMiddleware
 from .lib.timing import HTimingClient
@@ -34,35 +33,57 @@ from halfapi.lib.responses import (ORJSONResponse, UnauthorizedResponse,
     NotFoundResponse, InternalServerErrorResponse, NotImplementedResponse)
 
 from halfapi.lib.routes import gen_starlette_routes, debug_routes
-from halfapi.lib.schemas import get_api_routes, schema_json, get_acls
+from halfapi.lib.schemas import get_api_routes, get_api_domain_routes, schema_json, get_acls
 
 logger = logging.getLogger('uvicorn.asgi')
 
-routes = [ Route('/', get_api_routes) ]
+
+class HalfAPI:
+    def __init__(self, config=None):
+        if config:
+            SECRET = config.get('SECRET')
+            PRODUCTION = config.get('PRODUCTION')
+            DOMAINS = config.get('DOMAINS')
+            CONFIG = config.get('CONFIG', {
+                'domains': DOMAINS
+            })
+        else:
+            from halfapi.conf import CONFIG, SECRET, PRODUCTION, DOMAINS
 
 
-routes += [
+        routes = [ Route('/', get_api_routes) ]
+
+
+        routes += [
             Route('/halfapi/schema', schema_json),
             Route('/halfapi/acls', get_acls)
-]
+        ]
 
-routes += Route('/halfapi/current_user', lambda request, *args, **kwargs:
+        routes += Route('/halfapi/current_user', lambda request, *args, **kwargs:
             ORJSONResponse({'user':request.user.json})
             if SECRET and not isinstance(request.user, UnauthenticatedUser)
             else ORJSONResponse({'user': None})),
 
 
-if not PRODUCTION:
+        if not PRODUCTION:
             for route in debug_routes():
                 routes.append( route )
 
 
-if DOMAINSDICT:
+        if DOMAINS:
-    for route in gen_starlette_routes(DOMAINSDICT()):
+            for route in gen_starlette_routes(DOMAINS):
                 routes.append(route)
 
+            for domain in DOMAINS:
+                routes.append(
+                    Route(
+                        f'/{domain}',
+                        get_api_domain_routes(domain)
+                    )
+                )
 
-application = Starlette(
+
+        self.application = Starlette(
             debug=not PRODUCTION,
             routes=routes,
             exception_handlers={
@@ -71,24 +92,28 @@ application = Starlette(
                 500: InternalServerErrorResponse,
                 501: NotImplementedResponse
             }
-)
+        )
 
-if DOMAINSDICT:
+        print(f'HALFAPI CONFIG: {CONFIG}')
-    application.add_middleware(
+        self.application.add_middleware(
             DomainMiddleware,
             config=CONFIG
         )
 
-if SECRET:
+        if SECRET:
-    application.add_middleware(
+            self.application.add_middleware(
                 AuthenticationMiddleware,
                 backend=JWTAuthenticationBackend(secret_key=SECRET)
             )
 
-if not PRODUCTION:
+        if not PRODUCTION:
-    application.add_middleware(
+            self.application.add_middleware(
                 TimingMiddleware,
                 client=HTimingClient(),
                 metric_namer=StarletteScopeToName(prefix="halfapi",
-        starlette_app=application)
+                starlette_app=self.application)
             )
+
+
+
+application = HalfAPI().application

halfapi/conf.py

@@ -53,16 +53,11 @@ LOGLEVEL = 'info'
 HOST = '127.0.0.1'
 PORT = '3000'
 SECRET = ''
+CONF_FILE = os.environ.get('HALFAPI_CONF_FILE', '.halfapi/config')
 
-IS_PROJECT = os.path.isfile('.halfapi/config')
+is_project = lambda: os.path.isfile(CONF_FILE)
 
 
-CONFIG = {
-    'project_name': PROJECT_NAME,
-    'production': PRODUCTION,
-    'secret': SECRET,
-    'domains': DOMAINS
-}
 
 default_config = {
     'project': {
@@ -84,7 +79,7 @@ HALFAPI_ETC_FILE=os.path.join(
 HALFAPI_DOT_FILE=os.path.join(
     os.getcwd(), '.halfapi', 'config')
 
-HALFAPI_CONFIG_FILES = [ HALFAPI_ETC_FILE, HALFAPI_DOT_FILE ]
+HALFAPI_CONFIG_FILES = [ CONF_FILE, HALFAPI_DOT_FILE ]
 
 def conf_files():
     return [
@@ -121,8 +116,11 @@ def read_config():
 
 
 
-if IS_PROJECT:
+CONFIG = {}
-    read_config()
+IS_PROJECT = False
+if is_project():
+    IS_PROJECT = True
+    CONFIG = read_config()
 
     PROJECT_NAME = config.get('project', 'name', fallback=PROJECT_NAME)
 
@@ -150,3 +148,11 @@ if IS_PROJECT:
     LOGLEVEL = config.get('project', 'loglevel').lower() or 'info'
 
     BASE_DIR = config.get('project', 'base_dir', fallback='.') #os.getcwd())
+
+    CONFIG = {
+        'project_name': PROJECT_NAME,
+        'production': PRODUCTION,
+        'secret': SECRET,
+        'domains': DOMAINS
+    }
+