Merge branch 'main' into prek

Author: YuriiMotov

.github/workflows/test.yml

@@ -25,19 +25,7 @@ jobs:
   test:
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
-        pydantic-version: ["v2"]
-        include:
-          - python-version: "3.8"
-            pydantic-version: "v1"
-          - python-version: "3.9"
-            pydantic-version: "v1"
-          - python-version: "3.10"
-            pydantic-version: "v1"
-          - python-version: "3.11"
-            pydantic-version: "v1"
-          - python-version: "3.12"
-            pydantic-version: "v1"
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
       fail-fast: false
     runs-on: ubuntu-latest
     env:
@@ -65,9 +53,6 @@ jobs:
           limit-access-to-actor: true
       - name: Install Dependencies
         run: uv sync --locked --all-extras --dev
-      - name: Install Pydantic v1
-        if: matrix.pydantic-version == 'v1'
-        run: uv pip install "pydantic<2.0.0"
       - name: Lint
         run: uv run --no-sync scripts/lint.sh
       - run: mkdir coverage
@@ -79,7 +64,7 @@ jobs:
       - name: Store coverage files
         uses: actions/upload-artifact@v4
         with:
-          name: coverage-${{ matrix.python-version }}-${{ matrix.pydantic-version }}
+          name: coverage-${{ matrix.python-version }}
           path: coverage
           include-hidden-files: true
 

.python-version

@@ -1 +1 @@
-3.8
+3.9

pyproject.toml

@@ -3,7 +3,7 @@ name = "fastapi-cloud-cli"
 dynamic = ["version"]
 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"
 license = { text = "MIT" }
 classifiers = [
@@ -22,7 +22,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",
@@ -35,7 +34,7 @@ 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",
 ]

release-notes.md

@@ -2,6 +2,8 @@
 
 ## Latest Changes
 
+## 0.8.0
+
 ### Fixes
 
 * 🐛 Fix CI ran all tests on oldest supported Python. PR [#136](https://github.com/fastapilabs/fastapi-cloud-cli/pull/136) by [@DoctorJohn](https://github.com/DoctorJohn).
@@ -10,6 +12,11 @@
 
 * ♻️ Reorder log messages for deployment readiness. PR [#137](https://github.com/fastapilabs/fastapi-cloud-cli/pull/137) by [@alejsdev](https://github.com/alejsdev).
 
+### Upgrades
+
+* ➖ Drop support for Pydantic v1. PR [#139](https://github.com/fastapilabs/fastapi-cloud-cli/pull/139) by [@patrick91](https://github.com/patrick91).
+* 🔧 Drop support for Python 3.8. PR [#138](https://github.com/fastapilabs/fastapi-cloud-cli/pull/138) by [@patrick91](https://github.com/patrick91).
+
 ### Internal
 
 * 👷 Configure coverage, error on main tests, don't wait for Smokeshow. PR [#134](https://github.com/fastapilabs/fastapi-cloud-cli/pull/134) by [@YuriiMotov](https://github.com/YuriiMotov).

src/fastapi_cloud_cli/__init__.py

@@ -1 +1 @@
-__version__ = "0.7.0"
+__version__ = "0.8.0"

src/fastapi_cloud_cli/commands/deploy.py

@@ -7,28 +7,22 @@
 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.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__)
 
@@ -102,14 +96,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 +120,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 +173,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 +198,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 +233,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 = [
@@ -363,9 +357,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
@@ -432,7 +429,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 +454,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 +478,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
@@ -609,9 +605,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)
 

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.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,15 +20,15 @@ class EnvironmentVariable(BaseModel):
 
 
 class EnvironmentVariableResponse(BaseModel):
-    data: List[EnvironmentVariable]
+    data: list[EnvironmentVariable]
 
 
 def _get_environment_variables(app_id: str) -> EnvironmentVariableResponse:
     with APIClient() as client:
         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:

src/fastapi_cloud_cli/commands/login.py

@@ -16,7 +16,6 @@
     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 +43,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 +73,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
 

src/fastapi_cloud_cli/utils/api.py

@@ -1,26 +1,26 @@
 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,
     Union,
 )
 
 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
 
 logger = logging.getLogger(__name__)
 
@@ -48,8 +48,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")]
 )
 
 

src/fastapi_cloud_cli/utils/apps.py

@@ -4,8 +4,6 @@
 
 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")