fastapi-startkit 0.53.0__tar.gz → 0.54.0__tar.gz

{fastapi_startkit-0.53.0 → fastapi_startkit-0.54.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fastapi-startkit
-Version: 0.53.0
+Version: 0.54.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.53.0 → fastapi_startkit-0.54.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fastapi-startkit"
-version = "0.53.0"
+version = "0.54.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.53.0 → fastapi_startkit-0.54.0}/src/fastapi_startkit/fastapi/commands/serve_command.py

@@ -1,8 +1,11 @@
+from typing import Any
+
 from cleo.helpers import option
 
 from fastapi_startkit import Config
 from fastapi_startkit.console.command import Command
 from fastapi_startkit.environment import value as cast_value
+from fastapi_startkit.fastapi.config import FastAPIConfig
 from fastapi_startkit.support import Uri, Uriable
 
 
@@ -36,18 +39,27 @@ class ServeCommand(Command):
             "app",
             "a",
             flag=False,
-            default="bootstrap.application:app",
-            description="The application to serve",
+            default=None,
+            description="The application to serve (overrides fastapi config)",
         ),
     ]
 
-    def resolve_option(self, key: str, default: str | int | None = None):
-        value = self.option(key) or Config.get(f"fastapi.{key}", default)
+    def config_value(self, key: str) -> Any:
+        """Resolve `fastapi.<key>`, falling back to the FastAPIConfig default."""
+        # Instantiated per call so env-backed fields are read at command time.
+        default = getattr(FastAPIConfig(), key, None)
+        # Configuration.get() only substitutes its default on a missing key, so a
+        # key that is present but None would otherwise leak through.
+        value = Config.get(f"fastapi.{key}", default)
 
-        return cast_value(value)
+        return default if value is None else value
+
+    def resolve_option(self, key: str) -> Any:
+        """CLI flag > fastapi config > FastAPIConfig default."""
+        return cast_value(self.option(key) or self.config_value(key))
 
     def resolve_url(self) -> Uriable:
-        host = self.option("host") or Config.get("fastapi.app_url", "http://127.0.0.1:8000")
+        host = self.option("host") or self.config_value("app_url")
         port = self.option("port")
 
         if host and not host.startswith("http"):
@@ -60,15 +72,11 @@ class ServeCommand(Command):
     def handle(self):
         import uvicorn
 
-        from fastapi_startkit import Config
         from fastapi_startkit.container import Container
 
-        # Resolve server settings: CLI flag > fastapi config > uvicorn default (None)
-        cfg_reload_dirs = Config.get("fastapi.reload_dirs") or None
-        cfg_reload_excludes = Config.get("fastapi.reload_excludes") or None
-
         url = self.resolve_url()
-        reload = self.resolve_option("reload", True)
+        reload = self.resolve_option("reload")
+        app = self.resolve_option("app")
 
         kwargs = {
             "host": url.host(),
@@ -77,19 +85,24 @@ class ServeCommand(Command):
             "ws": "websockets-sansio",
         }
 
-        if self.is_app_exist():
+        if self.is_app_exist(app):
             kwargs.update(
                 {
-                    "app": self.option("app"),
+                    "app": app,
                     "factory": True,
                 }
             )
-            if cfg_reload_dirs is not None and reload:
-                kwargs["reload_dirs"] = cfg_reload_dirs
-            if cfg_reload_excludes is not None and reload:
-                kwargs["reload_excludes"] = cfg_reload_excludes
 
-            self.line(f"<info>Starting Uvicorn server on {url.host()}:{url.port()} [{self.option('app')}]...</info>")
+            if reload:
+                reload_dirs = self.config_value("reload_dirs")
+                reload_excludes = self.config_value("reload_excludes")
+
+                if reload_dirs:
+                    kwargs["reload_dirs"] = reload_dirs
+                if reload_excludes:
+                    kwargs["reload_excludes"] = reload_excludes
+
+            self.line(f"<info>Starting Uvicorn server on {url.host()}:{url.port()} [{app}]...</info>")
 
         else:
             self.line(f"<info>Starting Uvicorn server on {url.host()}:{url.port()}...</info>")
@@ -100,11 +113,9 @@ class ServeCommand(Command):
         except KeyboardInterrupt:
             self.line("<comment>Server stopped manually.</comment>")
 
-    def is_app_exist(self) -> "bool":
+    def is_app_exist(self, app: str) -> "bool":
         import importlib.util
 
-        app = self.option("app")
-
         module_name = app.split(":")[0]
         try:
             spec = importlib.util.find_spec(module_name)
@@ -113,6 +124,6 @@ class ServeCommand(Command):
         except (ImportError, ValueError):
             pass
 
-        self.line("<fg=yellow>Unable to detect the application, run the command with --app={app}</>")
+        self.line(f"<fg=yellow>Unable to detect the application '{app}', run the command with --app=your_module:app</>")
 
         return False

{fastapi_startkit-0.53.0 → fastapi_startkit-0.54.0}/src/fastapi_startkit/fastapi/config/fastapi.py

@@ -6,6 +6,7 @@ from fastapi_startkit.environment import env
 @dataclasses.dataclass
 class FastAPIConfig:
     app_url: str = dataclasses.field(default_factory=lambda: env("APP_URL", "http://127.0.0.1:8000"))
+    app: str = "bootstrap.application:app"
     reload: bool = dataclasses.field(default_factory=lambda: env("APP_RELOAD", True))
     reload_dirs: list | None = None
     reload_excludes: list = dataclasses.field(