fastapi-cli 0.0.3__tar.gz → 0.0.4__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (59) hide show
  1. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/PKG-INFO +4 -3
  2. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/pyproject.toml +7 -7
  3. fastapi_cli-0.0.4/src/fastapi_cli/__init__.py +1 -0
  4. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/src/fastapi_cli/cli.py +9 -1
  5. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/src/fastapi_cli/discover.py +9 -1
  6. fastapi_cli-0.0.4/tests/test_requirements.py +45 -0
  7. fastapi_cli-0.0.3/src/fastapi_cli/__init__.py +0 -1
  8. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/LICENSE +0 -0
  9. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/README.md +0 -0
  10. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/pdm_build.py +0 -0
  11. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/requirements-tests.txt +0 -0
  12. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/requirements.txt +0 -0
  13. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/scripts/format.sh +0 -0
  14. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/scripts/lint.sh +0 -0
  15. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/scripts/test-cov-html.sh +0 -0
  16. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/scripts/test.sh +0 -0
  17. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/src/fastapi_cli/__main__.py +0 -0
  18. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/src/fastapi_cli/exceptions.py +0 -0
  19. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/src/fastapi_cli/logging.py +0 -0
  20. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/src/fastapi_cli/py.typed +0 -0
  21. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/__init__.py +0 -0
  22. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/broken_package/mod/__init__.py +0 -0
  23. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/broken_package/mod/app.py +0 -0
  24. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/broken_package/utils.py +0 -0
  25. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/default_files/default_api/api.py +0 -0
  26. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/default_files/default_app/api.py +0 -0
  27. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/default_files/default_app/app.py +0 -0
  28. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/default_files/default_app_dir_api/app/__init__.py +0 -0
  29. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/default_files/default_app_dir_api/app/api.py +0 -0
  30. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/default_files/default_app_dir_app/app/__init__.py +0 -0
  31. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/default_files/default_app_dir_app/app/api.py +0 -0
  32. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/default_files/default_app_dir_app/app/app.py +0 -0
  33. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/default_files/default_app_dir_main/app/__init__.py +0 -0
  34. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/default_files/default_app_dir_main/app/api.py +0 -0
  35. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/default_files/default_app_dir_main/app/app.py +0 -0
  36. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/default_files/default_app_dir_main/app/main.py +0 -0
  37. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/default_files/default_app_dir_non_default/app/__init__.py +0 -0
  38. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/default_files/default_app_dir_non_default/app/nondefault.py +0 -0
  39. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/default_files/default_main/api.py +0 -0
  40. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/default_files/default_main/app.py +0 -0
  41. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/default_files/default_main/main.py +0 -0
  42. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/default_files/non_default/nonstandard.py +0 -0
  43. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/package/__init__.py +0 -0
  44. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/package/core/__init__.py +0 -0
  45. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/package/core/utils.py +0 -0
  46. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/package/mod/__init__.py +0 -0
  47. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/package/mod/api.py +0 -0
  48. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/package/mod/app.py +0 -0
  49. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/package/mod/other.py +0 -0
  50. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/single_file_api.py +0 -0
  51. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/single_file_app.py +0 -0
  52. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/assets/single_file_other.py +0 -0
  53. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/conftest.py +0 -0
  54. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/test_cli.py +0 -0
  55. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/test_utils_default_dir.py +0 -0
  56. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/test_utils_default_file.py +0 -0
  57. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/test_utils_package.py +0 -0
  58. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/test_utils_single_file.py +0 -0
  59. {fastapi_cli-0.0.3 → fastapi_cli-0.0.4}/tests/utils.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: fastapi-cli
3
- Version: 0.0.3
3
+ Version: 0.0.4
4
4
  Summary: Run and manage FastAPI apps from the command line with FastAPI CLI. 🚀
5
5
  Home-page: https://github.com/tiangolo/fastapi-cli
6
6
  Author-Email: =?utf-8?q?Sebasti=C3=A1n_Ram=C3=ADrez?= <tiangolo@gmail.com>
@@ -32,8 +32,9 @@ Project-URL: Homepage, https://github.com/tiangolo/fastapi-cli
32
32
  Project-URL: Repository, https://github.com/tiangolo/fastapi-cli
33
33
  Requires-Python: >=3.8
34
34
  Requires-Dist: typer>=0.12.3
35
- Requires-Dist: fastapi
36
- Requires-Dist: uvicorn[standard]>=0.15.0
35
+ Requires-Dist: fastapi; extra == "standard"
36
+ Requires-Dist: uvicorn[standard]>=0.15.0; extra == "standard"
37
+ Provides-Extra: standard
37
38
  Description-Content-Type: text/markdown
38
39
 
39
40
  # FastAPI CLI
@@ -33,15 +33,17 @@ classifiers = [
33
33
  ]
34
34
  dependencies = [
35
35
  "typer >= 0.12.3",
36
- "fastapi",
37
- "uvicorn[standard] >= 0.15.0",
38
36
  ]
39
- version = "0.0.3"
37
+ version = "0.0.4"
40
38
 
41
39
  [project.license]
42
40
  text = "MIT"
43
41
 
44
42
  [project.optional-dependencies]
43
+ standard = [
44
+ "fastapi",
45
+ "uvicorn[standard] >= 0.15.0",
46
+ ]
45
47
 
