roundtrip POC

Author: martindurant

example/main.py

@@ -1,5 +1,5 @@
 from pyscript_fsspec_client import io
-from pyscript import PyWorker, ffi
+from pyscript import PyWorker
 
 config = {
     "packages": ["fsspec", "fastparquet"],
@@ -10,4 +10,5 @@
     }
 }
 pw = PyWorker("./worker.py", type="pyodide", config=config)
+
 pw.sync.session = io.request

example/worker.py

@@ -1,7 +1,15 @@
-from pyscript import sync, document, window
+from pyscript import sync, ffi
 
 import fsspec
 import pyscript_fsspec_client.client
 
 fs = fsspec.filesystem("pyscript")
 print(fs.ls("local"))
+
+out = fs.cat("local/mdurant/code/fsspec-proxy/pyproject.toml")
+print("binary:", type(out), out)
+
+out = fs.cat("local/mdurant/code/fsspec-proxy/pyproject.toml", start=0, end=10)
+print("binary:", type(out), out)
+
+fs.pipe_file("local/mdurant/code/fsspec-proxy/OUTPUT", b"hello world")

pyscript-fsspec-client/pyscript_fsspec_client/client.py

@@ -2,7 +2,7 @@
 import logging
 import os
 
-from pyscript import sync
+from pyscript import sync, ffi
 from fsspec.spec import AbstractFileSystem, AbstractBufferedFile
 import fsspec.utils
 
@@ -17,7 +17,6 @@ class PyscriptFileSystem(AbstractFileSystem):
     def __init__(self, base_url=default_endpoint):
         super().__init__()
         self.base_url = base_url
-        self.session = sync.session
 
     def _split_path(self, path):
         key, *relpath = path.split("/", 1)
@@ -34,22 +33,19 @@ def _call(self, path, method="GET", range=None, binary=False, data=0, json=0):
             outmode = "text"
         if range:
             headers["Range"] = f"bytes={range[0]}-{range[1]}"
-        try:
-            print(method, f"{self.base_url}/{path}", headers, data, json, outmode)
-            out = self.session(
-                method, f"{self.base_url}/{path}",
-                #hearder=headers, data=data, json=json, outmode=outmode
-            )
-            print(out)
-            if isinstance(out, tuple) and out[0] == "error":
-                num, txt = out[1:]
-                raise OSError(num, txt)
-        except OSError as e:
-            if e.errno == 404:
-                raise FileNotFoundError(path)
-            if e.errno == 403:
-                raise PermissionError
-            raise
+        if data:
+            data = memoryview(data)
+            outmode = None
+        out = sync.session(
+            method, f"{self.base_url}/{path}", ffi.to_js(data),
+            ffi.to_js(headers), outmode
+        )
+        if isinstance(out, str) and out == "ISawAnError":
+            raise OSError(0, out)
+        if out is not None and not isinstance(out, str):
+            # may need a different conversion
+            out = bytes(out.to_py())
+        return out
 
     def ls(self, path, detail=True, **kwargs):
         path = self._strip_protocol(path)

pyscript-fsspec-client/pyscript_fsspec_client/io.py

@@ -1,26 +1,25 @@
 import json
 import pyscript
+import js
+from pyodide import ffi, console
 
 
 async def request(method, path, data=None, headers=None,
-                  outmode="json", **kwargs):
-    print("main", method, path)
-    if headers:
-        print(headers)
-        headers = json.loads(headers)
-    resp = await pyscript.fetch(path, method=method, budy=data, headers=headers or {},
-                                **kwargs)
-    print("fetched", resp, resp.status)
+                  outmode="text", **kwargs):
+    if data:
+        resp = await js.fetch(path, method=method, body=data.buffer, headers=headers or {},
+                              **kwargs)
+    else:
+        resp = await js.fetch(path, method=method, headers=headers or {},
+                              **kwargs)
+    if not resp.ok:
+        return "ISawAnError"
     if resp.status >= 400:
-        return ("error", resp.status, await resp.text())
-    if outmode == "json":
-        d = (await resp.json()).copy()
-        print(d)
-        return d
+        return "ISawAnError"
     if outmode == "text":
         return await resp.text()
     if outmode == "bytes":
-        return await resp.bytearray()
+        return await resp.arrayBuffer()
     if outmode is None:
         return
-    raise ValueError
+    return "ISawAnError"