Merge pull request #31 from getmarkus/cm-branch-29

feat: enhance settings management and clean up config

Author: getmarkus

app/tests/conftest.py

@@ -4,32 +4,31 @@
 
 import pytest
 from _pytest.config import Config
+
 from dotenv import load_dotenv
 from fastapi import FastAPI
 from fastapi.testclient import TestClient
 from loguru import logger
 from sqlmodel import Session, delete
-
+from config import get_settings  # noqa: E402
 
 # Specify the custom .env file
 # don't change ordering here, settings must be called prior to initialization of app.core.factory
 dotenv_path = Path(".env.testing")
 load_dotenv(dotenv_path=dotenv_path, override=True)
 
+settings = get_settings()
+
 from app.core.factory import create_app  # noqa: E402
 from app.resource_adapters.persistence.sqlmodel.database import get_engine  # noqa: E402
 from app.resource_adapters.persistence.sqlmodel.issues import Issue  # noqa: E402
-from config import get_settings  # noqa: E402
-
-
-settings = get_settings()
 
 
 def pytest_unconfigure(config: Config) -> None:
     """Clean up after each test."""
     # Extract database path from the database URL
     db_url = settings.database_url
-    if db_url.startswith("sqlite:///") and not db_url.endswith(":memory:"):
+    if "memory" not in db_url:
         # Remove the sqlite:/// prefix to get the file path
         db_path = db_url.replace("sqlite:///", "")
         # Remove ./ prefix if present

config.py

@@ -1,7 +1,12 @@
 from typing import List, Literal
 
 from pydantic import AnyHttpUrl
-from pydantic_settings import BaseSettings, SettingsConfigDict
+from pydantic_settings import (
+    BaseSettings,
+    SettingsConfigDict,
+    PydanticBaseSettingsSource,
+)
+from typing import Type
 from functools import lru_cache
 
 
@@ -15,13 +20,6 @@ class Settings(BaseSettings):
     database_type: str = "sqlmodel"
     current_env: Literal["testing", "default"]
 
-    @property
-    def get_table_schema(self) -> str | None:
-        """Return table_schema if database_url does not start with sqlite, otherwise return None."""
-        if self.database_url.startswith("sqlite"):
-            return None
-        return self.database_schema
-
     # CORS settings
     backend_cors_origins: List[str] = ["http://localhost:8000", "http://localhost:3000"]
     cors_allow_credentials: bool = False
@@ -43,19 +41,33 @@ def get_table_schema(self) -> str | None:
         extra="ignore",
     )
 
-    """ @field_validator("database_schema")
-    def validate_schema(cls, v: str | None, values) -> str | None:
-        # Only set database_schema if database_url doesn't start with sqlite
-        if values.data.get("database_url", "").startswith("sqlite"):
+    @property
+    def get_table_schema(self) -> str | None:
+        """Return table_schema if database_url does not start with sqlite, otherwise return None."""
+        if self.database_url.startswith("sqlite"):
             return None
-        return v """
+        return self.database_schema
 
     @property
     def backend_cors_origins_list(self) -> List[AnyHttpUrl]:
         return [AnyHttpUrl(origin) for origin in self.backend_cors_origins]
 
+    @classmethod
+    def settings_customise_sources(
+        cls,
+        settings_cls: Type[BaseSettings],
+        init_settings: PydanticBaseSettingsSource,
+        env_settings: PydanticBaseSettingsSource,
+        dotenv_settings: PydanticBaseSettingsSource,
+        file_secret_settings: PydanticBaseSettingsSource,
+    ) -> tuple[PydanticBaseSettingsSource, ...]:
+        return (
+            env_settings,
+            dotenv_settings,
+            file_secret_settings,
+        )
+
 
-# Singleton pattern to ensure only one settings instance
 @lru_cache()
 def get_settings() -> "Settings":
     return Settings()