fastapi-cloud-cli 0.23.0__tar.gz → 0.24.0__tar.gz

{fastapi_cloud_cli-0.23.0 → fastapi_cloud_cli-0.24.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastapi-cloud-cli
-Version: 0.23.0
+Version: 0.24.0
 Summary: Deploy and manage FastAPI Cloud apps from the command line 🚀
 Author-Email: Patrick Arminio <patrick@fastapilabs.com>
 License: MIT
@@ -40,6 +40,7 @@ Requires-Dist: pydantic[email]>=2.12.0; python_version >= "3.14"
 Requires-Dist: sentry-sdk>=2.20.0
 Requires-Dist: fastar>=0.10.0
 Requires-Dist: detect-installer>=0.1.0
+Requires-Dist: agent-detector>=1.1.0
 Provides-Extra: standard
 Requires-Dist: uvicorn[standard]>=0.15.0; extra == "standard"
 Description-Content-Type: text/markdown

{fastapi_cloud_cli-0.23.0 → fastapi_cloud_cli-0.24.0}/pyproject.toml

@@ -40,8 +40,9 @@ dependencies = [
     "sentry-sdk >= 2.20.0",
     "fastar >= 0.10.0",
     "detect-installer>=0.1.0",
+    "agent-detector>=1.1.0",
 ]
-version = "0.23.0"
+version = "0.24.0"
 
 [project.license]
 text = "MIT"
@@ -63,7 +64,7 @@ dev = [
     "prek>=0.2.24,<1.0.0",
     "pytest>=7.0.0,<10.0.0",
     "coverage[toml]>=7.2,<8.0",
-    "mypy==2.1.0",
+    "mypy==2.3.0",
     "ruff>=0.15.16",
     "respx==0.23.1",
     "time-machine>=2.19.0",

fastapi_cloud_cli-0.24.0/src/fastapi_cloud_cli/__init__.py

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

{fastapi_cloud_cli-0.23.0 → fastapi_cloud_cli-0.24.0}/src/fastapi_cloud_cli/cli.py

@@ -12,6 +12,7 @@ from .commands.ci import ci_app
 from .commands.deploy import deploy
 from .commands.deployments import deployments_app
 from .commands.env import env_app
+from .commands.integrations import integrations_app
 from .commands.login import login
 from .commands.logout import logout
 from .commands.logs import logs
@@ -73,6 +74,7 @@ cloud_app.add_typer(auth_app, name="auth")
 cloud_app.add_typer(apps_app, name="apps")
 cloud_app.add_typer(ci_app, name="ci")
 cloud_app.add_typer(deployments_app, name="deployments")
+cloud_app.add_typer(integrations_app, name="integrations")
 cloud_app.add_typer(teams_app, name="teams")
 cloud_app.add_typer(tokens_app, name="tokens")
 

{fastapi_cloud_cli-0.23.0 → fastapi_cloud_cli-0.24.0}/src/fastapi_cloud_cli/commands/apps/create.py

@@ -6,7 +6,6 @@ import typer
 from pydantic import BaseModel, Field
 from rich_toolkit import RichToolkit
 
-from fastapi_cloud_cli.commands.apps.list import _prompt_for_team
 from fastapi_cloud_cli.commands.deploy.archive import (
     _get_app_name,
     validate_app_directory,
@@ -16,6 +15,7 @@ from fastapi_cloud_cli.utils.apps import AppConfig, write_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.execution import JsonOutputOption
+from fastapi_cloud_cli.utils.teams import select_team
 
 logger = logging.getLogger(__name__)
 
@@ -130,7 +130,11 @@ def create_app(
                         hint="Pass --team-id to choose a team.",
                     )
 
-                team = _prompt_for_team(toolkit, client)
+                team = select_team(
+                    toolkit,
+                    client,
+                    empty_hint="Create a team before listing apps.",
+                )
                 team_id = team.id
                 toolkit.print_line()
 

{fastapi_cloud_cli-0.23.0 → fastapi_cloud_cli-0.24.0}/src/fastapi_cloud_cli/commands/apps/list.py

@@ -6,13 +6,13 @@ from pydantic import BaseModel, Field
 from rich.table import Table
 from rich.text import Text
 from rich_toolkit import RichToolkit
-from rich_toolkit.menu import Option
 
 from fastapi_cloud_cli.config import Settings
 from fastapi_cloud_cli.utils.api import APIClient
 from fastapi_cloud_cli.utils.auth import Identity
-from fastapi_cloud_cli.utils.cli import FastAPIRichToolkit, get_rich_toolkit
+from fastapi_cloud_cli.utils.cli import get_rich_toolkit
 from fastapi_cloud_cli.utils.execution import JsonOutputOption
+from fastapi_cloud_cli.utils.teams import Team, select_team
 
 logger = logging.getLogger(__name__)
 
@@ -31,12 +31,6 @@ class App(BaseModel):
     updated_at: str | None = None
 
 
-class Team(BaseModel):
-    id: str
-    slug: str
-    name: str
-
-
 class AppsListAPIResponse(BaseModel):
     data: list[App]
     count: int
@@ -84,15 +78,6 @@ def _get_apps_list_table(
     return table
 
 
-def _get_teams(client: APIClient) -> list[Team]:
-    response = client.get("/teams/")
-    response.raise_for_status()
-
-    data = response.json()["data"]
-
-    return [Team.model_validate(team) for team in data]
-
-
 def _get_team(client: APIClient, team_id: str) -> Team:
     response = client.get(f"/teams/{team_id}")
     response.raise_for_status()
@@ -149,36 +134,6 @@ def _render_apps_list_output(data: AppsListOutput, toolkit: RichToolkit) -> None
     )
 
 
-def _prompt_for_team(toolkit: FastAPIRichToolkit, client: APIClient) -> Team:
-    with toolkit.progress(
-        title="Fetching teams",
-        transient=True,
-    ) as progress:
-        with client.handle_http_errors(
-            progress,
-            default_message="Error fetching teams. Please try again later.",
-            toolkit=toolkit,
-        ):
-            teams = _get_teams(client)
-
-    if not teams:
-        toolkit.fail(
-            "missing_required_input",
-            "No teams found.",
-            hint="Create a team before listing apps.",
-        )
-
-    return toolkit.ask(
-        "Select the team:",
-        options=[
-            Option({"name": team.name, "value": team})
-            for team in sorted(teams, key=lambda team: team.name.lower())
-        ],
-        allow_filtering=True,
-        bullet=False,
-    )
-
-
 def list_apps(
     team_id: Annotated[
         str | None,
@@ -229,7 +184,11 @@ def list_apps(
                         hint="Pass --team-id to choose a team.",
                     )
 
-                team = _prompt_for_team(toolkit, client)
+                team = select_team(
+                    toolkit,
+                    client,
+                    empty_hint="Create a team before listing apps.",
+                )
                 team_id = team.id
                 team_slug = team.slug
 

fastapi_cloud_cli-0.24.0/src/fastapi_cloud_cli/commands/integrations/__init__.py

@@ -0,0 +1,13 @@
+import typer
+
+from fastapi_cloud_cli.commands.integrations.providers import providers_app
+from fastapi_cloud_cli.commands.integrations.resources import resources_app
+
+integrations_app = typer.Typer(
+    no_args_is_help=True,
+    help="Manage third-party integrations.",
+)
+integrations_app.add_typer(providers_app, name="providers")
+integrations_app.add_typer(resources_app, name="resources")
+
+__all__ = ["integrations_app"]

fastapi_cloud_cli-0.24.0/src/fastapi_cloud_cli/commands/integrations/providers/__init__.py

@@ -0,0 +1,11 @@
+import typer
+
+from fastapi_cloud_cli.commands.integrations.providers.list import list_providers
+
+providers_app = typer.Typer(
+    no_args_is_help=True,
+    help="Manage integration providers for a team.",
+)
+providers_app.command("list")(list_providers)
+
+__all__ = ["providers_app"]

fastapi_cloud_cli-0.24.0/src/fastapi_cloud_cli/commands/integrations/providers/list.py

@@ -0,0 +1,144 @@
+from typing import Annotated, Any, Literal
+
+import typer
+from pydantic import BaseModel
+from rich.table import Table
+from rich.text import Text
+from rich_toolkit import RichToolkit
+
+from fastapi_cloud_cli.utils.api import APIClient
+from fastapi_cloud_cli.utils.auth import Identity
+from fastapi_cloud_cli.utils.cli import get_rich_toolkit
+from fastapi_cloud_cli.utils.execution import JsonOutputOption
+from fastapi_cloud_cli.utils.teams import resolve_team_id
+
+ProviderStatus = Literal["available", "coming_soon", "connected"]
+
+STATUS_LABELS: dict[ProviderStatus, str] = {
+    "available": "not connected",
+    "coming_soon": "coming soon",
+    "connected": "connected",
+}
+
+
+class ConnectedIntegration(BaseModel):
+    id: str
+
+
+class IntegrationProvider(BaseModel):
+    id: str
+    name: str
+    status: ProviderStatus
+    connected_integration: ConnectedIntegration | None = None
+
+
+class ProvidersListAPIResponse(BaseModel):
+    data: list[IntegrationProvider]
+
+
+class ProvidersListOutput(BaseModel):
+    team_id: str
+    providers: list[IntegrationProvider]
+
+
+def _get_providers(client: APIClient, *, team_id: str) -> list[IntegrationProvider]:
+    response = client.get(f"/teams/{team_id}/integrations")
+    response.raise_for_status()
+
+    return ProvidersListAPIResponse.model_validate(response.json()).data
+
+
+def _get_providers_table(providers: list[IntegrationProvider]) -> Table:
+    table = Table.grid(padding=(0, 2), pad_edge=False)
+    table.add_column("Name", no_wrap=True)
+    table.add_column("Status", no_wrap=True)
+    table.add_column("Integration ID", no_wrap=True, overflow="ignore")
+    table.add_row(
+        Text("Name", style="bold"),
+        Text("Status", style="bold"),
+        Text("Integration ID", style="bold"),
+    )
+    table.add_row("", "", "")
+
+    for provider in providers:
+        connected_integration = provider.connected_integration
+        table.add_row(
+            Text(provider.name),
+            Text(
+                STATUS_LABELS[provider.status],
+                style="green" if provider.status == "connected" else "dim",
+            ),
+            Text(connected_integration.id if connected_integration else "-"),
+        )
+
+    return table
+
+
+def _render_providers_list_output(
+    data: ProvidersListOutput,
+    toolkit: RichToolkit,
+) -> None:
+    toolkit.print_title("integrations")
+    toolkit.print_line()
+
+    if not data.providers:
+        toolkit.print("No integration providers available.", bullet=False)
+        return
+
+    toolkit.print(_get_providers_table(data.providers), bullet=False)
+
+
+def list_providers(
+    team_id: Annotated[
+        str | None,
+        typer.Option(
+            "--team-id",
+            help=(
+                "ID of the team whose integration providers should be listed. "
+                "Defaults to the linked app's team."
+            ),
+        ),
+    ] = None,
+    json_output: JsonOutputOption = False,
+) -> Any:
+    """
+    List integration providers and their connection status for a team.
+    """
+    identity = Identity()
+
+    with get_rich_toolkit(json_output=json_output) as toolkit:
+        if not identity.is_logged_in():
+            toolkit.fail(
+                "not_logged_in",
+                "No credentials found.",
+                hint="Run `fastapi cloud login` or set FASTAPI_CLOUD_TOKEN.",
+            )
+
+        with APIClient() as client:
+            team_id = resolve_team_id(
+                toolkit,
+                client,
+                team_id=team_id,
+                empty_hint="Create a team before listing integration providers.",
+            )
+
+            with (
+                toolkit.progress(
+                    title="Fetching integration providers",
+                    transient=True,
+                ) as progress,
+                client.handle_http_errors(
+                    progress,
+                    default_message=(
+                        "Error fetching integration providers. Please try again later."
+                    ),
+                    not_found_message="Team not found.",
+                    toolkit=toolkit,
+                ),
+            ):
+                providers = _get_providers(client, team_id=team_id)
+
+        toolkit.success(
+            ProvidersListOutput(team_id=team_id, providers=providers),
+            render_output=_render_providers_list_output,
+        )

fastapi_cloud_cli-0.24.0/src/fastapi_cloud_cli/commands/integrations/resources/__init__.py

@@ -0,0 +1,19 @@
+import typer
+
+from fastapi_cloud_cli.commands.integrations.resources.connect import connect_resource
+from fastapi_cloud_cli.commands.integrations.resources.disconnect import (
+    disconnect_resource,
+)
+from fastapi_cloud_cli.commands.integrations.resources.get import get_resource
+from fastapi_cloud_cli.commands.integrations.resources.list import list_resources
+
+resources_app = typer.Typer(
+    no_args_is_help=True,
+    help="Manage resources connected to an app.",
+)
+resources_app.command("connect")(connect_resource)
+resources_app.command("disconnect")(disconnect_resource)
+resources_app.command("get")(get_resource)
+resources_app.command("list")(list_resources)
+
+__all__ = ["resources_app"]

fastapi_cloud_cli-0.24.0/src/fastapi_cloud_cli/commands/integrations/resources/connect.py

@@ -0,0 +1,155 @@
+import logging
+from typing import Annotated, Any
+
+import typer
+from pydantic import BaseModel, Field
+from rich.text import Text
+from rich_toolkit import RichToolkit
+
+from fastapi_cloud_cli.commands.apps.list import (
+    App,
+    _get_app,
+    _get_app_dashboard_url,
+    _get_team,
+)
+from fastapi_cloud_cli.config import Settings
+from fastapi_cloud_cli.utils.api import APIClient
+from fastapi_cloud_cli.utils.apps import resolve_app_id_or_fail
+from fastapi_cloud_cli.utils.auth import Identity
+from fastapi_cloud_cli.utils.cli import get_rich_toolkit
+from fastapi_cloud_cli.utils.execution import JsonOutputOption
+
+logger = logging.getLogger(__name__)
+
+
+class ResourceConnectOutput(BaseModel):
+    app_id: str
+    connect_url: str
+    app_name: Annotated[str, Field(exclude=True)]
+    browser_opened: Annotated[bool, Field(exclude=True)]
+    app_id_was_provided: Annotated[bool, Field(exclude=True)]
+
+
+def _get_resource_connect_url(
+    app: App,
+    *,
+    team_slug: str,
+    settings: Settings,
+) -> str:
+    app_dashboard_url = _get_app_dashboard_url(
+        app,
+        team_slug=team_slug,
+        settings=settings,
+    )
+    return f"{app_dashboard_url}/integrations/connect"
+
+
+def _render_resource_connect_output(
+    data: ResourceConnectOutput,
+    toolkit: RichToolkit,
+) -> None:
+    toolkit.print_title("connect resource")
+    toolkit.print_line()
+
+    if data.browser_opened:
+        toolkit.print(
+            f"Opened the integration setup for [bold]{data.app_name}[/bold] in your browser.",
+            emoji="🔌",
+        )
+    else:
+        toolkit.print(
+            f"Open the integration setup for [bold]{data.app_name}[/bold] in your browser:",
+            emoji="🔌",
+        )
+
+    toolkit.print(Text(data.connect_url, style=f"link {data.connect_url}"))
+    toolkit.print_line()
+
+    list_command = "fastapi cloud integrations resources list"
+    if data.app_id_was_provided:
+        list_command = f"{list_command} --app-id {data.app_id}"
+
+    toolkit.print(
+        f"When the connection is complete, run [bold]{list_command}[/bold] to view it.",
+        emoji="💡",
+    )
+
+
+def connect_resource(
+    app_id: Annotated[
+        str | None,
+        typer.Option(
+            "--app-id",
+            help="ID of the app to connect a provider resource to.",
+        ),
+    ] = None,
+    no_open: Annotated[
+        bool,
+        typer.Option(
+            "--no-open",
+            help="Do not open the browser automatically.",
+        ),
+    ] = False,
+    json_output: JsonOutputOption = False,
+) -> Any:
+    """
+    Open FastAPI Cloud to connect a provider resource to an app.
+    """
+    identity = Identity()
+
+    with get_rich_toolkit(json_output=json_output) as toolkit:
+        if not identity.is_logged_in():
+            toolkit.fail(
+                "not_logged_in",
+                "No credentials found.",
+                hint="Run `fastapi cloud login` or set FASTAPI_CLOUD_TOKEN.",
+            )
+
+        app_id_was_provided = app_id is not None
+        app_id = resolve_app_id_or_fail(toolkit, app_id=app_id)
+
+        with APIClient() as client:
+            with (
+                toolkit.progress(title="Fetching app", transient=True) as progress,
+                client.handle_http_errors(
+                    progress,
+                    default_message="Error fetching app. Please try again later.",
+                    not_found_message="App not found.",
+                    toolkit=toolkit,
+                ),
+            ):
+                app = _get_app(client, app_id)
+
+            with (
+                toolkit.progress(title="Fetching team", transient=True) as progress,
+                client.handle_http_errors(
+                    progress,
+                    default_message="Error fetching team. Please try again later.",
+                    not_found_message="Team not found.",
+                    toolkit=toolkit,
+                ),
+            ):
+                team = _get_team(client, app.team_id)
+
+        connect_url = _get_resource_connect_url(
+            app,
+            team_slug=team.slug,
+            settings=Settings.get(),
+        )
+        browser_opened = False
+
+        if not json_output and not no_open:
+            launch_result = typer.launch(connect_url)
+            logger.debug("Launch command result: %s", launch_result)
+            browser_opened = launch_result == 0
+
+        toolkit.success(
+            ResourceConnectOutput(
+                app_id=app.id,
+                app_name=app.name,
+                connect_url=connect_url,
+                browser_opened=browser_opened,
+                app_id_was_provided=app_id_was_provided,
+            ),
+            render_output=_render_resource_connect_output,
+        )