workers-py 1.3.0__py3-none-any.whl → 1.5.0__py3-none-any.whl

pywrangler/cli.py

@@ -4,13 +4,11 @@ import sys
 import textwrap
 import click
 
-from pywrangler.utils import setup_logging, write_success
+from .utils import setup_logging, write_success, WRANGLER_COMMAND
 
 setup_logging()
 logger = logging.getLogger("pywrangler")
 
-WRANGLER_COMMAND = ["npx", "--yes", "wrangler"]
-
 
 class ProxyToWranglerGroup(click.Group):
     def get_help(self, ctx):
@@ -57,6 +55,11 @@ class ProxyToWranglerGroup(click.Group):
             if cmd_name in ["dev", "publish", "deploy", "versions"]:
                 ctx.invoke(sync_command, force=False, directly_requested=False)
 
+            if cmd_name == "dev":
+                from pywrangler.sync import check_wrangler_version
+
+                check_wrangler_version()
+
             _proxy_to_wrangler(cmd_name, remaining_args)
             sys.exit(0)
 
@@ -90,6 +93,26 @@ def app(ctx, debug=False):
         logger.setLevel(logging.DEBUG)
 
 
+@app.command("types")
+@click.option(
+    "-o",
+    "--outdir",
+    type=click.Path(writable=True),
+    help="The output directory to write the generated types. Default: .venv/lib/python3.vv/site-packages/js-stubs",
+)
+@click.option(
+    "-c",
+    "--config",
+    type=click.Path(exists=True, dir_okay=False, readable=True),
+    help="Path to Wrangler configuration file",
+)
+def types_command(outdir=None, config=None):
+    from .types import wrangler_types
+
+    wrangler_types(outdir, config)
+    raise click.exceptions.Exit(code=0)
+
+
 @app.command("sync")
 @click.option("--force", is_flag=True, help="Force sync even if no changes detected")
 def sync_command(force=False, directly_requested=True):

pywrangler/sync.py

@@ -1,5 +1,6 @@
 import logging
 import os
+import re
 import shutil
 import tempfile
 from contextlib import contextmanager
@@ -229,6 +230,7 @@ def create_workers_venv():
 
 
 MIN_UV_VERSION = (0, 8, 10)
+MIN_WRANGLER_VERSION = (4, 42, 1)
 
 
 def check_uv_version():
@@ -243,6 +245,48 @@ def check_uv_version():
     raise click.exceptions.Exit(code=1)
 
 
