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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastapi-cloud-cli
-Version: 0.7.0
+Version: 0.9.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.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -30,13 +29,13 @@ 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.8
+Requires-Python: >=3.9
 Requires-Dist: typer>=0.12.3
 Requires-Dist: uvicorn[standard]>=0.15.0
 Requires-Dist: rignore>=0.5.1
 Requires-Dist: httpx>=0.27.0
 Requires-Dist: rich-toolkit>=0.14.5
-Requires-Dist: pydantic[email]>=1.6.1
+Requires-Dist: pydantic[email]>=2.0
 Requires-Dist: sentry-sdk>=2.20.0
 Requires-Dist: fastar>=0.8.0
 Provides-Extra: standard

{fastapi_cloud_cli-0.7.0 → fastapi_cloud_cli-0.9.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.8"
+requires-python = ">=3.9"
 readme = "README.md"
 classifiers = [
     "Intended Audience :: Information Technology",
@@ -23,7 +23,6 @@ classifiers = [
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
@@ -36,11 +35,11 @@ dependencies = [
     "rignore >= 0.5.1",
     "httpx >= 0.27.0",
     "rich-toolkit >= 0.14.5",
-    "pydantic[email] >= 1.6.1",
+    "pydantic[email] >= 2.0",
     "sentry-sdk >= 2.20.0",
     "fastar >= 0.8.0",
 ]
-version = "0.7.0"
+version = "0.9.0"
 
 [project.license]
 text = "MIT"
@@ -59,7 +58,7 @@ Changelog = "https://github.com/fastapilabs/fastapi-cloud-cli/blob/main/release-
 
 [dependency-groups]
 dev = [
-    "pre-commit>=2.17.0,<5.0.0",
+    "prek>=0.2.24,<1.0.0",
     "pytest>=4.4.0,<9.0.0",
     "coverage[toml]>=6.2,<8.0",
     "mypy==1.14.1",

fastapi_cloud_cli-0.9.0/src/fastapi_cloud_cli/__init__.py

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

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

@@ -7,28 +7,22 @@ from enum import Enum
 from itertools import cycle
 from pathlib import Path
 from textwrap import dedent
-from typing import Any, Dict, List, Optional, Union
+from typing import Annotated, Any, Optional, Union
 
 import fastar
 import rignore
 import typer
 from httpx import Client
-from pydantic import BaseModel, EmailStr, ValidationError
+from pydantic import BaseModel, EmailStr, TypeAdapter, ValidationError
 from rich.text import Text
 from rich_toolkit import RichToolkit
 from rich_toolkit.menu import Option
-from typing_extensions import Annotated
 
 from fastapi_cloud_cli.commands.login import login
 from fastapi_cloud_cli.utils.api import APIClient, BuildLogError, TooManyRetriesError
 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.auth import Identity
 from fastapi_cloud_cli.utils.cli import get_rich_toolkit, handle_http_errors
-from fastapi_cloud_cli.utils.pydantic_compat import (
-    TypeAdapter,
-    model_dump,
-    model_validate,
-)
 
 logger = logging.getLogger(__name__)
 
@@ -57,6 +51,7 @@ def _should_exclude_entry(path: Path) -> bool:
         "__pycache__",
         ".mypy_cache",
         ".pytest_cache",
+        ".git",
         ".gitignore",
         ".fastapicloudignore",
     ]
@@ -102,14 +97,14 @@ class Team(BaseModel):
     name: str
 
 
-def _get_teams() -> List[Team]:
+def _get_teams() -> list[Team]:
     with APIClient() as client:
         response = client.get("/teams/")
         response.raise_for_status()
 
         data = response.json()["data"]
 
-    return [model_validate(Team, team) for team in data]
+    return [Team.model_validate(team) for team in data]
 
 
 class AppResponse(BaseModel):
@@ -126,7 +121,7 @@ def _create_app(team_id: str, app_name: str) -> AppResponse:
 
         response.raise_for_status()
 
-        return model_validate(AppResponse, response.json())
+        return AppResponse.model_validate(response.json())
 
 
 class DeploymentStatus(str, Enum):
@@ -179,12 +174,12 @@ def _create_deployment(app_id: str) -> CreateDeploymentResponse:
         response = client.post(f"/apps/{app_id}/deployments/")
         response.raise_for_status()
 
-        return model_validate(CreateDeploymentResponse, response.json())
+        return CreateDeploymentResponse.model_validate(response.json())
 
 
 class RequestUploadResponse(BaseModel):
     url: str
-    fields: Dict[str, str]
+    fields: dict[str, str]
 
 
 def _upload_deployment(deployment_id: str, archive_path: Path) -> None:
@@ -204,7 +199,7 @@ def _upload_deployment(deployment_id: str, archive_path: Path) -> None:
         response = fastapi_client.post(f"/deployments/{deployment_id}/upload")
         response.raise_for_status()
 
-        upload_data = model_validate(RequestUploadResponse, response.json())
+        upload_data = RequestUploadResponse.model_validate(response.json())
         logger.debug("Received upload URL: %s", upload_data.url)
 
         logger.debug("Starting file upload to S3")
@@ -239,17 +234,17 @@ def _get_app(app_slug: str) -> Optional[AppResponse]:
 
         data = response.json()
 
-    return model_validate(AppResponse, data)
+    return AppResponse.model_validate(data)
 
 
-def _get_apps(team_id: str) -> List[AppResponse]:
+def _get_apps(team_id: str) -> list[AppResponse]:
     with APIClient() as client:
         response = client.get("/apps/", params={"team_id": team_id})
         response.raise_for_status()
 
         data = response.json()["data"]
 
-    return [model_validate(AppResponse, app) for app in data]
+    return [AppResponse.model_validate(app) for app in data]
 
 
 WAITING_MESSAGES = [
@@ -300,6 +295,8 @@ def _configure_app(toolkit: RichToolkit, path_to_deploy: Path) -> AppConfig:
 
     toolkit.print_line()
 
+    selected_app: Optional[AppResponse] = None
+
     if not create_new_app:
         with toolkit.progress("Fetching apps...") as progress:
             with handle_http_errors(
@@ -316,18 +313,45 @@ def _configure_app(toolkit: RichToolkit, path_to_deploy: Path) -> AppConfig:
 
             raise typer.Exit(1)
 
-        app = toolkit.ask(
+        selected_app = toolkit.ask(
             "Select the app you want to deploy to:",
             options=[Option({"name": app.slug, "value": app}) for app in apps],
         )
-    else:
-        app_name = toolkit.input(
+
+    app_name = (
+        selected_app.slug
+        if selected_app
+        else toolkit.input(
             title="What's your app name?",
             default=_get_app_name(path_to_deploy),
         )
+    )
 
-        toolkit.print_line()
+    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_line()
+
+    choice = toolkit.ask(
+        "Does everything look right?",
+        tag="confirm",
+        options=[
+            Option({"name": "Yes, start the deployment!", "value": "deploy"}),
+            Option({"name": "No, let me start over", "value": "cancel"}),
+        ],
+    )
+    toolkit.print_line()
 
+    if choice == "cancel":
+        toolkit.print("Deployment cancelled.")
+        raise typer.Exit(0)
+
+    if selected_app:  # pragma: no cover
+        app = selected_app
+    else:
         with toolkit.progress(title="Creating app...") as progress:
             with handle_http_errors(progress):
                 app = _create_app(team.id, app_name)
@@ -363,9 +387,12 @@ def _wait_for_deployment(
 
     last_message_changed_at = time.monotonic()
 
-    with toolkit.progress(
-        next(messages), inline_logs=True, lines_to_show=20
-    ) as progress, APIClient() as client:
+    with (
+        toolkit.progress(
+            next(messages), inline_logs=True, lines_to_show=20
+        ) as progress,
+        APIClient() as client,
+    ):
         try:
             for log in client.stream_build_logs(deployment.id):
                 time_elapsed = time.monotonic() - started_at
@@ -376,13 +403,13 @@ def _wait_for_deployment(
                 if log.type == "complete":
                     progress.log("")
                     progress.log(
-                        f"🐔 Ready the chicken! Your app is ready at [link={deployment.url}]{deployment.url}[/link]"
+                        f"You can also check the app logs at [link={deployment.dashboard_url}]{deployment.dashboard_url}[/link]"
                     )
 
                     progress.log("")
 
                     progress.log(
-                        f"You can also check the app logs at [link={deployment.dashboard_url}]{deployment.dashboard_url}[/link]"
+                        f"🐔 Ready the chicken! Your app is ready at [link={deployment.url}]{deployment.url}[/link]"
                     )
 
                     break
@@ -432,7 +459,7 @@ def _send_waitlist_form(
     with toolkit.progress("Sending your request...") as progress:
         with APIClient() as client:
             with handle_http_errors(progress):
-                response = client.post("/users/waiting-list", json=model_dump(result))
+                response = client.post("/users/waiting-list", json=result.model_dump())
 
                 response.raise_for_status()
 
@@ -457,7 +484,7 @@ def _waitlist_form(toolkit: RichToolkit) -> None:
 
     toolkit.print_line()
 
-    result = model_validate(SignupToWaitingList, {"email": email})
+    result = SignupToWaitingList.model_validate({"email": email})
 
     if toolkit.confirm(
         "Do you want to get access faster by giving us more information?",
@@ -481,8 +508,7 @@ def _waitlist_form(toolkit: RichToolkit) -> None:
         result = form.run()  # type: ignore
 
         try:
-            result = model_validate(
-                SignupToWaitingList,
+            result = SignupToWaitingList.model_validate(
                 {
                     "email": email,
                     **result,  # type: ignore
@@ -531,15 +557,27 @@ def deploy(
     skip_wait: Annotated[
         bool, typer.Option("--no-wait", help="Skip waiting for deployment status")
     ] = False,
+    provided_app_id: Annotated[
+        Union[str, None],
+        typer.Option(
+            "--app-id",
+            help="Application ID to deploy to",
+            envvar="FASTAPI_CLOUD_APP_ID",
+        ),
+    ] = None,
 ) -> Any:
     """
     Deploy a [bold]FastAPI[/bold] app to FastAPI Cloud. 🚀
     """
     logger.debug("Deploy command started")
-    logger.debug("Deploy path: %s, skip_wait: %s", path, skip_wait)
+    logger.debug(
+        "Deploy path: %s, skip_wait: %s, app_id: %s", path, skip_wait, provided_app_id
+    )
+
+    identity = Identity()
 
     with get_rich_toolkit() as toolkit:
-        if not is_logged_in():
+        if not identity.is_logged_in():
             logger.debug("User not logged in, prompting for login or waitlist")
 
             toolkit.print_title("Welcome to FastAPI Cloud!", tag="FastAPI")
@@ -576,19 +614,43 @@ def deploy(
 
         app_config = get_app_config(path_to_deploy)
 
-        if not app_config:
+        if app_config and provided_app_id and app_config.app_id != provided_app_id:
+            toolkit.print(
+                f"[error]Error: Provided app ID ({provided_app_id}) does not match the local "
+                f"config ({app_config.app_id}).[/]"
+            )
+            toolkit.print_line()
+            toolkit.print(
+                "Run [bold]fastapi cloud unlink[/] to remove the local config, "
+                "or remove --app-id / unset FASTAPI_CLOUD_APP_ID to use the configured app.",
+                tag="tip",
+            )
+
+            raise typer.Exit(1) from None
+
+        if provided_app_id:
+            target_app_id = provided_app_id
+        elif app_config:
+            target_app_id = app_config.app_id
+        else:
             logger.debug("No app config found, configuring new app")
+
             app_config = _configure_app(toolkit, path_to_deploy=path_to_deploy)
             toolkit.print_line()
+
+            target_app_id = app_config.app_id
+
+        if provided_app_id:
+            toolkit.print(f"Deploying to app [blue]{target_app_id}[/blue]...")
         else:
-            logger.debug("Existing app config found, proceeding with deployment")
             toolkit.print("Deploying app...")
-            toolkit.print_line()
+
+        toolkit.print_line()
 
         with toolkit.progress("Checking app...", transient=True) as progress:
             with handle_http_errors(progress):
-                logger.debug("Checking app with ID: %s", app_config.app_id)
-                app = _get_app(app_config.app_id)
+                logger.debug("Checking app with ID: %s", target_app_id)
+                app = _get_app(target_app_id)
 
             if not app:
                 logger.debug("App not found in API")
@@ -598,10 +660,12 @@ def deploy(
 
         if not app:
             toolkit.print_line()
-            toolkit.print(
-                "If you deleted this app, you can run [bold]fastapi cloud unlink[/] to unlink the local configuration.",
-                tag="tip",
-            )
+
+            if not provided_app_id:
+                toolkit.print(
+                    "If you deleted this app, you can run [bold]fastapi cloud unlink[/] to unlink the local configuration.",
+                    tag="tip",
+                )
             raise typer.Exit(1)
 
         with tempfile.TemporaryDirectory() as temp_dir:
@@ -609,9 +673,10 @@ def deploy(
             archive_path = Path(temp_dir) / "archive.tar"
             archive(path or Path.cwd(), archive_path)
 
-            with toolkit.progress(
-                title="Creating deployment"
-            ) as progress, handle_http_errors(progress):
+            with (
+                toolkit.progress(title="Creating deployment") as progress,
+                handle_http_errors(progress),
+            ):
                 logger.debug("Creating deployment for app: %s", app.id)
                 deployment = _create_deployment(app.id)
 

{fastapi_cloud_cli-0.7.0 → fastapi_cloud_cli-0.9.0}/src/fastapi_cloud_cli/commands/env.py

@@ -1,17 +1,15 @@
 import logging
 from pathlib import Path
-from typing import Any, List, Union
+from typing import Annotated, Any, Union
 
 import typer
 from pydantic import BaseModel
-from typing_extensions import Annotated
 
 from fastapi_cloud_cli.utils.api import APIClient
 from fastapi_cloud_cli.utils.apps import get_app_config
-from fastapi_cloud_cli.utils.auth import is_logged_in
+from fastapi_cloud_cli.utils.auth import Identity
 from fastapi_cloud_cli.utils.cli import get_rich_toolkit, handle_http_errors
 from fastapi_cloud_cli.utils.env import validate_environment_variable_name
-from fastapi_cloud_cli.utils.pydantic_compat import model_validate
 
 logger = logging.getLogger(__name__)
 
@@ -22,7 +20,7 @@ class EnvironmentVariable(BaseModel):
 
 
 class EnvironmentVariableResponse(BaseModel):
-    data: List[EnvironmentVariable]
+    data: list[EnvironmentVariable]
 
 
 def _get_environment_variables(app_id: str) -> EnvironmentVariableResponse:
@@ -30,7 +28,7 @@ def _get_environment_variables(app_id: str) -> EnvironmentVariableResponse:
         response = client.get(f"/apps/{app_id}/environment-variables/")
         response.raise_for_status()
 
-        return model_validate(EnvironmentVariableResponse, response.json())
+        return EnvironmentVariableResponse.model_validate(response.json())
 
 
 def _delete_environment_variable(app_id: str, name: str) -> bool:
@@ -72,8 +70,10 @@ def list(
     List the environment variables for the app.
     """
 
+    identity = Identity()
+
     with get_rich_toolkit(minimal=True) as toolkit:
-        if not is_logged_in():
+        if not identity.is_logged_in():
             toolkit.print(
                 "No credentials found. Use [blue]`fastapi login`[/] to login.",
                 tag="auth",
@@ -125,9 +125,10 @@ def delete(
     Delete an environment variable from the app.
     """
 
+    identity = Identity()
+
     with get_rich_toolkit(minimal=True) as toolkit:
-        # TODO: maybe this logic can be extracted to a function
-        if not is_logged_in():
+        if not identity.is_logged_in():
             toolkit.print(
                 "No credentials found. Use [blue]`fastapi login`[/] to login.",
                 tag="auth",
@@ -210,8 +211,10 @@ def set(
     Set an environment variable for the app.
     """
 
+    identity = Identity()
+
     with get_rich_toolkit(minimal=True) as toolkit:
-        if not is_logged_in():
+        if not identity.is_logged_in():
             toolkit.print(
                 "No credentials found. Use [blue]`fastapi login`[/] to login.",
                 tag="auth",

{fastapi_cloud_cli-0.7.0 → fastapi_cloud_cli-0.9.0}/src/fastapi_cloud_cli/commands/login.py

@@ -8,15 +8,8 @@ from pydantic import BaseModel
 
 from fastapi_cloud_cli.config import Settings
 from fastapi_cloud_cli.utils.api import APIClient
-from fastapi_cloud_cli.utils.auth import (
-    AuthConfig,
-    get_auth_token,
-    is_logged_in,
-    is_token_expired,
-    write_auth_config,
-)
+from fastapi_cloud_cli.utils.auth import AuthConfig, Identity, write_auth_config
 from fastapi_cloud_cli.utils.cli import get_rich_toolkit, handle_http_errors
-from fastapi_cloud_cli.utils.pydantic_compat import model_validate_json
 
 logger = logging.getLogger(__name__)
 
@@ -44,7 +37,7 @@ def _start_device_authorization(
 
     response.raise_for_status()
 
-    return model_validate_json(AuthorizationData, response.text)
+    return AuthorizationData.model_validate_json(response.text)
 
 
 def _fetch_access_token(client: httpx.Client, device_code: str, interval: int) -> str:
@@ -74,7 +67,7 @@ def _fetch_access_token(client: httpx.Client, device_code: str, interval: int) -
 
         time.sleep(interval)
 
-    response_data = model_validate_json(TokenResponse, response.text)
+    response_data = TokenResponse.model_validate_json(response.text)
 
     return response_data.access_token
 
@@ -83,13 +76,14 @@ def login() -> Any:
     """
     Login to FastAPI Cloud. 🚀
     """
-    token = get_auth_token()
-    if token is not None and is_token_expired(token):
+    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 is_logged_in():
+    if identity.is_logged_in():
         with get_rich_toolkit(minimal=True) as toolkit:
             toolkit.print("You are already logged in.")
             toolkit.print(

{fastapi_cloud_cli-0.7.0 → fastapi_cloud_cli-0.9.0}/src/fastapi_cloud_cli/commands/whoami.py

@@ -5,14 +5,20 @@ from rich import print
 from rich_toolkit.progress import Progress
 
 from fastapi_cloud_cli.utils.api import APIClient
-from fastapi_cloud_cli.utils.auth import is_logged_in
+from fastapi_cloud_cli.utils.auth import Identity
 from fastapi_cloud_cli.utils.cli import handle_http_errors
 
 logger = logging.getLogger(__name__)
 
 
 def whoami() -> Any:
-    if not is_logged_in():
+    identity = Identity()
+
+    if identity.auth_mode == "token":
+        print("⚡ [bold]Using API token from environment variable[/bold]")
+        return
+
+    if not identity.is_logged_in():
         print("No credentials found. Use [blue]`fastapi login`[/] to login.")
         return
 

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

@@ -1,12 +1,13 @@
 import json
 import logging
 import time
+from collections.abc import Generator
 from contextlib import contextmanager
 from datetime import timedelta
 from functools import wraps
 from typing import (
+    Annotated,
     Callable,
-    Generator,
     Literal,
     Optional,
     TypeVar,
@@ -14,13 +15,13 @@ from typing import (
 )
 
 import httpx
-from pydantic import BaseModel, Field, ValidationError
-from typing_extensions import Annotated, ParamSpec
+from pydantic import BaseModel, Field, TypeAdapter, ValidationError
+from typing_extensions import ParamSpec
 
 from fastapi_cloud_cli import __version__
 from fastapi_cloud_cli.config import Settings
-from fastapi_cloud_cli.utils.auth import get_auth_token
-from fastapi_cloud_cli.utils.pydantic_compat import TypeAdapter
+
+from .auth import Identity
 
 logger = logging.getLogger(__name__)
 
@@ -48,8 +49,8 @@ class BuildLogLineMessage(BaseModel):
 
 
 BuildLogLine = Union[BuildLogLineMessage, BuildLogLineGeneric]
-BuildLogAdapter = TypeAdapter[BuildLogLine](
-    Annotated[BuildLogLine, Field(discriminator="type")]  # type: ignore
+BuildLogAdapter: TypeAdapter[BuildLogLine] = TypeAdapter(
+    Annotated[BuildLogLine, Field(discriminator="type")]
 )
 
 
@@ -132,14 +133,13 @@ def attempts(
 class APIClient(httpx.Client):
     def __init__(self) -> None:
         settings = Settings.get()
-
-        token = get_auth_token()
+        identity = Identity()
 
         super().__init__(
             base_url=settings.base_api_url,
             timeout=httpx.Timeout(20),
             headers={
-                "Authorization": f"Bearer {token}",
+                "Authorization": f"Bearer {identity.token}",
                 "User-Agent": f"fastapi-cloud-cli/{__version__}",
             },
         )

{fastapi_cloud_cli-0.7.0 → fastapi_cloud_cli-0.9.0}/src/fastapi_cloud_cli/utils/apps.py

@@ -4,8 +4,6 @@ from typing import Optional
 
 from pydantic import BaseModel
 
-from fastapi_cloud_cli.utils.pydantic_compat import model_dump_json, model_validate_json
-
 logger = logging.getLogger("fastapi_cli")
 
 
@@ -23,7 +21,7 @@ def get_app_config(path_to_deploy: Path) -> Optional[AppConfig]:
         return None
 
     logger.debug("App config loaded successfully")
-    return model_validate_json(AppConfig, config_path.read_text(encoding="utf-8"))
+    return AppConfig.model_validate_json(config_path.read_text(encoding="utf-8"))
 
 
 README = """
@@ -52,7 +50,7 @@ def write_app_config(path_to_deploy: Path, app_config: AppConfig) -> None:
     config_path.parent.mkdir(parents=True, exist_ok=True)
 
     config_path.write_text(
-        model_dump_json(app_config),
+        app_config.model_dump_json(),
         encoding="utf-8",
     )
     readme_path.write_text(README, encoding="utf-8")