46
48
  [project.urls]
47
49
  Documentation = "https://fastapi.tiangolo.com"
@@ -75,11 +77,9 @@ source-includes = [
75
77
  name = "fastapi-cli-slim"
76
78
 
77
79
  [tool.tiangolo._internal-slim-build.packages.fastapi-cli]
78
- include-optional-dependencies = [
79
- "standard",
80
- ]
80
+ include-optional-dependencies = []
81
81
 
82
- [tool.tiangolo._internal-slim-build.packages.fastapi-cli.project.optional-dependencies]
82
+ [tool.tiangolo._internal-slim-build.packages.fastapi-cli.project]
83
83
 
84
84
  [tool.pytest.ini_options]
85
85
  addopts = [
@@ -0,0 +1 @@
1
+ __version__ = "0.0.4"
@@ -3,7 +3,6 @@ from pathlib import Path
3
3
  from typing import Any, Union
4
4
 
5
5
  import typer
6
- import uvicorn
7
6
  from rich import print
8
7
  from rich.padding import Padding
9
8
  from rich.panel import Panel
@@ -20,6 +19,11 @@ app = typer.Typer(rich_markup_mode="rich")
20
19
  setup_logging()
21
20
  logger = getLogger(__name__)
22
21
 
22
+ try:
23
+ import uvicorn
24
+ except ImportError: # pragma: no cover
25
+ uvicorn = None # type: ignore[assignment]
26
+
23
27
 
24
28
  def version_callback(value: bool) -> None:
25
29
  if value:
@@ -81,6 +85,10 @@ def _run(
81
85
  style="green",
82
86
  )
83
87
  print(Padding(panel, 1))
88
+ if not uvicorn:
89
+ raise FastAPICLIException(
90
+ "Could not import Uvicorn, try running 'pip install uvicorn'"
91
+ ) from None
84
92
  uvicorn.run(
85
93
  app=use_uvicorn_app,
86
94
  host=host,
@@ -5,7 +5,6 @@ from logging import getLogger
5
5
  from pathlib import Path
6
6
  from typing import Union
7
7
 
8
- from fastapi import FastAPI
9
8
  from rich import print
10
9
  from rich.padding import Padding
11
10
  from rich.panel import Panel
@@ -16,6 +15,11 @@ from fastapi_cli.exceptions import FastAPICLIException
16
15
 
17
16
  logger = getLogger(__name__)
18
17
 
18
+ try:
19
+ from fastapi import FastAPI
20
+ except ImportError: # pragma: no cover
21
+ FastAPI = None # type: ignore[misc, assignment]
22
+
19
23
 
20
24
  def get_default_path() -> Path:
21
25
  path = Path("main.py")
@@ -107,6 +111,10 @@ def get_app_name(*, mod_data: ModuleData, app_name: Union[str, None] = None) ->
107
111
  "Ensure all the package directories have an [blue]__init__.py[/blue] file"
108
112
  )
109
113
  raise
114
+ if not FastAPI: # type: ignore[truthy-function]
115
+ raise FastAPICLIException(
116
+ "Could not import FastAPI, try running 'pip install fastapi'"
117
+ ) from None
110
118
  object_names = dir(mod)
111
119
  object_names_set = set(object_names)
112
120
  if app_name:
@@ -0,0 +1,45 @@
1
+ from pathlib import Path
2
+
3
+ import pytest
4
+ from fastapi_cli.discover import get_import_string
5
+ from fastapi_cli.exceptions import FastAPICLIException
6
+ from typer.testing import CliRunner
7
+
8
+ from .utils import changing_dir
9
+
10
+ runner = CliRunner()
11
+
12
+ assets_path = Path(__file__).parent / "assets"
13
+
14
+
15
+ def test_no_uvicorn() -> None:
16
+ import fastapi_cli.cli
17
+ import uvicorn
18
+
19
+ fastapi_cli.cli.uvicorn = None # type: ignore[attr-defined, assignment]
20
+
21
+ with changing_dir(assets_path):
22
+ result = runner.invoke(fastapi_cli.cli.app, ["dev", "single_file_app.py"])
23
+ assert result.exit_code == 1
24
+ assert result.exception is not None
25
+ assert (
26
+ "Could not import Uvicorn, try running 'pip install uvicorn'"
27
+ in result.exception.args[0]
28
+ )
29
+
30
+ fastapi_cli.cli.uvicorn = uvicorn # type: ignore[attr-defined]
31
+
32
+
33
+ def test_no_fastapi() -> None:
34
+ import fastapi_cli.discover
35
+ from fastapi import FastAPI
36
+
37
+ fastapi_cli.discover.FastAPI = None # type: ignore[attr-defined, assignment]
38
+ with changing_dir(assets_path):
39
+ with pytest.raises(FastAPICLIException) as exc_info:
40
+ get_import_string(path=Path("single_file_app.py"))
41
+ assert "Could not import FastAPI, try running 'pip install fastapi'" in str(
42
+ exc_info.value
43
+ )
44
+
45
+ fastapi_cli.discover.FastAPI = FastAPI # type: ignore[attr-defined]
@@ -1 +0,0 @@
1
- __version__ = "0.0.3"
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes