fastapi-cloud-cli 0.2.1__tar.gz → 0.3.1__tar.gz

{fastapi_cloud_cli-0.2.1 → fastapi_cloud_cli-0.3.1}/PKG-INFO

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

{fastapi_cloud_cli-0.2.1 → fastapi_cloud_cli-0.3.1}/pyproject.toml

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

{fastapi_cloud_cli-0.2.1 → fastapi_cloud_cli-0.3.1}/requirements-tests.txt

@@ -3,5 +3,5 @@
 pytest >=4.4.0,<9.0.0
 coverage[toml] >=6.2,<8.0
 mypy ==1.14.1
-ruff ==0.12.0
+ruff ==0.13.0
 respx ==0.22.0

{fastapi_cloud_cli-0.2.1 → fastapi_cloud_cli-0.3.1}/requirements.txt

@@ -2,4 +2,4 @@
 
 -r requirements-tests.txt
 
-pre-commit >=2.17.0,<4.0.0
+pre-commit >=2.17.0,<5.0.0

fastapi_cloud_cli-0.3.1/src/fastapi_cloud_cli/__init__.py

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

{fastapi_cloud_cli-0.2.1 → fastapi_cloud_cli-0.3.1}/src/fastapi_cloud_cli/commands/deploy.py

@@ -25,7 +25,6 @@ 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
 from fastapi_cloud_cli.utils.cli import get_rich_toolkit, handle_http_errors
-from fastapi_cloud_cli.utils.env import validate_environment_variable_name
 
 logger = logging.getLogger(__name__)
 
@@ -49,7 +48,11 @@ def _should_exclude_entry(path: Path) -> bool:
 
 def archive(path: Path) -> Path:
     logger.debug("Starting archive creation for path: %s", path)
-    files = rignore.walk(path, should_exclude_entry=_should_exclude_entry)
+    files = rignore.walk(
+        path,
+        should_exclude_entry=_should_exclude_entry,
+        additional_ignore_paths=[".fastapicloudignore"],
+    )
 
     temp_dir = tempfile.mkdtemp()
     logger.debug("Created temp directory: %s", temp_dir)
@@ -64,6 +67,7 @@ def archive(path: Path) -> Path:
             if filename.is_dir():
                 continue
 
+            logger.debug("Adding %s to archive", filename.relative_to(path))
             tar.add(filename, arcname=filename.relative_to(path))
             file_count += 1
 
@@ -225,12 +229,6 @@ def _get_apps(team_id: str) -> List[AppResponse]:
     return [AppResponse.model_validate(app) for app in data]
 
 
