Rework imports

developmentseed · Aug 21, 2024 · 2e11d2f · 2e11d2f
1 parent f1037a9
commit 2e11d2f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/runtimes/eoapi/raster/eoapi/raster/app.py b/runtimes/eoapi/raster/eoapi/raster/app.py
@@ -7,7 +7,7 @@
 
 import jinja2
 import pystac
-from eoapi import auth
+from eoapi.auth_utils import AuthSettings, OpenIdConnectAuth
 from fastapi import Depends, FastAPI, Query
 from psycopg import OperationalError
 from psycopg.rows import dict_row
@@ -39,14 +39,15 @@
 from titiler.pgstac.reader import PgSTACReader
 
 from . import __version__ as eoapi_raster_version
-from . import config, logs
+from .config import ApiSettings
+from .logs import init_logging
 
-settings = config.ApiSettings()
-auth_settings = auth.AuthSettings()
+settings = ApiSettings()
+auth_settings = AuthSettings()
 
 
 # Logs
-logs.init_logging(
+init_logging(
     debug=settings.debug,
     loggers={
         "botocore.credentials": {
@@ -415,7 +416,7 @@ def landing(request: Request):
 
 # Add dependencies to routes
 if auth_settings.openid_configuration_url and not auth_settings.public_reads:
-    oidc_auth = auth.OpenIdConnectAuth(
+    oidc_auth = OpenIdConnectAuth(
         # URL to the OpenID Connect discovery document (https://openid.net/specs/openid-connect-discovery-1_0.html)
         openid_configuration_url=auth_settings.openid_configuration_url,
         openid_configuration_internal_url=auth_settings.openid_configuration_internal_url,

diff --git a/runtimes/eoapi/stac/eoapi/stac/app.py b/runtimes/eoapi/stac/eoapi/stac/app.py
@@ -3,7 +3,7 @@
 import logging
 from contextlib import asynccontextmanager
 
-from eoapi import auth
+from eoapi.auth_utils import AuthSettings, OpenIdConnectAuth
 from fastapi import FastAPI
 from fastapi.responses import ORJSONResponse
 from stac_fastapi.api.app import StacApi
@@ -46,12 +46,12 @@
 
 templates = Jinja2Templates(directory=str(resources_files(__package__) / "templates"))  # type: ignore
 
-api_settings = config.ApiSettings()
-auth_settings = auth.AuthSettings()
+api_settings = ApiSettings()
+auth_settings = AuthSettings()
 settings = Settings(enable_response_models=True)
 
 # Logs
-logs.init_logging(debug=api_settings.debug)
+init_logging(debug=api_settings.debug)
 logger = logging.getLogger(__name__)
 
 # Extensions
@@ -164,7 +164,7 @@ async def viewer_page(request: Request):
 
 
 if auth_settings.openid_configuration_url:
-    oidc_auth = auth.OpenIdConnectAuth(
+    oidc_auth = OpenIdConnectAuth(
         # URL to the OpenID Connect discovery document (https://openid.net/specs/openid-connect-discovery-1_0.html)
         openid_configuration_url=auth_settings.openid_configuration_url,
         openid_configuration_internal_url=auth_settings.openid_configuration_internal_url,

diff --git a/runtimes/eoapi/vector/eoapi/vector/app.py b/runtimes/eoapi/vector/eoapi/vector/app.py
@@ -4,7 +4,7 @@
 from contextlib import asynccontextmanager
 
 import jinja2
-from eoapi import auth
+from eoapi.auth_utils import AuthSettings, OpenIdConnectAuth
 from fastapi import FastAPI, Request
 from starlette.middleware.cors import CORSMiddleware
 from starlette.templating import Jinja2Templates
@@ -17,7 +17,8 @@
 from tipg.settings import PostgresSettings
 
 from . import __version__ as eoapi_vector_version
-from . import config, logs
+from .config import ApiSettings
+from .logs import init_logging
 
 try:
     from importlib.resources import files as resources_files  # type: ignore
@@ -28,12 +29,12 @@
 
 CUSTOM_SQL_DIRECTORY = resources_files(__package__) / "sql"
 
-settings = config.ApiSettings()
+settings = ApiSettings()
 postgres_settings = PostgresSettings()
-auth_settings = auth.AuthSettings()
+auth_settings = AuthSettings()
 
 # Logs
-logs.init_logging(
+init_logging(
     debug=settings.debug,
     loggers={
         "botocore.credentials": {
@@ -177,7 +178,7 @@ async def refresh(request: Request):
 
 
 if auth_settings.openid_configuration_url and not auth_settings.public_reads:
-    oidc_auth = auth.OpenIdConnectAuth(
+    oidc_auth = OpenIdConnectAuth(
         # URL to the OpenID Connect discovery document (https://openid.net/specs/openid-connect-discovery-1_0.html)
         openid_configuration_url=auth_settings.openid_configuration_url,
         openid_configuration_internal_url=auth_settings.openid_configuration_internal_url,