fastapi-cloud-cli 0.15.0__tar.gz → 0.15.1__tar.gz

{fastapi_cloud_cli-0.15.0 → fastapi_cloud_cli-0.15.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastapi-cloud-cli
-Version: 0.15.0
+Version: 0.15.1
 Summary: Deploy and manage FastAPI Cloud apps from the command line 🚀
 Author-Email: Patrick Arminio <patrick@fastapilabs.com>
 License: MIT

{fastapi_cloud_cli-0.15.0 → fastapi_cloud_cli-0.15.1}/pyproject.toml

@@ -40,7 +40,7 @@ dependencies = [
     "sentry-sdk >= 2.20.0",
     "fastar >= 0.8.0",
 ]
-version = "0.15.0"
+version = "0.15.1"
 
 [project.license]
 text = "MIT"

fastapi_cloud_cli-0.15.1/src/fastapi_cloud_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.15.1"

{fastapi_cloud_cli-0.15.0 → fastapi_cloud_cli-0.15.1}/src/fastapi_cloud_cli/commands/deploy.py

@@ -304,6 +304,7 @@ def _configure_app(toolkit: RichToolkit, path_to_deploy: Path) -> AppConfig:
         "Select the team you want to deploy to:",
         tag="team",
         options=[Option({"name": team.name, "value": team}) for team in teams],
+        allow_filtering=True,
     )
 
     toolkit.print_line()