+def check_wrangler_version():
+    """
+    Check that the installed wrangler version is at least 4.42.1.
+
+    Raises:
+        click.exceptions.Exit: If wrangler is not installed or version is too old.
+    """
+    result = run_command(
+        ["npx", "--yes", "wrangler", "--version"], capture_output=True, check=False
+    )
+    if result.returncode != 0:
+        logger.error("Failed to get wrangler version. Is wrangler installed?")
+        logger.error("Install wrangler with: npm install wrangler@latest")
+        raise click.exceptions.Exit(code=1)
+
+    # Parse version from output like "wrangler 4.42.1" or " ⛅️ wrangler 4.42.1"
+    version_line = result.stdout.strip()
+    # Extract version number using regex
+    version_match = re.search(r"wrangler\s+(\d+)\.(\d+)\.(\d+)", version_line)
+
+    if not version_match:
+        logger.error(f"Could not parse wrangler version from: {version_line}")
+        logger.error("Install wrangler with: npm install wrangler@latest")
+        raise click.exceptions.Exit(code=1)
+
+    major, minor, patch = map(int, version_match.groups())
+    current_version = (major, minor, patch)
+
+    if current_version < MIN_WRANGLER_VERSION:
+        min_version_str = ".".join(str(x) for x in MIN_WRANGLER_VERSION)
+        current_version_str = ".".join(str(x) for x in current_version)
+        logger.error(
+            f"wrangler version at least {min_version_str} required, have {current_version_str}."
+        )
+        logger.error("Update wrangler with: npm install wrangler@latest")
+        raise click.exceptions.Exit(code=1)
+
+    logger.debug(
+        f"wrangler version {'.'.join(str(x) for x in current_version)} is sufficient"
+    )
+
+
 def create_pyodide_venv():
     if PYODIDE_VENV_PATH.is_dir():
         logger.debug(
@@ -333,10 +377,9 @@ def _install_requirements_to_vendor(requirements: list[str]):
 
 
 def _install_requirements_to_venv(requirements: list[str]):
-    # Create a requirements file for .venv-workers that includes webtypy and pyodide-py
+    # Create a requirements file for .venv-workers that includes pyodide-py
     relative_venv_workers_path = VENV_WORKERS_PATH.relative_to(PROJECT_ROOT)
     requirements = requirements.copy()
-    requirements.append("webtypy")
     requirements.append("pyodide-py")
 
     logger.info(

pywrangler/types.py

@@ -0,0 +1,45 @@
+from .utils import WRANGLER_COMMAND, run_command
+from tempfile import TemporaryDirectory
+from pathlib import Path
+import logging
+
+logger = logging.getLogger(__name__)
+
+TSCONFIG = """
+{
+  "compilerOptions": {
+    "target": "esnext",
+    "module": "esnext",
+    "moduleResolution": "nodenext",
+    "lib": ["esnext"]
+  },
+  "include": ["worker-configuration.d.ts"]
+}
+"""
+
+PACKAGE_JSON = """
+{
+  "dependencies": {
+    "typescript": "^5.3.2"
+  }
+}
+"""
+
+
+def wrangler_types(outdir_arg: str | None, config: str | None, /):
+    args = ["types"]
+    if config:
+        args += ["--config", config]
+    if outdir_arg is None:
+        outdir = Path("src")
+    else:
+        outdir = Path(outdir_arg)
+    stubs_dir = outdir / "js-stubs"
+    stubs_dir.mkdir(parents=True, exist_ok=True)
+    with TemporaryDirectory() as tmp_str:
+        tmp = Path(tmp_str)
+        run_command(WRANGLER_COMMAND + args + [tmp / "worker-configuration.d.ts"])
+        (tmp / "tsconfig.json").write_text(TSCONFIG)
+        (tmp / "package.json").write_text(PACKAGE_JSON)
+        run_command(["npm", "-C", tmp, "install"])
+        run_command(["npx", "@pyodide/ts-to-python", tmp, stubs_dir / "__init__.pyi"])

pywrangler/utils.py

@@ -6,6 +6,8 @@ import click
 from rich.logging import Console, RichHandler
 from rich.theme import Theme
 
+WRANGLER_COMMAND = ["npx", "--yes", "wrangler"]
+
 logger = logging.getLogger(__name__)
 
 SUCCESS_LEVEL = 100

{workers_py-1.3.0.dist-info → workers_py-1.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: workers-py
-Version: 1.3.0
+Version: 1.5.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
@@ -11,6 +11,7 @@ Requires-Python: >=3.10
 Requires-Dist: click<9.0.0,>=8.0.0
 Requires-Dist: pyjson5>=1.6.0
 Requires-Dist: pyodide-cli
+Requires-Dist: pyodide-py
 Requires-Dist: rich>=13.0.0
 Provides-Extra: build
 Requires-Dist: uv~=0.5.23; extra == 'build'

workers_py-1.5.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+pywrangler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pywrangler/__main__.py,sha256=BnrUM7YiBmlM4HAn2MI9hP1kVNtzeK_kEgQhRy5HTq0,38
+pywrangler/cli.py,sha256=yKLn7GU9lWuw0Lhc6XPl5N9SlJ6y5KNGRQtZJT6a8LM,5728
+pywrangler/metadata.py,sha256=vttmaCtouSr9ADj8ncvNGqeaWEGFP8pamH2T6ohFjnA,408
+pywrangler/sync.py,sha256=CAJdZRZb_xGBX0c4pskfJFrKt8cq6wBpDtPbrWnVJeQ,14248
+pywrangler/types.py,sha256=RyOTVFFC75vJ0NxGzXWJGouRpQ5k4gsf3Jsiq-i_ans,1174
+pywrangler/utils.py,sha256=Vtg0qenIWArGXPhI2jL_4c8tUQByUqQKUVzGbCeoqrw,3318
+workers_py-1.5.0.dist-info/METADATA,sha256=SzUilHhIKFo2gP42JrQzh5CONGXek4wC1OvuGfYkAas,1854
+workers_py-1.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+workers_py-1.5.0.dist-info/entry_points.txt,sha256=pt6X-Nv5-gSiKUwrnvLwzlSXs9yP37m7zdTAi8f6nAM,50
+workers_py-1.5.0.dist-info/RECORD,,

workers_py-1.3.0.dist-info/RECORD

@@ -1,10 +0,0 @@
-pywrangler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pywrangler/__main__.py,sha256=BnrUM7YiBmlM4HAn2MI9hP1kVNtzeK_kEgQhRy5HTq0,38
-pywrangler/cli.py,sha256=3hMjtOOib3HaTqCkuMGQe7MbBZNnim2ByHcDY4JxFlw,5091
-pywrangler/metadata.py,sha256=vttmaCtouSr9ADj8ncvNGqeaWEGFP8pamH2T6ohFjnA,408
-pywrangler/sync.py,sha256=ZzsRY8VsGOQufuQpJ0DxnPH3wXzTu5Myyh8wXs21oXA,12570
-pywrangler/utils.py,sha256=wfkT7GbKtgtjHXtV3AjNeb25ohdAfrprdZIlqqidiQU,3269
-workers_py-1.3.0.dist-info/METADATA,sha256=Xnj3ud5RhYdFFkndX_urC-jD3YWv_aUHQv2ckr_qiqA,1828
-workers_py-1.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-workers_py-1.3.0.dist-info/entry_points.txt,sha256=pt6X-Nv5-gSiKUwrnvLwzlSXs9yP37m7zdTAi8f6nAM,50
-workers_py-1.3.0.dist-info/RECORD,,