rebasing onto main

Author: rasputyashka

src/fastapi_cli/cli.py

@@ -100,6 +100,7 @@ def _run(
     entrypoint: Union[str, None] = None,
     proxy_headers: bool = False,
     forwarded_allow_ips: Union[str, None] = None,
+    is_factory: bool = False,
 ) -> None:
     with get_rich_toolkit() as toolkit:
         server_type = "development" if command == "dev" else "production"
@@ -187,6 +188,7 @@ def _run(
             proxy_headers=proxy_headers,
             forwarded_allow_ips=forwarded_allow_ips,
             log_config=get_uvicorn_log_config(),
+            factory=is_factory,
         )
 
 
@@ -195,7 +197,7 @@ def dev(
     path: Annotated[
         Union[Path, None],
         typer.Argument(
-            help="A path to a Python file or package directory (with [blue]__init__.py[/blue] files) containing a [bold]FastAPI[/bold] app. If not provided, a default set of paths will be tried."
+            help="A path to a Python file or package directory (with [blue]__init__.py[/blue] files) containing a [bold]FastAPI[/bold] app or app factory. If not provided, a default set of paths will be tried."
         ),
     ] = None,
     *,
@@ -250,6 +252,12 @@ def dev(
             help="Comma separated list of IP Addresses to trust with proxy headers. The literal '*' means trust everything."
         ),
     ] = None,
+    factory: Annotated[
+        bool,
+        typer.Option(
+            help="Treat [bold]path[bold] as an application factory, i.e. a () -> <ASGI app> callable."
+        ),
+    ] = False,
 ) -> Any:
     """
     Run a [bold]FastAPI[/bold] app in [yellow]development[/yellow] mode. 🧪
@@ -287,6 +295,7 @@ def dev(
         command="dev",
         proxy_headers=proxy_headers,
         forwarded_allow_ips=forwarded_allow_ips,
+        is_factory=factory,
     )
 
 
@@ -356,6 +365,12 @@ def run(
             help="Comma separated list of IP Addresses to trust with proxy headers. The literal '*' means trust everything."
         ),
     ] = None,
+    factory: Annotated[
+        bool,
+        typer.Option(
+            help="Treat [bold]path[bold] as an application factory, i.e. a () -> <ASGI app> callable."
+        ),
+    ] = False,
 ) -> Any:
     """
     Run a [bold]FastAPI[/bold] app in [green]production[/green] mode. 🚀
@@ -394,6 +409,7 @@ def run(
         command="run",
         proxy_headers=proxy_headers,
         forwarded_allow_ips=forwarded_allow_ips,
+        is_factory=factory,
     )
 
 

src/fastapi_cli/discover.py

@@ -65,7 +65,9 @@ def get_module_data_from_path(path: Path) -> ModuleData:
     )
 
 
-def get_app_name(*, mod_data: ModuleData, app_name: Union[str, None] = None) -> str:
+def get_app_name(
+    *, mod_data: ModuleData, app_name: Union[str, None] = None, is_factory: bool = False
+) -> str:
     try:
         mod = importlib.import_module(mod_data.module_import_str)
     except (ImportError, ValueError) as e:
@@ -86,21 +88,30 @@ def get_app_name(*, mod_data: ModuleData, app_name: Union[str, None] = None) ->
                 f"Could not find app name {app_name} in {mod_data.module_import_str}"
             )
         app = getattr(mod, app_name)
-        if not isinstance(app, FastAPI):
+        if not isinstance(app, FastAPI) and not is_factory:
             raise FastAPICLIException(
                 f"The app name {app_name} in {mod_data.module_import_str} doesn't seem to be a FastAPI app"
             )
+        else:
+            if not callable(app) and is_factory:
+                raise FastAPICLIException(
+                    f"The app factory {app_name} in {mod_data.module_import_str} doesn't seem to be a function"
+                )
         return app_name
     for preferred_name in ["app", "api"]:
         if preferred_name in object_names_set:
             obj = getattr(mod, preferred_name)
-            if isinstance(obj, FastAPI):
+            if isinstance(obj, FastAPI) and not is_factory:
                 return preferred_name
     for name in object_names:
         obj = getattr(mod, name)
-        if isinstance(obj, FastAPI):
+        if isinstance(obj, FastAPI) and not is_factory:
+            return name
+        elif callable(name) and is_factory:
             return name
-    raise FastAPICLIException("Could not find FastAPI app in module, try using --app")
+    raise FastAPICLIException(
+        "Could not find FastAPI app or app factory in module, try using --app"
+    )
 
 
 @dataclass