fastapi-cloud-cli 0.25.0__py3-none-any.whl → 0.26.0__py3-none-any.whl

fastapi_cloud_cli/__init__.py

@@ -1 +1 @@
-__version__ = "0.25.0"
+__version__ = "0.26.0"

fastapi_cloud_cli/api/__init__.py

@@ -4,12 +4,21 @@ from ._errors import _get_response_error_message as _get_response_error_message
 from ._errors import get_http_error_code as get_http_error_code
 from ._errors import get_http_error_hint as get_http_error_hint
 from ._errors import handle_http_error as handle_http_error
+from ._models import BUILD_FAILED_STATUSES as BUILD_FAILED_STATUSES
 from ._models import SUCCESSFUL_STATUSES as SUCCESSFUL_STATUSES
+from ._models import TERMINAL_STATUSES as TERMINAL_STATUSES
 from ._models import AppLogEntry as AppLogEntry
+from ._models import BuildFailure as BuildFailure
+from ._models import BuildLogLineGeneric as BuildLogLineGeneric
 from ._models import BuildLogLineMessage as BuildLogLineMessage
 from ._models import CustomDomain as CustomDomain
 from ._models import CustomDomainRecord as CustomDomainRecord
 from ._models import CustomDomainStatus as CustomDomainStatus
+from ._models import Deployment as Deployment
 from ._models import DeploymentStatus as DeploymentStatus
+from ._models import EnvironmentVariable as EnvironmentVariable
+from ._models import (
+    EnvironmentVariableCreatePayload as EnvironmentVariableCreatePayload,
+)
 from ._retry import STREAM_LOGS_MAX_RETRIES as STREAM_LOGS_MAX_RETRIES
 from .client import APIClient as APIClient

fastapi_cloud_cli/api/_models.py

@@ -4,6 +4,22 @@ from typing import Annotated, Literal
 from pydantic import BaseModel, Field, TypeAdapter
 
 
+class EnvironmentVariable(BaseModel):
+    name: str
+    value: str | None = None
+    is_secret: bool = False
+    updated_at: str | None = None
+
+
+class EnvironmentVariableResponse(BaseModel):
+    data: list[EnvironmentVariable]
+
+
+class EnvironmentVariableCreatePayload(BaseModel):
+    value: str
+    is_secret: bool = False
+
+
 class AppLogEntry(BaseModel):
     timestamp: str
     message: str
@@ -21,6 +37,13 @@ class BuildLogLineMessage(BaseModel):
     id: str | None = None
 
 
+class BuildFailure(BaseModel):
+    error_code: str
+    error_title: str
+    error_message: str
+    error_hint: str
+
+
 BuildLogLine = BuildLogLineMessage | BuildLogLineGeneric
 BuildLogAdapter: TypeAdapter[BuildLogLine] = TypeAdapter(
     Annotated[BuildLogLine, Field(discriminator="type")]
@@ -125,16 +148,29 @@ class DeploymentStatus(str, Enum):
         }[status]
 
 
+class Deployment(BaseModel):
+    id: str
+    app_id: str
+    slug: str
+    status: DeploymentStatus
+    created_at: str
+    url: str | None = None
+    dashboard_url: str | None = None
+    failure: BuildFailure | None = None
+
+
 SUCCESSFUL_STATUSES = {DeploymentStatus.success, DeploymentStatus.verifying_skipped}
