fastapi-cloud-cli 0.5.2__tar.gz → 0.7.0__tar.gz

{fastapi_cloud_cli-0.5.2 → fastapi_cloud_cli-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastapi-cloud-cli
-Version: 0.5.2
+Version: 0.7.0
 Summary: Deploy and manage FastAPI Cloud apps from the command line 🚀
 Author-Email: Patrick Arminio <patrick@fastapilabs.com>
 License: MIT
@@ -25,7 +25,6 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Classifier: License :: OSI Approved :: MIT License
 Project-URL: Homepage, https://github.com/fastapilabs/fastapi-cloud-cli
 Project-URL: Documentation, https://fastapi.tiangolo.com/fastapi-cloud-cli/
 Project-URL: Repository, https://github.com/fastapilabs/fastapi-cloud-cli
@@ -39,7 +38,7 @@ Requires-Dist: httpx>=0.27.0
 Requires-Dist: rich-toolkit>=0.14.5
 Requires-Dist: pydantic[email]>=1.6.1
 Requires-Dist: sentry-sdk>=2.20.0
-Requires-Dist: fastar>=0.5.0
+Requires-Dist: fastar>=0.8.0
 Provides-Extra: standard
 Requires-Dist: uvicorn[standard]>=0.15.0; extra == "standard"
 Description-Content-Type: text/markdown

{fastapi_cloud_cli-0.5.2 → fastapi_cloud_cli-0.7.0}/pyproject.toml

@@ -29,7 +29,6 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
-    "License :: OSI Approved :: MIT License",
 ]
 dependencies = [
     "typer >= 0.12.3",
@@ -39,9 +38,9 @@ dependencies = [
     "rich-toolkit >= 0.14.5",
     "pydantic[email] >= 1.6.1",
     "sentry-sdk >= 2.20.0",
-    "fastar >= 0.5.0",
+    "fastar >= 0.8.0",
 ]
-version = "0.5.2"
+version = "0.7.0"
 
 [project.license]
 text = "MIT"
@@ -58,6 +57,17 @@ Repository = "https://github.com/fastapilabs/fastapi-cloud-cli"
 Issues = "https://github.com/fastapilabs/fastapi-cloud-cli/issues"
 Changelog = "https://github.com/fastapilabs/fastapi-cloud-cli/blob/main/release-notes.md"
 
+[dependency-groups]
+dev = [
+    "pre-commit>=2.17.0,<5.0.0",
+    "pytest>=4.4.0,<9.0.0",
+    "coverage[toml]>=6.2,<8.0",
+    "mypy==1.14.1",
+    "ruff==0.13.0",
+    "respx==0.22.0",
+    "time-machine==2.15.0",
+]
+
 [build-system]
 requires = [
     "pdm-backend",
@@ -74,7 +84,6 @@ path = "src/fastapi_cloud_cli/__init__.py"
 [tool.pdm.build]
 source-includes = [
     "tests/",
-    "requirements*.txt",
     "scripts/",
 ]
 

fastapi_cloud_cli-0.7.0/src/fastapi_cloud_cli/__init__.py

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

{fastapi_cloud_cli-0.5.2 → fastapi_cloud_cli-0.7.0}/src/fastapi_cloud_cli/commands/deploy.py

@@ -6,6 +6,7 @@ import time
 from enum import Enum
 from itertools import cycle
 from pathlib import Path
+from textwrap import dedent
 from typing import Any, Dict, List, Optional, Union
 
 import fastar
@@ -32,6 +33,19 @@ from fastapi_cloud_cli.utils.pydantic_compat import (
 logger = logging.getLogger(__name__)
 
 
+def _cancel_upload(deployment_id: str) -> None:
+    logger.debug("Cancelling upload for deployment: %s", deployment_id)
+
+    try:
+        with APIClient() as client:
+            response = client.post(f"/deployments/{deployment_id}/upload-cancelled")
+            response.raise_for_status()
+
+            logger.debug("Upload cancellation notification sent successfully")
+    except Exception as e:
+        logger.debug("Failed to notify server about upload cancellation: %s", e)
+
+
 def _get_app_name(path: Path) -> str:
     # TODO: use pyproject.toml to get the app name
     return path.name
@@ -68,7 +82,7 @@ def archive(path: Path, tar_path: Path) -> Path:
     logger.debug("Archive will be created at: %s", tar_path)
 
     file_count = 0
-    with fastar.open(tar_path, "w") as tar:
+    with fastar.open(tar_path, "w:zst") as tar:
         for filename in files:
             if filename.is_dir():
                 continue
@@ -260,8 +274,7 @@ LONG_WAIT_MESSAGES = [
 
 
 def _configure_app(toolkit: RichToolkit, path_to_deploy: Path) -> AppConfig:
-    if not toolkit.confirm(f"Setup and deploy [blue]{path_to_deploy}[/]?", tag="dir"):
-        raise typer.Exit(0)
+    toolkit.print(f"Setting up and deploying [blue]{path_to_deploy}[/blue]", tag="path")
 
     toolkit.print_line()
 
@@ -389,12 +402,15 @@ def _wait_for_deployment(
 
                     last_message_changed_at = time.monotonic()
 
-        except (BuildLogError, TooManyRetriesError) as e:
-            logger.error("Build log streaming failed: %s", e)
-            toolkit.print_line()
-            toolkit.print(
-                f"⚠️  Unable to stream build logs. Check the dashboard for status: [link={deployment.dashboard_url}]{deployment.dashboard_url}[/link]"
+        except (BuildLogError, TooManyRetriesError, TimeoutError) as e:
+            progress.set_error(
+                dedent(f"""
+                [error]Build log streaming failed: {e}[/]
+
+                Unable to stream build logs. Check the dashboard for status: [link={deployment.dashboard_url}]{deployment.dashboard_url}[/link]
+                """).strip()
             )
+
             raise typer.Exit(1) from e
 
 
@@ -599,15 +615,19 @@ def deploy(
                 logger.debug("Creating deployment for app: %s", app.id)
                 deployment = _create_deployment(app.id)
 
-                progress.log(
-                    f"Deployment created successfully! Deployment slug: {deployment.slug}"
-                )
+                try:
+                    progress.log(
+                        f"Deployment created successfully! Deployment slug: {deployment.slug}"
+                    )
 
-                progress.log("Uploading deployment...")
+                    progress.log("Uploading deployment...")
 
-                _upload_deployment(deployment.id, archive_path)
+                    _upload_deployment(deployment.id, archive_path)
 
-                progress.log("Deployment uploaded successfully!")
+                    progress.log("Deployment uploaded successfully!")
+                except KeyboardInterrupt:
+                    _cancel_upload(deployment.id)
+                    raise
 
         toolkit.print_line()
 

{fastapi_cloud_cli-0.5.2 → fastapi_cloud_cli-0.7.0}/src/fastapi_cloud_cli/utils/api.py

@@ -114,8 +114,7 @@ def attempts(
             for attempt_number in range(total_attempts):
                 if time.monotonic() - start > timeout.total_seconds():
                     raise TimeoutError(
-                        "Build log streaming timed out after %ds",
-                        timeout.total_seconds(),
+                        f"Build log streaming timed out after {timeout.total_seconds():.0f}s"
                     )
 
                 with attempt(attempt_number):

{fastapi_cloud_cli-0.5.2 → fastapi_cloud_cli-0.7.0}/tests/test_archive.py

@@ -1,6 +1,6 @@
-import tarfile
 from pathlib import Path
 
+import fastar
 import pytest
 
 from fastapi_cloud_cli.commands.deploy import archive
@@ -13,6 +13,13 @@ def src_path(tmp_path: Path) -> Path:
     return path
 
 
+@pytest.fixture
+def dst_path(tmp_path: Path) -> Path:
+    path = tmp_path / "destination"
+    path.mkdir()
+    return path
+
+
 @pytest.fixture
 def tar_path(tmp_path: Path) -> Path:
     return tmp_path / "archive.tar"
@@ -29,7 +36,7 @@ def test_archive_creates_tar_file(src_path: Path, tar_path: Path) -> None:
 
 
 def test_archive_excludes_venv_and_similar_folders(
-    src_path: Path, tar_path: Path
+    src_path: Path, tar_path: Path, dst_path: Path
 ) -> None:
     """Should exclude .venv directory from archive."""
     # the only files we want to include
@@ -53,24 +60,38 @@ def test_archive_excludes_venv_and_similar_folders(
 
     archive(src_path, tar_path)
 
-    with tarfile.open(tar_path, "r") as tar:
-        names = tar.getnames()
-        assert set(names) == {"main.py", "static/index.html"}
+    with fastar.open(tar_path, "r") as tar:
+        tar.unpack(dst_path)
+
+    assert set(dst_path.glob("**/*")) == {
+        dst_path / "main.py",
+        dst_path / "static",
+        dst_path / "static" / "index.html",
+    }
 
 
-def test_archive_preserves_relative_paths(src_path: Path, tar_path: Path) -> None:
+def test_archive_preserves_relative_paths(
+    src_path: Path, tar_path: Path, dst_path: Path
+) -> None:
     (src_path / "src").mkdir()
     (src_path / "src" / "app").mkdir()
     (src_path / "src" / "app" / "main.py").write_text("print('hello')")
 
     archive(src_path, tar_path)
 
-    with tarfile.open(tar_path, "r") as tar:
-        names = tar.getnames()
-        assert names == ["src/app/main.py"]
+    with fastar.open(tar_path, "r") as tar:
+        tar.unpack(dst_path)
 
+    assert set(dst_path.glob("**/*")) == {
+        dst_path / "src",
+        dst_path / "src" / "app",
+        dst_path / "src" / "app" / "main.py",
+    }
 
-def test_archive_respects_fastapicloudignore(src_path: Path, tar_path: Path) -> None:
+
+def test_archive_respects_fastapicloudignore(
+    src_path: Path, tar_path: Path, dst_path: Path
+) -> None:
     """Should exclude files specified in .fastapicloudignore."""
     (src_path / "main.py").write_text("print('hello')")
     (src_path / "config.py").write_text("CONFIG = 'value'")
@@ -82,16 +103,17 @@ def test_archive_respects_fastapicloudignore(src_path: Path, tar_path: Path) ->
 
     archive(src_path, tar_path)
 
-    with tarfile.open(tar_path, "r") as tar:
-        names = tar.getnames()
-        assert set(names) == {
-            "main.py",
-            "config.py",
-        }
+    with fastar.open(tar_path, "r") as tar:
+        tar.unpack(dst_path)
+
+    assert set(dst_path.glob("**/*")) == {
+        dst_path / "main.py",
+        dst_path / "config.py",
+    }
 
 
 def test_archive_respects_fastapicloudignore_unignore(
-    src_path: Path, tar_path: Path
+    src_path: Path, tar_path: Path, dst_path: Path
 ) -> None:
     """Test we can use .fastapicloudignore to unignore files inside .gitignore"""
     (src_path / "main.py").write_text("print('hello')")
@@ -109,12 +131,20 @@ def test_archive_respects_fastapicloudignore_unignore(
 
     archive(src_path, tar_path)
 
-    with tarfile.open(tar_path, "r") as tar:
-        names = tar.getnames()
-        assert set(names) == {"main.py", "static/build/style.css"}
+    with fastar.open(tar_path, "r") as tar:
+        tar.unpack(dst_path)
 
+    assert set(dst_path.glob("**/*")) == {
+        dst_path / "main.py",
+        dst_path / "static",
+        dst_path / "static" / "build",
+        dst_path / "static" / "build" / "style.css",
+    }
 
-def test_archive_includes_hidden_files(src_path: Path, tar_path: Path) -> None:
+
+def test_archive_includes_hidden_files(
+    src_path: Path, tar_path: Path, dst_path: Path
+) -> None:
     """Should include hidden files in the archive by default."""
     (src_path / "main.py").write_text("print('hello')")
     (src_path / ".env").write_text("SECRET_KEY=xyz")
@@ -123,10 +153,12 @@ def test_archive_includes_hidden_files(src_path: Path, tar_path: Path) -> None:
 
     archive(src_path, tar_path)
 
-    with tarfile.open(tar_path, "r") as tar:
-        names = tar.getnames()
-        assert set(names) == {
-            "main.py",
-            ".env",
-            ".config/settings.json",
-        }
+    with fastar.open(tar_path, "r") as tar:
+        tar.unpack(dst_path)
+
+    assert set(dst_path.glob("**/*")) == {
+        dst_path / "main.py",
+        dst_path / ".env",
+        dst_path / ".config",
+        dst_path / ".config" / "settings.json",
+    }

{fastapi_cloud_cli-0.5.2 → fastapi_cloud_cli-0.7.0}/tests/test_cli_deploy.py

@@ -15,6 +15,7 @@ from typer.testing import CliRunner
 
 from fastapi_cloud_cli.cli import app
 from fastapi_cloud_cli.config import Settings
+from fastapi_cloud_cli.utils.api import BuildLogError, TooManyRetriesError
 from tests.conftest import ConfiguredApp
 from tests.utils import Keys, build_logs_response, changing_dir
 
@@ -211,20 +212,6 @@ def test_shows_waitlist_form_when_not_logged_in_longer_flow(
     assert "Let's go! Thanks for your interest in FastAPI Cloud! 🚀" in result.output
 
 
-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.container.getchar"
-    ) as mock_getchar:
-        mock_getchar.side_effect = steps
-
-        result = runner.invoke(app, ["deploy"])
-
-        assert result.exit_code == 0
-        assert "Setup and deploy" in result.output
-
-
 @pytest.mark.respx(base_url=settings.base_api_url)
 def test_shows_error_when_trying_to_get_teams(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
@@ -323,7 +310,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, Keys.ENTER, *"demo", Keys.ENTER]
+    steps = [Keys.ENTER, Keys.ENTER, *"demo", Keys.ENTER]
 
     team = _get_random_team()
 
@@ -354,7 +341,7 @@ def test_creates_app_on_backend(
 def test_uses_existing_app(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
-    steps = [Keys.ENTER, Keys.ENTER, Keys.RIGHT_ARROW, Keys.ENTER, *"demo", Keys.ENTER]
+    steps = [Keys.ENTER, Keys.RIGHT_ARROW, Keys.ENTER, *"demo", Keys.ENTER]
 
     team = _get_random_team()
 
@@ -384,7 +371,6 @@ def test_exits_successfully_when_deployment_is_done(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
     steps = [
-        Keys.ENTER,
         Keys.ENTER,
         Keys.ENTER,
         *"demo",
@@ -634,7 +620,6 @@ def test_shows_error_when_app_does_not_exist(
 
 def _deploy_without_waiting(respx_mock: respx.MockRouter, tmp_path: Path) -> Result:
     steps = [
-        Keys.ENTER,
         Keys.ENTER,
         Keys.ENTER,
         *"demo",
@@ -759,7 +744,6 @@ def test_shows_no_apps_found_message_when_team_has_no_apps(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
     steps = [
-        Keys.ENTER,  # Setup and deploy
         Keys.ENTER,  # Select team
         Keys.RIGHT_ARROW,  # Choose existing app (No)
         Keys.ENTER,
@@ -788,11 +772,14 @@ def test_shows_no_apps_found_message_when_team_has_no_apps(
         )
 
 
+@pytest.mark.parametrize(
+    "error",
+    [BuildLogError, TooManyRetriesError, TimeoutError],
+)
 @pytest.mark.respx(base_url=settings.base_api_url)
-def test_handles_build_log_streaming_error(
-    logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
+def test_shows_error_message_on_build_exception(
+    logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter, error: Exception
 ) -> None:
-    """Test that BuildLogError is caught and shows dashboard link (lines 384, 387-392)."""
     app_data = _get_random_app()
     team_data = _get_random_team()
     app_id = app_data["id"]
@@ -819,11 +806,10 @@ def test_handles_build_log_streaming_error(
         return_value=Response(200)
     )
 
-    respx_mock.get(f"/deployments/{deployment_data['id']}/build-logs").mock(
-        return_value=Response(422, text="Error")
-    )
-
-    with changing_dir(tmp_path):
+    with changing_dir(tmp_path), patch(
+        "fastapi_cloud_cli.utils.api.APIClient.stream_build_logs",
+        side_effect=error,
+    ):
         result = runner.invoke(app, ["deploy"])
 
         assert result.exit_code == 1
@@ -832,10 +818,8 @@ def test_handles_build_log_streaming_error(
 
 
 @pytest.mark.respx(base_url=settings.base_api_url)
-def test_shows_error_message_when_build_log_streaming_fails(
-    logged_in_cli: None,
-    tmp_path: Path,
-    respx_mock: respx.MockRouter,
+def test_shows_error_message_on_build_log_http_error(
+    logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
     app_data = _get_random_app()
     team_data = _get_random_team()
@@ -870,6 +854,7 @@ def test_shows_error_message_when_build_log_streaming_fails(
     with changing_dir(tmp_path), patch("time.sleep"):
         result = runner.invoke(app, ["deploy"])
 
+        assert result.exit_code == 1
         assert "Unable to stream build logs" in result.output
         assert deployment_data["dashboard_url"] in result.output
 
@@ -1007,3 +992,68 @@ def test_long_wait_messages(
         result = runner.invoke(app, ["deploy"])
 
         assert "long wait message" in result.output
+
+
+@pytest.mark.respx(base_url=settings.base_api_url)
+def test_calls_upload_cancelled_when_user_interrupts(
+    logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
+) -> None:
+    app_data = _get_random_app()
+    team_data = _get_random_team()
+    app_id = app_data["id"]
+    team_id = team_data["id"]
+    deployment_data = _get_random_deployment(app_id=app_id)
+
+    config_path = tmp_path / ".fastapicloud" / "cloud.json"
+    config_path.parent.mkdir(parents=True, exist_ok=True)
+    config_path.write_text(f'{{"app_id": "{app_id}", "team_id": "{team_id}"}}')
+
+    respx_mock.get(f"/apps/{app_id}").mock(return_value=Response(200, json=app_data))
+    respx_mock.post(f"/apps/{app_id}/deployments/").mock(
+        return_value=Response(201, json=deployment_data)
+    )
+
+    upload_cancelled_route = respx_mock.post(
+        f"/deployments/{deployment_data['id']}/upload-cancelled"
+    ).mock(return_value=Response(200))
+
+    with changing_dir(tmp_path), patch(
+        "fastapi_cloud_cli.commands.deploy._upload_deployment",
+        side_effect=KeyboardInterrupt(),
+    ):
+        runner.invoke(app, ["deploy"])
+
+        assert upload_cancelled_route.called
+
+
+@pytest.mark.respx(base_url=settings.base_api_url)
+def test_cancel_upload_swallows_exceptions(
+    logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
+) -> None:
+    app_data = _get_random_app()
+    team_data = _get_random_team()
+    app_id = app_data["id"]
+    team_id = team_data["id"]
+    deployment_data = _get_random_deployment(app_id=app_id)
+
+    config_path = tmp_path / ".fastapicloud" / "cloud.json"
+    config_path.parent.mkdir(parents=True, exist_ok=True)
+    config_path.write_text(f'{{"app_id": "{app_id}", "team_id": "{team_id}"}}')
+
+    respx_mock.get(f"/apps/{app_id}").mock(return_value=Response(200, json=app_data))
+    respx_mock.post(f"/apps/{app_id}/deployments/").mock(
+        return_value=Response(201, json=deployment_data)
+    )
+
+    upload_cancelled_route = respx_mock.post(
+        f"/deployments/{deployment_data['id']}/upload-cancelled"
+    ).mock(return_value=Response(500))
+
+    with changing_dir(tmp_path), patch(
+        "fastapi_cloud_cli.commands.deploy._upload_deployment",
+        side_effect=KeyboardInterrupt(),
+    ):
+        result = runner.invoke(app, ["deploy"])
+
+        assert upload_cancelled_route.called
+        assert "HTTPStatusError" not in result.output

{fastapi_cloud_cli-0.5.2 → fastapi_cloud_cli-0.7.0}/tests/test_cli_login.py

@@ -19,7 +19,9 @@ assets_path = Path(__file__).parent / "assets"
 
 
 @pytest.mark.respx(base_url=settings.base_api_url)
-def test_shows_a_message_if_something_is_wrong(respx_mock: respx.MockRouter) -> None:
+def test_shows_a_message_if_something_is_wrong(
+    logged_out_cli: None, respx_mock: respx.MockRouter
+) -> None:
     with patch("fastapi_cloud_cli.commands.login.typer.launch") as mock_open:
         respx_mock.post(
             "/login/device/authorization", data={"client_id": settings.client_id}

fastapi_cloud_cli-0.5.2/requirements-tests.txt

@@ -1,8 +0,0 @@
--e .
-
-pytest >=4.4.0,<9.0.0
-coverage[toml] >=6.2,<8.0
-mypy ==1.14.1
-ruff ==0.13.0
-respx ==0.22.0
-time-machine ==2.15.0

fastapi_cloud_cli-0.5.2/requirements.txt

@@ -1,5 +0,0 @@
--e .
-
--r requirements-tests.txt
-
-pre-commit >=2.17.0,<5.0.0

fastapi_cloud_cli-0.5.2/src/fastapi_cloud_cli/__init__.py

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