-def _create_environment_variables(app_id: str, env_vars: Dict[str, str]) -> None:
-    with APIClient() as client:
-        response = client.patch(f"/apps/{app_id}/environment-variables/", json=env_vars)
-        response.raise_for_status()
-
-
 def _stream_build_logs(deployment_id: str) -> Generator[str, None, None]:
     with APIClient() as client:
         with client.stream(
@@ -395,45 +393,6 @@ def _wait_for_deployment(
                     last_message_changed_at = time.monotonic()  # pragma: no cover
 
 
-def _setup_environment_variables(toolkit: RichToolkit, app_id: str) -> None:
-    if not toolkit.confirm("Do you want to setup environment variables?", tag="env"):
-        return
-
-    toolkit.print_line()
-
-    env_vars = {}
-
-    while True:
-        key = toolkit.input(
-            "Enter the environment variable name: [ENTER to skip]", required=False
-        )
-
-        if key.strip() == "":
-            break
-
-        if not validate_environment_variable_name(key):
-            toolkit.print(
-                "[error]Invalid environment variable name.",
-            )
-
-        else:
-            value = toolkit.input(
-                "Enter the environment variable value:", password=True
-            )
-
-            env_vars[key] = value
-
-        toolkit.print_line()
-
-    toolkit.print_line()
-
-    with toolkit.progress("Setting up environment variables...") as progress:
-        with handle_http_errors(progress):
-            _create_environment_variables(app_id, env_vars)
-
-        progress.log("Environment variables set up successfully!")
-
-
 class SignupToWaitingList(BaseModel):
     email: EmailStr
     name: Optional[str] = None
@@ -601,9 +560,6 @@ def deploy(
             logger.debug("No app config found, configuring new app")
             app_config = _configure_app(toolkit, path_to_deploy=path_to_deploy)
             toolkit.print_line()
-
-            _setup_environment_variables(toolkit, app_config.app_id)
-            toolkit.print_line()
         else:
             logger.debug("Existing app config found, proceeding with deployment")
             toolkit.print("Deploying app...")

{fastapi_cloud_cli-0.2.1 → fastapi_cloud_cli-0.3.1}/src/fastapi_cloud_cli/commands/env.py

@@ -44,11 +44,13 @@ def _delete_environment_variable(app_id: str, name: str) -> bool:
     return True
 
 
-def _set_environment_variable(app_id: str, name: str, value: str) -> None:
+def _set_environment_variable(
+    app_id: str, name: str, value: str, is_secret: bool = False
+) -> None:
     with APIClient() as client:
-        response = client.patch(
+        response = client.post(
             f"/apps/{app_id}/environment-variables/",
-            json={name: value},
+            json={"name": name, "value": value, "is_secret": is_secret},
         )
         response.raise_for_status()
 

{fastapi_cloud_cli-0.2.1 → fastapi_cloud_cli-0.3.1}/src/fastapi_cloud_cli/commands/login.py

@@ -87,7 +87,7 @@ def login() -> Any:
 
             url = authorization_data.verification_uri_complete
 
-            progress.log(f"Opening {url}")
+            progress.log(f"Opening [link={url}]{url}[/link]")
 
         toolkit.print_line()
 

fastapi_cloud_cli-0.3.1/tests/test_archive.py

@@ -0,0 +1,103 @@
+import tarfile
+from pathlib import Path
+
+from fastapi_cloud_cli.commands.deploy import archive
+
+
+def test_archive_creates_tar_file(tmp_path: Path) -> None:
+    (tmp_path / "main.py").write_text("print('hello')")
+    (tmp_path / "config.json").write_text('{"key": "value"}')
+    (tmp_path / "subdir").mkdir()
+    (tmp_path / "subdir" / "utils.py").write_text("def helper(): pass")
+
+    tar_path = archive(tmp_path)
+
+    assert tar_path.exists()
+    assert tar_path.suffix == ".tar"
+    assert tar_path.name.startswith("fastapi-cloud-deploy-")
+
+
+def test_archive_excludes_venv_and_similar_folders(tmp_path: Path) -> None:
+    """Should exclude .venv directory from archive."""
+    # the only files we want to include
+    (tmp_path / "main.py").write_text("print('hello')")
+    (tmp_path / "static").mkdir()
+    (tmp_path / "static" / "index.html").write_text("<html></html>")
+    # virtualenv
+    (tmp_path / ".venv").mkdir()
+    (tmp_path / ".venv" / "lib").mkdir()
+    (tmp_path / ".venv" / "lib" / "package.py").write_text("# package")
+    # pycache
+    (tmp_path / "__pycache__").mkdir()
+    (tmp_path / "__pycache__" / "main.cpython-311.pyc").write_text("bytecode")
+    # pyc files
+    (tmp_path / "main.pyc").write_text("bytecode")
+    # mypy/pytest
+    (tmp_path / ".mypy_cache").mkdir()
+    (tmp_path / ".mypy_cache" / "file.json").write_text("{}")
+    (tmp_path / ".pytest_cache").mkdir()
+    (tmp_path / ".pytest_cache" / "cache.db").write_text("data")
+
+    tar_path = archive(tmp_path)
+
+    with tarfile.open(tar_path, "r") as tar:
+        names = tar.getnames()
+        assert set(names) == {"main.py", "static/index.html"}
+
+
+def test_archive_preserves_relative_paths(tmp_path: Path) -> None:
+    (tmp_path / "src").mkdir()
+    (tmp_path / "src" / "app").mkdir()
+    (tmp_path / "src" / "app" / "main.py").write_text("print('hello')")
+
+    tar_path = archive(tmp_path)
+
+    with tarfile.open(tar_path, "r") as tar:
+        names = tar.getnames()
+        assert names == ["src/app/main.py"]
+
+
+def test_archive_respects_fastapicloudignore(tmp_path: Path) -> None:
+    """Should exclude files specified in .fastapicloudignore."""
+    # Create test files
+    (tmp_path / "main.py").write_text("print('hello')")
+    (tmp_path / "config.py").write_text("CONFIG = 'value'")
+    (tmp_path / "secrets.env").write_text("SECRET_KEY=xyz")
+    (tmp_path / "data").mkdir()
+    (tmp_path / "data" / "file.txt").write_text("data")
+
+    # Create .fastapicloudignore file
+    (tmp_path / ".fastapicloudignore").write_text("secrets.env\ndata/\n")
+
+    # Create archive
+    tar_path = archive(tmp_path)
+
+    # Verify ignored files are excluded
+    with tarfile.open(tar_path, "r") as tar:
+        names = tar.getnames()
+        assert set(names) == {
+            "main.py",
+            "config.py",
+        }
+
+
+def test_archive_respects_fastapicloudignore_unignore(tmp_path: Path) -> None:
+    """Test we can use .fastapicloudignore to unignore files inside .gitignore"""
+    # Create test files
+    (tmp_path / "main.py").write_text("print('hello')")
+    (tmp_path / "static/build").mkdir(exist_ok=True, parents=True)
+    (tmp_path / "static/build/style.css").write_text("body { background: #bada55 }")
+    # Rignore needs a .git folder to make .gitignore work
+    (tmp_path / ".git").mkdir(exist_ok=True, parents=True)
+    (tmp_path / ".gitignore").write_text("build/")
+
+    # Create .fastapicloudignore file
+    (tmp_path / ".fastapicloudignore").write_text("!static/build")
+
+    # Create archive
+    tar_path = archive(tmp_path)
+
+    # Verify ignored files are excluded
+    with tarfile.open(tar_path, "r") as tar:
+        names = tar.getnames()
+        assert set(names) == {"main.py", "static/build/style.css"}

{fastapi_cloud_cli-0.2.1 → fastapi_cloud_cli-0.3.1}/tests/test_cli_deploy.py

@@ -386,8 +386,6 @@ def test_exits_successfully_when_deployment_is_done(
         Keys.ENTER,
         *"demo",
         Keys.ENTER,
-        Keys.RIGHT_ARROW,
-        Keys.ENTER,
     ]
 
     team_data = _get_random_team()
@@ -642,8 +640,6 @@ def _deploy_without_waiting(respx_mock: respx.MockRouter, tmp_path: Path) -> Res
         Keys.ENTER,
         *"demo",
         Keys.ENTER,
-        Keys.RIGHT_ARROW,
-        Keys.ENTER,
     ]
 
     team_data = _get_random_team()
@@ -730,97 +726,6 @@ def test_does_not_duplicate_entry_in_git_ignore(
     assert git_ignore_path.read_text() == ".fastapicloud\n"
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
-def test_creates_environment_variables_during_app_setup(
-    logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
-) -> None:
-    steps = [
-        Keys.ENTER,  # Setup and deploy
-        Keys.ENTER,  # Select team
-        Keys.ENTER,  # Create new app
-        *"demo",  # App name
-        Keys.ENTER,
-        Keys.ENTER,  # Setup environment variables (Yes)
-        *"API_KEY",  # Environment variable name
-        Keys.ENTER,
-        *"secret123",  # Environment variable value
-        Keys.ENTER,
-        Keys.ENTER,  # Empty key to finish
-        Keys.CTRL_C,  # Exit before deployment
-    ]
-
-    team = _get_random_team()
-    app_data = _get_random_app(team_id=team["id"])
-
-    respx_mock.get("/teams/").mock(return_value=Response(200, json={"data": [team]}))
-
-    respx_mock.post("/apps/", json={"name": "demo", "team_id": team["id"]}).mock(
-        return_value=Response(201, json=app_data)
-    )
-
-    env_vars_request = respx_mock.patch(
-        f"/apps/{app_data['id']}/environment-variables/", json={"API_KEY": "secret123"}
-    ).mock(return_value=Response(200))
-
-    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 env_vars_request.called
-        assert "Environment variables set up successfully!" in result.output
-
-
-@pytest.mark.respx(base_url=settings.base_api_url)
-def test_rejects_invalid_environment_variable_names(
-    logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
-) -> None:
-    steps = [
-        Keys.ENTER,  # Setup and deploy
-        Keys.ENTER,  # Select team
-        Keys.ENTER,  # Create new app
-        *"demo",  # App name
-        Keys.ENTER,
-        Keys.ENTER,  # Setup environment variables (Yes)
-        *"123-invalid",  # Invalid environment variable name (starts with digit, contains hyphen)
-        Keys.ENTER,
-        *"VALID_KEY",  # Valid environment variable name
-        Keys.ENTER,
-        *"value123",  # Environment variable value
-        Keys.ENTER,
-        Keys.ENTER,  # Empty key to finish
-        Keys.CTRL_C,  # Exit before deployment
-    ]
-
-    team = _get_random_team()
-    app_data = _get_random_app(team_id=team["id"])
-
-    respx_mock.get("/teams/").mock(return_value=Response(200, json={"data": [team]}))
-
-    respx_mock.post("/apps/", json={"name": "demo", "team_id": team["id"]}).mock(
-        return_value=Response(201, json=app_data)
-    )
-
-    env_vars_request = respx_mock.patch(
-        f"/apps/{app_data['id']}/environment-variables/", json={"VALID_KEY": "value123"}
-    ).mock(return_value=Response(200))
-
-    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 env_vars_request.called
-        assert "Invalid environment variable name." in result.output
-        assert "Environment variables set up successfully!" in result.output
-
-
 @pytest.mark.respx(base_url=settings.base_api_url)
 def test_shows_error_for_invalid_waitlist_form_data(
     logged_out_cli: None, tmp_path: Path, respx_mock: respx.MockRouter

{fastapi_cloud_cli-0.2.1 → fastapi_cloud_cli-0.3.1}/tests/test_env_set.py

@@ -47,9 +47,7 @@ def test_shows_a_message_if_app_is_not_configured(logged_in_cli: None) -> None:
 def test_shows_a_message_if_something_is_wrong(
     logged_in_cli: None, respx_mock: respx.MockRouter, configured_app: Path
 ) -> None:
-    respx_mock.patch("/apps/123/environment-variables/").mock(
-        return_value=Response(500)
-    )
+    respx_mock.post("/apps/123/environment-variables/").mock(return_value=Response(500))
 
     with changing_dir(configured_app):
         result = runner.invoke(app, ["env", "set", "SOME_VAR", "secret"])
@@ -65,9 +63,7 @@ def test_shows_a_message_if_something_is_wrong(
 def test_shows_message_when_it_sets(
     logged_in_cli: None, respx_mock: respx.MockRouter, configured_app: Path
 ) -> None:
-    respx_mock.patch("/apps/123/environment-variables/").mock(
-        return_value=Response(200)
-    )
+    respx_mock.post("/apps/123/environment-variables/").mock(return_value=Response(200))
 
     with changing_dir(configured_app):
         result = runner.invoke(app, ["env", "set", "SOME_VAR", "secret"])
@@ -82,9 +78,7 @@ def test_asks_for_name_and_value(
 ) -> None:
     steps = [*"SOME_VAR", Keys.ENTER, *"secret", Keys.ENTER]
 
-    respx_mock.patch("/apps/123/environment-variables/").mock(
-        return_value=Response(200)
-    )
+    respx_mock.post("/apps/123/environment-variables/").mock(return_value=Response(200))
 
     with changing_dir(configured_app), patch(
         "rich_toolkit.container.getchar", side_effect=steps

fastapi_cloud_cli-0.2.1/src/fastapi_cloud_cli/__init__.py

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