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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastapi-cloud-cli
-Version: 0.11.0
+Version: 0.13.0
 Summary: Deploy and manage FastAPI Cloud apps from the command line 🚀
 Author-Email: Patrick Arminio <patrick@fastapilabs.com>
 License: MIT
@@ -19,7 +19,6 @@ Classifier: Framework :: FastAPI
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -29,13 +28,15 @@ Project-URL: Documentation, https://fastapi.tiangolo.com/fastapi-cloud-cli/
 Project-URL: Repository, https://github.com/fastapilabs/fastapi-cloud-cli
 Project-URL: Issues, https://github.com/fastapilabs/fastapi-cloud-cli/issues
 Project-URL: Changelog, https://github.com/fastapilabs/fastapi-cloud-cli/blob/main/release-notes.md
-Requires-Python: >=3.9
-Requires-Dist: typer>=0.12.3
-Requires-Dist: uvicorn[standard]>=0.15.0
+Requires-Python: >=3.10
+Requires-Dist: typer>=0.16.0
+Requires-Dist: uvicorn[standard]>=0.17.6
 Requires-Dist: rignore>=0.5.1
 Requires-Dist: httpx>=0.27.0
-Requires-Dist: rich-toolkit>=0.14.5
-Requires-Dist: pydantic[email]>=2.0
+Requires-Dist: rich-toolkit>=0.19.4
+Requires-Dist: pydantic[email]>=2.7.4; python_version < "3.13"
+Requires-Dist: pydantic[email]>=2.8.0; python_version == "3.13"
+Requires-Dist: pydantic[email]>=2.12.0; python_version >= "3.14"
 Requires-Dist: sentry-sdk>=2.20.0
 Requires-Dist: fastar>=0.8.0
 Provides-Extra: standard

{fastapi_cloud_cli-0.11.0 → fastapi_cloud_cli-0.13.0}/pyproject.toml

