Simplify ApplicationSettings

Author: AndreuCodina

src/python_archetype/api/.env.Development

@@ -1 +1,2 @@
-LoggingLevel="INFO"
+LoggingLevel="INFO"
+AZURE_KEY_VAULT_URL="https://my-resource.vault.azure.net/"

src/python_archetype/api/.env.Local

@@ -1,4 +1,4 @@
-LoggingLevel="INFO"
-CosmosDbNoSqlUrl="http://localhost:8081"
+LOGGING_LEVEL="INFO"
+COSMOS_DB_NO_SQL_URL="http://localhost:8081"
 CosmosDbNoSqlKey="C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=="
-CosmosDbNoSqlDatabase="mydatabase"
+COSMOS_DB_NO_SQL_DATABASE="mydatabase"

src/python_archetype/api/.env.Production

@@ -1 +1,2 @@
-LoggingLevel="CRITICAL"
+LoggingLevel="CRITICAL"
+AZURE_KEY_VAULT_URL="https://my-resource.vault.azure.net/"

src/python_archetype/api/.env.Staging

@@ -1 +1,2 @@
-LoggingLevel="CRITICAL"
+LoggingLevel="CRITICAL"
+AZURE_KEY_VAULT_URL="https://my-resource.vault.azure.net/"

src/python_archetype/api/application_settings.py

@@ -1,59 +1,51 @@
 from pathlib import Path
 
 from azure.identity import DefaultAzureCredential
-from pydantic import SecretStr
-from pydantic.alias_generators import to_pascal
+from pydantic import Field, SecretStr
 from pydantic_settings import (
     AzureKeyVaultSettingsSource,
     BaseSettings,
-    DotEnvSettingsSource,
-    EnvSettingsSource,
     PydanticBaseSettingsSource,
     SettingsConfigDict,
 )
 
 from python_archetype.common.application_environment import ApplicationEnvironment
 
+current_path = Path(__file__).parent.resolve()
+
 
 class ApplicationSettings(BaseSettings):
-    model_config = SettingsConfigDict(alias_generator=to_pascal, extra="ignore")
+    model_config = SettingsConfigDict(
+        extra="ignore",
+        env_nested_delimiter="__",
+        env_file=(
+            str(current_path / ".env"),
+            str(current_path / f".env.{ApplicationEnvironment.get_current()}"),
+        ),
+    )
 
     logging_level: str
     cosmos_db_no_sql_url: str
-    cosmos_db_no_sql_key: SecretStr
+    cosmos_db_no_sql_key: SecretStr = Field(alias="CosmosDbNoSqlKey")
     cosmos_db_no_sql_database: str
 
     @classmethod
     def settings_customise_sources(
         cls,
         settings_cls: type[BaseSettings],
         init_settings: PydanticBaseSettingsSource,  # noqa: ARG003
-        env_settings: PydanticBaseSettingsSource,  # noqa: ARG003
-        dotenv_settings: PydanticBaseSettingsSource,  # noqa: ARG003
+        env_settings: PydanticBaseSettingsSource,
+        dotenv_settings: PydanticBaseSettingsSource,
         file_secret_settings: PydanticBaseSettingsSource,  # noqa: ARG003
     ) -> tuple[PydanticBaseSettingsSource, ...]:
-        env = EnvSettingsSource(
-            settings_cls,
-            env_nested_delimiter="__",
-        )
-        current_path = Path(__file__).parent.resolve()
-        dotenv = DotEnvSettingsSource(
-            settings_cls,
-            env_file=[
-                str(current_path / ".env"),
-                str(current_path / f".env.{ApplicationEnvironment.get_current()}"),
-            ],
-            env_nested_delimiter=":",
-            case_sensitive=True,
-        )
-        settings = (env, dotenv)
+        settings = (env_settings, dotenv_settings)
 
         if ApplicationEnvironment.get_current() != ApplicationEnvironment.LOCAL:
             azure_key_vault = AzureKeyVaultSettingsSource(
                 settings_cls,
-                dotenv()["AzureKeyVaultUrl"],
+                dotenv_settings()["azure_key_vault_url"],
                 DefaultAzureCredential(),
             )
-            settings += (azure_key_vault,)
+            settings = (azure_key_vault, *settings)
 
         return settings