✨ Allow to specify application directory

Shortcake-Parent: improve-how-we-handle-invalid-tokens

Author: patrick91

pyproject.toml

@@ -33,7 +33,7 @@ dependencies = [
     "uvicorn[standard] >= 0.15.0",
     "rignore >= 0.5.1",
     "httpx >= 0.27.0",
-    "rich-toolkit >= 0.14.5",
+    "rich-toolkit >= 0.19.3",
     "pydantic[email] >= 2.0",
     "sentry-sdk >= 2.20.0",
     "fastar >= 0.8.0",

src/fastapi_cloud_cli/commands/deploy.py

@@ -115,11 +115,11 @@ class AppResponse(BaseModel):
     slug: str
 
 
-def _create_app(team_id: str, app_name: str) -> AppResponse:
+def _create_app(team_id: str, app_name: str, directory: Optional[str]) -> AppResponse:
     with APIClient() as client:
         response = client.post(
             "/apps/",
-            json={"name": app_name, "team_id": team_id},
+            json={"name": app_name, "team_id": team_id, "directory": directory},
         )
 
         response.raise_for_status()
@@ -332,10 +332,22 @@ def _configure_app(toolkit: RichToolkit, path_to_deploy: Path) -> AppConfig:
 
     toolkit.print_line()
 
+    directory_input = toolkit.input(
+        title="Path to the directory containing your app:",
+        tag="dir",
+        placeholder="[italic]Leave empty if it's the current directory[/italic]",
+    )
+
+    directory: Optional[str] = directory_input if directory_input else None
+
+    toolkit.print_line()
+
     toolkit.print("Deployment configuration:", tag="summary")
     toolkit.print_line()
     toolkit.print(f"Team: [bold]{team.name}[/bold]")
     toolkit.print(f"App name: [bold]{app_name}[/bold]")
+    toolkit.print(f"Directory: [bold]{directory or '.'}[/bold]")
+
     toolkit.print_line()
 
     choice = toolkit.ask(
@@ -357,7 +369,7 @@ def _configure_app(toolkit: RichToolkit, path_to_deploy: Path) -> AppConfig:
     else:
         with toolkit.progress(title="Creating app...") as progress:
             with handle_http_errors(progress):
-                app = _create_app(team.id, app_name)
+                app = _create_app(team.id, app_name, directory=directory)
 
             progress.log(f"App created successfully! App slug: {app.slug}")
 

src/fastapi_cloud_cli/utils/cli.py

@@ -56,12 +56,13 @@ def get_rich_toolkit(minimal: bool = False) -> RichToolkit:
         theme={
             "tag.title": "white on #009485",
             "tag": "white on #007166",
-            "placeholder": "grey85",
+            "placeholder": "grey62",
             "text": "white",
             "selected": "#007166",
             "result": "grey85",
             "progress": "on #007166",
             "error": "red",
+            "cancelled": "indian_red italic",
         },
     )
 

tests/test_cli_deploy.py

@@ -332,7 +332,7 @@ def test_asks_for_app_name_after_team(
 def test_creates_app_on_backend(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
-    steps = [Keys.ENTER, Keys.ENTER, *"demo", Keys.ENTER, Keys.ENTER]
+    steps = [Keys.ENTER, Keys.ENTER, *"demo", Keys.ENTER, Keys.ENTER, Keys.ENTER]
 
     team = _get_random_team()
 
@@ -343,10 +343,50 @@ def test_creates_app_on_backend(
         )
     )
 
-    respx_mock.post("/apps/", json={"name": "demo", "team_id": team["id"]}).mock(
-        return_value=Response(201, json=_get_random_app(team_id=team["id"]))
+    respx_mock.post(
+        "/apps/", json={"name": "demo", "team_id": team["id"], "directory": None}
+    ).mock(return_value=Response(201, json=_get_random_app(team_id=team["id"])))
+
+    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 "App created successfully" in result.output
+
+
+@pytest.mark.respx
+def test_creates_app_with_directory(
+    logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
+) -> None:
+    steps = [
+        Keys.ENTER,
+        Keys.ENTER,
+        *"demo",
+        Keys.ENTER,
+        *"src",
+        Keys.ENTER,
+        Keys.ENTER,
+    ]
+
+    team = _get_random_team()
+
+    respx_mock.get("/teams/").mock(
+        return_value=Response(
+            200,
+            json={"data": [team]},
+        )
     )
 
+    respx_mock.post(
+        "/apps/", json={"name": "demo", "team_id": team["id"], "directory": "src"}
+    ).mock(return_value=Response(201, json=_get_random_app(team_id=team["id"])))
+
     with (
         changing_dir(tmp_path),
         patch("rich_toolkit.container.getchar") as mock_getchar,
@@ -358,6 +398,7 @@ def test_creates_app_on_backend(
         assert result.exit_code == 1
 
         assert "App created successfully" in result.output
+        assert "Directory: src" in result.output
 
 
 @pytest.mark.respx
@@ -369,6 +410,7 @@ def test_cancels_deployment_when_user_selects_no(
         Keys.ENTER,
         *"demo",
         Keys.ENTER,
+        Keys.ENTER,
         Keys.DOWN_ARROW,
         Keys.ENTER,
     ]
@@ -434,6 +476,7 @@ def test_exits_successfully_when_deployment_is_done(
         *"demo",
         Keys.ENTER,
         Keys.ENTER,
+        Keys.ENTER,
     ]
 
     team_data = _get_random_team()
@@ -443,9 +486,9 @@ def test_exits_successfully_when_deployment_is_done(
         return_value=Response(200, json={"data": [team_data]})
     )
 
-    respx_mock.post("/apps/", json={"name": "demo", "team_id": team_data["id"]}).mock(
-        return_value=Response(201, json=app_data)
-    )
+    respx_mock.post(
+        "/apps/", json={"name": "demo", "team_id": team_data["id"], "directory": None}
+    ).mock(return_value=Response(201, json=app_data))
 
     respx_mock.get(f"/apps/{app_data['id']}").mock(
         return_value=Response(200, json=app_data)
@@ -685,6 +728,7 @@ def _deploy_without_waiting(respx_mock: respx.MockRouter, tmp_path: Path) -> Res
         *"demo",
         Keys.ENTER,
         Keys.ENTER,
+        Keys.ENTER,
     ]
 
     team_data = _get_random_team()
@@ -698,9 +742,9 @@ def _deploy_without_waiting(respx_mock: respx.MockRouter, tmp_path: Path) -> Res
         )
     )
 
-    respx_mock.post("/apps/", json={"name": "demo", "team_id": team_data["id"]}).mock(
-        return_value=Response(201, json=app_data)
-    )
+    respx_mock.post(
+        "/apps/", json={"name": "demo", "team_id": team_data["id"], "directory": None}
+    ).mock(return_value=Response(201, json=app_data))
 
     respx_mock.get(f"/apps/{app_data['id']}").mock(
         return_value=Response(200, json=app_data)