✨ Add waitlist form

Author: patrick91

pyproject.toml

@@ -35,8 +35,8 @@ dependencies = [
     "uvicorn[standard] >= 0.15.0",
     "rignore >= 0.5.1",
     "httpx >= 0.27.0,< 0.28.0",
-    "rich-toolkit >= 0.14.3",
-    "pydantic >= 1.6.1",
+    "rich-toolkit >= 0.14.5",
+    "pydantic[email] >= 1.6.1",
 ]
 
 [project.optional-dependencies]

src/fastapi_cloud_cli/commands/deploy.py

@@ -1,5 +1,7 @@
+import contextlib
 import json
 import logging
+import subprocess
 import tarfile
 import tempfile
 import time
@@ -12,7 +14,7 @@
 import rignore
 import typer
 from httpx import Client
-from pydantic import BaseModel
+from pydantic import BaseModel, EmailStr, TypeAdapter, ValidationError
 from rich.text import Text
 from rich_toolkit import RichToolkit
 from rich_toolkit.menu import Option
@@ -385,6 +387,118 @@ def _setup_environment_variables(toolkit: RichToolkit, app_id: str) -> None:
         progress.log("Environment variables set up successfully!")
 
 
+class SignupToWaitingList(BaseModel):
+    email: EmailStr
+    name: Optional[str] = None
+    organization: Optional[str] = None
+    role: Optional[str] = None
+    team_size: Optional[str] = None
+    location: Optional[str] = None
+    use_case: Optional[str] = None
+    secret_code: Optional[str] = None
+
+
+def _send_waitlist_form(
+    result: SignupToWaitingList,
+    toolkit: RichToolkit,
+) -> None:
+    with toolkit.progress("Sending your request...") as progress:
+        with APIClient() as client:
+            with handle_http_errors(progress):
+                response = client.post(
+                    "/users/waiting-list", json=result.model_dump(mode="json")
+                )
+
+                response.raise_for_status()
+
+        progress.log("Let's go! Thanks for your interest in FastAPI Cloud! 🚀")
+
+
+def _waitlist_form(toolkit: RichToolkit) -> None:
+    from rich_toolkit.form import Form
+
+    toolkit.print(
+        "We're currently in private beta. If you want to be notified when we launch, please fill out the form below.",
+        tag="waitlist",
+    )
+
+    toolkit.print_line()
+
+    email = toolkit.input(
+        "Enter your email:",
+        required=True,
+        validator=TypeAdapter(EmailStr),
+    )
+
+    toolkit.print_line()
+
+    result = SignupToWaitingList(email=email)
+
+    if toolkit.confirm(
+        "Do you want to get access faster by giving us more information?",
+        tag="waitlist",
+    ):
+        toolkit.print_line()
+        form = Form("Waitlist form", style=toolkit.style)
+
+        form.add_input("name", label="Name", placeholder="John Doe")
+        form.add_input("organization", label="Organization", placeholder="Acme Inc.")
+        form.add_input("team", label="Team", placeholder="Team A")
+        form.add_input("role", label="Role", placeholder="Developer")
+        form.add_input("location", label="Location", placeholder="San Francisco")
+        form.add_input(
+            "use_case",
+            label="How do you plan to use FastAPI Cloud?",
+            placeholder="I'm building a web app",
+        )
+        form.add_input("secret_code", label="Secret code", placeholder="123456")
+
+        result = form.run()  # type: ignore
+
+        try:
+            result = SignupToWaitingList.model_validate(
+                {
+                    "email": email,
+                    **result,  # type: ignore
+                }
+            )
+        except ValidationError:
+            toolkit.print(
+                "[error]Invalid form data. Please try again.[/]",
+            )
+
+            return
+
+    toolkit.print_line()
+
+    if toolkit.confirm(
+        (
+            "Do you agree to\n"
+            "- Terms of Service: [link=https://fastapicloud.com/legal/terms]https://fastapicloud.com/legal/terms[/link]\n"
+            "- Privacy Policy: [link=https://fastapicloud.com/legal/privacy-policy]https://fastapicloud.com/legal/privacy-policy[/link]\n"
+        ),
+        tag="terms",
+    ):
+        toolkit.print_line()
+
+        _send_waitlist_form(
+            result,
+            toolkit,
+        )
+
+        with contextlib.suppress(Exception):
+            subprocess.run(
+                ["open", "raycast://confetti"],
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+                check=False,
+            )
+
+        toolkit.print_line()
+
+        toolkit.print("Thank you for your interest in FastAPI Cloud! 🚀")
+
+
 def deploy(
     path: Annotated[
         Union[Path, None],
@@ -401,17 +515,14 @@ def deploy(
     """
 
     with get_rich_toolkit() as toolkit:
-        toolkit.print_title("Starting deployment", tag="FastAPI")
-        toolkit.print_line()
-
         if not is_logged_in():
-            toolkit.print(
-                "No credentials found. Use [blue]`fastapi login`[/] to login.",
-                tag="auth",
-            )
+            _waitlist_form(toolkit)
 
             raise typer.Exit(1)
 
+        toolkit.print_title("Starting deployment", tag="FastAPI")
+        toolkit.print_line()
+
         path_to_deploy = path or Path.cwd()
 
         app_config = get_app_config(path_to_deploy)

tests/test_cli_deploy.py

@@ -58,11 +58,94 @@ def _get_random_deployment(
     }
 
 
-def test_shows_error_when_not_logged_in(logged_out_cli: None) -> None:
-    result = runner.invoke(app, ["deploy"])
+@pytest.mark.respx(base_url=settings.base_api_url)
+def test_shows_waitlist_form_when_not_logged_in(
+    logged_out_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
+) -> None:
+    steps = [*"some@example.com", Keys.ENTER, Keys.RIGHT_ARROW, Keys.ENTER, Keys.ENTER]
+
+    respx_mock.post(
+        "/users/waiting-list",
+        json={
+            "email": "some@example.com",
+            "location": None,
+            "name": None,
+            "organization": None,
+            "role": None,
+            "secret_code": None,
+            "team_size": None,
+            "use_case": None,
+        },
+    ).mock(return_value=Response(200))
+
+    with changing_dir(tmp_path), patch(
+        "rich_toolkit.menu.click.getchar"
+    ) as mock_getchar:
+        mock_getchar.side_effect = steps
+
+        result = runner.invoke(app, ["deploy"])
+
+    assert result.exit_code == 1
+    assert "We're currently in private beta" in result.output
+    assert "Let's go! Thanks for your interest in FastAPI Cloud! 🚀" in result.output
+
+
+@pytest.mark.respx(base_url=settings.base_api_url)
+def test_shows_waitlist_form_when_not_logged_in_longer_flow(
+    logged_out_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
+) -> None:
+    steps = [
+        *"some@example.com",
+        Keys.ENTER,
+        Keys.ENTER,
+        # Name
+        *"Patrick",
+        Keys.TAB,
+        # Organization
+        *"FastAPI Cloud",
+        Keys.TAB,
+        # Team
+        *"Team A",
+        Keys.TAB,
+        # Role
+        *"Developer",
+        Keys.TAB,
+        # Location
+        *"London",
+        Keys.TAB,
+        # Use case
+        *"I want to build a web app",
+        Keys.TAB,
+        # Secret code
+        *"PyCon Italia",
+        Keys.ENTER,
+        Keys.ENTER,
+    ]
+
+    respx_mock.post(
+        "/users/waiting-list",
+        json={
+            "email": "some@example.com",
+            "name": "Patrick",
+            "organization": "FastAPI Cloud",
+            "role": "Developer",
+            "team_size": None,
+            "location": "London",
+            "use_case": "I want to build a web app",
+            "secret_code": "PyCon Italia",
+        },
+    ).mock(return_value=Response(200))
+
+    with changing_dir(tmp_path), patch(
+        "rich_toolkit.menu.click.getchar"
+    ) as mock_getchar:
+        mock_getchar.side_effect = steps
+
+        result = runner.invoke(app, ["deploy"])
 
     assert result.exit_code == 1
-    assert "No credentials found." in result.output
+    assert "We're currently in private beta" in result.output
+    assert "Let's go! Thanks for your interest in FastAPI Cloud! 🚀" in result.output
 
 
 def test_asks_to_setup_the_app(logged_in_cli: None, tmp_path: Path) -> None:

tests/utils.py

@@ -18,3 +18,4 @@ class Keys:
     RIGHT_ARROW = "\x1b[C"
     ENTER = "\r"
     CTRL_C = "\x03"
+    TAB = "\t"