workers-py 1.6.2__py3-none-any.whl → 1.7.0__py3-none-any.whl

pywrangler/sync.py

@@ -177,7 +177,7 @@ def _install_requirements_to_vendor(requirements: list[str]) -> None:
         extra={"markup": True},
     )
     with temp_requirements_file(requirements) as requirements_file:
-        run_command(
+        result = run_command(
             [
                 "uv",
                 "pip",
@@ -190,8 +190,31 @@ def _install_requirements_to_vendor(requirements: list[str]) -> None:
                 "--index-strategy",
                 "unsafe-best-match",
             ],
+            capture_output=True,
+            check=False,
             env=os.environ | {"VIRTUAL_ENV": get_pyodide_venv_path()},
         )
+        if result.returncode != 0:
+            logger.warning(result.stdout.strip())
+            # Handle some common failures and give nicer error messages for them.
+            lowered_stdout = result.stdout.lower()
+            if "invalid peer certificate" in lowered_stdout:
+                logger.error(
+                    "Installation failed because of an invalid peer certificate. Are your systems certificates correctly installed? Do you have an Enterprise VPN enabled?"
+                )
+            elif "failed to fetch" in lowered_stdout:
+                logger.error(
+                    "Installation failed because of a failed fetch. Is your network connection working?"
+                )
+            elif "no solution found when resolving dependencies" in lowered_stdout:
+                logger.error(
+                    "Installation failed because the packages you requested are not supported by Python Workers. See above for details."
+                )
+            else:
+                logger.error(
+                    "Installation of packages into the Python Worker failed. Possibly because these packages are not currently supported. See above for details."
+                )
+            raise click.exceptions.Exit(code=result.returncode)
         pyv = get_python_version()
         shutil.rmtree(vendor_path)
         shutil.copytree(
@@ -221,7 +244,7 @@ def _install_requirements_to_venv(requirements: list[str]) -> None:
         extra={"markup": True},
     )
     with temp_requirements_file(requirements) as requirements_file:
-        run_command(
+        result = run_command(
             [
                 "uv",
                 "pip",
@@ -229,8 +252,16 @@ def _install_requirements_to_venv(requirements: list[str]) -> None:
                 "-r",
                 requirements_file,
             ],
+            check=False,
             env=os.environ | {"VIRTUAL_ENV": venv_workers_path},
+            capture_output=True,
         )
+        if result.returncode != 0:
+            logger.warning(result.stdout.strip())
+            logger.error(
+                "Failed to install the requirements defined in your pyproject.toml file. See above for details."
+            )
+            raise click.exceptions.Exit(code=result.returncode)
 
     get_venv_workers_token_path().touch()
     logger.info(
@@ -240,8 +271,14 @@ def _install_requirements_to_venv(requirements: list[str]) -> None:
 
 
 def install_requirements(requirements: list[str]) -> None:
-    _install_requirements_to_vendor(requirements)
+    # Note: the order these are executed is important.
+    # We need to install to .venv-workers first, so that we can determine if the packages requested
+    # by the user are valid.
     _install_requirements_to_venv(requirements)
+    # Then we install the same requirements to the vendor directory. If this installation
+    # fails while the above succeeded, it implies that Pyodide does not support these package
+    # requirements which allows us to give a nicer error message to the user.
+    _install_requirements_to_vendor(requirements)
 
 
 def _is_out_of_date(token: Path, time: float) -> bool:

pywrangler/utils.py

@@ -79,20 +79,24 @@ def run_command(
     """
     logger.log(RUNNING_LEVEL, f"{' '.join(str(arg) for arg in command)}")
     try:
+        kwargs = {}
+        if capture_output:
+            kwargs = dict(stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+
         process = subprocess.run(
             command,
             cwd=cwd,
             env=env,
             check=check,
-            capture_output=capture_output,
             text=True,
-        )
+            **kwargs,
+        )  # type: ignore[call-overload]
         if process.stdout and not capture_output:
             logger.log(OUTPUT_LEVEL, f"{process.stdout.strip()}")
-        return process
+        return process  # type: ignore[no-any-return]
     except subprocess.CalledProcessError as e:
         logger.error(
-            f"Error running command: {' '.join(str(arg) for arg in command)}\nExit code: {e.returncode}\nOutput:\n{e.stdout.strip() if e.stdout else ''}{e.stderr.strip() if e.stderr else ''}"
+            f"Error running command: {' '.join(str(arg) for arg in command)}\nExit code: {e.returncode}\nOutput:\n{e.stdout.strip() if e.stdout else ''}"
         )
         raise click.exceptions.Exit(code=e.returncode) from None
     except FileNotFoundError:

{workers_py-1.6.2.dist-info → workers_py-1.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: workers-py
-Version: 1.6.2
+Version: 1.7.0
 Summary: A set of libraries and tools for Python Workers
 Project-URL: Homepage, https://github.com/cloudflare/workers-py
 Project-URL: Bug Tracker, https://github.com/cloudflare/workers-py/issues

{workers_py-1.6.2.dist-info → workers_py-1.7.0.dist-info}/RECORD

@@ -3,10 +3,10 @@ pywrangler/__main__.py,sha256=wcCrL4PjG51r5wVKqJhcoJPTLfHW0wNbD31DrUN0MWI,28
 pywrangler/cli.py,sha256=8C4iBntruyMkQqOb0KfH_H0QNGYYWEBtKFA7b7zGSmE,5467
 pywrangler/metadata.py,sha256=ndh584ALzshSXwduTmqVczfF5Mpn7z0F9ztn3Dugf70,408
 pywrangler/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pywrangler/sync.py,sha256=zn3396_8Hotu_6FnlQwdITgdUxze50tbO5xVzwjUxIU,9498
+pywrangler/sync.py,sha256=TuM_bmBdgi37xYFtD62GTNwyNaDgO87QwfS-OYLR8OM,11647
 pywrangler/types.py,sha256=hYJ6hNIjWb0faBGW82AWfCBsF_JPb7sXKCXPtFM3Mhk,1183
-pywrangler/utils.py,sha256=AHF-0VMdgQPVFkZfanHEQNyoNpAFbOstaXDNbNb2T5Y,10368
-workers_py-1.6.2.dist-info/METADATA,sha256=yXqeNFXPfH92_6v7dtFKw8fYExJjYtsbpXOw2pQb5OY,1774
-workers_py-1.6.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-workers_py-1.6.2.dist-info/entry_points.txt,sha256=pt6X-Nv5-gSiKUwrnvLwzlSXs9yP37m7zdTAi8f6nAM,50
-workers_py-1.6.2.dist-info/RECORD,,
+pywrangler/utils.py,sha256=mPY8LcRqYMuyVzyWS_077-4MX3K6sIThV1gY8_br9U0,10495
+workers_py-1.7.0.dist-info/METADATA,sha256=z6R2A_5LLb2hE5xY6NOpqXxX0ooA3kexOp1BIho7qlc,1774
+workers_py-1.7.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+workers_py-1.7.0.dist-info/entry_points.txt,sha256=pt6X-Nv5-gSiKUwrnvLwzlSXs9yP37m7zdTAi8f6nAM,50
+workers_py-1.7.0.dist-info/RECORD,,