fastapi-startkit 0.43.0__tar.gz → 0.44.0__tar.gz

{fastapi_startkit-0.43.0 → fastapi_startkit-0.44.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fastapi-startkit
-Version: 0.43.0
+Version: 0.44.0
 Summary: Fastapi Starter kit components
 Author: Bedram Tamang
 Author-email: Bedram Tamang <tmgbedu@gmail.com>

{fastapi_startkit-0.43.0 → fastapi_startkit-0.44.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fastapi-startkit"
-version = "0.43.0"
+version = "0.44.0"
 description = "Fastapi Starter kit components"
 authors = [
     {name = "Bedram Tamang", email = "tmgbedu@gmail.com"}

{fastapi_startkit-0.43.0 → fastapi_startkit-0.44.0}/src/fastapi_startkit/fastapi/commands/serve_command.py

@@ -1,8 +1,9 @@
 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.support import Uriable, Uri
+from fastapi_startkit.support import Uri, Uriable
 
 
 class ServeCommand(Command):
@@ -46,10 +47,15 @@ class ServeCommand(Command):
         return cast_value(value)
 
     def resolve_url(self) -> Uriable:
-        host = self.resolve_option("host", "127.0.0.1")
-        port = self.resolve_option("port", 8000)
+        host = self.option("host") or Config.get("fastapi.app_url", "http://127.0.0.1:8000")
+        port = self.option("port")
+
+        if host and not host.startswith("http"):
+            host = f"http://{host}"
+
+        uri = Uri.of(host)
 
-        return Uri.of(Config.get("fastapi.app_url", "http://127.0.0.1:8000")).with_host(host).with_port(port)
+        return uri.with_port(port) if port else uri
 
     def handle(self):
         import uvicorn
@@ -62,11 +68,12 @@ class ServeCommand(Command):
         cfg_reload_excludes = Config.get("fastapi.reload_excludes") or None
 
         url = self.resolve_url()
+        reload = self.resolve_option("reload", True)
 
         kwargs = {
             "host": url.host(),
             "port": url.port(),
-            "reload": self.resolve_option("reload", True),
+            "reload": reload,
             "ws": "websockets-sansio",
         }
 
@@ -77,9 +84,9 @@ class ServeCommand(Command):
                     "factory": True,
                 }
             )
-            if cfg_reload_dirs is not None:
+            if cfg_reload_dirs is not None and reload:
                 kwargs["reload_dirs"] = cfg_reload_dirs
-            if cfg_reload_excludes is not None:
+            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>")

{fastapi_startkit-0.43.0 → fastapi_startkit-0.44.0}/src/fastapi_startkit/fastapi/config/fastapi.py

@@ -5,14 +5,7 @@ from fastapi_startkit.environment import env
 
 @dataclasses.dataclass
 class FastAPIConfig:
-    """Server configuration for the uvicorn/FastAPI serve command.
-
-    All fields can be overridden via environment variables or by publishing a
-    ``config/fastapi.py`` file in the application root.
-    """
-
-    host: str = dataclasses.field(default_factory=lambda: env("APP_HOST", "127.0.0.1"))
-    port: int = dataclasses.field(default_factory=lambda: env("APP_PORT", 8000))
+    app_url: str = dataclasses.field(default_factory=lambda: env("APP_URL", "http://127.0.0.1:8000"))
     reload: bool = dataclasses.field(default_factory=lambda: env("APP_RELOAD", True))
     reload_dirs: list | None = None
     reload_excludes: list = dataclasses.field(