fastapi-cloud-cli 0.1.2__tar.gz → 0.1.5__tar.gz

{fastapi_cloud_cli-0.1.2 → fastapi_cloud_cli-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastapi-cloud-cli
-Version: 0.1.2
+Version: 0.1.5
 Summary: Deploy and manage FastAPI Cloud apps from the command line 🚀
 Author-Email: Patrick Arminio <patrick@fastapilabs.com>
 License: MIT

{fastapi_cloud_cli-0.1.2 → fastapi_cloud_cli-0.1.5}/pyproject.toml

@@ -40,7 +40,7 @@ dependencies = [
     "pydantic[email] >= 1.6.1",
     "sentry-sdk >= 2.20.0",
 ]
-version = "0.1.2"
+version = "0.1.5"
 
 [project.license]
 text = "MIT"

fastapi_cloud_cli-0.1.5/src/fastapi_cloud_cli/__init__.py

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

{fastapi_cloud_cli-0.1.2 → fastapi_cloud_cli-0.1.5}/src/fastapi_cloud_cli/commands/deploy.py

@@ -345,42 +345,43 @@ def _wait_for_deployment(
     with toolkit.progress(
         next(messages), inline_logs=True, lines_to_show=20
     ) as progress:
-        for line in _stream_build_logs(deployment.id):
-            time_elapsed = time.monotonic() - started_at
+        with handle_http_errors(progress=progress):
+            for line in _stream_build_logs(deployment.id):
+                time_elapsed = time.monotonic() - started_at
 
-            data = json.loads(line)
+                data = json.loads(line)
 
-            if "message" in data:
-                progress.log(Text.from_ansi(data["message"].rstrip()))
+                if "message" in data:
+                    progress.log(Text.from_ansi(data["message"].rstrip()))
 
-            if data.get("type") == "complete":
-                progress.log("")
-                progress.log(
-                    f"🐔 Ready the chicken! Your app is ready at [link={deployment.url}]{deployment.url}[/link]"
-                )
+                if data.get("type") == "complete":
+                    progress.log("")
+                    progress.log(
+                        f"🐔 Ready the chicken! Your app is ready at [link={deployment.url}]{deployment.url}[/link]"
+                    )
 
-                progress.log("")
+                    progress.log("")
 
-                progress.log(
-                    f"You can also check the app logs at [link={deployment.dashboard_url}]{deployment.dashboard_url}[/link]"
-                )
+                    progress.log(
+                        f"You can also check the app logs at [link={deployment.dashboard_url}]{deployment.dashboard_url}[/link]"
+                    )
 
-                break
+                    break
 
-            if data.get("type") == "failed":
-                progress.log("")
-                progress.log(
-                    f"😔 Oh no! Something went wrong. Check out the logs at [link={deployment.dashboard_url}]{deployment.dashboard_url}[/link]"
-                )
-                raise typer.Exit(1)
+                if data.get("type") == "failed":
+                    progress.log("")
+                    progress.log(
+                        f"😔 Oh no! Something went wrong. Check out the logs at [link={deployment.dashboard_url}]{deployment.dashboard_url}[/link]"
+                    )
+                    raise typer.Exit(1)
 
-            if time_elapsed > 30:
-                messages = cycle(LONG_WAIT_MESSAGES)  # pragma: no cover
+                if time_elapsed > 30:
+                    messages = cycle(LONG_WAIT_MESSAGES)  # pragma: no cover
 
-            if (time.monotonic() - last_message_changed_at) > 2:
-                progress.title = next(messages)  # pragma: no cover
+                if (time.monotonic() - last_message_changed_at) > 2:
+                    progress.title = next(messages)  # pragma: no cover
 
-                last_message_changed_at = time.monotonic()  # pragma: no cover
+                    last_message_changed_at = time.monotonic()  # pragma: no cover
 
 
 def _setup_environment_variables(toolkit: RichToolkit, app_id: str) -> None:
@@ -529,10 +530,6 @@ def _waitlist_form(toolkit: RichToolkit) -> None:
                 check=False,
             )
 
-        toolkit.print_line()
-
-        toolkit.print("Thank you for your interest in FastAPI Cloud! 🚀")
-
 
 def deploy(
     path: Annotated[

{fastapi_cloud_cli-0.1.2 → fastapi_cloud_cli-0.1.5}/src/fastapi_cloud_cli/commands/login.py

@@ -6,7 +6,7 @@ import httpx
 import typer
 from pydantic import BaseModel
 
-from fastapi_cloud_cli.config import settings
+from fastapi_cloud_cli.config import Settings
 from fastapi_cloud_cli.utils.api import APIClient
 from fastapi_cloud_cli.utils.auth import AuthConfig, write_auth_config
 from fastapi_cloud_cli.utils.cli import get_rich_toolkit, handle_http_errors
@@ -29,6 +29,8 @@ class TokenResponse(BaseModel):
 def _start_device_authorization(
     client: httpx.Client,
 ) -> AuthorizationData:
+    settings = Settings.get()
+
     response = client.post(
         "/login/device/authorization", data={"client_id": settings.client_id}
     )
@@ -39,6 +41,8 @@ def _start_device_authorization(
 
 
 def _fetch_access_token(client: httpx.Client, device_code: str, interval: int) -> str:
+    settings = Settings.get()
+
     while True:
         response = client.post(
             "/login/device/token",

{fastapi_cloud_cli-0.1.2 → fastapi_cloud_cli-0.1.5}/src/fastapi_cloud_cli/config.py

@@ -21,5 +21,6 @@ class Settings(BaseModel):
 
         return cls(**user_settings)
 
-
-settings = Settings.from_user_settings(get_cli_config_path())
+    @classmethod
+    def get(cls) -> "Settings":
+        return cls.from_user_settings(get_cli_config_path())

{fastapi_cloud_cli-0.1.2 → fastapi_cloud_cli-0.1.5}/src/fastapi_cloud_cli/utils/api.py

@@ -1,16 +1,19 @@
 import httpx
 
 from fastapi_cloud_cli import __version__
-from fastapi_cloud_cli.config import settings
+from fastapi_cloud_cli.config import Settings
 from fastapi_cloud_cli.utils.auth import get_auth_token
 
 
 class APIClient(httpx.Client):
     def __init__(self) -> None:
+        settings = Settings.get()
+
         token = get_auth_token()
 
         super().__init__(
             base_url=settings.base_api_url,
+            timeout=httpx.Timeout(20),
             headers={
                 "Authorization": f"Bearer {token}",
                 "User-Agent": f"fastapi-cloud-cli/{__version__}",

{fastapi_cloud_cli-0.1.2 → fastapi_cloud_cli-0.1.5}/tests/test_cli_deploy.py

@@ -11,11 +11,12 @@ from httpx import Response
 from typer.testing import CliRunner
 
 from fastapi_cloud_cli.cli import app
-from fastapi_cloud_cli.config import settings
+from fastapi_cloud_cli.config import Settings
 from tests.conftest import ConfiguredApp
 from tests.utils import Keys, changing_dir
 
 runner = CliRunner()
+settings = Settings.get()
 
 assets_path = Path(__file__).parent / "assets"
 

{fastapi_cloud_cli-0.1.2 → fastapi_cloud_cli-0.1.5}/tests/test_cli_login.py

@@ -8,9 +8,10 @@ from httpx import Response
 from typer.testing import CliRunner
 
 from fastapi_cloud_cli.cli import app
-from fastapi_cloud_cli.config import settings
+from fastapi_cloud_cli.config import Settings
 
 runner = CliRunner()
+settings = Settings.get()
 
 assets_path = Path(__file__).parent / "assets"
 

{fastapi_cloud_cli-0.1.2 → fastapi_cloud_cli-0.1.5}/tests/test_cli_whoami.py

@@ -6,9 +6,10 @@ from httpx import ReadTimeout, Response
 from typer.testing import CliRunner
 
 from fastapi_cloud_cli.cli import app
-from fastapi_cloud_cli.config import settings
+from fastapi_cloud_cli.config import Settings
 
 runner = CliRunner()
+settings = Settings.get()
 
 assets_path = Path(__file__).parent / "assets"
 

{fastapi_cloud_cli-0.1.2 → fastapi_cloud_cli-0.1.5}/tests/test_env_delete.py

@@ -7,10 +7,11 @@ from httpx import Response
 from typer.testing import CliRunner
 
 from fastapi_cloud_cli.cli import app
-from fastapi_cloud_cli.config import settings
+from fastapi_cloud_cli.config import Settings
 from tests.utils import Keys, changing_dir
 
 runner = CliRunner()
+settings = Settings.get()
 
 assets_path = Path(__file__).parent / "assets"
 

{fastapi_cloud_cli-0.1.2 → fastapi_cloud_cli-0.1.5}/tests/test_env_list.py

@@ -6,11 +6,12 @@ from httpx import Response
 from typer.testing import CliRunner
 
 from fastapi_cloud_cli.cli import app
-from fastapi_cloud_cli.config import settings
+from fastapi_cloud_cli.config import Settings
 from tests.conftest import ConfiguredApp
 from tests.utils import changing_dir
 
 runner = CliRunner()
+settings = Settings.get()
 
 assets_path = Path(__file__).parent / "assets"
 

{fastapi_cloud_cli-0.1.2 → fastapi_cloud_cli-0.1.5}/tests/test_env_set.py

@@ -7,10 +7,11 @@ from httpx import Response
 from typer.testing import CliRunner
 
 from fastapi_cloud_cli.cli import app
-from fastapi_cloud_cli.config import settings
+from fastapi_cloud_cli.config import Settings
 from tests.utils import Keys, changing_dir
 
 runner = CliRunner()
+settings = Settings.get()
 
 assets_path = Path(__file__).parent / "assets"
 

fastapi_cloud_cli-0.1.2/src/fastapi_cloud_cli/__init__.py

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