♻️ Move API client into a package

src/fastapi_cloud_cli/api/__init__.py

@@ -0,0 +1,12 @@
+from .client import STREAM_LOGS_MAX_RETRIES as STREAM_LOGS_MAX_RETRIES
+from .client import SUCCESSFUL_STATUSES as SUCCESSFUL_STATUSES
+from .client import APIClient as APIClient
+from .client import AppLogEntry as AppLogEntry
+from .client import BuildLogLineMessage as BuildLogLineMessage
+from .client import DeploymentStatus as DeploymentStatus
+from .client import StreamLogError as StreamLogError
+from .client import TooManyRetriesError as TooManyRetriesError
+from .client import _get_response_error_message as _get_response_error_message
+from .client import get_http_error_code as get_http_error_code
+from .client import get_http_error_hint as get_http_error_hint
+from .client import handle_http_error as handle_http_error

src/fastapi_cloud_cli/utils/api.py → src/fastapi_cloud_cli/api/client.py

@@ -21,10 +21,9 @@
 
 from fastapi_cloud_cli import __version__
 from fastapi_cloud_cli.config import Settings
+from fastapi_cloud_cli.utils.auth import AuthMode, Identity, delete_auth_config
 from fastapi_cloud_cli.utils.errors import ErrorCode, ErrorToolkit
 
-from .auth import AuthMode, Identity, delete_auth_config
-
 logger = logging.getLogger(__name__)
 
 STREAM_LOGS_MAX_RETRIES = 3

src/fastapi_cloud_cli/commands/_flow.py

@@ -6,8 +6,8 @@
 from rich_toolkit import RichToolkit
 from rich_toolkit.progress import Progress
 
+from fastapi_cloud_cli.api import APIClient
 from fastapi_cloud_cli.config import Settings
-from fastapi_cloud_cli.utils.api import APIClient
 from fastapi_cloud_cli.utils.auth import AuthConfig, AuthMode, write_auth_config
 from fastapi_cloud_cli.utils.cli import FastAPIRichToolkit
 

src/fastapi_cloud_cli/commands/apps/create.py

@@ -6,11 +6,11 @@
 from pydantic import BaseModel, Field
 from rich_toolkit import RichToolkit
 
+from fastapi_cloud_cli.api import APIClient
 from fastapi_cloud_cli.commands.deploy.archive import (
     _get_app_name,
     validate_app_directory,
 )
-from fastapi_cloud_cli.utils.api import APIClient
 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

src/fastapi_cloud_cli/commands/apps/get.py

@@ -6,14 +6,14 @@
 from rich.text import Text
 from rich_toolkit import RichToolkit
 
+from fastapi_cloud_cli.api import APIClient
 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_details_table, get_rich_toolkit

src/fastapi_cloud_cli/commands/apps/link.py

@@ -7,8 +7,8 @@
 from rich_toolkit import RichToolkit
 from rich_toolkit.menu import Option
 
+from fastapi_cloud_cli.api import APIClient
 from fastapi_cloud_cli.commands.apps.list import _get_app
-from fastapi_cloud_cli.utils.api import APIClient
 from fastapi_cloud_cli.utils.apps import AppConfig, get_app_config, write_app_config
 from fastapi_cloud_cli.utils.auth import Identity
 from fastapi_cloud_cli.utils.cli import FastAPIRichToolkit, get_rich_toolkit

src/fastapi_cloud_cli/commands/apps/list.py

@@ -7,8 +7,8 @@
 from rich.text import Text
 from rich_toolkit import RichToolkit
 
+from fastapi_cloud_cli.api import APIClient
 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 get_rich_toolkit
 from fastapi_cloud_cli.utils.execution import JsonOutputOption

src/fastapi_cloud_cli/commands/apps/update.py

@@ -5,8 +5,8 @@
 from pydantic import BaseModel
 from rich_toolkit import RichToolkit
 
+from fastapi_cloud_cli.api import APIClient
 from fastapi_cloud_cli.commands.deploy.archive import validate_app_directory
-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

src/fastapi_cloud_cli/commands/auth/wait.py

@@ -2,12 +2,12 @@
 
 import typer
 
+from fastapi_cloud_cli.api import APIClient
 from fastapi_cloud_cli.commands._flow import (
     DEFAULT_LOGIN_TIMEOUT_SECONDS,
     complete_device_login,
     render_login_output,
 )
-from fastapi_cloud_cli.utils.api import APIClient
 from fastapi_cloud_cli.utils.cli import get_rich_toolkit
 from fastapi_cloud_cli.utils.execution import JsonOutputOption
 

src/fastapi_cloud_cli/commands/deploy/cloud.py

@@ -1,6 +1,6 @@
 from pydantic import BaseModel
 
