reflex-hosting-cli 0.1.64__tar.gz → 0.1.66__tar.gz

{reflex_hosting_cli-0.1.64 → reflex_hosting_cli-0.1.66}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reflex-hosting-cli
-Version: 0.1.64
+Version: 0.1.66
 Summary: Reflex Hosting CLI
 Author-email: Nikhil Rao <nikhil@reflex.dev>, Alek Petuskey <alek@reflex.dev>
 Maintainer-email: Simon Young <simon@reflex.dev>, Khaleel Al-Adhami <khaleel@reflex.dev>

{reflex_hosting_cli-0.1.64 → reflex_hosting_cli-0.1.66}/src/reflex_cli/utils/hosting.py

@@ -1078,6 +1078,20 @@ def select_project(project: str, token: str | None = None) -> str:
     return f"{project} is now selected."
 
 
+def normalize_project_id(value: Any) -> str | None:
+    """Normalize a project ID value, treating empty/whitespace strings and non-strings as None.
+
+    Args:
+        value: The raw project ID value from config, CLI args, or hosting.json.
+
+    Returns:
+        The stripped project ID, or None if the value is missing or blank.
+    """
+    if isinstance(value, str) and value.strip():
+        return value.strip()
+    return None
+
+
 def get_selected_project() -> str | None:
     """Retrieve the currently selected project ID.
 
@@ -1088,10 +1102,10 @@ def get_selected_project() -> str | None:
     try:
         with constants.Hosting.HOSTING_JSON.open() as config_file:
             hosting_config = json.load(config_file)
-            return hosting_config.get("project")
+            return normalize_project_id(hosting_config.get("project"))
     except Exception as ex:
         console.debug(
-            f"Unable to fetch token from {constants.Hosting.HOSTING_JSON} due to: {ex}"
+            f"Unable to read selected project from {constants.Hosting.HOSTING_JSON} due to: {ex}"
         )
     return None
 
@@ -1970,14 +1984,18 @@ def authenticate_on_browser() -> tuple[str, dict[str, Any]]:
         constants.Hosting.HOSTING_SERVICE_UI, f"/cli/login?request_id={request_id}"
     )
 
-    console.print(f"Opening {auth_url} ...")
-
     if not is_valid_url(constants.Hosting.HOSTING_SERVICE_UI):
         console.error(
             f"Invalid hosting URL: {constants.Hosting.HOSTING_SERVICE_UI}. Ensure the URL is in the correct format and includes a valid scheme"
         )
         raise click.exceptions.Exit(1)
 
+    console.print(
+        f"Opening {auth_url} ... By connecting your account, you agree to "
+        "Reflex Cloud [Terms of Service] and [Privacy Policy].",
+        markup=False,
+    )
+
     if not webbrowser.open(auth_url):
         console.warn(
             f"Unable to automatically open the browser. Please go to {auth_url} to authenticate."

{reflex_hosting_cli-0.1.64 → reflex_hosting_cli-0.1.66}/src/reflex_cli/v2/cli.py

@@ -28,7 +28,8 @@ def login(
         loglevel: The log level to use.
 
     Returns:
-        Information about the logged in user.
+        Information about the newly logged in user or empty dict if already
+        logged in.
 
     Raises:
         SystemExit: If the command fails.
@@ -42,7 +43,7 @@ def login(
     access_token, validated_info = hosting.authenticated_token()
     if access_token:
         console.print("You already logged in.")
-        return validated_info
+        return {}
 
     # If not already logged in, open a browser window/tab to the login page.
     access_token, validated_info = hosting.authenticate_on_browser()
@@ -179,19 +180,24 @@ def deploy(
         if not description:
             description = config.get("description", None)
 
-    # resolve the project id from the project name.
+    project_id = hosting.normalize_project_id(project_id)
+
     if project_name and not project_id:
         result = hosting.search_project(
             project_name, client=authenticated_client, interactive=interactive
         )
-        project_id = result.get("id") if result else None
+        project_id = hosting.normalize_project_id(result.get("id")) if result else None
+
+    selected_project_id = hosting.get_selected_project()
 
+    validated_project: dict[str, Any] | None = None
     try:
-        # check if provided project exists.
+        if not project_id:
+            project_id = selected_project_id
         if project_id:
-            hosting.get_project(project_id, client=authenticated_client)
-        else:
-            project_id = hosting.get_selected_project()
+            validated_project = hosting.get_project(
+                project_id, client=authenticated_client
+            )
     except httpx.HTTPStatusError as ex:
         try:
             console.error(ex.response.json().get("detail"))
@@ -209,9 +215,7 @@ def deploy(
     try:
         if app_name and not app_id:
             search_project_id = project_id
-            if not interactive and not project and not search_project_id:
-                search_project_id = hosting.get_selected_project()
-            elif interactive and not project:
+            if interactive and not project:
                 search_project_id = None
 
             app = hosting.search_app(
@@ -230,16 +234,13 @@ def deploy(
         raise click.exceptions.Exit(1) from ex
 
     if app and interactive and not project and not app_id:
-        default_project_id = hosting.get_selected_project()
+        default_project_id = selected_project_id
         app_project_id = app.get("project_id")
 
         if app_project_id and (
             not default_project_id or app_project_id != default_project_id
         ):
-            app_project = hosting.get_project(
-                app_project_id, client=authenticated_client
-            )
-            app_project_name = app_project.get("name", "Unknown")
+            app_project_name = (app.get("project") or {}).get("name") or app_project_id
             if (
                 console.ask(
                     f"Deploy to app '{app['name']}' in project '{app_project_name}'?",
@@ -262,55 +263,40 @@ def deploy(
             )
             == "y"
         ):
-            # Check if we need confirmation for deploying to non-default project
             if not project:
-                default_project_id = hosting.get_selected_project()
-                if not default_project_id:
-                    try:
-                        if project_id:
-                            target_project = hosting.get_project(
-                                project_id, client=authenticated_client
-                            )
-                            project_name = target_project.get("name", "Unknown")
-                        else:
-                            token = hosting.get_existing_access_token()
-                            default_project_id = hosting.get_default_project(
-                                authenticated_client
+                needs_confirmation = not selected_project_id or (
+                    project_id and project_id != selected_project_id
+                )
+                if needs_confirmation:
+                    if project_id:
+                        project_display_name = (
+                            (
+                                validated_project.get("name")
+                                if validated_project
+                                else None
                             )
-                            if default_project_id:
-                                default_project = hosting.get_project(
-                                    default_project_id, client=authenticated_client
-                                )
-                                project_name = default_project.get(
-                                    "name", "Default Project"
-                                )
-                            else:
-                                project_name = "Default Project"
-                    except Exception:
-                        project_name = "Unknown"
-
-                    if (
-                        console.ask(
-                            f"Create and deploy app '{app_name}' in project '{project_name}'?",
-                            choices=["y", "n"],
-                            default="y",
+                            or project_name
+                            or project_id
                         )
-                        != "y"
-                    ):
-                        console.info("Deployment cancelled.")
-                        raise click.exceptions.Exit(0)
-                elif project_id and project_id != default_project_id:
-                    try:
-                        target_project = hosting.get_project(
-                            project_id, client=authenticated_client
+                    else:
+                        project_display_name = "your default project"
+                        fallback_project_id = hosting.get_default_project(
+                            authenticated_client
                         )
-                        project_name = target_project.get("name", "Unknown")
-                    except Exception:
-                        project_name = "Unknown"
+                        if fallback_project_id:
+                            try:
+                                fallback_project = hosting.get_project(
+                                    fallback_project_id, client=authenticated_client
+                                )
+                                project_display_name = (
+                                    fallback_project.get("name") or project_display_name
+                                )
+                            except Exception:
+                                pass
 
                     if (
                         console.ask(
-                            f"Create and deploy app '{app_name}' in project '{project_name}'?",
+                            f"Create and deploy app '{app_name}' in project '{project_display_name}'?",
                             choices=["y", "n"],
                             default="y",
                         )

{reflex_hosting_cli-0.1.64 → reflex_hosting_cli-0.1.66}/src/reflex_cli/v2/gcp.py

@@ -6,6 +6,7 @@ a Cloud Build job (via a ``cloudbuild.yaml`` written to a tempfile and
 referenced with ``gcloud builds submit --config=...``) — the user's project
 tree is never modified. The script reads its parameters from environment
 variables (GCP_PROJECT, GCP_REGION, SERVICE_NAME, AR_REPO, VERSION,
+CLOUD_RUN_CPU, CLOUD_RUN_MEMORY, CLOUD_RUN_MIN_INSTANCES,
 REFLEX_CLOUDBUILD_YAML).
 """
 