@@ -335,6 +336,7 @@ def _configure_app(toolkit: RichToolkit, path_to_deploy: Path) -> AppConfig:
         selected_app = toolkit.ask(
             "Select the app you want to deploy to:",
             options=[Option({"name": app.slug, "value": app}) for app in apps],
+            allow_filtering=True,
         )
 
     app_name = (

{fastapi_cloud_cli-0.15.0 → fastapi_cloud_cli-0.15.1}/tests/test_cli_deploy.py

@@ -24,8 +24,8 @@ runner = CliRunner()
 assets_path = Path(__file__).parent / "assets"
 
 
-def _get_random_team() -> dict[str, str]:
-    name = "".join(random.choices(string.ascii_lowercase, k=10))
+def _get_random_team(name: str | None = None) -> dict[str, str]:
+    name = name or "".join(random.choices(string.ascii_lowercase, k=10))
     slug = "".join(random.choices(string.ascii_lowercase, k=10))
     id = "".join(random.choices(string.digits, k=10))
 
@@ -323,6 +323,42 @@ def test_shows_teams(
         assert team_2["name"] in result.output
 
 
+@pytest.mark.respx
+def test_filter_teams(
+    logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
+) -> None:
+    steps = [*"al", Keys.ENTER, Keys.CTRL_C]
+
+    team_1 = _get_random_team(name="Alpha Team")
+    team_2 = _get_random_team(name="Beta Team")
+
+    respx_mock.get("/teams/").mock(
+        return_value=Response(
+            200,
+            json={"data": [team_1, team_2]},
+        )
+    )
+
+    with (
+        changing_dir(tmp_path),
+        patch("rich_toolkit.container.getchar") as mock_getchar,
+    ):
+        mock_getchar.side_effect = steps
+
+        result = runner.invoke(app, ["deploy"])
+
+        assert result.exit_code == 1
+
+        assert "Filter: al" in result.output
+
+        # Truncate part of the output before "Filter: al"
+        filer_pos = result.output.rfind("Filter: al")
+        last_output = result.output[filer_pos:]
+
+        assert team_1["name"] in last_output
+        assert team_2["name"] not in last_output
+
+
 @pytest.mark.respx
 def test_asks_for_app_name_after_team(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
@@ -349,6 +385,48 @@ def test_asks_for_app_name_after_team(
         assert "What's your app name?" in result.output
 
 
+@pytest.mark.respx
+def test_filter_apps(
+    logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
+) -> None:
+    steps = [Keys.ENTER, Keys.RIGHT_ARROW, Keys.ENTER, *"an", Keys.ENTER, Keys.CTRL_C]
+
+    team = _get_random_team()
+
+    respx_mock.get("/teams/").mock(
+        return_value=Response(
+            200,
+            json={"data": [team]},
+        )
+    )
+
+    app_1 = _get_random_app(team_id=team["id"], slug="My App")
+    app_2 = _get_random_app(team_id=team["id"], slug="Another App")
+
+    respx_mock.get("/apps/", params={"team_id": team["id"]}).mock(
+        return_value=Response(200, json={"data": [app_1, app_2]})
+    )
+
+    with (
+        changing_dir(tmp_path),
+        patch("rich_toolkit.container.getchar") as mock_getchar,
+    ):
+        mock_getchar.side_effect = steps
+
+        result = runner.invoke(app, ["deploy"])
+
+        assert result.exit_code == 1
+
+        assert "Filter: an" in result.output
+
+        # Truncate part of the output before "Filter: an"
+        filer_pos = result.output.rfind("Filter: an")
+        last_output = result.output[filer_pos:]
+
+        assert app_1["slug"] not in last_output
+        assert app_2["slug"] in last_output
+
+
 @pytest.mark.respx
 def test_creates_app_on_backend(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter

fastapi_cloud_cli-0.15.0/src/fastapi_cloud_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.15.0"

fastapi_cloud_cli-0.15.0/tests/assets/broken_package/mod/__init__.py

@@ -1 +0,0 @@
-from .app import app as app

fastapi_cloud_cli-0.15.0/tests/assets/broken_package/mod/app.py

@@ -1,10 +0,0 @@
-from fastapi import FastAPI
-
-from ..utils import get_message
-
-app = FastAPI()
-
-
-@app.get("/")
-def app_root():
-    return {"message": get_message()}

fastapi_cloud_cli-0.15.0/tests/assets/broken_package/utils.py

@@ -1,2 +0,0 @@
-def get_message() -> str:
-    return "Hello World!"

fastapi_cloud_cli-0.15.0/tests/assets/default_files/default_api/api.py

@@ -1,8 +0,0 @@
-from fastapi import FastAPI
-
-app = FastAPI()
-
-
-@app.get("/")
-def app_root():
-    return {"message": "single file app"}

fastapi_cloud_cli-0.15.0/tests/assets/default_files/default_app/api.py

@@ -1,8 +0,0 @@
-from fastapi import FastAPI
-
-app = FastAPI()
-
-
-@app.get("/")
-def app_root():
-    return {"message": "single file app"}

fastapi_cloud_cli-0.15.0/tests/assets/default_files/default_app/app.py

@@ -1,8 +0,0 @@
-from fastapi import FastAPI
-
-app = FastAPI()
-
-
-@app.get("/")
-def app_root():
-    return {"message": "single file app"}

fastapi_cloud_cli-0.15.0/tests/assets/default_files/default_app_dir_api/app/api.py

@@ -1,8 +0,0 @@
-from fastapi import FastAPI
-
-app = FastAPI()
-
-
-@app.get("/")
-def app_root():
-    return {"message": "single file app"}

fastapi_cloud_cli-0.15.0/tests/assets/default_files/default_app_dir_app/app/api.py

@@ -1,8 +0,0 @@
-from fastapi import FastAPI
-
-app = FastAPI()
-
-
-@app.get("/")
-def app_root():
-    return {"message": "single file app"}

fastapi_cloud_cli-0.15.0/tests/assets/default_files/default_app_dir_app/app/app.py

@@ -1,8 +0,0 @@
-from fastapi import FastAPI
-
-app = FastAPI()
-
-
-@app.get("/")
-def app_root():
-    return {"message": "single file app"}

fastapi_cloud_cli-0.15.0/tests/assets/default_files/default_app_dir_main/app/api.py

@@ -1,8 +0,0 @@
-from fastapi import FastAPI
-
-app = FastAPI()
-
-
-@app.get("/")
-def app_root():
-    return {"message": "single file app"}

fastapi_cloud_cli-0.15.0/tests/assets/default_files/default_app_dir_main/app/app.py

@@ -1,8 +0,0 @@
-from fastapi import FastAPI
-
-app = FastAPI()
-
-
-@app.get("/")
-def app_root():
-    return {"message": "single file app"}

fastapi_cloud_cli-0.15.0/tests/assets/default_files/default_app_dir_main/app/main.py

@@ -1,8 +0,0 @@
-from fastapi import FastAPI
-
-app = FastAPI()
-
-
-@app.get("/")
-def app_root():
-    return {"message": "single file app"}

fastapi_cloud_cli-0.15.0/tests/assets/default_files/default_app_dir_non_default/app/nondefault.py

@@ -1,8 +0,0 @@
-from fastapi import FastAPI
-
-app = FastAPI()
-
-
-@app.get("/")
-def app_root():
-    return {"message": "single file app"}

fastapi_cloud_cli-0.15.0/tests/assets/default_files/default_main/api.py

@@ -1,8 +0,0 @@
-from fastapi import FastAPI
-
-app = FastAPI()
-
-
-@app.get("/")
-def app_root():
-    return {"message": "single file app"}

fastapi_cloud_cli-0.15.0/tests/assets/default_files/default_main/app.py

@@ -1,8 +0,0 @@
-from fastapi import FastAPI
-
-app = FastAPI()
-
-
-@app.get("/")
-def app_root():
-    return {"message": "single file app"}

fastapi_cloud_cli-0.15.0/tests/assets/default_files/default_main/main.py

@@ -1,8 +0,0 @@
-from fastapi import FastAPI
-
-app = FastAPI()
-
-
-@app.get("/")
-def app_root():
-    return {"message": "single file app"}

fastapi_cloud_cli-0.15.0/tests/assets/default_files/non_default/nonstandard.py

@@ -1,8 +0,0 @@
-from fastapi import FastAPI
-
-app = FastAPI()
-
-
-@app.get("/")
-def app_root():
-    return {"message": "single file app"}

fastapi_cloud_cli-0.15.0/tests/assets/package/__init__.py

@@ -1,2 +0,0 @@
-from .mod.api import api as api
-from .mod.app import app as app

fastapi_cloud_cli-0.15.0/tests/assets/package/core/utils.py

@@ -1,2 +0,0 @@
-def get_hello_world() -> str:
-    return "Hello World"

fastapi_cloud_cli-0.15.0/tests/assets/package/mod/__init__.py

@@ -1 +0,0 @@
-from .app import app as app

fastapi_cloud_cli-0.15.0/tests/assets/package/mod/api.py

@@ -1,24 +0,0 @@
-from fastapi import FastAPI
-
-first_other = FastAPI()
-
-
-@first_other.get("/")
-def first_other_root():
-    return {"message": "package first_other"}
-
-
-second_other = FastAPI()
-
-
-@second_other.get("/")
-def second_other_root():
-    return {"message": "package second_other"}
-
-
-api = FastAPI()
-
-
-@api.get("/")
-def api_root():
-    return {"message": "package api"}

fastapi_cloud_cli-0.15.0/tests/assets/package/mod/app.py

@@ -1,32 +0,0 @@
-from fastapi import FastAPI
-
-first_other = FastAPI()
-
-
-@first_other.get("/")
-def first_other_root():
-    return {"message": "package first_other"}
-
-
-second_other = FastAPI()
-
-
-@second_other.get("/")
-def second_other_root():
-    return {"message": "package second_other"}
-
-
-api = FastAPI()
-
-
-@api.get("/")
-def api_root():
-    return {"message": "package api"}
-
-
-app = FastAPI()
-
-
-@app.get("/")
-def app_root():
-    return {"message": "package app"}

fastapi_cloud_cli-0.15.0/tests/assets/package/mod/other.py

@@ -1,16 +0,0 @@
-from fastapi import FastAPI
-
-first_other = FastAPI()
-
-
-@first_other.get("/")
-def first_other_root():
-    return {"message": "package first_other"}
-
-
-second_other = FastAPI()
-
-
-@second_other.get("/")
-def second_other_root():
-    return {"message": "package second_other"}

fastapi_cloud_cli-0.15.0/tests/assets/single_file_api.py

@@ -1,24 +0,0 @@
-from fastapi import FastAPI
-
-first_other = FastAPI()
-
-
-@first_other.get("/")
-def first_other_root():
-    return {"message": "single file first_other"}
-
-
-second_other = FastAPI()
-
-
-@second_other.get("/")
-def second_other_root():
-    return {"message": "single file second_other"}
-
-
-api = FastAPI()
-
-
-@api.get("/")
-def api_root():
-    return {"message": "single file api"}

fastapi_cloud_cli-0.15.0/tests/assets/single_file_app.py

@@ -1,32 +0,0 @@
-from fastapi import FastAPI
-
-first_other = FastAPI()
-
-
-@first_other.get("/")
-def first_other_root():
-    return {"message": "single file first_other"}
-
-
-second_other = FastAPI()
-
-
-@second_other.get("/")
-def second_other_root():
-    return {"message": "single file second_other"}
-
-
-api = FastAPI()
-
-
-@api.get("/")
-def api_root():
-    return {"message": "single file api"}
-
-
-app = FastAPI()
-
-
-@app.get("/")
-def app_root():
-    return {"message": "single file app"}

fastapi_cloud_cli-0.15.0/tests/assets/single_file_other.py

@@ -1,16 +0,0 @@
-from fastapi import FastAPI
-
-first_other = FastAPI()
-
-
-@first_other.get("/")
-def first_other_root():
-    return {"message": "single file first_other"}
-
-
-second_other = FastAPI()
-
-
-@second_other.get("/")
-def second_other_root():
-    return {"message": "single file second_other"}