-from fastapi_cloud_cli.utils.api import (
+from fastapi_cloud_cli.api import (
     APIClient,
     DeploymentStatus,
     _get_response_error_message,

src/fastapi_cloud_cli/commands/deploy/command.py

@@ -6,6 +6,7 @@
 import typer
 from pydantic import BaseModel
 
+from fastapi_cloud_cli.api import APIClient, DeploymentStatus
 from fastapi_cloud_cli.commands.deploy.archive import _get_large_files, archive
 from fastapi_cloud_cli.commands.deploy.cloud import (
     AppResponse,
@@ -18,7 +19,6 @@
 from fastapi_cloud_cli.commands.deploy.upload import _cancel_upload, _upload_deployment
 from fastapi_cloud_cli.commands.deploy.wait import _wait_for_deployment
 from fastapi_cloud_cli.commands.login import _interactive_login
-from fastapi_cloud_cli.utils.api import APIClient, DeploymentStatus
 from fastapi_cloud_cli.utils.apps import get_app_config
 from fastapi_cloud_cli.utils.auth import Identity
 from fastapi_cloud_cli.utils.cli import FastAPIRichToolkit, get_rich_toolkit

src/fastapi_cloud_cli/commands/deploy/configure.py

@@ -4,6 +4,7 @@
 from pydantic import TypeAdapter
 from rich_toolkit.menu import Option
 
+from fastapi_cloud_cli.api import APIClient
 from fastapi_cloud_cli.commands.deploy.archive import AppDirectory, _get_app_name
 from fastapi_cloud_cli.commands.deploy.cloud import (
     AppResponse,
@@ -12,7 +13,6 @@
     _get_teams,
     _update_app,
 )
-from fastapi_cloud_cli.utils.api import APIClient
 from fastapi_cloud_cli.utils.apps import AppConfig, write_app_config
 from fastapi_cloud_cli.utils.cli import FastAPIRichToolkit
 

src/fastapi_cloud_cli/commands/deploy/upload.py

@@ -6,8 +6,8 @@
 from pydantic import BaseModel
 from rich_toolkit.progress import Progress
 
+from fastapi_cloud_cli.api import APIClient
 from fastapi_cloud_cli.commands.deploy.cloud import CreateDeploymentResponse
-from fastapi_cloud_cli.utils.api import APIClient
 from fastapi_cloud_cli.utils.progress_file import ProgressFile
 
 logger = logging.getLogger(__name__)

src/fastapi_cloud_cli/commands/deploy/wait.py

@@ -6,14 +6,14 @@
 from rich.text import Text
 from rich_toolkit import RichToolkit
 
-from fastapi_cloud_cli.commands.deploy.cloud import CreateDeploymentResponse
-from fastapi_cloud_cli.utils.api import (
+from fastapi_cloud_cli.api import (
     SUCCESSFUL_STATUSES,
     APIClient,
     DeploymentStatus,
     StreamLogError,
     TooManyRetriesError,
 )
+from fastapi_cloud_cli.commands.deploy.cloud import CreateDeploymentResponse
 
 # (bullet emoji, message) — the emoji replaces the progress animation
 WAITING_MESSAGES = [

src/fastapi_cloud_cli/commands/deployments.py

@@ -9,7 +9,7 @@
 from rich.text import Text
 from rich_toolkit import RichToolkit
 
-from fastapi_cloud_cli.utils.api import (
+from fastapi_cloud_cli.api import (
     APIClient,
     BuildLogLineMessage,
     DeploymentStatus,

src/fastapi_cloud_cli/commands/env/_shared.py

@@ -1,7 +1,7 @@
 from pydantic import BaseModel
 from rich.text import Text
 
-from fastapi_cloud_cli.utils.api import APIClient
+from fastapi_cloud_cli.api import APIClient
 
 ENV_VAR_VALUE_MAX_LENGTH = 40
 

src/fastapi_cloud_cli/commands/env/delete.py

@@ -6,8 +6,8 @@
 from rich_toolkit import RichToolkit
 from rich_toolkit.menu import Option
 
+from fastapi_cloud_cli.api import APIClient
 from fastapi_cloud_cli.commands.env._shared import _get_environment_variables
-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

src/fastapi_cloud_cli/commands/env/get.py

@@ -7,13 +7,13 @@
 from rich_toolkit import RichToolkit
 from rich_toolkit.menu import Option
 
+from fastapi_cloud_cli.api import APIClient
 from fastapi_cloud_cli.commands.env._shared import (
     EnvironmentVariable,
     _find_environment_variable,
     _format_env_var_value,
     _get_environment_variables,
 )
-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

src/fastapi_cloud_cli/commands/env/list.py

@@ -7,13 +7,13 @@
 from rich.text import Text
 from rich_toolkit import RichToolkit
 
+from fastapi_cloud_cli.api import APIClient
 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.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

src/fastapi_cloud_cli/commands/env/set.py

@@ -6,7 +6,7 @@
 from pydantic import BaseModel, Field
 from rich_toolkit import RichToolkit
 
-from fastapi_cloud_cli.utils.api import APIClient
+from fastapi_cloud_cli.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 FastAPIRichToolkit, get_rich_toolkit

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

@@ -6,7 +6,7 @@
 from rich.text import Text
 from rich_toolkit import RichToolkit
 
-from fastapi_cloud_cli.utils.api import APIClient
+from fastapi_cloud_cli.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

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

@@ -6,14 +6,14 @@
 from rich.text import Text
 from rich_toolkit import RichToolkit
 
+from fastapi_cloud_cli.api import APIClient
 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

src/fastapi_cloud_cli/commands/integrations/resources/disconnect.py

@@ -5,10 +5,10 @@
 from rich_toolkit import RichToolkit
 from rich_toolkit.menu import Option
 
+from fastapi_cloud_cli.api import APIClient
 from fastapi_cloud_cli.commands.integrations.resources.get import _get_resource
 from fastapi_cloud_cli.commands.integrations.resources.list import _get_resources
 from fastapi_cloud_cli.commands.integrations.resources.providers import PROVIDER_NAMES
-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

src/fastapi_cloud_cli/commands/integrations/resources/get.py

@@ -6,11 +6,11 @@
 from rich.text import Text
 from rich_toolkit import RichToolkit
 
+from fastapi_cloud_cli.api import APIClient
 from fastapi_cloud_cli.commands.integrations.resources.providers import (
     PROVIDER_NAMES,
     Provider,
 )
-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_details_table, get_rich_toolkit

src/fastapi_cloud_cli/commands/integrations/resources/list.py

@@ -6,11 +6,11 @@
 from rich.text import Text
 from rich_toolkit import RichToolkit
 
+from fastapi_cloud_cli.api import APIClient
 from fastapi_cloud_cli.commands.integrations.resources.providers import (
     PROVIDER_NAMES,
     Provider,
 )
-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

src/fastapi_cloud_cli/commands/login.py

@@ -3,14 +3,14 @@
 
 import typer
 
+from fastapi_cloud_cli.api import APIClient
 from fastapi_cloud_cli.commands._flow import (
     DEFAULT_LOGIN_TIMEOUT_SECONDS,
     complete_device_login,
     device_authorization_output,
     render_login_output,
     start_device_authorization,
 )
-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.execution import JsonOutputOption

src/fastapi_cloud_cli/commands/logs.py

@@ -11,7 +11,7 @@
 from rich.markup import escape
 from rich_toolkit import RichToolkit
 
-from fastapi_cloud_cli.utils.api import (
+from fastapi_cloud_cli.api import (
     APIClient,
     AppLogEntry,
     StreamLogError,

src/fastapi_cloud_cli/commands/setup_ci.py

@@ -9,7 +9,7 @@
 import typer
 from pydantic import BaseModel
 
-from fastapi_cloud_cli.utils.api import APIClient
+from fastapi_cloud_cli.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 FastAPIRichToolkit, get_rich_toolkit

src/fastapi_cloud_cli/commands/teams/__init__.py

@@ -7,13 +7,13 @@
 from rich.table import Table
 from rich_toolkit import RichToolkit
 
+from fastapi_cloud_cli.api import APIClient
 from fastapi_cloud_cli.commands.teams.get import (
     Team,
     _get_team_dashboard_url,
     get_team,
 )
 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 get_rich_toolkit
 from fastapi_cloud_cli.utils.execution import JsonOutputOption

src/fastapi_cloud_cli/commands/teams/get.py

@@ -5,8 +5,8 @@
 from pydantic import BaseModel
 from rich_toolkit import RichToolkit
 
+from fastapi_cloud_cli.api import APIClient
 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 get_details_table, get_rich_toolkit
 from fastapi_cloud_cli.utils.execution import JsonOutputOption

src/fastapi_cloud_cli/commands/tokens/create.py

@@ -5,7 +5,7 @@
 from pydantic import BaseModel, Field
 from rich_toolkit import RichToolkit
 
-from fastapi_cloud_cli.utils.api import APIClient
+from fastapi_cloud_cli.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 FastAPIRichToolkit, get_rich_toolkit

src/fastapi_cloud_cli/commands/tokens/delete.py

@@ -4,7 +4,7 @@
 from pydantic import BaseModel
 from rich_toolkit import RichToolkit
 
-from fastapi_cloud_cli.utils.api import APIClient
+from fastapi_cloud_cli.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

src/fastapi_cloud_cli/commands/tokens/list.py

@@ -6,7 +6,7 @@
 from rich.text import Text
 from rich_toolkit import RichToolkit
 
-from fastapi_cloud_cli.utils.api import APIClient
+from fastapi_cloud_cli.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

src/fastapi_cloud_cli/commands/whoami.py

@@ -4,7 +4,7 @@
 from pydantic import BaseModel
 from rich_toolkit import RichToolkit
 
-from fastapi_cloud_cli.utils.api import APIClient
+from fastapi_cloud_cli.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