fastapi-cloud-cli 0.1.4__tar.gz → 0.2.0__tar.gz

{fastapi_cloud_cli-0.1.4 → fastapi_cloud_cli-0.2.0}/PKG-INFO

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

{fastapi_cloud_cli-0.1.4 → fastapi_cloud_cli-0.2.0}/pyproject.toml

@@ -40,7 +40,7 @@ dependencies = [
     "pydantic[email] >= 1.6.1",
     "sentry-sdk >= 2.20.0",
 ]
-version = "0.1.4"
+version = "0.2.0"
 
 [project.license]
 text = "MIT"

fastapi_cloud_cli-0.2.0/src/fastapi_cloud_cli/__init__.py

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

{fastapi_cloud_cli-0.1.4 → fastapi_cloud_cli-0.2.0}/src/fastapi_cloud_cli/cli.py

@@ -4,6 +4,7 @@ from .commands.deploy import deploy
 from .commands.env import env_app
 from .commands.login import login
 from .commands.logout import logout
+from .commands.unlink import unlink
 from .commands.whoami import whoami
 from .logging import setup_logging
 from .utils.sentry import init_sentry
@@ -20,6 +21,7 @@ app.command()(deploy)
 app.command()(login)
 app.command()(logout)
 app.command()(whoami)
+app.command()(unlink)
 
 app.add_typer(env_app, name="env")
 

{fastapi_cloud_cli-0.1.4 → fastapi_cloud_cli-0.2.0}/src/fastapi_cloud_cli/commands/deploy.py

@@ -20,6 +20,7 @@ from rich_toolkit import RichToolkit
 from rich_toolkit.menu import Option
 from typing_extensions import Annotated
 
+from fastapi_cloud_cli.commands.login import login
 from fastapi_cloud_cli.utils.api import APIClient
 from fastapi_cloud_cli.utils.apps import AppConfig, get_app_config, write_app_config
 from fastapi_cloud_cli.utils.auth import is_logged_in
@@ -108,8 +109,11 @@ class DeploymentStatus(str, Enum):
     ready_for_build = "ready_for_build"
     building = "building"
     extracting = "extracting"
+    extracting_failed = "extracting_failed"
     building_image = "building_image"
+    building_image_failed = "building_image_failed"
     deploying = "deploying"
+    deploying_failed = "deploying_failed"
     success = "success"
     failed = "failed"
 
@@ -120,8 +124,11 @@ class DeploymentStatus(str, Enum):
             cls.ready_for_build: "Ready for build",
             cls.building: "Building",
             cls.extracting: "Extracting",
+            cls.extracting_failed: "Extracting failed",
             cls.building_image: "Building image",
+            cls.building_image_failed: "Build failed",
             cls.deploying: "Deploying",
+            cls.deploying_failed: "Deploying failed",
             cls.success: "Success",
             cls.failed: "Failed",
         }[status]
