Merge commit 'a75d9dcea3d0d328ee5f07d83951297e00c804d3' into kenton/f…

…ix-sql-cache

src/pyodide/internal/workers.py

@@ -1,14 +1,16 @@
 # This module defines a Workers API for Python. It is similar to the API provided by
 # JS Workers, but with changes and additions to be more idiomatic to the Python
 # programming language.
-from collections.abc import Generator, MutableMapping
+from collections.abc import Generator, Iterable, MutableMapping
+from contextlib import ExitStack, contextmanager
+from enum import StrEnum
 from http import HTTPMethod, HTTPStatus
 from typing import TypedDict, Unpack
 
 import js
 
 import pyodide.http
-from pyodide.ffi import JsException, to_js
+from pyodide.ffi import JsException, create_proxy, destroy_proxies, to_js
 from pyodide.http import pyfetch
 
 JSBody = (
@@ -25,6 +27,8 @@ class FetchKwargs(TypedDict, total=False):
     method: HTTPMethod = HTTPMethod.GET
 
 
+# TODO: Pyodide's FetchResponse.headers returns a dict[str, str] which means
+#       duplicates are lost, we should fix that so it returns a http.client.HTTPMessage
 class FetchResponse(pyodide.http.FetchResponse):
     # TODO: Consider upstreaming the `body` attribute
     @property
@@ -38,6 +42,10 @@ def body(self) -> Body:
         else:
             return b
 
+    @property
+    def js_object(self) -> "js.Response":
+        return self.js_response
+
     """
     Instance methods defined below.
 
@@ -77,6 +85,15 @@ def _to_python_exception(exc: JsException) -> Exception:
         return exc
 
 
+@contextmanager
+def _manage_pyproxies():
+    proxies = js.Array.new()
+    try:
+        yield proxies
+    finally:
+        destroy_proxies(proxies)
+
+
 class Response(FetchResponse):
     def __init__(
         self,
@@ -96,7 +113,7 @@ def __init__(
         # Initialise via the FetchResponse super-class which gives us access to
         # methods that we would ordinarily have to redeclare.
         js_resp = js.Response.new(
-            body.js_form_data if isinstance(body, FormData) else body, **options
+            body.js_object if isinstance(body, FormData) else body, **options
         )
         super().__init__(js_resp.url, js_resp)
 
@@ -141,62 +158,269 @@ def json(
         headers: Headers = None,
     ):
         options = Response._create_options(status, statusText, headers)
-        try:
-            return js.Response.json(
-                to_js(data, dict_converter=js.Object.fromEntries), **options
-            )
-        except JsException as exc:
-            raise _to_python_exception(exc) from exc
+        with _manage_pyproxies() as pyproxies:
+            try:
+                return js.Response.json(
+                    to_js(
+                        data, dict_converter=js.Object.fromEntries, pyproxies=pyproxies
+                    ),
+                    **options,
+                )
+            except JsException as exc:
+                raise _to_python_exception(exc) from exc
 
 
-# TODO: Implement pythonic blob API
-FormDataValue = "str | js.Blob"
+FormDataValue = "str | js.Blob | Blob"
 
 
-class FormData(MutableMapping[str, FormDataValue]):
-    def __init__(self, form_data: "js.FormData | None | dict[str, FormDataValue]"):
-        if form_data:
-            if isinstance(form_data, dict):
-                self.js_form_data = js.FormData.new()
-                for item in form_data.items():
-                    self.js_form_data.append(item[0], item[1])
-            else:
-                self.js_form_data = form_data
+def _py_value_to_js(item: FormDataValue) -> "str | js.Blob":
+    if isinstance(item, Blob):
+        return item.js_object
+    else:
+        return item
+
+
+def _js_value_to_py(item: FormDataValue) -> "str | Blob | File":
+    if hasattr(item, "constructor") and (item.constructor.name in ("Blob", "File")):
+        if item.constructor.name == "File":
+            return File(item, item.name)
         else:
-            self.js_form_data = js.FormData.new()
+            return Blob(item)
+    else:
+        return item
+
+
+class FormData(MutableMapping[str, FormDataValue]):
+    """
+    This API follows that of https://pypi.org/project/multidict/.
+    """
+
+    def __init__(
+        self, form_data: "js.FormData | None | dict[str, FormDataValue]" = None
+    ):
+        if not form_data:
+            self._js_form_data = js.FormData.new()
+            return
+
+        if isinstance(form_data, dict):
+            self._js_form_data = js.FormData.new()
+            for k, v in form_data.items():
+                self._js_form_data.append(k, _py_value_to_js(v))
+            return
+
+        if (
+            hasattr(form_data, "constructor")
+            and form_data.constructor.name == "FormData"
+        ):
+            self._js_form_data = form_data
+            return
 
-    def __getitem__(self, key: str) -> list[FormDataValue]:
-        return list(self.js_form_data.getAll(key))
+        raise TypeError("Expected form_data to be a dict or an instance of FormData")
 
-    def __setitem__(self, key: str, value: list[FormDataValue]):
-        self.js_form_data.delete(key)
-        for item in value:
-            self.js_form_data.append(key, item)
+    def __getitem__(self, key: str) -> FormDataValue:
+        return _js_value_to_py(self._js_form_data.get(key))
 
-    def append(self, key: str, value: FormDataValue):
-        self.js_form_data.append(key, value)
+    def __setitem__(self, key: str, value: FormDataValue):
+        if isinstance(value, list):
+            raise TypeError("Expected single item in arguments to FormData.__setitem__")
+        self._js_form_data.set(key, _py_value_to_js(value))
+
+    def append(self, key: str, value: FormDataValue, filename: str | None = None):
+        self._js_form_data.append(key, _py_value_to_js(value), filename)
 
     def delete(self, key: str):
-        self.js_form_data.delete(key)
+        self._js_form_data.delete(key)
 
     def __contains__(self, key: str) -> bool:
-        return self.js_form_data.has(key)
+        return self._js_form_data.has(key)
 
     def values(self) -> Generator[FormDataValue, None, None]:
-        yield from self.js_form_data.values()
+        for val in self._js_form_data.values():
+            yield _js_value_to_py(val)
 
     def keys(self) -> Generator[str, None, None]:
-        yield from self.js_form_data.keys()
+        yield from self._js_form_data.keys()
 
     def __iter__(self):
         yield from self.keys()
 
     def items(self) -> Generator[tuple[str, FormDataValue], None, None]:
-        for item in self.js_form_data.entries():
-            yield (item[0], item[1])
+        for k, v in self._js_form_data.entries():
+            yield (k, _js_value_to_py(v))
 
     def __delitem__(self, key: str):
         self.delete(key)
 
     def __len__(self):
         return len(self.keys())
+
+    def get_all(self, key: str) -> list[FormDataValue]:
+        return [_js_value_to_py(x) for x in self._js_form_data.getAll(key)]
+
+    @property
+    def js_object(self) -> "js.FormData":
+        return self._js_form_data
+
+
+def _supports_buffer_protocol(o):
+    try:
+        # memoryview used only for testing type; 'with' releases the view instantly
+        with memoryview(o):
+            return True
+    except TypeError:
+        return False
+
+
+@contextmanager
+def _make_blob_entry(e):
+    if isinstance(e, str):
+        yield e
+        return
+    if isinstance(e, Blob):
+        yield e._js_blob
+        return
+    if hasattr(e, "constructor") and (e.constructor.name in ("Blob", "File")):
+        yield e
+        return
+    if _supports_buffer_protocol(e):
+        px = create_proxy(e)
+        buf = px.getBuffer()
+        try:
+            yield buf.data
+            return
+        finally:
+            buf.release()
+            px.destroy()
+    raise TypeError(f"Don't know how to handle {type(e)} for Blob()")
+
+
+def _is_iterable(obj):
+    try:
+        iter(obj)
+    except TypeError:
+        return False
+    else:
+        return True
+
+
+BlobValue = (
+    "str | bytes | js.ArrayBuffer | js.TypedArray | js.DataView | js.Blob | Blob | File"
+)
+
+
+class BlobEnding(StrEnum):
+    TRANSPARENT = "transparent"
+    NATIVE = "native"
+
+
+class Blob:
+    def __init__(
+        self,
+        blob_parts: "Iterable[BlobValue] | BlobValue",
+        content_type: str | None = None,
+        endings: BlobEnding | str | None = None,
+    ):
+        if endings:
+            endings = str(endings)
+
+        is_single_item = not _is_iterable(blob_parts)
+        if is_single_item:
+            # Inherit the content_type if we have a single item. If a File is passed
+            # in then its metadata is lost.
+            if not content_type and isinstance(blob_parts, Blob):
+                content_type = blob_parts.content_type
+            if hasattr(blob_parts, "constructor") and (
+                blob_parts.constructor.name in ("Blob", "File")
+            ):
+                if not content_type:
+                    content_type = blob_parts.type
+
+            # Otherwise create a new Blob below.
+            blob_parts = [blob_parts]
+
+        with ExitStack() as stack:
+            args = [stack.enter_context(_make_blob_entry(e)) for e in blob_parts]
+            with _manage_pyproxies() as pyproxies:
+                self._js_blob = js.Blob.new(
+                    to_js(args, pyproxies=pyproxies),
+                    type=content_type,
+                    endings=endings,
+                )
+
+    @property
+    def size(self) -> int:
+        return self._js_blob.size
+
+    @property
+    def content_type(self) -> str:
+        return self._js_blob.type
+
+    @property
+    def js_object(self) -> "js.Blob":
+        return self._js_blob
+
+    async def text(self) -> str:
+        return await self.js_object.text()
+
+    async def bytes(self) -> bytes:
+        return (await self.js_object.arrayBuffer()).to_bytes()
+
+    def slice(
+        self,
+        start: int | None = None,
+        end: int | None = None,
+        content_type: str | None = None,
+    ):
+        return self.js_object.slice(start, end, content_type)
+
+
+class File(Blob):
+    def __init__(
+        self,
+        blob_parts: "Iterable[BlobValue] | BlobValue",
+        filename: str,
+        content_type: str | None = None,
+        endings: BlobEnding | str | None = None,
+        last_modified: int | None = None,
+    ):
+        if endings:
+            endings = str(endings)
+
+        is_single_item = not _is_iterable(blob_parts)
+        if is_single_item:
+            # Inherit the content_type and lastModified if we have a
+            # single item.
+            if not content_type and isinstance(blob_parts, Blob):
+                content_type = blob_parts.content_type
+            if not last_modified and isinstance(blob_parts, File):
+                last_modified = blob_parts.last_modified
+            if hasattr(blob_parts, "constructor") and (
+                blob_parts.constructor.name in ("Blob", "File")
+            ):
+                if not content_type:
+                    content_type = blob_parts.type
+                if blob_parts.constructor.name == "File":
+                    if not last_modified:
+                        last_modified = blob_parts.lastModified
+
+            # Otherwise create a new File below.
+            blob_parts = [blob_parts]
+
+        with ExitStack() as stack:
+            args = [stack.enter_context(_make_blob_entry(e)) for e in blob_parts]
+            with _manage_pyproxies() as pyproxies:
+                self._js_blob = js.File.new(
+                    to_js(args, pyproxies=pyproxies),
+                    filename,
+                    type=content_type,
+                    endings=endings,
+                    lastModified=last_modified,
+                )
+
+    @property
+    def name(self) -> str:
+        return self._js_blob.name
+
+    @property
+    def last_modified(self) -> int:
+        return self._js_blob.last_modified

src/workerd/server/tests/python/sdk/server.py

@@ -1,4 +1,4 @@
-from cloudflare.workers import FormData, Response
+from cloudflare.workers import Blob, FormData, Response
 
 
 async def on_fetch(request):
@@ -14,6 +14,13 @@ async def on_fetch(request):
     elif request.url.endswith("/formdata"):
         data = FormData({"field": "value"})
         return Response(data)
+    elif request.url.endswith("/formdatablob"):
+        data = FormData({"field": "value"})
+        data["blob.py"] = Blob("print(42)", content_type="text/python")
+        data.append(
+            "metadata", Blob("{}", content_type="text/python"), filename="metadata.json"
+        )
+        return Response(data)
     else:
         raise ValueError("Unexpected path " + request.url)