fastapi-cloud-cli 0.10.1__tar.gz → 0.11.0__tar.gz

{fastapi_cloud_cli-0.10.1 → fastapi_cloud_cli-0.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastapi-cloud-cli
-Version: 0.10.1
+Version: 0.11.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.10.1 → fastapi_cloud_cli-0.11.0}/pyproject.toml

@@ -39,7 +39,7 @@ dependencies = [
     "sentry-sdk >= 2.20.0",
     "fastar >= 0.8.0",
 ]
-version = "0.10.1"
+version = "0.11.0"
 
 [project.license]
 text = "MIT"

fastapi_cloud_cli-0.11.0/src/fastapi_cloud_cli/__init__.py

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

{fastapi_cloud_cli-0.10.1 → fastapi_cloud_cli-0.11.0}/src/fastapi_cloud_cli/cli.py

@@ -2,6 +2,7 @@ import typer
 
 from .commands.deploy import deploy
 from .commands.env import env_app
+from .commands.link import link
 from .commands.login import login
 from .commands.logout import logout
 from .commands.logs import logs
@@ -25,6 +26,7 @@ cloud_app = typer.Typer(
 
 # fastapi cloud [command]
 cloud_app.command()(deploy)
+cloud_app.command()(link)
 cloud_app.command()(login)
 cloud_app.command()(logs)
 cloud_app.command()(logout)

{fastapi_cloud_cli-0.10.1 → fastapi_cloud_cli-0.11.0}/src/fastapi_cloud_cli/commands/deploy.py

@@ -62,6 +62,9 @@ def _should_exclude_entry(path: Path) -> bool:
     if path.suffix == ".pyc":
         return True
 
+    if path.name == ".env" or path.name.startswith(".env."):
+        return True
+
     return False
 
 

fastapi_cloud_cli-0.11.0/src/fastapi_cloud_cli/commands/link.py

@@ -0,0 +1,117 @@
+import logging
+from pathlib import Path
+from typing import Any
+
+import typer
+from rich_toolkit.menu import Option
+
+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 Identity
+from fastapi_cloud_cli.utils.cli import get_rich_toolkit, handle_http_errors
+
+logger = logging.getLogger(__name__)
+
+
+def link() -> Any:
+    """
+    Link a local directory to an existing FastAPI Cloud app.
+    """
+    identity = Identity()
+
+    with get_rich_toolkit() as toolkit:
+        if not identity.is_logged_in():
+            toolkit.print(
+                "[error]You need to be logged in to link an app.[/]",
+            )
+            toolkit.print_line()
+            toolkit.print(
+                "Run [bold]fastapi cloud login[/] to authenticate.",
+                tag="tip",
+            )
+            raise typer.Exit(1)
+
+        path_to_link = Path.cwd()
+
+        if get_app_config(path_to_link):
+            toolkit.print(
+                "[error]This directory is already linked to an app.[/]",
+            )
+            toolkit.print_line()
+            toolkit.print(
+                "Run [bold]fastapi cloud unlink[/] first to remove the existing configuration.",
+                tag="tip",
+            )
+            raise typer.Exit(1)
+
+        toolkit.print_title("Link to FastAPI Cloud", tag="FastAPI")
+        toolkit.print_line()
+
+        with toolkit.progress("Fetching teams...") as progress:
+            with handle_http_errors(
+                progress, message="Error fetching teams. Please try again later."
+            ):
+                with APIClient() as client:
+                    response = client.get("/teams/")
+                    response.raise_for_status()
+                    teams_data = response.json()["data"]
+
+        if not teams_data:
+            toolkit.print(
+                "[error]No teams found. Please create a team first.[/]",
+            )
+            raise typer.Exit(1)
+
+        toolkit.print_line()
+
+        team = toolkit.ask(
+            "Select the team:",
+            tag="team",
+            options=[
+                Option({"name": t["name"], "value": {"id": t["id"], "name": t["name"]}})
+                for t in teams_data
+            ],
+        )
+
+        toolkit.print_line()
+
+        with toolkit.progress("Fetching apps...") as progress:
+            with handle_http_errors(
+                progress, message="Error fetching apps. Please try again later."
+            ):
+                with APIClient() as client:
+                    response = client.get("/apps/", params={"team_id": team["id"]})
+                    response.raise_for_status()
+                    apps_data = response.json()["data"]
+
+        if not apps_data:
+            toolkit.print(
+                "[error]No apps found in this team.[/]",
+            )
+            toolkit.print_line()
+            toolkit.print(
+                "Run [bold]fastapi cloud deploy[/] to create and deploy a new app.",
+                tag="tip",
+            )
+            raise typer.Exit(1)
+
+        toolkit.print_line()
+
+        app = toolkit.ask(
+            "Select the app to link:",
+            tag="app",
+            options=[
+                Option({"name": a["slug"], "value": {"id": a["id"], "slug": a["slug"]}})
+                for a in apps_data
+            ],
+        )
+
+        toolkit.print_line()
+
+        app_config = AppConfig(app_id=app["id"], team_id=team["id"])
+        write_app_config(path_to_link, app_config)
+
+        toolkit.print(
+            f"Successfully linked to app [bold]{app['slug']}[/bold]! 🔗",
+        )
+        logger.debug(f"Linked to app: {app['id']} in team: {team['id']}")

{fastapi_cloud_cli-0.10.1 → fastapi_cloud_cli-0.11.0}/tests/test_archive.py

@@ -143,12 +143,13 @@ def test_archive_respects_fastapicloudignore_unignore(
     }
 
 
-def test_archive_includes_hidden_files(
+def test_archive_includes_hidden_files_but_excludes_env(
     src_path: Path, tar_path: Path, dst_path: Path
 ) -> None:
-    """Should include hidden files in the archive by default."""
+    """Should include hidden files but exclude .env files."""
     (src_path / "main.py").write_text("print('hello')")
     (src_path / ".env").write_text("SECRET_KEY=xyz")
+    (src_path / ".env.local").write_text("LOCAL_KEY=abc")
     (src_path / ".config").mkdir()
     (src_path / ".config" / "settings.json").write_text('{"setting": "value"}')
 
@@ -159,7 +160,6 @@ def test_archive_includes_hidden_files(
 
     assert set(dst_path.glob("**/*")) == {
         dst_path / "main.py",
-        dst_path / ".env",
         dst_path / ".config",
         dst_path / ".config" / "settings.json",
     }

fastapi_cloud_cli-0.11.0/tests/test_cli_link.py

@@ -0,0 +1,191 @@
+from pathlib import Path
+from unittest.mock import patch
+
+import pytest
+import respx
+from httpx import Response
+from typer.testing import CliRunner
+
+from fastapi_cloud_cli.cli import cloud_app as app
+from fastapi_cloud_cli.config import Settings
+from fastapi_cloud_cli.utils.apps import AppConfig
+from tests.conftest import ConfiguredApp
+from tests.utils import Keys, changing_dir
+
+runner = CliRunner()
+settings = Settings.get()
+
+
+def test_shows_a_message_if_not_logged_in(logged_out_cli: None) -> None:
+    result = runner.invoke(app, ["link"])
+
+    assert result.exit_code == 1
+    assert "You need to be logged in to link an app." in result.output
+
+
+def test_shows_a_message_if_already_linked(
+    logged_in_cli: None, configured_app: ConfiguredApp
+) -> None:
+    with changing_dir(configured_app.path):
+        result = runner.invoke(app, ["link"])
+
+    assert result.exit_code == 1
+    assert "This directory is already linked to an app." in result.output
+
+
+@pytest.mark.respx(base_url=settings.base_api_url)
+def test_shows_a_message_if_no_teams(
+    logged_in_cli: None, respx_mock: respx.MockRouter, tmp_path: Path
+) -> None:
+    respx_mock.get("/teams/").mock(return_value=Response(200, json={"data": []}))
+
+    with changing_dir(tmp_path):
+        result = runner.invoke(app, ["link"])
+
+    assert result.exit_code == 1
+    assert "No teams found" in result.output
+
+
+@pytest.mark.respx(base_url=settings.base_api_url)
+def test_shows_a_message_if_no_apps(
+    logged_in_cli: None, respx_mock: respx.MockRouter, tmp_path: Path
+) -> None:
+    steps = [Keys.ENTER]
+
+    respx_mock.get("/teams/").mock(
+        return_value=Response(
+            200, json={"data": [{"id": "team-1", "name": "My Team", "slug": "my-team"}]}
+        )
+    )
+    respx_mock.get("/apps/", params={"team_id": "team-1"}).mock(
+        return_value=Response(200, json={"data": []})
+    )
+
+    with (
+        changing_dir(tmp_path),
+        patch("rich_toolkit.container.getchar") as mock_getchar,
+    ):
+        mock_getchar.side_effect = steps
+        result = runner.invoke(app, ["link"])
+
+    assert result.exit_code == 1
+    assert "No apps found in this team." in result.output
+
+
+@pytest.mark.respx(base_url=settings.base_api_url)
+def test_links_successfully(
+    logged_in_cli: None, respx_mock: respx.MockRouter, tmp_path: Path
+) -> None:
+    steps = [Keys.ENTER, Keys.ENTER]
+
+    respx_mock.get("/teams/").mock(
+        return_value=Response(
+            200, json={"data": [{"id": "team-1", "name": "My Team", "slug": "my-team"}]}
+        )
+    )
+    respx_mock.get("/apps/", params={"team_id": "team-1"}).mock(
+        return_value=Response(200, json={"data": [{"id": "app-1", "slug": "my-app"}]})
+    )
+
+    with (
+        changing_dir(tmp_path),
+        patch("rich_toolkit.container.getchar") as mock_getchar,
+    ):
+        mock_getchar.side_effect = steps
+        result = runner.invoke(app, ["link"])
+
+    assert result.exit_code == 0
+    assert "Successfully linked to app" in result.output
+    assert "my-app" in result.output
+
+    config_path = tmp_path / ".fastapicloud" / "cloud.json"
+    assert config_path.exists()
+    config = AppConfig.model_validate_json(config_path.read_text())
+    assert config.app_id == "app-1"
+    assert config.team_id == "team-1"
+
+
+@pytest.mark.respx(base_url=settings.base_api_url)
+def test_shows_error_on_teams_api_failure(
+    logged_in_cli: None, respx_mock: respx.MockRouter, tmp_path: Path
+) -> None:
+    respx_mock.get("/teams/").mock(return_value=Response(500))
+
+    with changing_dir(tmp_path):
+        result = runner.invoke(app, ["link"])
+
+    assert result.exit_code == 1
+    assert "Error fetching teams" in result.output
+
+
+@pytest.mark.respx(base_url=settings.base_api_url)
+def test_shows_error_on_apps_api_failure(
+    logged_in_cli: None, respx_mock: respx.MockRouter, tmp_path: Path
+) -> None:
+    steps = [Keys.ENTER]
+
+    respx_mock.get("/teams/").mock(
+        return_value=Response(
+            200, json={"data": [{"id": "team-1", "name": "My Team", "slug": "my-team"}]}
+        )
+    )
+    respx_mock.get("/apps/", params={"team_id": "team-1"}).mock(
+        return_value=Response(500)
+    )
+
+    with (
+        changing_dir(tmp_path),
+        patch("rich_toolkit.container.getchar") as mock_getchar,
+    ):
+        mock_getchar.side_effect = steps
+        result = runner.invoke(app, ["link"])
+
+    assert result.exit_code == 1
+    assert "Error fetching apps" in result.output
+
+
+@pytest.mark.respx(base_url=settings.base_api_url)
+def test_links_with_multiple_teams_and_apps(
+    logged_in_cli: None, respx_mock: respx.MockRouter, tmp_path: Path
+) -> None:
+    steps = [Keys.DOWN_ARROW, Keys.ENTER, Keys.DOWN_ARROW, Keys.ENTER]
+
+    respx_mock.get("/teams/").mock(
+        return_value=Response(
+            200,
+            json={
+                "data": [
+                    {"id": "team-1", "name": "Team One", "slug": "team-one"},
+                    {"id": "team-2", "name": "Team Two", "slug": "team-two"},
+                ]
+            },
+        )
+    )
+    respx_mock.get("/apps/", params={"team_id": "team-2"}).mock(
+        return_value=Response(
+            200,
+            json={
+                "data": [
+                    {"id": "app-1", "slug": "first-app"},
+                    {"id": "app-2", "slug": "second-app"},
+                ]
+            },
+        )
+    )
+
+    with (
+        changing_dir(tmp_path),
+        patch("rich_toolkit.container.getchar") as mock_getchar,
+    ):
+        mock_getchar.side_effect = steps
+        result = runner.invoke(app, ["link"])
+
+    assert result.exit_code == 0
+    assert "Successfully linked to app" in result.output
+    assert "second-app" in result.output
+
+    config_path = tmp_path / ".fastapicloud" / "cloud.json"
+    assert config_path.exists()
+    config = AppConfig.model_validate_json(config_path.read_text())
+    assert config.app_id == "app-2"
+    assert config.team_id == "team-2"

{fastapi_cloud_cli-0.10.1 → fastapi_cloud_cli-0.11.0}/tests/test_deploy_utils.py

@@ -19,6 +19,11 @@ from fastapi_cloud_cli.commands.deploy import DeploymentStatus, _should_exclude_
         Path(".venv"),
         Path("__pycache__"),
         Path("module.pyc"),
+        Path("/project/.env"),
+        Path("/project/.env.local"),
+        Path("/project/.env.production"),
+        Path(".env"),
+        Path(".env.development"),
     ],
 )
 def test_excludes_paths(path: Path) -> None:
@@ -37,6 +42,8 @@ def test_excludes_paths(path: Path) -> None:
         Path("/project/src/module.pyx"),  # similar to .pyc but different
         Path("/project/config.json"),
         Path("/project/README.md"),
+        Path("/project/.envrc"),  # not a .env file
+        Path("/project/env.py"),  # not a .env file
     ],
 )
 def test_includes_paths(path: Path) -> None:

fastapi_cloud_cli-0.10.1/src/fastapi_cloud_cli/__init__.py

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