@@ -345,42 +352,43 @@ def _wait_for_deployment(
     with toolkit.progress(
         next(messages), inline_logs=True, lines_to_show=20
     ) as progress:
-        for line in _stream_build_logs(deployment.id):
-            time_elapsed = time.monotonic() - started_at
+        with handle_http_errors(progress=progress):
+            for line in _stream_build_logs(deployment.id):
+                time_elapsed = time.monotonic() - started_at
 
-            data = json.loads(line)
+                data = json.loads(line)
 
-            if "message" in data:
-                progress.log(Text.from_ansi(data["message"].rstrip()))
+                if "message" in data:
+                    progress.log(Text.from_ansi(data["message"].rstrip()))
 
-            if data.get("type") == "complete":
-                progress.log("")
-                progress.log(
-                    f"🐔 Ready the chicken! Your app is ready at [link={deployment.url}]{deployment.url}[/link]"
-                )
+                if data.get("type") == "complete":
+                    progress.log("")
+                    progress.log(
+                        f"🐔 Ready the chicken! Your app is ready at [link={deployment.url}]{deployment.url}[/link]"
+                    )
 
-                progress.log("")
+                    progress.log("")
 
-                progress.log(
-                    f"You can also check the app logs at [link={deployment.dashboard_url}]{deployment.dashboard_url}[/link]"
-                )
+                    progress.log(
+                        f"You can also check the app logs at [link={deployment.dashboard_url}]{deployment.dashboard_url}[/link]"
+                    )
 
-                break
+                    break
 
-            if data.get("type") == "failed":
-                progress.log("")
-                progress.log(
-                    f"😔 Oh no! Something went wrong. Check out the logs at [link={deployment.dashboard_url}]{deployment.dashboard_url}[/link]"
-                )
-                raise typer.Exit(1)
+                if data.get("type") == "failed":
+                    progress.log("")
+                    progress.log(
+                        f"😔 Oh no! Something went wrong. Check out the logs at [link={deployment.dashboard_url}]{deployment.dashboard_url}[/link]"
+                    )
+                    raise typer.Exit(1)
 
-            if time_elapsed > 30:
-                messages = cycle(LONG_WAIT_MESSAGES)  # pragma: no cover
+                if time_elapsed > 30:
+                    messages = cycle(LONG_WAIT_MESSAGES)  # pragma: no cover
 
-            if (time.monotonic() - last_message_changed_at) > 2:
-                progress.title = next(messages)  # pragma: no cover
+                if (time.monotonic() - last_message_changed_at) > 2:
+                    progress.title = next(messages)  # pragma: no cover
 
-                last_message_changed_at = time.monotonic()  # pragma: no cover
+                    last_message_changed_at = time.monotonic()  # pragma: no cover
 
 
 def _setup_environment_variables(toolkit: RichToolkit, app_id: str) -> None:
@@ -549,10 +557,33 @@ def deploy(
 
     with get_rich_toolkit() as toolkit:
         if not is_logged_in():
-            logger.debug("User not logged in, showing waitlist form")
-            _waitlist_form(toolkit)
+            logger.debug("User not logged in, prompting for login or waitlist")
 
-            raise typer.Exit(1)
+            toolkit.print_title("Welcome to FastAPI Cloud!", tag="FastAPI")
+            toolkit.print_line()
+
+            toolkit.print(
+                "You need to be logged in to deploy to FastAPI Cloud.",
+                tag="info",
+            )
+            toolkit.print_line()
+
+            choice = toolkit.ask(
+                "What would you like to do?",
+                tag="auth",
+                options=[
+                    Option({"name": "Login to my existing account", "value": "login"}),
+                    Option({"name": "Join the waiting list", "value": "waitlist"}),
+                ],
+            )
+
+            toolkit.print_line()
+
+            if choice == "login":
+                login()
+            else:
+                _waitlist_form(toolkit)
+                raise typer.Exit(1)
 
         toolkit.print_title("Starting deployment", tag="FastAPI")
         toolkit.print_line()
@@ -585,7 +616,13 @@ def deploy(
                     "App not found. Make sure you're logged in the correct account."
                 )
 
-                raise typer.Exit(1)
+        if not app:
+            toolkit.print_line()
+            toolkit.print(
+                "If you deleted this app, you can run [bold]fastapi unlink[/] to unlink the local configuration.",
+                tag="tip",
+            )
+            raise typer.Exit(1)
 
         logger.debug("Creating archive for deployment")
         archive_path = archive(path or Path.cwd())  # noqa: F841

fastapi_cloud_cli-0.2.0/src/fastapi_cloud_cli/commands/unlink.py

@@ -0,0 +1,29 @@
+import logging
+import shutil
+from pathlib import Path
+from typing import Any
+
+import typer
+
+from fastapi_cloud_cli.utils.cli import get_rich_toolkit
+
+logger = logging.getLogger(__name__)
+
+
+def unlink() -> Any:
+    """
+    Unlink by deleting the `.fastapicloud` directory.
+    """
+    with get_rich_toolkit(minimal=True) as toolkit:
+        config_dir = Path.cwd() / ".fastapicloud"
+
+        if not config_dir.exists():
+            toolkit.print(
+                "No FastAPI Cloud configuration found in the current directory."
+            )
+            logger.debug(f"Configuration directory not found: {config_dir}")
+            raise typer.Exit(1)
+
+        shutil.rmtree(config_dir)
+        toolkit.print("FastAPI Cloud configuration has been unlinked successfully! 🚀")
+        logger.debug(f"Deleted configuration directory: {config_dir}")

{fastapi_cloud_cli-0.1.4 → fastapi_cloud_cli-0.2.0}/src/fastapi_cloud_cli/utils/api.py

@@ -13,6 +13,7 @@ class APIClient(httpx.Client):
 
         super().__init__(
             base_url=settings.base_api_url,
+            timeout=httpx.Timeout(20),
             headers={
                 "Authorization": f"Bearer {token}",
                 "User-Agent": f"fastapi-cloud-cli/{__version__}",

{fastapi_cloud_cli-0.1.4 → fastapi_cloud_cli-0.2.0}/tests/test_cli_deploy.py

@@ -60,10 +60,63 @@ def _get_random_deployment(
 
 
 @pytest.mark.respx(base_url=settings.base_api_url)
-def test_shows_waitlist_form_when_not_logged_in(
+def test_chooses_login_option_when_not_logged_in(
     logged_out_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
-    steps = [*"some@example.com", Keys.ENTER, Keys.RIGHT_ARROW, Keys.ENTER, Keys.ENTER]
+    steps = [Keys.ENTER]
+
+    respx_mock.post(
+        "/login/device/authorization", data={"client_id": settings.client_id}
+    ).mock(
+        return_value=Response(
+            200,
+            json={
+                "verification_uri_complete": "http://test.com",
+                "verification_uri": "http://test.com",
+                "user_code": "1234",
+                "device_code": "5678",
+            },
+        )
+    )
+    respx_mock.post(
+        "/login/device/token",
+        data={
+            "device_code": "5678",
+            "client_id": settings.client_id,
+            "grant_type": "urn:ietf:params:oauth:grant-type:device_code",
+        },
+    ).mock(return_value=Response(200, json={"access_token": "test_token_1234"}))
+
+    with changing_dir(tmp_path), patch(
+        "rich_toolkit.container.getchar"
+    ) as mock_getchar, patch(
+        "fastapi_cloud_cli.commands.login.typer.launch"
+    ) as mock_launch:
+        mock_getchar.side_effect = steps
+
+        result = runner.invoke(app, ["deploy"])
+
+    assert "Welcome to FastAPI Cloud!" in result.output
+    assert "What would you like to do?" in result.output
+    assert "Login to my existing account" in result.output
+    assert "Join the waiting list" in result.output
+    assert "Now you are logged in!" in result.output
+    assert mock_launch.called
+
+
+@pytest.mark.respx(base_url=settings.base_api_url)
+def test_chooses_waitlist_option_when_not_logged_in(
+    logged_out_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
+) -> None:
+    steps = [
+        Keys.DOWN_ARROW,
+        Keys.ENTER,
+        *"some@example.com",
+        Keys.ENTER,
+        Keys.RIGHT_ARROW,
+        Keys.ENTER,
+        Keys.ENTER,
+    ]
 
     respx_mock.post(
         "/users/waiting-list",
@@ -80,13 +133,17 @@ def test_shows_waitlist_form_when_not_logged_in(
     ).mock(return_value=Response(200))
 
     with changing_dir(tmp_path), patch(
-        "rich_toolkit.menu.click.getchar"
+        "rich_toolkit.container.getchar"
     ) as mock_getchar:
         mock_getchar.side_effect = steps
 
         result = runner.invoke(app, ["deploy"])
 
     assert result.exit_code == 1
+    assert "Welcome to FastAPI Cloud!" in result.output
+    assert "What would you like to do?" in result.output
+    assert "Login to my existing account" in result.output
+    assert "Join the waiting list" in result.output
     assert "We're currently in private beta" in result.output
     assert "Let's go! Thanks for your interest in FastAPI Cloud! 🚀" in result.output
 
@@ -96,6 +153,8 @@ def test_shows_waitlist_form_when_not_logged_in_longer_flow(
     logged_out_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
     steps = [
+        Keys.DOWN_ARROW,  # Select "Join the waiting list"
+        Keys.ENTER,
         *"some@example.com",
         Keys.ENTER,
         Keys.ENTER,
@@ -138,7 +197,7 @@ def test_shows_waitlist_form_when_not_logged_in_longer_flow(
     ).mock(return_value=Response(200))
 
     with changing_dir(tmp_path), patch(
-        "rich_toolkit.menu.click.getchar"
+        "rich_toolkit.container.getchar"
     ) as mock_getchar:
         mock_getchar.side_effect = steps
 
@@ -153,7 +212,7 @@ def test_asks_to_setup_the_app(logged_in_cli: None, tmp_path: Path) -> None:
     steps = [Keys.RIGHT_ARROW, Keys.ENTER]
 
     with changing_dir(tmp_path), patch(
-        "rich_toolkit.menu.click.getchar"
+        "rich_toolkit.container.getchar"
     ) as mock_getchar:
         mock_getchar.side_effect = steps
 
@@ -171,7 +230,9 @@ def test_shows_error_when_trying_to_get_teams(
 
     respx_mock.get("/teams/").mock(return_value=Response(500))
 
-    with changing_dir(tmp_path), patch("click.getchar") as mock_getchar:
+    with changing_dir(tmp_path), patch(
+        "rich_toolkit.container.getchar"
+    ) as mock_getchar:
         mock_getchar.side_effect = steps
 
         result = runner.invoke(app, ["deploy"])
@@ -189,7 +250,9 @@ def test_handles_invalid_auth(
 
     respx_mock.get("/teams/").mock(return_value=Response(401))
 
-    with changing_dir(tmp_path), patch("click.getchar") as mock_getchar:
+    with changing_dir(tmp_path), patch(
+        "rich_toolkit.container.getchar"
+    ) as mock_getchar:
         mock_getchar.side_effect = steps
 
         result = runner.invoke(app, ["deploy"])
@@ -215,7 +278,9 @@ def test_shows_teams(
         )
     )
 
-    with changing_dir(tmp_path), patch("click.getchar") as mock_getchar:
+    with changing_dir(tmp_path), patch(
+        "rich_toolkit.container.getchar"
+    ) as mock_getchar:
         mock_getchar.side_effect = steps
 
         result = runner.invoke(app, ["deploy"])
@@ -239,7 +304,9 @@ def test_asks_for_app_name_after_team(
         )
     )
 
-    with changing_dir(tmp_path), patch("click.getchar") as mock_getchar:
+    with changing_dir(tmp_path), patch(
+        "rich_toolkit.container.getchar"
+    ) as mock_getchar:
         mock_getchar.side_effect = steps
 
         result = runner.invoke(app, ["deploy"])
@@ -268,7 +335,9 @@ def test_creates_app_on_backend(
         return_value=Response(201, json=_get_random_app(team_id=team["id"]))
     )
 
-    with changing_dir(tmp_path), patch("click.getchar") as mock_getchar:
+    with changing_dir(tmp_path), patch(
+        "rich_toolkit.container.getchar"
+    ) as mock_getchar:
         mock_getchar.side_effect = steps
 
         result = runner.invoke(app, ["deploy"])
@@ -294,7 +363,9 @@ def test_uses_existing_app(
         return_value=Response(200, json={"data": [app_data]})
     )
 
-    with changing_dir(tmp_path), patch("click.getchar") as mock_getchar:
+    with changing_dir(tmp_path), patch(
+        "rich_toolkit.container.getchar"
+    ) as mock_getchar:
         mock_getchar.side_effect = steps
 
         result = runner.invoke(app, ["deploy"])
@@ -367,7 +438,9 @@ def test_exits_successfully_when_deployment_is_done(
         )
     )
 
-    with changing_dir(tmp_path), patch("click.getchar") as mock_getchar:
+    with changing_dir(tmp_path), patch(
+        "rich_toolkit.container.getchar"
+    ) as mock_getchar:
         mock_getchar.side_effect = steps
 
         result = runner.invoke(app, ["deploy"])
@@ -615,7 +688,9 @@ def _deploy_without_waiting(respx_mock: respx.MockRouter, tmp_path: Path) -> Res
         return_value=Response(200)
     )
 
-    with changing_dir(tmp_path), patch("click.getchar") as mock_getchar:
+    with changing_dir(tmp_path), patch(
+        "rich_toolkit.container.getchar"
+    ) as mock_getchar:
         mock_getchar.side_effect = steps
 
         return runner.invoke(app, ["deploy", "--no-wait"])
@@ -687,7 +762,9 @@ def test_creates_environment_variables_during_app_setup(
         f"/apps/{app_data['id']}/environment-variables/", json={"API_KEY": "secret123"}
     ).mock(return_value=Response(200))
 
-    with changing_dir(tmp_path), patch("click.getchar") as mock_getchar:
+    with changing_dir(tmp_path), patch(
+        "rich_toolkit.container.getchar"
+    ) as mock_getchar:
         mock_getchar.side_effect = steps
 
         result = runner.invoke(app, ["deploy"])
@@ -731,7 +808,9 @@ def test_rejects_invalid_environment_variable_names(
         f"/apps/{app_data['id']}/environment-variables/", json={"VALID_KEY": "value123"}
     ).mock(return_value=Response(200))
 
-    with changing_dir(tmp_path), patch("click.getchar") as mock_getchar:
+    with changing_dir(tmp_path), patch(
+        "rich_toolkit.container.getchar"
+    ) as mock_getchar:
         mock_getchar.side_effect = steps
 
         result = runner.invoke(app, ["deploy"])
@@ -747,6 +826,8 @@ def test_shows_error_for_invalid_waitlist_form_data(
     logged_out_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
     steps = [
+        Keys.DOWN_ARROW,  # Select "Join the waiting list"
+        Keys.ENTER,
         *"test@example.com",
         Keys.ENTER,
         Keys.ENTER,  # Choose to provide more information
@@ -754,7 +835,7 @@ def test_shows_error_for_invalid_waitlist_form_data(
     ]
 
     with changing_dir(tmp_path), patch(
-        "rich_toolkit.menu.click.getchar"
+        "rich_toolkit.container.getchar"
     ) as mock_getchar, patch("rich_toolkit.form.Form.run") as mock_form_run:
         mock_getchar.side_effect = steps
         # Simulate form returning data with invalid email field to trigger ValidationError
@@ -789,7 +870,9 @@ def test_shows_no_apps_found_message_when_team_has_no_apps(
         return_value=Response(200, json={"data": []})
     )
 
-    with changing_dir(tmp_path), patch("click.getchar") as mock_getchar:
+    with changing_dir(tmp_path), patch(
+        "rich_toolkit.container.getchar"
+    ) as mock_getchar:
         mock_getchar.side_effect = steps
 
         result = runner.invoke(app, ["deploy"])

fastapi_cloud_cli-0.2.0/tests/test_cli_unlink.py

@@ -0,0 +1,50 @@
+from pathlib import Path
+from unittest.mock import patch
+
+from typer.testing import CliRunner
+
+from fastapi_cloud_cli.cli import app
+
+runner = CliRunner()
+
+
+def test_unlink_removes_fastapicloud_dir(tmp_path: Path) -> None:
+    config_dir = tmp_path / ".fastapicloud"
+    config_dir.mkdir(parents=True)
+
+    cloud_json = config_dir / "cloud.json"
+    cloud_json.write_text('{"app_id": "123", "team_id": "456"}')
+
+    readme_file = config_dir / "README.md"
+    readme_file.write_text("# FastAPI Cloud Configuration")
+
+    gitignore_file = config_dir / ".gitignore"
+    gitignore_file.write_text("*")
+
+    with patch("fastapi_cloud_cli.commands.unlink.Path.cwd", return_value=tmp_path):
+        result = runner.invoke(app, ["unlink"])
+
+    assert result.exit_code == 0
+    assert (
+        "FastAPI Cloud configuration has been unlinked successfully! 🚀"
+        in result.output
+    )
+
+    assert not config_dir.exists()
+    assert not cloud_json.exists()
+    assert not readme_file.exists()
+    assert not gitignore_file.exists()
+
+
+def test_unlink_when_no_configuration_exists(tmp_path: Path) -> None:
+    config_dir = tmp_path / ".fastapicloud"
+    assert not config_dir.exists()
+
+    with patch("fastapi_cloud_cli.commands.unlink.Path.cwd", return_value=tmp_path):
+        result = runner.invoke(app, ["unlink"])
+
+    assert result.exit_code == 1
+    assert (
+        "No FastAPI Cloud configuration found in the current directory."
+        in result.output
+    )

{fastapi_cloud_cli-0.1.4 → fastapi_cloud_cli-0.2.0}/tests/test_deploy_utils.py

@@ -51,8 +51,11 @@ def test_includes_paths(path: Path) -> None:
         (DeploymentStatus.ready_for_build, "Ready for build"),
         (DeploymentStatus.building, "Building"),
         (DeploymentStatus.extracting, "Extracting"),
+        (DeploymentStatus.extracting_failed, "Extracting failed"),
         (DeploymentStatus.building_image, "Building image"),
+        (DeploymentStatus.building_image_failed, "Build failed"),
         (DeploymentStatus.deploying, "Deploying"),
+        (DeploymentStatus.deploying_failed, "Deploying failed"),
         (DeploymentStatus.success, "Success"),
         (DeploymentStatus.failed, "Failed"),
     ],

{fastapi_cloud_cli-0.1.4 → fastapi_cloud_cli-0.2.0}/tests/test_env_delete.py

@@ -122,7 +122,9 @@ def test_shows_selector_for_environment_variables(
         return_value=Response(204)
     )
 
-    with changing_dir(configured_app), patch("click.getchar", side_effect=steps):
+    with changing_dir(configured_app), patch(
+        "rich_toolkit.container.getchar", side_effect=steps
+    ):
         result = runner.invoke(app, ["env", "delete"])
 
     assert result.exit_code == 0

{fastapi_cloud_cli-0.1.4 → fastapi_cloud_cli-0.2.0}/tests/test_env_set.py

@@ -86,7 +86,9 @@ def test_asks_for_name_and_value(
         return_value=Response(200)
     )
 
-    with changing_dir(configured_app), patch("click.getchar", side_effect=steps):
+    with changing_dir(configured_app), patch(
+        "rich_toolkit.container.getchar", side_effect=steps
+    ):
         result = runner.invoke(app, ["env", "set"])
 
     assert result.exit_code == 0

{fastapi_cloud_cli-0.1.4 → fastapi_cloud_cli-0.2.0}/tests/utils.py

@@ -16,6 +16,7 @@ def changing_dir(directory: Union[str, Path]) -> Generator[None, None, None]:
 
 class Keys:
     RIGHT_ARROW = "\x1b[C"
+    DOWN_ARROW = "\x1b[B"
     ENTER = "\r"
     CTRL_C = "\x03"
     TAB = "\t"

fastapi_cloud_cli-0.1.4/src/fastapi_cloud_cli/__init__.py

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