@@ -5,7 +5,7 @@ description = "Deploy and manage FastAPI Cloud apps from the command line 🚀"
 authors = [
     { name = "Patrick Arminio", email = "patrick@fastapilabs.com" },
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 readme = "README.md"
 classifiers = [
     "Intended Audience :: Information Technology",
@@ -23,23 +23,24 @@ classifiers = [
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-    "typer >= 0.12.3",
-    "uvicorn[standard] >= 0.15.0",
+    "typer >= 0.16.0",
+    "uvicorn[standard] >= 0.17.6",
     "rignore >= 0.5.1",
     "httpx >= 0.27.0",
-    "rich-toolkit >= 0.14.5",
-    "pydantic[email] >= 2.0",
+    "rich-toolkit >= 0.19.4",
+    "pydantic[email] >= 2.7.4; python_version < '3.13'",
+    "pydantic[email] >= 2.8.0; python_version == '3.13'",
+    "pydantic[email] >= 2.12.0; python_version >= '3.14'",
     "sentry-sdk >= 2.20.0",
     "fastar >= 0.8.0",
 ]
-version = "0.11.0"
+version = "0.13.0"
 
 [project.license]
 text = "MIT"
@@ -59,8 +60,8 @@ Changelog = "https://github.com/fastapilabs/fastapi-cloud-cli/blob/main/release-
 [dependency-groups]
 dev = [
     "prek>=0.2.24,<1.0.0",
-    "pytest>=4.4.0,<9.0.0",
-    "coverage[toml]>=6.2,<8.0",
+    "pytest>=7.0.0,<9.0.0",
+    "coverage[toml]>=7.2,<8.0",
     "mypy==1.14.1",
     "ruff==0.13.0",
     "respx==0.22.0",
@@ -101,6 +102,7 @@ source = [
     "src",
     "tests",
 ]
+relative_files = true
 context = "${CONTEXT}"
 dynamic_context = "test_function"
 omit = [

fastapi_cloud_cli-0.13.0/src/fastapi_cloud_cli/__init__.py

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

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

@@ -1,19 +1,20 @@
 import contextlib
 import logging
+import re
 import subprocess
 import tempfile
 import time
 from enum import Enum
 from itertools import cycle
-from pathlib import Path
+from pathlib import Path, PurePosixPath
 from textwrap import dedent
-from typing import Annotated, Any, Optional, Union
+from typing import Annotated, Any
 
 import fastar
 import rignore
 import typer
 from httpx import Client
-from pydantic import BaseModel, EmailStr, TypeAdapter, ValidationError
+from pydantic import AfterValidator, BaseModel, EmailStr, TypeAdapter, ValidationError
 from rich.text import Text
 from rich_toolkit import RichToolkit
 from rich_toolkit.menu import Option
@@ -27,6 +28,39 @@ from fastapi_cloud_cli.utils.cli import get_rich_toolkit, handle_http_errors
 logger = logging.getLogger(__name__)
 
 
+def validate_app_directory(v: str | None) -> str | None:
+    if v is None:
+        return None
+
+    v = v.strip()
+
+    if not v:
+        return None
+
+    if v.startswith("~"):
+        raise ValueError("cannot start with '~'")
+
+    path = PurePosixPath(v)
+
+    if path.is_absolute():
+        raise ValueError("must be a relative path, not absolute")
+
+    if ".." in path.parts:
+        raise ValueError("cannot contain '..' path segments")
+
+    normalized = path.as_posix()
+
+    if not re.fullmatch(r"[A-Za-z0-9._/ -]+", normalized):
+        raise ValueError(
+            "contains invalid characters (allowed: letters, numbers, space, / . _ -)"
+        )
+
+    return normalized
+
+
+AppDirectory = Annotated[str | None, AfterValidator(validate_app_directory)]
+
+
 def _cancel_upload(deployment_id: str) -> None:
     logger.debug("Cancelling upload for deployment: %s", deployment_id)
 
@@ -113,13 +147,26 @@ def _get_teams() -> list[Team]:
 class AppResponse(BaseModel):
     id: str
     slug: str
+    directory: str | None
+
+
+def _update_app(app_id: str, directory: str | None) -> AppResponse:
+    with APIClient() as client:
+        response = client.patch(
+            f"/apps/{app_id}",
+            json={"directory": directory},
+        )
+
+        response.raise_for_status()
+
+        return AppResponse.model_validate(response.json())
 
 
-def _create_app(team_id: str, app_name: str) -> AppResponse:
+def _create_app(team_id: str, app_name: str, directory: str | None) -> AppResponse:
     with APIClient() as client:
         response = client.post(
             "/apps/",
-            json={"name": app_name, "team_id": team_id},
+            json={"name": app_name, "team_id": team_id, "directory": directory},
         )
 
         response.raise_for_status()
@@ -226,7 +273,7 @@ def _upload_deployment(deployment_id: str, archive_path: Path) -> None:
         logger.debug("Upload notification sent successfully")
 
 
-def _get_app(app_slug: str) -> Optional[AppResponse]:
+def _get_app(app_slug: str) -> AppResponse | None:
     with APIClient() as client:
         response = client.get(f"/apps/{app_slug}")
 
@@ -278,7 +325,7 @@ def _configure_app(toolkit: RichToolkit, path_to_deploy: Path) -> AppConfig:
 
     with toolkit.progress("Fetching teams...") as progress:
         with handle_http_errors(
-            progress, message="Error fetching teams. Please try again later."
+            progress, default_message="Error fetching teams. Please try again later."
         ):
             teams = _get_teams()
 
@@ -298,12 +345,12 @@ def _configure_app(toolkit: RichToolkit, path_to_deploy: Path) -> AppConfig:
 
     toolkit.print_line()
 
-    selected_app: Optional[AppResponse] = None
+    selected_app: AppResponse | None = None
 
     if not create_new_app:
         with toolkit.progress("Fetching apps...") as progress:
             with handle_http_errors(
-                progress, message="Error fetching apps. Please try again later."
+                progress, default_message="Error fetching apps. Please try again later."
             ):
                 apps = _get_apps(team.id)
 
@@ -332,10 +379,26 @@ def _configure_app(toolkit: RichToolkit, path_to_deploy: Path) -> AppConfig:
 
     toolkit.print_line()
 
+    initial_directory = selected_app.directory if selected_app else ""
+
+    directory_input = toolkit.input(
+        title="Path to the directory containing your app (e.g. src, backend):",
+        tag="dir",
+        value=initial_directory or "",
+        placeholder="[italic]Leave empty if it's the current directory[/italic]",
+        validator=TypeAdapter(AppDirectory),
+    )
+
+    directory: str | None = 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]")
+    toolkit.print(f"Directory: [bold]{directory or '.'}[/bold]")
+
     toolkit.print_line()
 
     choice = toolkit.ask(
@@ -352,12 +415,21 @@ def _configure_app(toolkit: RichToolkit, path_to_deploy: Path) -> AppConfig:
         toolkit.print("Deployment cancelled.")
         raise typer.Exit(0)
 
-    if selected_app:  # pragma: no cover
-        app = selected_app
+    if selected_app:
+        if directory != selected_app.directory:
+            with (
+                toolkit.progress(title="Updating app directory...") as progress,
+                handle_http_errors(progress),
+            ):
+                app = _update_app(selected_app.id, directory=directory)
+
+                progress.log(f"App directory updated to '{directory or '.'}'")
+        else:
+            app = selected_app
     else:
         with toolkit.progress(title="Creating app...") as progress:
             with handle_http_errors(progress):
-                app = _create_app(team.id, app_name)
+                app = _create_app(team.id, app_name, directory=directory)
 
             progress.log(f"App created successfully! App slug: {app.slug}")
 
@@ -446,13 +518,13 @@ def _wait_for_deployment(
 
 class SignupToWaitingList(BaseModel):
     email: EmailStr
-    name: Optional[str] = None
-    organization: Optional[str] = None
-    role: Optional[str] = None
-    team_size: Optional[str] = None
-    location: Optional[str] = None
-    use_case: Optional[str] = None
-    secret_code: Optional[str] = None
+    name: str | None = None
+    organization: str | None = None
+    role: str | None = None
+    team_size: str | None = None
+    location: str | None = None
+    use_case: str | None = None
+    secret_code: str | None = None
 
 
 def _send_waitlist_form(
@@ -552,7 +624,7 @@ def _waitlist_form(toolkit: RichToolkit) -> None:
 
 def deploy(
     path: Annotated[
-        Union[Path, None],
+        Path | None,
         typer.Argument(
             help="A path to the folder containing the app you want to deploy"
         ),
@@ -561,7 +633,7 @@ def deploy(
         bool, typer.Option("--no-wait", help="Skip waiting for deployment status")
     ] = False,
     provided_app_id: Annotated[
-        Union[str, None],
+        str | None,
         typer.Option(
             "--app-id",
             help="Application ID to deploy to",
@@ -586,10 +658,16 @@ def deploy(
             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",
-            )
+            if identity.token and identity.is_expired():
+                toolkit.print(
+                    "Your session has expired. Please log in again.",
+                    tag="info",
+                )
+            else:
+                toolkit.print(
+                    "You need to be logged in to deploy to FastAPI Cloud.",
+                    tag="info",
+                )
             toolkit.print_line()
 
             choice = toolkit.ask(
@@ -601,8 +679,6 @@ def deploy(
                 ],
             )
 
-            toolkit.print_line()
-
             if choice == "login":
                 login()
             else:

{fastapi_cloud_cli-0.11.0 → fastapi_cloud_cli-0.13.0}/src/fastapi_cloud_cli/commands/env.py

@@ -1,6 +1,6 @@
 import logging
 from pathlib import Path
-from typing import Annotated, Any, Optional, Union
+from typing import Annotated, Any
 
 import typer
 from pydantic import BaseModel
@@ -16,7 +16,7 @@ logger = logging.getLogger(__name__)
 
 class EnvironmentVariable(BaseModel):
     name: str
-    value: Optional[str] = None
+    value: str | None = None
 
 
 class EnvironmentVariableResponse(BaseModel):
@@ -60,7 +60,7 @@ env_app = typer.Typer()
 @env_app.command()
 def list(
     path: Annotated[
-        Union[Path, None],
+        Path | None,
         typer.Argument(
             help="A path to the folder containing the app you want to deploy"
         ),
@@ -110,12 +110,12 @@ def list(
 
 @env_app.command()
 def delete(
-    name: Union[str, None] = typer.Argument(
+    name: str | None = typer.Argument(
         None,
         help="The name of the environment variable to delete",
     ),
     path: Annotated[
-        Union[Path, None],
+        Path | None,
         typer.Argument(
             help="A path to the folder containing the app you want to deploy"
         ),
@@ -192,16 +192,16 @@ def delete(
 
 @env_app.command()
 def set(
-    name: Union[str, None] = typer.Argument(
+    name: str | None = typer.Argument(
         None,
         help="The name of the environment variable to set",
     ),
-    value: Union[str, None] = typer.Argument(
+    value: str | None = typer.Argument(
         None,
         help="The value of the environment variable to set",
     ),
     path: Annotated[
-        Union[Path, None],
+        Path | None,
         typer.Argument(
             help="A path to the folder containing the app you want to deploy"
         ),

{fastapi_cloud_cli-0.11.0 → fastapi_cloud_cli-0.13.0}/src/fastapi_cloud_cli/commands/link.py

@@ -49,7 +49,8 @@ def link() -> Any:
 
         with toolkit.progress("Fetching teams...") as progress:
             with handle_http_errors(
-                progress, message="Error fetching teams. Please try again later."
+                progress,
+                default_message="Error fetching teams. Please try again later.",
             ):
                 with APIClient() as client:
                     response = client.get("/teams/")
@@ -77,7 +78,7 @@ def link() -> Any:
 
         with toolkit.progress("Fetching apps...") as progress:
             with handle_http_errors(
-                progress, message="Error fetching apps. Please try again later."
+                progress, default_message="Error fetching apps. Please try again later."
             ):
                 with APIClient() as client:
                     response = client.get("/apps/", params={"team_id": team["id"]})

{fastapi_cloud_cli-0.11.0 → fastapi_cloud_cli-0.13.0}/src/fastapi_cloud_cli/commands/login.py

@@ -78,17 +78,13 @@ def login() -> Any:
     """
     identity = Identity()
 
-    if identity.is_expired():
-        with get_rich_toolkit(minimal=True) as toolkit:
-            toolkit.print("Your session has expired. Logging in again...")
-            toolkit.print_line()
-
     if identity.is_logged_in():
         with get_rich_toolkit(minimal=True) as toolkit:
             toolkit.print("You are already logged in.")
             toolkit.print(
                 "Run [bold]fastapi cloud logout[/bold] first if you want to switch accounts."
             )
+
         return
 
     with get_rich_toolkit() as toolkit, APIClient() as client:

{fastapi_cloud_cli-0.11.0 → fastapi_cloud_cli-0.13.0}/src/fastapi_cloud_cli/commands/logs.py

@@ -2,9 +2,10 @@ import logging
 import re
 from datetime import datetime
 from pathlib import Path
-from typing import Annotated, Optional
+from typing import Annotated
 
 import typer
+from httpx import HTTPError
 from rich.markup import escape
 from rich_toolkit import RichToolkit
 
@@ -16,7 +17,7 @@ from fastapi_cloud_cli.utils.api import (
 )
 from fastapi_cloud_cli.utils.apps import AppConfig, get_app_config
 from fastapi_cloud_cli.utils.auth import Identity
-from fastapi_cloud_cli.utils.cli import get_rich_toolkit
+from fastapi_cloud_cli.utils.cli import get_rich_toolkit, handle_http_error
 
 logger = logging.getLogger(__name__)
 
@@ -85,21 +86,20 @@ def _process_log_stream(
                 return
     except KeyboardInterrupt:  # pragma: no cover
         toolkit.print_line()
+
         return
     except StreamLogError as e:
-        error_msg = str(e)
-        if "HTTP 401" in error_msg or "HTTP 403" in error_msg:
-            toolkit.print(
-                "The specified token is not valid. Use [blue]`fastapi login`[/] to generate a new token.",
-            )
-        elif "HTTP 404" in error_msg:
-            toolkit.print(
-                "App not found. Make sure to use the correct account.",
-            )
+        if e.status_code == 404:
+            message = "App not found. Make sure to use the correct account."
+
+        elif isinstance(e.__cause__, HTTPError):
+            message = handle_http_error(e.__cause__)
+
         else:
-            toolkit.print(
-                f"[red]Error:[/] {escape(error_msg)}",
-            )
+            message = f"[red]Error:[/] {escape(str(e))}"
+
+        toolkit.print(message)
+
         raise typer.Exit(1) from None
     except (TooManyRetriesError, TimeoutError):
         toolkit.print(
@@ -110,7 +110,7 @@ def _process_log_stream(
 
 def logs(
     path: Annotated[
-        Optional[Path],
+        Path | None,
         typer.Argument(
             help="Path to the folder containing the app (defaults to current directory)"
         ),

{fastapi_cloud_cli-0.11.0 → fastapi_cloud_cli-0.13.0}/src/fastapi_cloud_cli/commands/whoami.py

@@ -24,7 +24,7 @@ def whoami() -> Any:
 
     with APIClient() as client:
         with Progress(title="⚡ Fetching profile", transient=True) as progress:
-            with handle_http_errors(progress, message=""):
+            with handle_http_errors(progress, default_message=""):
                 response = client.get("/users/me")
                 response.raise_for_status()
 

{fastapi_cloud_cli-0.11.0 → fastapi_cloud_cli-0.13.0}/src/fastapi_cloud_cli/logging.py

@@ -1,14 +1,11 @@
 import logging
 import os
-from typing import Union
 
 from rich.console import Console
 from rich.logging import RichHandler
 
 
-def setup_logging(
-    terminal_width: Union[int, None] = None, level: Union[int, None] = None
-) -> None:
+def setup_logging(terminal_width: int | None = None, level: int | None = None) -> None:
     if level is None:
         level = (
             logging.DEBUG if os.getenv("FASTAPI_CLOUD_DEBUG") == "1" else logging.INFO

{fastapi_cloud_cli-0.11.0 → fastapi_cloud_cli-0.13.0}/src/fastapi_cloud_cli/utils/api.py

@@ -1,17 +1,14 @@
 import json
 import logging
 import time
-from collections.abc import Generator
+from collections.abc import Callable, Generator
 from contextlib import contextmanager
 from datetime import timedelta
 from functools import wraps
 from typing import (
     Annotated,
-    Callable,
     Literal,
-    Optional,
     TypeVar,
-    Union,
 )
 
 import httpx
@@ -32,7 +29,9 @@ STREAM_LOGS_TIMEOUT = timedelta(minutes=5)
 class StreamLogError(Exception):
     """Raised when there's an error streaming logs (build or app logs)."""
 
-    pass
+    def __init__(self, message: str, *, status_code: int | None = None) -> None:
+        super().__init__(message)
+        self.status_code = status_code
 
 
 class TooManyRetriesError(Exception):
@@ -47,16 +46,16 @@ class AppLogEntry(BaseModel):
 
 class BuildLogLineGeneric(BaseModel):
     type: Literal["complete", "failed", "timeout", "heartbeat"]
-    id: Optional[str] = None
+    id: str | None = None
 
 
 class BuildLogLineMessage(BaseModel):
     type: Literal["message"] = "message"
     message: str
-    id: Optional[str] = None
+    id: str | None = None
 
 
-BuildLogLine = Union[BuildLogLineMessage, BuildLogLineGeneric]
+BuildLogLine = BuildLogLineMessage | BuildLogLineGeneric
 BuildLogAdapter: TypeAdapter[BuildLogLine] = TypeAdapter(
     Annotated[BuildLogLine, Field(discriminator="type")]
 )
@@ -100,7 +99,8 @@ def attempt(attempt_number: int) -> Generator[None, None, None]:
             except Exception:
                 error_detail = "(response body unavailable)"
             raise StreamLogError(
-                f"HTTP {error.response.status_code}: {error_detail}"
+                f"HTTP {error.response.status_code}: {error_detail}",
+                status_code=error.response.status_code,
             ) from error
 
 
@@ -194,7 +194,7 @@ class APIClient(httpx.Client):
 
             time.sleep(0.5)
 
-    def _parse_log_line(self, line: str) -> Optional[BuildLogLine]:
+    def _parse_log_line(self, line: str) -> BuildLogLine | None:
         try:
             return BuildLogAdapter.validate_json(line)
         except (ValidationError, json.JSONDecodeError) as e:

{fastapi_cloud_cli-0.11.0 → fastapi_cloud_cli-0.13.0}/src/fastapi_cloud_cli/utils/apps.py

@@ -1,6 +1,5 @@
 import logging
 from pathlib import Path
-from typing import Optional
 
 from pydantic import BaseModel
 
@@ -12,7 +11,7 @@ class AppConfig(BaseModel):
     team_id: str
 
 
-def get_app_config(path_to_deploy: Path) -> Optional[AppConfig]:
+def get_app_config(path_to_deploy: Path) -> AppConfig | None:
     config_path = path_to_deploy / ".fastapicloud/cloud.json"
     logger.debug("Looking for app config at: %s", config_path)
 

{fastapi_cloud_cli-0.11.0 → fastapi_cloud_cli-0.13.0}/src/fastapi_cloud_cli/utils/auth.py

@@ -4,7 +4,7 @@ import json
 import logging
 import os
 import time
-from typing import Literal, Optional
+from typing import Literal
 
 from pydantic import BaseModel
 
@@ -36,7 +36,7 @@ def delete_auth_config() -> None:
         logger.debug("Auth config file doesn't exist, nothing to delete")
 
 
-def read_auth_config() -> Optional[AuthConfig]:
+def read_auth_config() -> AuthConfig | None:
     auth_path = get_auth_path()
     logger.debug("Reading auth config from: %s", auth_path)
 
@@ -48,7 +48,7 @@ def read_auth_config() -> Optional[AuthConfig]:
     return AuthConfig.model_validate_json(auth_path.read_text(encoding="utf-8"))
 
 
-def _get_auth_token() -> Optional[str]:
+def _get_auth_token() -> str | None:
     logger.debug("Getting auth token")
     auth_data = read_auth_config()
 
@@ -120,7 +120,7 @@ class Identity:
             self.token = env_token
             self.auth_mode = "token"
 
-    def _get_token_from_env(self) -> Optional[str]:
+    def _get_token_from_env(self) -> str | None:
         return os.environ.get("FASTAPI_CLOUD_TOKEN")
 
     def is_expired(self) -> bool: