Merge the changes from PR over latest code

Author: Michael "M3" Lasevich

src/fastapi_cli/cli.py

@@ -1,7 +1,6 @@
 import json
 import logging
 import sys
-
 from pathlib import Path
 from typing import Any, List, Union
 
@@ -10,7 +9,7 @@
 from rich.tree import Tree
 from typing_extensions import Annotated
 
-from fastapi_cli.discover import get_app, get_import_string, get_import_data
+from fastapi_cli.discover import get_app, get_import_data
 from fastapi_cli.exceptions import FastAPICLIException
 
 from . import __version__

src/fastapi_cli/discover.py

@@ -4,7 +4,7 @@
 from dataclasses import dataclass
 from logging import getLogger
 from pathlib import Path
-from typing import Iterator, List, Tuple, Union
+from typing import Iterator, List, Union
 
 from fastapi_cli.exceptions import FastAPICLIException
 
@@ -116,8 +116,6 @@ def get_app_name(*, mod_data: ModuleData, app_name: Union[str, None] = None) ->
     raise FastAPICLIException("Could not find FastAPI app in module, try using --app")
 
 
-# TODO: fix get_import_data vs get_import_string
-
 @dataclass
 class ImportData:
     app_name: str
@@ -126,7 +124,7 @@ class ImportData:
 
 
 def get_import_data(
-        *, path: Union[Path, None] = None, app_name: Union[str, None] = None
+    *, path: Union[Path, None] = None, app_name: Union[str, None] = None
 ) -> ImportData:
     if not path:
         path = get_default_path()
@@ -146,82 +144,13 @@ def get_import_data(
         app_name=use_app_name, module_data=mod_data, import_string=import_string
     )
 
-def get_import_string(
-    *, path: Union[Path, None] = None, app_name: Union[str, None] = None
-) -> str:
-    if not path:
-        path = get_default_path()
-
-    logger.debug(f"Using path [blue]{path}[/blue]")
-    logger.debug(f"Resolved absolute path {path.resolve()}")
-
-    if not path.exists():
-        raise FastAPICLIException(f"Path does not exist {path}")
-    mod_data = get_module_data_from_path(path)
-    sys.path.insert(0, str(mod_data.extra_sys_path))
-    use_app_name = get_app_name(mod_data=mod_data, app_name=app_name)
-    import_example = Syntax(
-        f"from {mod_data.module_import_str} import {use_app_name}", "python"
-    )
-    import_panel = Padding(
-        Panel(
-            import_example,
-            title="[b green]Importable FastAPI app[/b green]",
-            expand=False,
-            padding=(1, 2),
-        ),
-        1,
-    )
-    logger.info("Found importable FastAPI app")
-    print(import_panel)
-    import_string = f"{mod_data.module_import_str}:{use_app_name}"
-    logger.info(f"Using import string [b green]{import_string}[/b green]")
-    return import_string
-
-def get_import_string_parts(
-        *, path: Union[Path, None] = None, app_name: Union[str, None] = None
-) -> Tuple[ModuleData, str]:
-    if not path:
-        path = get_default_path()
-    logger.info(f"Using path [blue]{path}[/blue]")
-    logger.info(f"Resolved absolute path {path.resolve()}")
-    if not path.exists():
-        raise FastAPICLIException(f"Path does not exist {path}")
-    mod_data = get_module_data_from_path(path)
-    sys.path.insert(0, str(mod_data.extra_sys_path))
-    use_app_name = get_app_name(mod_data=mod_data, app_name=app_name)
-
-    return mod_data, use_app_name
-
-
-def get_import_string(
-        *, path: Union[Path, None] = None, app_name: Union[str, None] = None
-) -> str:
-    mod_data, use_app_name = get_import_string_parts(path=path, app_name=app_name)
-    import_string = f"{mod_data.module_import_str}:{use_app_name}"
-    import_example = Syntax(
-        f"from {mod_data.module_import_str} import {use_app_name}", "python"
-    )
-    import_panel = Padding(
-        Panel(
-            import_example,
-            title="[b green]Importable FastAPI app[/b green]",
-            expand=False,
-            padding=(1, 2),
-        ),
-        1,
-    )
-    logger.info("Found importable FastAPI app")
-    print(import_panel)
-
-    logger.info(f"Using import string [b green]{import_string}[/b green]")
-    return import_string
-
 
 def get_app(
     *, path: Union[Path, None] = None, app_name: Union[str, None] = None
 ) -> FastAPI:
-    mod_data, use_app_name = get_import_string_parts(path=path, app_name=app_name)
+    """Get the FastAPI app instance from the given path and app name."""
+    import_data: ImportData = get_import_data(path=path, app_name=app_name)
+    mod_data, use_app_name = import_data.module_data, import_data.app_name
     with mod_data.sys_path():
         mod = importlib.import_module(mod_data.module_import_str)
     app = getattr(mod, use_app_name)

tests/test_cli.py

@@ -5,12 +5,10 @@
 from unittest.mock import patch
 
 import uvicorn
-from fastapi_cli.cli import app
-# from fastapi_cli.exceptions import FastAPICLIException
-
 from typer.testing import CliRunner
 
 from fastapi_cli.cli import app
+from fastapi_cli.exceptions import FastAPICLIException
 from fastapi_cli.utils.cli import get_uvicorn_log_config
 from tests.utils import changing_dir
 

tests/test_utils_package.py

@@ -2,8 +2,8 @@
 
 import pytest
 from pytest import CaptureFixture
-from fastapi_cli.discover import get_app, get_import_string
-from fastapi_cli.discover import get_import_data
+
+from fastapi_cli.discover import get_app, get_import_data
 from fastapi_cli.exceptions import FastAPICLIException
 from tests.utils import changing_dir