@primate/python 0.2.0 → 0.4.0

package/lib/private/Default.js

@@ -1,85 +1,46 @@
 import Runtime from "#Runtime";
-import wrap from "@primate/core/route/wrap";
+import TAG from "@primate/core/backend/TAG";
+import fail from "@primate/core/fail";
+import log from "@primate/core/log";
 import assert from "@rcompat/assert";
 import FileRef from "@rcompat/fs/FileRef";
-const js_wrapper = async (fileRef, packages) => {
-    const userPythonRaw = await fileRef.text();
-    const user_code = userPythonRaw.replace(/`/g, "\\`").replace(/\\/g, "\\\\");
-    return `
-import route from "primate/route";
-import to_request from "@primate/python/to-request";
-import to_response from "@primate/python/to-response";
-import session from "primate/config/session";
-import helpers from "@primate/python/helpers";
-import pyodide from "@primate/python/pyodide";
-import borrow from "@primate/python/borrow";
-
-const wrapped_session = {
-  get id() {
-    return session().id;
-  },
-  get exists() {
-    return session().exists;
-  },
-  create(initial) {
-    session().create(borrow(initial));
-  },
-  get() {
-    return session().get();
-  },
-  try() {
-    return session().get();
-  },
-  set(data) {
-    session().set(borrow(data));
-  },
-  destroy() {
-    session().destroy();
-  },
-};
-
-const python = await pyodide();
-const messageCallback = () => {};
-
-await python.loadPackage("micropip", { messageCallback });
-const micropip = python.pyimport("micropip");
-await micropip.install("primate-run", { messageCallback });
-${packages.map(p => `await micropip.install("${p}", { messageCallback });`).join("\n")}
-
-await python.runPython(\`${user_code}\`);
-
-// Get the registry of registered route function names
-const registry = python.runPython("Route.registry()").toJs();
-
-// Create route handler functions
-await python.runPython(\`
-\${Object.keys(registry).map(route => \`
-def run_\${route.toUpperCase()}(js_request, helpers_obj, session_obj):
-    Route.set_session(session_obj, helpers_obj)
-    request = Route.Request(js_request, helpers_obj)
-    return Route.call_route("\${route.toUpperCase()}", request)
-\`).join("\\n")}
-\`);
-
-// Create route handlers for each registered route
-for (const [verb, func_name] of Object.entries(registry)) {
-  const route_fn = python.globals.get(\`run_\${verb.toUpperCase()}\`);
-
-  route[verb.toLowerCase()](async request => {
-    try {
-      const converted_request = await to_request(request);
-      const result = await route_fn(converted_request, helpers, wrapped_session);
-      return to_response(result);
-    } catch (e) {
-      console.error(\`python error (\${verb.toLowerCase()})\`, e);
-      return { status: 500, body: "Python execution error: " + e.message };
-    }
-  });
+import execute from "@rcompat/stdio/execute";
+const PACKAGE = "primate-run";
+const [MAJOR, MINOR] = TAG.split(".").map(Number);
+function package_not_found() {
+    return fail("package not found - run 'pip install {0}~={1}.0'", PACKAGE, TAG);
+}
+function pkg_mismatch(major, minor) {
+    return fail("installed {0} package version {1}.{2}.x not in range ~> {3}.x", PACKAGE, major, minor, TAG);
+}
+async function show_package() {
+    const str0 = () => "";
+    let out = await execute(`pip show ${PACKAGE} 2>/dev/null`).catch(str0);
+    if (out.trim())
+        return out;
+    out = await execute(`uv pip show ${PACKAGE} 2>/dev/null`).catch(str0);
+    if (out.trim())
+        return out;
+    out = await execute(`python -m pip show ${PACKAGE} 2>/dev/null`).catch(str0);
+    if (out.trim())
+        return out;
+    return null;
+}
+async function check_version() {
+    const output = await show_package();
+    if (!output)
+        throw package_not_found();
+    const version_match = output.match(/Version:\s*(\d+)\.(\d+)\.(\d+)/);
+    if (!version_match)
+        throw package_not_found();
+    const [major, minor] = version_match.slice(1).map(Number);
+    if (major !== MAJOR || minor !== MINOR)
+        throw pkg_mismatch(major, minor);
+    log.info("using {0} package {1}.{2}.x", PACKAGE, major, minor);
 }
-`;
-};
 export default class Default extends Runtime {
     async build(app, next) {
+        await check_version();
         const requirements_txt = app.root.join("requirements.txt");
         let packages = [];
         if (await requirements_txt.exists()) {
@@ -89,10 +50,20 @@ export default class Default extends Runtime {
                 .filter(line => line.trim() && !line.startsWith("#"))
                 .map(p => p.trim());
         }
-        app.bind(this.fileExtension, async (route, { build, context }) => {
+        const packages_str = JSON.stringify(packages);
+        app.bind(this.fileExtension, async (file, { context }) => {
             assert(context === "routes", "python: only route files are supported");
-            const code = wrap(await js_wrapper(route, packages), route, build);
-            await route.append(".js").write(code);
+            const relative = file.debase(app.path.routes).path.replace(/^\//, "");
+            const source = await file.text();
+            return `
+        import wrapper from "@primate/python/wrapper";
+        await wrapper(
+          ${JSON.stringify(source)},
+          ${packages_str},
+          "${PACKAGE}~=${TAG}.0",
+          "${relative}"
+        );
+      `;
         });
         return next(app);
     }

package/lib/private/pyodide.d.ts

@@ -1,2 +1,3 @@
-export default function (): Promise<any>;
+import { type PyodideAPI } from "pyodide";
+export default function (): Promise<PyodideAPI>;
 //# sourceMappingURL=pyodide.d.ts.map

package/lib/private/pyodide.js

@@ -1,5 +1,8 @@
 import { loadPyodide } from "pyodide";
+let pyodide = null;
 export default async function () {
-    return await loadPyodide({ indexURL: "./node_modules/pyodide" });
+    if (!pyodide)
+        pyodide = await loadPyodide({ indexURL: "./node_modules/pyodide" });
+    return pyodide;
 }
 //# sourceMappingURL=pyodide.js.map

package/lib/private/to-request.d.ts

@@ -24,7 +24,7 @@ export default function to_request(request: RequestFacade): Promise<{
     body: {
         text: () => string;
         json: () => string;
-        fields: () => Record<string, string>;
+        form: () => Dict<string>;
         files: () => FileEntry[];
         binary: () => {
             buffer: Uint8Array<ArrayBuffer>;

package/lib/private/to-request.js

@@ -28,41 +28,37 @@ function toDict(obj) {
     }
     return out;
 }
-async function bridgeFields(body) {
-    const fields = body.fields(); // can be strings or File
-    const plain = Object.create(null);
+async function bridge_form(body) {
+    const form = Object.create(null);
     const files = [];
     const pending = [];
-    for (const [k, v] of Object.entries(fields)) {
-        if (typeof v === "string") {
-            plain[k] = v;
-        }
-        else {
-            // v is File
-            const name = v.name;
-            const type = v.type;
-            const size = v.size;
-            pending.push(v.arrayBuffer().then(buffer => {
-                files.push({
-                    bytes: new Uint8Array(buffer),
-                    field: k,
-                    name,
-                    size,
-                    type,
-                });
-            }));
-        }
+    for (const [k, v] of Object.entries(body.form())) {
+        form[k] = v;
+    }
+    for (const [k, v] of Object.entries(body.files())) {
+        const name = v.name;
+        const type = v.type;
+        const size = v.size;
+        pending.push(v.arrayBuffer().then(buffer => {
+            files.push({
+                bytes: new Uint8Array(buffer),
+                field: k,
+                name,
+                size,
+                type,
+            });
+        }));
     }
     await Promise.all(pending);
     return {
-        fields: () => plain,
+        form: () => form,
         files: () => files,
     };
 }
 async function bridgeBody(body) {
-    let fields, buffer, blob;
-    if (body.type === "fields") {
-        fields = await bridgeFields(body);
+    let form, buffer, blob;
+    if (body.type === "form") {
+        form = await bridge_form(body);
     }
     if (body.type === "binary") {
         blob = body.binary();
@@ -73,8 +69,8 @@ async function bridgeBody(body) {
         json: () => {
             return JSON.stringify(body.json());
         },
-        fields: () => fields.fields(),
-        files: () => fields.files(),
+        form: () => form.form(),
+        files: () => form.files(),
         binary: () => {
             const mime = blob.type || "application/octet-stream";
             return {

package/lib/private/wrapper.d.ts

@@ -0,0 +1,2 @@
+export default function wrapper(source: string, packages: string[], primate_run: string, id: string): Promise<void>;
+//# sourceMappingURL=wrapper.d.ts.map

package/lib/private/wrapper.js

@@ -0,0 +1,92 @@
+import borrow from "@primate/python/borrow";
+import helpers from "@primate/python/helpers";
+import pyodide from "@primate/python/pyodide";
+import to_request from "@primate/python/to-request";
+import to_response from "@primate/python/to-response";
+import session from "primate/config/session";
+import route from "primate/route";
+const messageCallback = () => { };
+let _micropip = null;
+const installed = new Set();
+async function load_micropip(python) {
+    if (!_micropip) {
+        _micropip = (async () => {
+            await python.loadPackage("micropip", { messageCallback });
+            return python.pyimport("micropip");
+        })();
+    }
+    return _micropip;
+}
+async function load_package(micropip, pkg) {
+    if (installed.has(pkg))
+        return;
+    await micropip.install(pkg, { messageCallback });
+    installed.add(pkg);
+}
+export default async function wrapper(source, packages, primate_run, id) {
+    const python = await pyodide();
+    const micropip = await load_micropip(python);
+    const route_id = JSON.stringify(id);
+    await load_package(micropip, primate_run);
+    for (const pkg of packages) {
+        await load_package(micropip, pkg);
+    }
+    await python.runPython(`
+    from primate import Route
+    Route.clear(${route_id})
+    Route.scope(${route_id})
+  `);
+    await python.runPython(source);
+    const verbs = python.runPython(`
+    from primate import Route
+    list(Route.registry(${route_id}).keys())
+  `).toJs();
+    const wrapped_session = {
+        get id() {
+            return session().id;
+        },
+        get exists() {
+            return session().exists;
+        },
+        create(initial) {
+            session().create(borrow(initial));
+        },
+        get() {
+            return session().get();
+        },
+        try() {
+            return session().get();
+        },
+        set(data) {
+            session().set(borrow(data));
+        },
+        destroy() {
+            session().destroy();
+        },
+    };
+    for (const verb of verbs) {
+        route[verb.toLowerCase()](async (request) => {
+            python.globals.set("js_req", await to_request(request));
+            python.globals.set("helpers_obj", helpers);
+            python.globals.set("session_obj", wrapped_session);
+            const verb_str = JSON.stringify(verb);
+            try {
+                const result = await python.runPythonAsync(`
+          from primate import Route
+          await Route.call_js(${route_id}, ${verb_str}, js_req, helpers_obj, session_obj)
+        `);
+                return to_response(result);
+            }
+            catch (e) {
+                console.error(`python error (${verb.toLowerCase()})`, e);
+                return { status: 500, body: "Python execution error: " + e.message };
+            }
+            finally {
+                python.globals.delete("js_req");
+                python.globals.delete("helpers_obj");
+                python.globals.delete("session_obj");
+            }
+        });
+    }
+}
+//# sourceMappingURL=wrapper.js.map

package/lib/public/wrapper.d.ts

@@ -0,0 +1,2 @@
+export { default } from "#wrapper";
+//# sourceMappingURL=wrapper.d.ts.map

package/lib/public/wrapper.js

@@ -0,0 +1,2 @@
+export { default } from "#wrapper";
+//# sourceMappingURL=wrapper.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primate/python",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "Primate Python backend",
   "homepage": "https://primate.run/docs/backend/python",
   "bugs": "https://github.com/primate-run/primate/issues",
@@ -17,13 +17,14 @@
   },
   "dependencies": {
     "@rcompat/assert": "^0.3.1",
-    "@rcompat/fs": "^0.21.1",
-    "pyodide": "^0.28.3",
-    "@primate/core": "^0.2.0",
-    "pema": "^0.2.0"
+    "@rcompat/fs": "^0.22.3",
+    "@rcompat/stdio": "^0.12.2",
+    "pyodide": "^0.29.0",
+    "@primate/core": "^0.4.0",
+    "pema": "^0.4.0"
   },
   "peerDependencies": {
-    "primate": "^0.33.0"
+    "primate": "^0.35.0"
   },
   "type": "module",
   "imports": {