fastapi-startkit 0.55.0__tar.gz → 0.56.0__tar.gz

{fastapi_startkit-0.55.0 → fastapi_startkit-0.56.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fastapi-startkit
-Version: 0.55.0
+Version: 0.56.0
 Summary: A modular, provider-driven framework for building async Python web applications with FastAPI — bundling a service container, configuration system, an async-first ORM, facades, and a Cleo-powered console.
 Keywords: fastapi,framework,async,web,asgi,orm,sqlalchemy,pydantic,ioc-container,dependency-injection,service-provider,cli,console,configuration,microservices,starter-kit,boilerplate
 Author: Bedram Tamang

{fastapi_startkit-0.55.0 → fastapi_startkit-0.56.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fastapi-startkit"
-version = "0.55.0"
+version = "0.56.0"
 description = "A modular, provider-driven framework for building async Python web applications with FastAPI — bundling a service container, configuration system, an async-first ORM, facades, and a Cleo-powered console."
 readme = "README.md"
 keywords = [

{fastapi_startkit-0.55.0 → fastapi_startkit-0.56.0}/src/fastapi_startkit/config/app.py

@@ -7,5 +7,5 @@ from fastapi_startkit.environment.environment import env
 class AppConfig:
     name: str = field(default_factory=lambda: os.getenv("APP_NAME", "FastAPI starter kit"))
     env: str = field(default_factory=lambda: os.getenv("APP_ENV", "development"))
-    debug: bool = field(default_factory=lambda: env("APP_DEBUG", "true"))
+    debug: bool = field(default_factory=lambda: env("APP_DEBUG", True))
     timezone: str = field(default_factory=lambda: os.getenv("APP_TIMEZONE", "UTC"))

{fastapi_startkit-0.55.0 → fastapi_startkit-0.56.0}/src/fastapi_startkit/environment/environment.py

@@ -2,9 +2,15 @@
 
 import os
 import sys
+from typing import Any, Literal, TypeVar, overload
+
 from dotenv import load_dotenv
 
 
+T = TypeVar("T")
+EnvValue = str | int | bool
+
+
 class Environment:
     @staticmethod
     def resolve_environment(base_path=None, env: str | None = None):
@@ -63,11 +69,45 @@ class Environment:
                 break
 
 
-def env(value, default="", cast=True):
-    """Helper to retrieve the value of an environment variable or returns
-    a default value. In addition, if type can be inferred then the value can be casted to the
-    inferred type."""
-    env_var = os.getenv(value, default)
+@overload
+def env(val: str, default: T, cast: Literal[False]) -> str | T: ...
+
+
+@overload
+def env(val: str, default: Literal[""], cast: Literal[True] = True) -> EnvValue: ...
+
+
+@overload
+def env(val: str, default: None, cast: Literal[True] = True) -> EnvValue | None: ...
+
+
+@overload
+def env(val: str, default: T, cast: Literal[True] = True) -> T: ...
+
+
+@overload
+def env(val: str, default: None, cast: bool) -> EnvValue | None: ...
+
+
+@overload
+def env(val: str, default: T, cast: bool) -> EnvValue | T: ...
+
+
+@overload
+def env(val: str) -> EnvValue: ...
+
+
+@overload
+def env(val: str, *, cast: Literal[False]) -> str: ...
+
+
+@overload
+def env(val: str, *, cast: bool) -> EnvValue: ...
+
+
+def env(val: str, default: Any = "", cast: bool = True) -> Any:
+    """Return an environment value, casting it to the supplied default's type when possible."""
+    env_var = os.getenv(val, default)
 
     if not cast:
         return env_var
@@ -75,18 +115,23 @@ def env(value, default="", cast=True):
     if env_var == "":
         env_var = default
 
-    if isinstance(env_var, bool):
-        return env_var
-    elif env_var is None:
-        return None
-    elif isinstance(env_var, int) or env_var.isnumeric():
-        return int(env_var)
-    elif env_var in ("false", "False"):
-        return False
-    elif env_var in ("true", "True"):
-        return True
-    else:
-        return env_var
+    if default in ("", None):
+        return value(env_var)
+
+    default_type = type(default)
+    if default_type is bool:
+        if isinstance(env_var, bool):
+            return env_var
+        if env_var in ("true", "True"):
+            return True
+        if env_var in ("false", "False"):
+            return False
+        raise ValueError(f"Cannot cast environment variable {val!r} to bool")
+
+    try:
+        return default_type(env_var)
+    except (TypeError, ValueError) as error:
+        raise ValueError(f"Cannot cast environment variable {val!r} to {default_type.__name__}") from error
 
 
 def value(env_var, default=""):

{fastapi_startkit-0.55.0 → fastapi_startkit-0.56.0}/src/fastapi_startkit/storage/config/storage.py

@@ -19,12 +19,12 @@ class StorageConfig:
                 url=env("FILESYSTEM_PUBLIC_DISK_URL", "/storage"),
             ),
             "s3": S3Config(
-                key=env("AWS_ACCESS_KEY_ID"),
-                secret=env("AWS_SECRET_ACCESS_KEY"),
-                region=env("AWS_DEFAULT_REGION"),
-                bucket=env("AWS_BUCKET"),
-                url=env("AWS_URL"),
-                endpoint=env("AWS_ENDPOINT"),
+                key=env("AWS_ACCESS_KEY_ID", "", cast=False),
+                secret=env("AWS_SECRET_ACCESS_KEY", "", cast=False),
+                region=env("AWS_DEFAULT_REGION", "", cast=False),
+                bucket=env("AWS_BUCKET", "", cast=False),
+                url=env("AWS_URL", "", cast=False),
+                endpoint=env("AWS_ENDPOINT", "", cast=False),
             ),
         }
     )