@@ -37,6 +38,9 @@ ENV_GCP_REGION = "GCP_REGION"
 ENV_SERVICE_NAME = "SERVICE_NAME"
 ENV_AR_REPO = "AR_REPO"
 ENV_VERSION = "VERSION"
+ENV_CPU = "CLOUD_RUN_CPU"
+ENV_MEMORY = "CLOUD_RUN_MEMORY"
+ENV_MIN_INSTANCES = "CLOUD_RUN_MIN_INSTANCES"
 # Path to the Cloud Build config file written by the CLI. The rewritten
 # deploy script references it as ``--config="${REFLEX_CLOUDBUILD_YAML}"``.
 ENV_REFLEX_CLOUDBUILD_YAML = "REFLEX_CLOUDBUILD_YAML"
@@ -136,6 +140,28 @@ DEPLOY_ENV_ALLOWLIST = frozenset({
     default=None,
     help="The image version tag (sets VERSION). Defaults to a UTC timestamp.",
 )
+@click.option(
+    "--cpu",
+    "cpu",
+    default="1",
+    show_default=True,
+    help="Cloud Run CPU allocation, e.g. '1', '2', '4' (sets CLOUD_RUN_CPU).",
+)
+@click.option(
+    "--memory",
+    "memory",
+    default="1Gi",
+    show_default=True,
+    help="Cloud Run memory allocation, e.g. '512Mi', '1Gi', '2Gi' (sets CLOUD_RUN_MEMORY).",
+)
+@click.option(
+    "--min-instances",
+    "min_instances",
+    default=1,
+    show_default=True,
+    type=click.IntRange(min=0),
+    help="Minimum number of Cloud Run instances to keep warm (sets CLOUD_RUN_MIN_INSTANCES). Set to 0 to scale to zero.",
+)
 @click.option(
     "--source",
     "source_dir",
@@ -170,6 +196,9 @@ def deploy_command(
     service_name: str,
     ar_repo: str,
     version_tag: str | None,
+    cpu: str,
+    memory: str,
+    min_instances: int,
     source_dir: str,
     token: str | None,
     interactive: bool,
@@ -252,6 +281,9 @@ def deploy_command(
         ENV_SERVICE_NAME: service_name,
         ENV_AR_REPO: ar_repo,
         ENV_VERSION: version_value,
+        ENV_CPU: cpu,
+        ENV_MEMORY: memory,
+        ENV_MIN_INSTANCES: str(min_instances),
     }
 
     console.info("Received deploy manifest from Reflex.")