✨ 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.2",
     "pydantic[email] >= 2.0",
     "sentry-sdk >= 2.20.0",
     "fastar >= 0.8.0",

src/fastapi_cloud_cli/commands/deploy.py

@@ -332,10 +332,23 @@ 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",
+        default="",
+        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]")
+    if directory:
+        toolkit.print(f"Directory: [bold]{directory}[/bold]")
     toolkit.print_line()
 
     choice = toolkit.ask(
@@ -361,7 +374,7 @@ def _configure_app(toolkit: RichToolkit, path_to_deploy: Path) -> AppConfig:
 
             progress.log(f"App created successfully! App slug: {app.slug}")
 
-    app_config = AppConfig(app_id=app.id, team_id=team.id)
+    app_config = AppConfig(app_id=app.id, team_id=team.id, directory=directory)
 
     write_app_config(path_to_deploy, app_config)
 
@@ -674,7 +687,12 @@ def deploy(
         with tempfile.TemporaryDirectory() as temp_dir:
             logger.debug("Creating archive for deployment")
             archive_path = Path(temp_dir) / "archive.tar"
-            archive(path or Path.cwd(), archive_path)
+
+            deploy_path = path or Path.cwd()
+            if app_config and app_config.directory:
+                deploy_path = deploy_path / app_config.directory
+
+            archive(deploy_path, archive_path)
 
             with (
                 toolkit.progress(title="Creating deployment") as progress,

src/fastapi_cloud_cli/utils/apps.py

@@ -10,6 +10,7 @@
 class AppConfig(BaseModel):
     app_id: str
     team_id: str
+    directory: Optional[str] = None
 
 
 def get_app_config(path_to_deploy: Path) -> Optional[AppConfig]:
@@ -32,6 +33,7 @@ def get_app_config(path_to_deploy: Path) -> Optional[AppConfig]:
 The "cloud.json" file contains:
 - The ID of the FastAPI app that you linked ("app_id")
 - The ID of the team your FastAPI Cloud project is owned by ("team_id")
+- Optionally, the directory within your repo that contains the app ("directory")
 
 > Should I commit the ".fastapicloud" folder?
 No, you should not commit the ".fastapicloud" folder to your version control system.

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

@@ -318,7 +318,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()
 
@@ -355,6 +355,7 @@ def test_cancels_deployment_when_user_selects_no(
         Keys.ENTER,
         *"demo",
         Keys.ENTER,
+        Keys.ENTER,
         Keys.DOWN_ARROW,
         Keys.ENTER,
     ]
@@ -420,6 +421,7 @@ def test_exits_successfully_when_deployment_is_done(
         *"demo",
         Keys.ENTER,
         Keys.ENTER,
+        Keys.ENTER,
     ]
 
     team_data = _get_random_team()
@@ -671,6 +673,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()