updated some functionality

Author: amyfromandi

services/api-v3/api/routes/object.py

@@ -18,15 +18,14 @@
 from minio import Minio
 from sqlalchemy import text
 from starlette.datastructures import UploadFile as StarletteUploadFile
-from macrostrat.core import app as app_
+from api.settings import settings
 
 router = APIRouter(
     prefix="/object",
     tags=["file"],
     responses={404: {"description": "Not found"}},
 )
 
-settings = app_.settings
 
 def guess_mime_type(filename: str) -> str:
     mime, _ = mimetypes.guess_type(filename)
@@ -53,10 +52,10 @@ def sha256_of_uploadfile(
 def get_s3_client():
     # TODO need to add or configure these envs within api v3 kubernetes config
     return Minio(
-        endpoint=settings.get("storage.endpoint"),
-        access_key=settings.get("storage.access_key"),
-        secret_key=settings.get("storage.secret_key"),
-        secure=True,
+        endpoint=settings.s3_endpoint,
+        access_key=settings.s3_access_key,
+        secret_key=settings.s3_secret_key,
+        secure=settings.s3_secure,
     )
 
 def get_storage_host_bucket() -> tuple[str, str]:
@@ -66,12 +65,12 @@ def get_storage_host_bucket() -> tuple[str, str]:
     """
     import urllib.parse
 
-    raw_host = settings.get("storage.endpoint")
+    raw_host = settings.s3_endpoint
     parsed = urllib.parse.urlparse(
         raw_host if "://" in raw_host else f"https://{raw_host}"
     )
     host = parsed.hostname or raw_host.split(":")[0]
-    bucket = settings.get("storage.bucket_name")
+    bucket = settings.s3_bucket
     return host, bucket
 
 

services/api-v3/api/settings.py

@@ -0,0 +1,46 @@
+from pydantic import Field
+from pydantic_settings import BaseSettings, SettingsConfigDict
+
+
+class Settings(BaseSettings):
+    """
+    Centralized application settings for API v3.
+    Values are loaded from environment variables and .env.
+    """
+
+    model_config = SettingsConfigDict(
+        env_file=".env",
+        env_file_encoding="utf-8",
+        extra="ignore",
+    )
+
+    # Environment
+    environment: str = Field(default="development", alias="ENVIRONMENT")
+
+    # Database
+    database_uri: str = Field(alias="uri")
+
+    # OAuth
+    redirect_uri: str = Field(alias="REDIRECT_URI_ENV")
+    oauth_authorization_url: str = Field(alias="OAUTH_AUTHORIZATION_URL")
+    oauth_token_url: str = Field(alias="OAUTH_TOKEN_URL")
+    oauth_userinfo_url: str = Field(alias="OAUTH_USERINFO_URL")
+    oauth_client_id: str = Field(alias="OAUTH_CLIENT_ID")
+    oauth_client_secret: str = Field(alias="OAUTH_CLIENT_SECRET")
+
+    # JWT
+    jwt_secret_key: str = Field(alias="SECRET_KEY")
+    jwt_algorithm: str = Field(
+        default="HS256",
+        alias="JWT_ENCRYPTION_ALGORITHM",
+    )
+
+    # S3 / MinIO
+    s3_access_key: str = Field(alias="S3_ACCESS_KEY")
+    s3_secret_key: str = Field(alias="S3_SECRET_KEY")
+    s3_bucket: str = Field(alias="S3_BUCKET")
+    s3_endpoint: str = Field(alias="S3_ENDPOINT")
+    s3_secure: bool = Field(default=True, alias="S3_SECURE")
+
+
+settings = Settings()

services/api-v3/pyproject.toml

@@ -3,7 +3,7 @@ name = "api"
 version = "2.3.3"
 description = ""
 authors = [{ name = "Cannon Lock", email = "[email protected]" }]
-requires-python = ">=3.11,<4"
+requires-python = ">=3.11,<3.13"
 readme = "README.md"
 dependencies = [
     "sqlalchemy[asyncio]>=2.0.22,<3",
@@ -26,6 +26,8 @@ dependencies = [
     "macrostrat.database>=3.0.0,<4",
     "macrostrat.match-utils",
     "morecantile>=7.0.2",
+    "pydantic-settings>2"
+
 ]
 
 [dependency-groups]