-FAILED_STATUSES = {
+BUILD_FAILED_STATUSES = {
+    DeploymentStatus.building_image_failed,
+    DeploymentStatus.building_image_failed_timeout,
+    DeploymentStatus.extracting_failed,
+    DeploymentStatus.extracting_failed_archive_too_large,
+}
+FAILED_STATUSES = BUILD_FAILED_STATUSES | {
     DeploymentStatus.failed,
     DeploymentStatus.verifying_failed,
     DeploymentStatus.verification_failed_oom,
     DeploymentStatus.deploying_failed,
     DeploymentStatus.deploying_skipped,
-    DeploymentStatus.building_image_failed,
-    DeploymentStatus.building_image_failed_timeout,
-    DeploymentStatus.extracting_failed,
-    DeploymentStatus.extracting_failed_archive_too_large,
 }
 TERMINAL_STATUSES = SUCCESSFUL_STATUSES | FAILED_STATUSES

fastapi_cloud_cli/api/client.py

@@ -30,7 +30,10 @@ from ._models import (
     BuildLogLine,
     CustomDomain,
     CustomDomainsAPIResponse,
+    Deployment,
     DeploymentStatus,
+    EnvironmentVariableCreatePayload,
+    EnvironmentVariableResponse,
 )
 from ._retry import (
     STREAM_LOGS_MAX_RETRIES,
@@ -136,6 +139,39 @@ class APIClient(httpx.Client):
 
             raise typer.Exit(1) from None
 
+    def get_deployment(self, deployment_id: str) -> Deployment:
+        response = self.get(f"/deployments/{deployment_id}")
+        response.raise_for_status()
+        return Deployment.model_validate(response.json())
+
+    def get_environment_variables(self, *, app_id: str) -> EnvironmentVariableResponse:
+        response = self.get(f"/apps/{app_id}/environment-variables/")
+        response.raise_for_status()
+
+        return EnvironmentVariableResponse.model_validate(response.json())
+
+    def batch_environment_variables(
+        self,
+        *,
+        app_id: str,
+        upsert: dict[str, EnvironmentVariableCreatePayload],
+        delete: list[str],
+        redeploy: bool = True,
+    ) -> EnvironmentVariableResponse:
+        response = self.put(
+            f"/apps/{app_id}/environment-variables/",
+            json={
+                "upsert": {
+                    name: payload.model_dump() for name, payload in upsert.items()
+                },
+                "delete": delete,
+                "redeploy": redeploy,
+            },
+        )
+        response.raise_for_status()
+
+        return EnvironmentVariableResponse.model_validate(response.json())
+
     def get_custom_domains(self, *, app_id: str) -> CustomDomainsAPIResponse:
         response = self.get(f"/apps/{app_id}/custom-domains")
         response.raise_for_status()

fastapi_cloud_cli/commands/deploy/wait.py

@@ -1,19 +1,25 @@
+import contextlib
 import time
 from itertools import cycle
 from textwrap import dedent
 
 import typer
+from httpx import HTTPError
 from rich.text import Text
 from rich_toolkit import RichToolkit
 
 from fastapi_cloud_cli.api import (
     SUCCESSFUL_STATUSES,
     APIClient,
+    BuildFailure,
     DeploymentStatus,
     StreamLogError,
     TooManyRetriesError,
 )
 from fastapi_cloud_cli.commands.deploy.cloud import CreateDeploymentResponse
+from fastapi_cloud_cli.utils.build_logs import print_build_error
+from fastapi_cloud_cli.utils.cli import FastAPIRichToolkit
+from fastapi_cloud_cli.utils.execution import is_ci_enabled
 
 # (bullet emoji, message) — the emoji replaces the progress animation
 WAITING_MESSAGES = [
@@ -89,7 +95,7 @@ def _verify_deployment(
 
 
 def _wait_for_deployment(
-    toolkit: RichToolkit,
+    toolkit: FastAPIRichToolkit,
     client: APIClient,
     app_id: str,
     deployment: CreateDeploymentResponse,
@@ -107,12 +113,15 @@ def _wait_for_deployment(
             "Checking the status of your deployment",
             inline_logs=True,
             lines_to_show=20,
+            # Keep the log panel replaceable by a diagnosis, but retain CI logs.
+            preserve_logs=is_ci_enabled(),
             emoji="👀",
             done_emoji="🚀",
         ) as progress,
     ):
         build_complete = False
         build_failed = False
+        build_error: BuildFailure | None = None
 
         try:
             for log in client.stream_build_logs(deployment.id):
@@ -128,6 +137,12 @@ def _wait_for_deployment(
 
                 if log.type == "failed":
                     build_failed = True
+                    build_error = None
+
+                    with contextlib.suppress(HTTPError):
+                        build_error = client.get_deployment(deployment.id).failure
+
+                    progress.transient = build_error is not None
                     # the headline comes from the title once there are log
                     # lines, and from current_message when there are none
                     progress.title = "Build failed"
@@ -157,10 +172,16 @@ def _wait_for_deployment(
             raise typer.Exit(1) from None
 
     if build_failed:
-        toolkit.print_line()
+        if build_error is not None:
+            print_build_error(toolkit, build_error)
+            toolkit.print_line()
+            message = "Check out the logs at"
+        else:
+            toolkit.print_line()
+            message = "Oh no! Something went wrong. Check out the logs at"
         toolkit.print(
-            f"Oh no! Something went wrong. Check out the logs at [link={deployment.dashboard_url}]{deployment.dashboard_url}[/link]",
-            emoji="😔",
+            f"{message} [link={deployment.dashboard_url}]{deployment.dashboard_url}[/link]",
+            emoji="👀" if build_error is not None else "😔",
         )
         raise typer.Exit(1)
 

fastapi_cloud_cli/commands/deployments.py

@@ -5,14 +5,19 @@ from typing import Annotated, Any
 import typer
 from httpx import HTTPError
 from pydantic import BaseModel
+from rich.markup import escape
 from rich.table import Table
 from rich.text import Text
 from rich_toolkit import RichToolkit
 
 from fastapi_cloud_cli.api import (
+    BUILD_FAILED_STATUSES,
+    TERMINAL_STATUSES,
     APIClient,
+    BuildFailure,
+    BuildLogLineGeneric,
     BuildLogLineMessage,
-    DeploymentStatus,
+    Deployment,
     StreamLogError,
     TooManyRetriesError,
     get_http_error_code,
@@ -35,16 +40,6 @@ DEFAULT_LIMIT = 100
 DEFAULT_OFFSET = 0
 
 
-class Deployment(BaseModel):
-    id: str
-    app_id: str
-    slug: str
-    status: DeploymentStatus
-    created_at: str
-    url: str | None = None
-    dashboard_url: str | None = None
-
-
 class DeploymentsListAPIResponse(BaseModel):
     data: list[Deployment]
     count: int
@@ -70,6 +65,7 @@ class BuildLogsOutput(BaseModel):
     deployment_id: str
     failed: bool
     logs: list[BuildLogOutput]
+    failure: BuildFailure | None = None
 
 
 def _get_deployments(
@@ -94,13 +90,6 @@ def _get_deployments(
     )
 
 
-def _get_deployment(client: APIClient, *, deployment_id: str) -> DeploymentGetOutput:
-    response = client.get(f"/deployments/{deployment_id}")
-    response.raise_for_status()
-
-    return DeploymentGetOutput(deployment=Deployment.model_validate(response.json()))
-
-
 def _render_deployments_list_output(
     data: DeploymentsListOutput, toolkit: RichToolkit
 ) -> None:
@@ -129,7 +118,7 @@ def _render_deployments_list_output(
 
 
 def _render_deployment_get_output(
-    data: DeploymentGetOutput, toolkit: RichToolkit
+    data: DeploymentGetOutput, toolkit: FastAPIRichToolkit
 ) -> None:
     deployment = data.deployment
 
@@ -164,6 +153,23 @@ def _render_deployment_get_output(
         )
     )
 
+    if deployment.failure is not None:
+        toolkit.print_line()
+        _print_deployment_failure(toolkit, deployment.failure)
+
+
+def _print_deployment_failure(
+    toolkit: FastAPIRichToolkit, failure: BuildFailure
+) -> None:
+    toolkit.print("This deployment failed with the following error:", emoji="🚨")
+    toolkit.print_line()
+    toolkit.print(Text(failure.error_title, style="bold"))
+    toolkit.print_line()
+    toolkit.print(Text(failure.error_message))
+    if failure.error_hint:
+        toolkit.print_line()
+        toolkit.print_hint(escape(failure.error_hint))
+
 
 def _print_build_log_json(
     deployment_id: str,
@@ -171,12 +177,14 @@ def _print_build_log_json(
     *,
     log_id: str | None,
     message: str | None = None,
+    failure: BuildFailure | None = None,
 ) -> None:
     record = {
         "type": record_type,
         "deployment_id": deployment_id,
         "id": log_id,
         "message": message,
+        "failure": failure.model_dump(mode="json") if failure is not None else None,
     }
 
     typer.echo(
@@ -191,22 +199,31 @@ BUILD_LOG_BULLET = "[dim]▕[/dim]"
 
 
 def _print_build_log_line(toolkit: RichToolkit, message: str) -> None:
-    toolkit.print(Text.from_ansi(message.rstrip()), emoji=BUILD_LOG_BULLET)
+    text = Text.from_ansi(message.rstrip())
+
+    if not text.plain.strip():
+        # Keep the log marker when the style would otherwise omit an empty line.
+        text = Text("\u200b")
+
+    toolkit.print(text, emoji=BUILD_LOG_BULLET)
 
 
 def _render_build_logs_output(
     data: BuildLogsOutput, toolkit: FastAPIRichToolkit
 ) -> None:
-    if not data.logs:
-        toolkit.print("No build logs found.")
-        return
-
     for log in data.logs:
         _print_build_log_line(toolkit, log.message)
 
-    if data.failed:
+    if data.failure:
+        if data.logs:
+            toolkit.print_line()
+
+        _print_deployment_failure(toolkit, data.failure)
+    elif data.failed:
         toolkit.print_line()
         toolkit.print_error("Build failed.")
+    elif not data.logs:
+        toolkit.print("No build logs found.")
 
 
 def _stream_build_logs(
@@ -214,9 +231,12 @@ def _stream_build_logs(
     client: APIClient,
     deployment_id: str,
 ) -> bool:
-    failed = False
+    deployment = client.get_deployment(deployment_id)
+    terminal_log: BuildLogLineGeneric | None = None
 
-    for log in client.stream_build_logs(deployment_id, follow=True):
+    for log in client.stream_build_logs(
+        deployment_id, follow=deployment.status not in TERMINAL_STATUSES
+    ):
         if isinstance(log, BuildLogLineMessage):
             if toolkit.mode == "json":
                 _print_build_log_json(
@@ -227,26 +247,30 @@ def _stream_build_logs(
                 )
             else:
                 _print_build_log_line(toolkit, log.message)
-
-        elif log.type == "complete":
-            if toolkit.mode == "json":
-                _print_build_log_json(
-                    deployment_id,
-                    "complete",
-                    log_id=log.id,
-                )
-
-        elif log.type == "failed":
-            failed = True
-            if toolkit.mode == "json":
-                _print_build_log_json(
-                    deployment_id,
-                    "failed",
-                    log_id=log.id,
-                )
-            else:
-                toolkit.print_line()
-                toolkit.print_error("Build failed.")
+        else:
+            terminal_log = log
+
+    if deployment.status not in TERMINAL_STATUSES:
+        deployment = client.get_deployment(deployment_id)
+
+    failed = (
+        terminal_log is not None and terminal_log.type == "failed"
+    ) or deployment.status in BUILD_FAILED_STATUSES
+
+    if toolkit.mode == "json":
+        if failed or terminal_log is not None or deployment.status in TERMINAL_STATUSES:
+            _print_build_log_json(
+                deployment_id,
+                "failed" if failed else "complete",
+                log_id=terminal_log.id if terminal_log is not None else None,
+                failure=deployment.failure,
+            )
+    elif deployment.failure is not None:
+        toolkit.print_line()
+        _print_deployment_failure(toolkit, deployment.failure)
+    elif failed:
+        toolkit.print_line()
+        toolkit.print_error("Build failed.")
 
     return failed
 
@@ -262,7 +286,13 @@ def _fetch_build_logs(client: APIClient, deployment_id: str) -> BuildLogsOutput:
         elif log.type == "failed":
             failed = True
 
-    return BuildLogsOutput(deployment_id=deployment_id, failed=failed, logs=logs)
+    deployment = client.get_deployment(deployment_id)
+    return BuildLogsOutput(
+        deployment_id=deployment_id,
+        failed=failed or deployment.status in BUILD_FAILED_STATUSES,
+        logs=logs,
+        failure=deployment.failure,
+    )
 
 
 def _handle_build_log_error(
@@ -338,22 +368,24 @@ def get_deployment(
     resolve_app_id_or_fail(toolkit, app_id=app_id)
 
     with APIClient() as client:
-        with toolkit.progress(
-            title="Fetching deployment",
-            transient=True,
-        ) as progress:
-            with client.handle_http_errors(
+        with (
+            toolkit.progress(
+                title="Fetching deployment",
+                transient=True,
+            ) as progress,
+            client.handle_http_errors(
                 progress,
                 default_message="Error fetching deployment. Please try again later.",
                 not_found_message="Deployment not found.",
                 toolkit=toolkit,
-            ):
-                result = _get_deployment(
-                    client,
-                    deployment_id=deployment_id,
-                )
+            ),
+        ):
+            deployment = client.get_deployment(deployment_id)
 
-    toolkit.success(result, render_output=_render_deployment_get_output)
+    toolkit.success(
+        DeploymentGetOutput(deployment=deployment),
+        render_output=_render_deployment_get_output,
+    )
 
 
 @deployments_app.command("build-logs", cls=UserCommand)
@@ -407,6 +439,14 @@ def build_logs(
         return
     except StreamLogError as e:
         _handle_build_log_error(toolkit, e)
+    except HTTPError as e:
+        code = get_http_error_code(e)
+        toolkit.fail(
+            code,
+            handle_http_error(e, not_found_message="Deployment not found."),
+            hint=get_http_error_hint(code),
+            render_output=_render_build_log_error,
+        )
 
     except (TooManyRetriesError, TimeoutError):
         message = "Lost connection to build log stream. Please try again later."

fastapi_cloud_cli/commands/env/_shared.py

@@ -1,31 +1,10 @@
-from pydantic import BaseModel
 from rich.text import Text
 
-from fastapi_cloud_cli.api import APIClient
+from fastapi_cloud_cli.api import EnvironmentVariable
 
 ENV_VAR_VALUE_MAX_LENGTH = 40
 
 
-class EnvironmentVariable(BaseModel):
-    name: str
-    value: str | None = None
-    is_secret: bool = False
-    updated_at: str | None = None
-
-
-class EnvironmentVariableResponse(BaseModel):
-    data: list[EnvironmentVariable]
-
-
-def _get_environment_variables(
-    client: APIClient, app_id: str
-) -> EnvironmentVariableResponse:
-    response = client.get(f"/apps/{app_id}/environment-variables/")
-    response.raise_for_status()
-
-    return EnvironmentVariableResponse.model_validate(response.json())
-
-
 def _find_environment_variable(
     environment_variables: list[EnvironmentVariable], name: str
 ) -> EnvironmentVariable | None:

fastapi_cloud_cli/commands/env/delete.py

@@ -9,7 +9,6 @@ from rich_toolkit.menu import Option
 from fastapi_cloud_cli.api import APIClient
 from fastapi_cloud_cli.commands._auth import UserCommand, get_user_command_context
 from fastapi_cloud_cli.commands.env._app import env_app
-from fastapi_cloud_cli.commands.env._shared import _get_environment_variables
 from fastapi_cloud_cli.utils.apps import resolve_app_id_or_fail
 from fastapi_cloud_cli.utils.env import validate_environment_variable_name
 from fastapi_cloud_cli.utils.execution import JsonOutputOption
@@ -32,17 +31,6 @@ def _render_environment_variable_delete_output(
     toolkit.print(f"Environment variable [bold]{data.name}[/] deleted.", bullet=False)
 
 
-def _delete_environment_variable(client: APIClient, app_id: str, name: str) -> bool:
-    response = client.delete(f"/apps/{app_id}/environment-variables/{name}")
-
-    if response.status_code == 404:
-        return False
-
-    response.raise_for_status()
-
-    return True
-
-
 @env_app.command(cls=UserCommand)
 def delete(
     ctx: typer.Context,
@@ -84,10 +72,19 @@ def delete(
             help="Confirm deletion without prompting.",
         ),
     ] = False,
+    no_redeploy: Annotated[
+        bool,
+        typer.Option(
+            "--no-redeploy",
+            help="Delete the environment variable without redeploying the app.",
+        ),
+    ] = False,
     json_output: JsonOutputOption = False,
 ) -> Any:
     """
-    Delete an environment variable from the app.
+    Delete an environment variable and redeploy the app by default.
+
+    Succeeds even if the variable is already absent.
     """
 
     toolkit = get_user_command_context(ctx).toolkit
@@ -109,9 +106,9 @@ def delete(
             with toolkit.progress(
                 "Fetching environment variables...", transient=True
             ) as progress:
-                with client.handle_http_errors(progress):
-                    environment_variables = _get_environment_variables(
-                        client=client, app_id=target_app_id
+                with client.handle_http_errors(progress, toolkit=toolkit):
+                    environment_variables = client.get_environment_variables(
+                        app_id=target_app_id
                     )
 
             toolkit.print_title("environment variables")
@@ -163,23 +160,14 @@ def delete(
         with toolkit.progress(
             "Deleting environment variable", transient=True
         ) as progress:
-            with client.handle_http_errors(progress):
-                deleted = _delete_environment_variable(
-                    client=client, app_id=target_app_id, name=name
+            with client.handle_http_errors(progress, toolkit=toolkit):
+                client.batch_environment_variables(
+                    app_id=target_app_id,
+                    upsert={},
+                    delete=[name],
+                    redeploy=not no_redeploy,
                 )
 
-    if not deleted:
-        message = (
-            f"Environment variable {name} not found."
-            if toolkit.mode == "json"
-            else "Environment variable not found."
-        )
-        toolkit.fail(
-            "not_found",
-            message,
-            hint="Run `fastapi cloud env list` to see available variables.",
-        )
-
     toolkit.success(
         EnvironmentVariableDeleteOutput(
             app_id=target_app_id, name=name, show_tag=name_provided

fastapi_cloud_cli/commands/env/get.py

@@ -7,14 +7,12 @@ from rich.table import Table
 from rich_toolkit import RichToolkit
 from rich_toolkit.menu import Option
 
-from fastapi_cloud_cli.api import APIClient
+from fastapi_cloud_cli.api import APIClient, EnvironmentVariable
 from fastapi_cloud_cli.commands._auth import UserCommand, get_user_command_context
 from fastapi_cloud_cli.commands.env._app import env_app
 from fastapi_cloud_cli.commands.env._shared import (
-    EnvironmentVariable,
     _find_environment_variable,
     _format_env_var_value,
-    _get_environment_variables,
 )
 from fastapi_cloud_cli.utils.apps import resolve_app_id_or_fail
 from fastapi_cloud_cli.utils.execution import JsonOutputOption
@@ -92,8 +90,8 @@ def get_variable(
             "Fetching environment variables...", transient=True
         ) as progress:
             with client.handle_http_errors(progress):
-                environment_variables = _get_environment_variables(
-                    client=client, app_id=target_app_id
+                environment_variables = client.get_environment_variables(
+                    app_id=target_app_id
                 )
 
     if name is None:

fastapi_cloud_cli/commands/env/list.py

@@ -7,14 +7,12 @@ from rich.table import Table
 from rich.text import Text
 from rich_toolkit import RichToolkit
 
-from fastapi_cloud_cli.api import APIClient
+from fastapi_cloud_cli.api import APIClient, EnvironmentVariable
 from fastapi_cloud_cli.commands._auth import UserCommand, get_user_command_context
 from fastapi_cloud_cli.commands.env._app import env_app
 from fastapi_cloud_cli.commands.env._shared import (
     ENV_VAR_VALUE_MAX_LENGTH,
-    EnvironmentVariable,
     _format_env_var_value,
-    _get_environment_variables,
 )
 from fastapi_cloud_cli.utils.apps import resolve_app_id_or_fail
 from fastapi_cloud_cli.utils.dates import format_last_updated
@@ -94,8 +92,8 @@ def list_variables(
             "Fetching environment variables...", transient=True
         ) as progress:
             with client.handle_http_errors(progress):
-                environment_variables = _get_environment_variables(
-                    client=client, app_id=target_app_id
+                environment_variables = client.get_environment_variables(
+                    app_id=target_app_id
                 )
 
     toolkit.success(

fastapi_cloud_cli/commands/env/set.py

@@ -6,7 +6,7 @@ import typer
 from pydantic import BaseModel, Field
 from rich_toolkit import RichToolkit
 
-from fastapi_cloud_cli.api import APIClient
+from fastapi_cloud_cli.api import APIClient, EnvironmentVariableCreatePayload
 from fastapi_cloud_cli.commands._auth import UserCommand, get_user_command_context
 from fastapi_cloud_cli.commands.env._app import env_app
 from fastapi_cloud_cli.utils.apps import resolve_app_id_or_fail
@@ -95,16 +95,6 @@ def _resolve_environment_variable_value(
     return _input(toolkit, "Enter the value of the environment variable:")
 
 
-def _set_environment_variable(
-    client: APIClient, app_id: str, name: str, value: str, is_secret: bool = False
-) -> None:
-    response = client.post(
-        f"/apps/{app_id}/environment-variables/",
-        json={"name": name, "value": value, "is_secret": is_secret},
-    )
-    response.raise_for_status()
-
-
 @env_app.command(cls=UserCommand)
 def set(
     ctx: typer.Context,
@@ -153,13 +143,20 @@ def set(
         bool,
         typer.Option(
             "--secret",
-            help="Mark the environment variable as secret",
+            help="Mark a new environment variable as secret. Existing variables keep their secret status.",
+        ),
+    ] = False,
+    no_redeploy: Annotated[
+        bool,
+        typer.Option(
+            "--no-redeploy",
+            help="Save the environment variable without redeploying the app.",
         ),
     ] = False,
     json_output: JsonOutputOption = False,
 ) -> Any:
     """
-    Set an environment variable for the app.
+    Create or update an environment variable and redeploy the app by default.
     """
 
     toolkit = get_user_command_context(ctx).toolkit
@@ -190,20 +187,27 @@ def set(
         with toolkit.progress(
             "Setting environment variable", transient=True
         ) as progress:
-            with client.handle_http_errors(progress):
-                _set_environment_variable(
-                    client=client,
+            with client.handle_http_errors(progress, toolkit=toolkit):
+                environment_variables = client.batch_environment_variables(
                     app_id=target_app_id,
-                    name=name,
-                    value=value,
-                    is_secret=secret,
+                    upsert={
+                        name: EnvironmentVariableCreatePayload(
+                            value=value, is_secret=secret
+                        )
+                    },
+                    delete=[],
+                    redeploy=not no_redeploy,
                 )
 
+    variable = next(
+        variable for variable in environment_variables.data if variable.name == name
+    )
+
     toolkit.success(
         EnvironmentVariableSetOutput(
             app_id=target_app_id,
             name=name,
-            is_secret=secret,
+            is_secret=variable.is_secret,
             show_tag=not prompts_user,
         ),
         render_output=_render_environment_variable_set_output,

fastapi_cloud_cli/utils/build_logs.py

@@ -0,0 +1,14 @@
+from rich.markup import escape
+from rich.text import Text
+
+from fastapi_cloud_cli.api import BuildFailure
+from fastapi_cloud_cli.utils.cli import FastAPIRichToolkit
+
+
+def print_build_error(toolkit: FastAPIRichToolkit, error: BuildFailure) -> None:
+    toolkit.print(Text(error.error_title, style="bold red"), emoji="🚨")
+    toolkit.print_line()
+    toolkit.print(Text(error.error_message))
+    if error.error_hint:
+        toolkit.print_line()
+        toolkit.print_hint(escape(error.error_hint))

fastapi_cloud_cli/utils/cli.py

@@ -282,7 +282,11 @@ class FastAPIStyle(BaseStyle):
         prefix = Text(" " * self.content_padding)
 
         if emoji:
-            prefix.append_text(Text.from_markup(emoji))
+            bullet = Text.from_markup(emoji)
+            bullet.plain = self.symbol(
+                bullet.plain, fallback=" x" if emoji == ERROR_BULLET else "*"
+            )
+            prefix.append_text(bullet)
 
         prefix.pad_right(
             self.content_padding + self.emoji_column_width - prefix.cell_len

{fastapi_cloud_cli-0.25.0.dist-info → fastapi_cloud_cli-0.26.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastapi-cloud-cli
-Version: 0.25.0
+Version: 0.26.0
 Summary: Deploy and manage FastAPI Cloud apps from the command line 🚀
 Author-Email: Patrick Arminio <patrick@fastapilabs.com>
 License: MIT
@@ -33,7 +33,7 @@ Requires-Dist: typer>=0.26.1
 Requires-Dist: uvicorn[standard]>=0.17.6
 Requires-Dist: rignore>=0.5.1
 Requires-Dist: httpx>=0.27.0
-Requires-Dist: rich-toolkit>=0.20.3
+Requires-Dist: rich-toolkit>=0.20.5
 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"

{fastapi_cloud_cli-0.25.0.dist-info → fastapi_cloud_cli-0.26.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
-fastapi_cloud_cli-0.25.0.dist-info/METADATA,sha256=D-nWRnnIHdExKn_WdA44-ZDduiixp_ncxL85rbdQwVM,3108
-fastapi_cloud_cli-0.25.0.dist-info/WHEEL,sha256=VP-D4TPS230sME9Z3vb3INXvo1yt0924YRm5AOsk_dE,90
-fastapi_cloud_cli-0.25.0.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-fastapi_cloud_cli-0.25.0.dist-info/licenses/LICENSE,sha256=FqD5B4VbXJnefprQseE0U8llL6FxojC-i8muZy7YmSU,1086
-fastapi_cloud_cli/__init__.py,sha256=Mu4JbSLl5nr-J2figk5hmW2mrw4skf_oeIzxbnpcgwY,23
+fastapi_cloud_cli-0.26.0.dist-info/METADATA,sha256=cGX_kGGfi9Wqny026UsXThsuq5nm8Vyoqu08Ar2uXJE,3108
+fastapi_cloud_cli-0.26.0.dist-info/WHEEL,sha256=VP-D4TPS230sME9Z3vb3INXvo1yt0924YRm5AOsk_dE,90
+fastapi_cloud_cli-0.26.0.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+fastapi_cloud_cli-0.26.0.dist-info/licenses/LICENSE,sha256=FqD5B4VbXJnefprQseE0U8llL6FxojC-i8muZy7YmSU,1086
+fastapi_cloud_cli/__init__.py,sha256=S1dNBNSmHJkAHkq1vL1Yg-dFpQk0fri_CstNlL1u5qw,23
 fastapi_cloud_cli/__main__.py,sha256=bYt9eEaoRQWdejEHFD8REx9jxVEdZptECFsV7F49Ink,30
 fastapi_cloud_cli/_app.py,sha256=7RNSWWNLEoIN3WwvTBJ3MSKIPPfbbwoLHFJrSYdJjJc,735
-fastapi_cloud_cli/api/__init__.py,sha256=vb3qIJvoxX8Xc9QQ0ZRank5sWGeNGdRpZvkWzF4C91Y,908
+fastapi_cloud_cli/api/__init__.py,sha256=ORZqOHW7yaKjq0jY7M5pK8J5oyFgMOrWNeBzXMC2fCA,1359
 fastapi_cloud_cli/api/_errors.py,sha256=NJVIfaKsPDZi-7Y5JlZU0qsZc3BBozEC1bb1RKdGs2Q,3711
-fastapi_cloud_cli/api/_models.py,sha256=4BX_uYvwsDGp7_2qxh6Zk0U0E3X--q-1jMOf-bRkYGY,4749
+fastapi_cloud_cli/api/_models.py,sha256=9h546GVlEi9CJ7vWt7UNfcpubuvnJ2pUgs33gbKrqVc,5469
 fastapi_cloud_cli/api/_retry.py,sha256=SsSG2jid2RjwpHpKRU_YfzzjLKAnk17OjgkyQgPLzxo,2706
-fastapi_cloud_cli/api/client.py,sha256=4ucVNX2Unaxwyi9Phgahv0JDZHWSecqAR39-oQvK1vU,9624
+fastapi_cloud_cli/api/client.py,sha256=kzrU6nx-L2vWJZ99-KCzTpZIPfhVMwrcRcqaMx9TAo4,10884
 fastapi_cloud_cli/cli.py,sha256=u-ZYE-mN0Ml5XNy11iMR_W8WCqp8d2J6BZ7YH05-CkM,3989
 fastapi_cloud_cli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastapi_cloud_cli/commands/_auth.py,sha256=8LKkpQnEoBwJbU_LvIPsDrACuIfc1cyI7xXRpGEPLvw,1199
@@ -34,8 +34,8 @@ fastapi_cloud_cli/commands/deploy/cloud.py,sha256=ISsO-cQpdsw2Ia6R9P-TIOMKx1VxD1
 fastapi_cloud_cli/commands/deploy/command.py,sha256=7RQCqlVrqusLl2ZtWYOfQ95nEoixszbHdfQiuocrgqQ,13967
 fastapi_cloud_cli/commands/deploy/configure.py,sha256=2D9MDknTp5yE5ihIE_oHBNgrPY4fcvaItR2dK1SiXVk,4898
 fastapi_cloud_cli/commands/deploy/upload.py,sha256=TRHKVco06ZKXSLAV80iBy81HswAzSe00GvshOpfkv5s,3185
-fastapi_cloud_cli/commands/deploy/wait.py,sha256=nvz7K79HUWCCsHTjibZBapVlhkRb4XRoX-O5zByOGEk,5792
-fastapi_cloud_cli/commands/deployments.py,sha256=4B5d6r_UR9Tu68F2SJhG90liffCUpof4U0Lt_bW-q0w,12720
+fastapi_cloud_cli/commands/deploy/wait.py,sha256=f-4xFftueemMtdONqeA65x0UqksS32bc6XOiZatvFpg,6723
+fastapi_cloud_cli/commands/deployments.py,sha256=ZWbfdkkwkmMqtR8ysrnR9bAlnEAsoPAg9DlQbTJuYfU,14319
 fastapi_cloud_cli/commands/domains/__init__.py,sha256=t0kcyNvJVHITc6xPWvsTMKCUpWd3Y_Ur-F2V66UyGeY,106
 fastapi_cloud_cli/commands/domains/_app.py,sha256=h-6saPMt--q5vUM3fKxI-kf0c7Ej-5bY9lXYMVsMF9I,120
 fastapi_cloud_cli/commands/domains/_setup.py,sha256=YiY8uF9QAq3UKf2vTI6sryAlsqGXlfNgYR1qLU6b7g4,6710
@@ -48,11 +48,11 @@ fastapi_cloud_cli/commands/domains/rendering.py,sha256=mqDMDTaZLvOmDbPO-vrqj0IXB
 fastapi_cloud_cli/commands/domains/restart.py,sha256=Ph3Q4WhtePuAJxdzOYp6YISqUYYGOIVEc-rbsqArbmU,4836
 fastapi_cloud_cli/commands/env/__init__.py,sha256=X3cOoOwBCn8jgoIPWMPGRiRzPfUomiavIS04q5gWa24,90
 fastapi_cloud_cli/commands/env/_app.py,sha256=Ip-tTBKpl_xUhMwnYlmvep7tu-VC3gFHo_9IWklBg_k,123
-fastapi_cloud_cli/commands/env/_shared.py,sha256=qAC5vTCy1MlS1CtV9DuiodAuCdkkXDtmaiXgHw0Gttg,1380
-fastapi_cloud_cli/commands/env/delete.py,sha256=TPxe7Rbu2k3upA7esLFbGzdzPaa3Dcs-f96K0y5YMNI,5919
-fastapi_cloud_cli/commands/env/get.py,sha256=4brqnPCx-1My8o-njpb63FgERtoZyL1BlXG0vxSBn40,4023
-fastapi_cloud_cli/commands/env/list.py,sha256=aa7QFybYQcdrm2WJoPVoyHI_6ixEwma0rWdkGRBGKUM,3316
-fastapi_cloud_cli/commands/env/set.py,sha256=6rehE7DTCRU5AHFzZqHUkDQrmyHuiY6DG7NjI0ZVB4g,5931
+fastapi_cloud_cli/commands/env/_shared.py,sha256=dDtLjcv5AK7v9N_BPD4fZaElc1Mu3xBBpHA78kbeyTI,855
+fastapi_cloud_cli/commands/env/delete.py,sha256=baILA8agCL41h2MNbbdPqj5k600AAG7HYboxveGo2Ag,5601
+fastapi_cloud_cli/commands/env/get.py,sha256=4IzcRM0Np7rvvHijbkt3DTtcbEUdhgiVnGUE65NiSSw,3978
+fastapi_cloud_cli/commands/env/list.py,sha256=oeqjX-eofuidbyoZY31x2bpm0aZAavDhmT3KW3n5jww,3271
+fastapi_cloud_cli/commands/env/set.py,sha256=wGOFeaat-W1OE8VnTeayezlmcPEeeIHznEEcYj4wELk,6247
 fastapi_cloud_cli/commands/integrations/__init__.py,sha256=0rxfgiemdH6QLzxeA1egGi9T6JVw8EiBV_cOF4cTe-I,424
 fastapi_cloud_cli/commands/integrations/providers/__init__.py,sha256=XalsF3zAyPvlDsS8a7U9aGtkL2PZz6trlcUFyOdUTAo,136
 fastapi_cloud_cli/commands/integrations/providers/_app.py,sha256=IkgPmQfkRb0ajimz0D7yqaLRciy8tWOufVxdFNer_rU,124
@@ -84,7 +84,8 @@ fastapi_cloud_cli/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastapi_cloud_cli/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastapi_cloud_cli/utils/apps.py,sha256=-qVIxpuXLlRFywDzY9-ZtFcwzFQ0cdFE0bQcQqIN33o,2722
 fastapi_cloud_cli/utils/auth.py,sha256=O4MzQ1jj16hkO8-NPD1TGUSAabbb-GXx2QLY7vVyyjs,3951
-fastapi_cloud_cli/utils/cli.py,sha256=6KjdzsI1secJEzXOqfv8IEa9g3NBAILCDtY7JnizYO8,14475
+fastapi_cloud_cli/utils/build_logs.py,sha256=rVFz1OyedADpuemBwL2mIVSrkjBPEwoD_nAarPkPluY,500
+fastapi_cloud_cli/utils/cli.py,sha256=q11avEJcjBlOpifeTnsDX--BxMGR2aXVbHKgxdPrFhY,14635
 fastapi_cloud_cli/utils/config.py,sha256=qxPHFmzfJWfm_sfc-DKFPoNTc5jFK7_Bnfy6DVhWigE,700
 fastapi_cloud_cli/utils/dates.py,sha256=cnBPp1f2cDj8_3vWt1RnOrbGVYh7Nr31n95gN5t2RSI,1081
 fastapi_cloud_cli/utils/env.py,sha256=a9S6ehNGxhKbQHXxFVJtjqMEkodKwKa0wOvRVh9VBjw,125
@@ -94,4 +95,4 @@ fastapi_cloud_cli/utils/progress_file.py,sha256=GMK-OgS1pr2IgfBpJgwPqkb2k37W0b2C
 fastapi_cloud_cli/utils/sentry.py,sha256=C_KlTV8JCtB3slrCJLNoTo6beM87rWjxAr92uwmWLR0,599
 fastapi_cloud_cli/utils/teams.py,sha256=PSCL-hySKcUU_pz45xBEKeB8NCbWLBCGlgx_GFLZ-2w,2007
 fastapi_cloud_cli/utils/version_check.py,sha256=-iOus8nWNsQn9FnC5tZD0iCftjUdeCj-RFskPLz1KZE,5209
-fastapi_cloud_cli-0.25.0.dist-info/RECORD,,
+fastapi_cloud_cli-0.26.0.dist-info/RECORD,,