reflex-hosting-cli 0.1.2__tar.gz → 0.1.3__tar.gz

{reflex_hosting_cli-0.1.2 → reflex_hosting_cli-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: reflex-hosting-cli
-Version: 0.1.2
+Version: 0.1.3
 Summary: Reflex Hosting CLI
 Home-page: https://reflex.dev
 License: Apache-2.0
@@ -19,6 +19,7 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: coverage (>=7.3.2,<8.0.0)
 Requires-Dist: httpx (>=0.24.0,<0.25.0)
 Requires-Dist: pipdeptree (>=2.13.1,<3.0.0)
+Requires-Dist: pipreqs (>=0.4.13,<0.5.0)
 Requires-Dist: platformdirs (>=3.10.0,<4.0.0)
 Requires-Dist: pydantic (>=1.10.2,<2.0.0)
 Requires-Dist: rich (>=13.0.0,<14.0.0)

{reflex_hosting_cli-0.1.2 → reflex_hosting_cli-0.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "reflex-hosting-cli"
-version = "0.1.2"
+version = "0.1.3"
 description = "Reflex Hosting CLI"
 license = "Apache-2.0"
 authors = [
@@ -33,6 +33,7 @@ websockets = ">=10.4"
 httpx = "^0.24.0"
 rich = "^13.0.0"
 coverage = "^7.3.2"
+pipreqs = "^0.4.13"
 pipdeptree = "^2.13.1"
 
 [tool.poetry.group.dev.dependencies]

reflex_hosting_cli-0.1.3/reflex_cli/cli.py.rej

@@ -0,0 +1,15 @@
+diff a/reflex_cli/cli.py b/reflex_cli/cli.py	(rejected hunks)
+@@ -281,7 +281,12 @@ def deploy(
+     # Display the key events such as build, deploy, etc
+     # TODO: print logs based on event_id
+     server_report_deploy_success = hosting.poll_deploy_milestones(
+-        key, from_iso_timestamp=backend_deploy_requested_at
++        key,
++        from_iso_timestamp=backend_deploy_requested_at,
++        deploy_event_ids=[
++            backend_deploy_response.event_id,
++            frontend_deploy_response.event_id,
++        ],
+     )
+ 
+     if server_report_deploy_success is None:

{reflex_hosting_cli-0.1.2 → reflex_hosting_cli-0.1.3}/reflex_cli/constants/hosting.py

@@ -32,3 +32,6 @@ class RequirementsTxt(SimpleNamespace):
 
     # The requirements.txt file.
     FILE = "requirements.txt"
+
+    # Number of unused packages for which we will throw a warning.
+    UNUSED_WARN_THRESHOLD = 20

reflex_hosting_cli-0.1.3/reflex_cli/utils/dependency.py

@@ -0,0 +1,136 @@
+"""Building the app and initializing all prerequisites."""
+
+from __future__ import annotations
+
+import difflib
+import os
+import re
+import subprocess
+import sys
+import tempfile
+
+from reflex_cli import constants
+from reflex_cli.utils import console
+
+
+def check_requirements():
+    """Check if the requirements.txt needs update based on current environment.
+    Throw warnings if too many installed or unused (based on imports) packages in
+    the local environment.
+    """
+    # Run the command and get the output into a temporary requirements.txt file
+    tmp_dir = tempfile.mkdtemp()
+
+    requirements_by_pipreqs_txt = f"{tmp_dir}/requirements_by_pipreqs.txt"
+    pipreqs_command = [
+        "pipreqs",
+        # By default, it runs in the current directory
+        "--use-local",
+        "--savepath",  # Save the file instead of printing to stdout. The print option outputs debug info not sure how to disable.
+        requirements_by_pipreqs_txt,
+    ]
+    console.debug(
+        f"Running command to generate requirements using pipreqs to see how many packages are actually used: {pipreqs_command}"
+    )
+    num_used_packages = None
+    try:
+        subprocess.run(
+            pipreqs_command,
+            capture_output=True,
+            text=True,
+            check=True,
+        )
+        with open(requirements_by_pipreqs_txt, "r") as f:
+            num_used_packages = sum(1 for _ in f)
+        console.debug(f"Number of used packages: {num_used_packages}")
+        # Clean up the temporary requirements.txt files
+        os.remove(requirements_by_pipreqs_txt)
+    except subprocess.CalledProcessError as cpe:
+        # Only need to log this
+        console.debug(f"Unable to run pipreqs util in the subprocess: {cpe}")
+    except OSError as ose:
+        console.debug(
+            f"Unable to interact with pipreqs generated temporary requirements.txt: {ose}"
+        )
+
+    # Run the pipdeptree command and get the output
+    try:
+        result = subprocess.run(
+            [sys.executable, "-m", "pipdeptree", "--warn", "silence"],
+            capture_output=True,
+            text=True,
+            check=True,
+        )
+    except subprocess.CalledProcessError as cpe:
+        console.debug(f"Unable to run pipdeptree util in subprocess: {cpe}")
+        console.warn(
+            "Unable to detect installed packages in your environment. Please make sure your requirements.txt is up to date."
+        )
+        return
+
+    # Filter the output lines using a regular expression
+    lines = result.stdout.split("\n")
+    new_requirements_lines = []
+    for line in lines:
+        if re.match(r"^\w+", line):
+            new_requirements_lines.append(f"{line}\n")
+
+    current_requirements_lines = ""
+    if os.path.exists(constants.RequirementsTxt.FILE):
+        with open(constants.RequirementsTxt.FILE, "r") as f:
+            current_requirements_lines = list(f)
+            console.debug("Current requirements.txt:")
+            console.debug("".join(current_requirements_lines))
+
+    # Show the differences of current and the newly generated requirements.txt
+    diff_content = "".join(
+        difflib.unified_diff(
+            current_requirements_lines,
+            new_requirements_lines,
+            fromfile="requirements.txt",
+            tofile="new_requirements.txt",
+        )
+    )
+
+    if (
+        num_used_packages is not None
+        and (
+            estimated_unused_num_packages := len(new_requirements_lines)
+            - num_used_packages
+        )
+        >= constants.RequirementsTxt.UNUSED_WARN_THRESHOLD
+    ):
+        console.warn(
+            f"Estimated {estimated_unused_num_packages} packages not used. Please make sure your environment is clean."
+        )
+    if not diff_content:
+        console.info("No updates required for the requirements.txt.")
+        return
+
+    if not current_requirements_lines:
+        console.info("It seems like there's no requirements.txt in your project.")
+    else:
+        console.info("The requirements.txt may need to be updated.")
+
+    console.print(diff_content)
+
+    user_choice = console.ask(
+        "Would you like to update requirements.txt based on the changes above?",
+        choices=["y", "n"],
+    )
+    if user_choice != "y":
+        console.warn("Please update requirements.txt manually if needed.")
+        # Not exit here since the newly generated requirements.txt is necessarily correct
+        # i.e., user enters `n` to override and proceed to deploy
+        return
+
+    # Write the filtered lines to requirements.txt
+    try:
+        with open(constants.RequirementsTxt.FILE, "w") as f:
+            f.writelines(new_requirements_lines)
+            console.info("requirements.txt updated.")
+    except OSError:
+        console.error(
+            f"Unable to write to {constants.RequirementsTxt.FILE}. Please manually update it."
+        )
+        sys.exit(1)

{reflex_hosting_cli-0.1.2 → reflex_hosting_cli-0.1.3}/reflex_cli/utils/hosting.py

@@ -987,7 +987,7 @@ def interactive_get_deployment_key_from_user_input(
 
         # If user takes the suggestion, we will use the suggested key and proceed
         while key_input := console.ask(
-            f"Choose a name for your deployed app. Enter to use default.",
+            f"Choose a name for your deployed app (https://<picked-name>.reflex.run)\nEnter to use default.",
             default=key_candidate,
         ):
             if not is_valid_deployment_key(key_input):
@@ -1279,7 +1279,7 @@ def prompt_for_regions(
     # Then CP needs to know the user's location, which requires user permission
     while True:
         region_input = console.ask(
-            "Region to deploy to. Enter to use default.",
+            "Region to deploy to. See regions: https://bit.ly/46Qr3mF\nEnter to use default.",
             default=regions[0] if regions else "sjc",
         )
 

reflex_hosting_cli-0.1.2/reflex_cli/utils/dependency.py

@@ -1,48 +0,0 @@
-"""Building the app and initializing all prerequisites."""
-
-from __future__ import annotations
-
-import os
-import re
-import subprocess
-import sys
-
-from reflex_cli import constants
-from reflex_cli.utils import console
-
-
-def generate_requirements():
-    """Generate a requirements.txt file based on the current environment."""
-    # Run the command and get the output
-    result = subprocess.run(
-        [sys.executable, "-m", "pipdeptree", "--warn", "silence"],
-        capture_output=True,
-        text=True,
-    )
-
-    # Filter the output lines using a regular expression
-    lines = result.stdout.split("\n")
-    filtered_lines = [line for line in lines if re.match(r"^\w+", line)]
-
-    # Write the filtered lines to requirements.txt
-    with open("requirements.txt", "w") as f:
-        for line in filtered_lines:
-            f.write(line + "\n")
-
-
-def check_requirements():
-    """Check if the requirements are installed."""
-    if not os.path.exists(constants.RequirementsTxt.FILE):
-        console.warn("It seems like there's no requirements.txt in your project.")
-        response = console.ask(
-            "Would you like us to auto-generate one based on your current environment?",
-            choices=["y", "n"],
-        )
-
-        if response == "y":
-            generate_requirements()
-        else:
-            console.error(
-                "Please create a requirements.txt file in your project's root directory and try again."
-            )
-            exit()