@primate/python 0.4.0 → 0.5.0

package/lib/private/Default.js

@@ -3,8 +3,8 @@ 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";
-import execute from "@rcompat/stdio/execute";
+import fs from "@rcompat/fs";
+import io from "@rcompat/io";
 const PACKAGE = "primate-run";
 const [MAJOR, MINOR] = TAG.split(".").map(Number);
 function package_not_found() {
@@ -15,13 +15,13 @@ function pkg_mismatch(major, minor) {
 }
 async function show_package() {
     const str0 = () => "";
-    let out = await execute(`pip show ${PACKAGE} 2>/dev/null`).catch(str0);
+    let out = await io.run(`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);
+    out = await io.run(`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);
+    out = await io.run(`python -m pip show ${PACKAGE} 2>/dev/null`).catch(str0);
     if (out.trim())
         return out;
     return null;
@@ -44,7 +44,7 @@ export default class Default extends Runtime {
         const requirements_txt = app.root.join("requirements.txt");
         let packages = [];
         if (await requirements_txt.exists()) {
-            const requirements = await FileRef.text(requirements_txt);
+            const requirements = await fs.text(requirements_txt);
             packages = requirements
                 .split("\n")
                 .filter(line => line.trim() && !line.startsWith("#"))
@@ -52,16 +52,19 @@ export default class Default extends Runtime {
         }
         const packages_str = JSON.stringify(packages);
         app.bind(this.fileExtension, async (file, { context }) => {
-            assert(context === "routes", "python: only route files are supported");
+            assert.true(context === "routes", "python: only route files are supported");
             const relative = file.debase(app.path.routes).path.replace(/^\//, "");
             const source = await file.text();
             return `
         import wrapper from "@primate/python/wrapper";
+        import i18n from "app:config:i18n";
+        import session from "app:config:session";
         await wrapper(
           ${JSON.stringify(source)},
           ${packages_str},
           "${PACKAGE}~=${TAG}.0",
-          "${relative}"
+          "${relative}",
+          { i18n, session }
         );
       `;
         });

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

@@ -1,5 +1,5 @@
-import type RequestFacade from "@primate/core/request/RequestFacade";
-import type Dict from "@rcompat/type/Dict";
+import type { RequestFacade } from "@primate/core/request";
+import type { Dict } from "@rcompat/type";
 type FileEntry = {
     bytes: Uint8Array;
     field: string;

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

@@ -1,5 +1,5 @@
-import type ResponseLike from "@primate/core/response/ResponseLike";
-import type Dict from "@rcompat/type/Dict";
+import { type ResponseLike } from "@primate/core/response";
+import type { Dict } from "@rcompat/type";
 import type { PyProxy } from "pyodide/ffi";
 declare const _default: (response: Dict | PyProxy) => ResponseLike;
 export default _default;

package/lib/private/to-response.js

@@ -1,8 +1,7 @@
 import HANDLER_PROPERTY from "#handler-property";
 import unwrap from "#unwrap";
-import error from "@primate/core/response/error";
-import redirect from "@primate/core/response/redirect";
-import view from "@primate/core/response/view";
+import response from "@primate/core/response";
+const { error, redirect, view } = response;
 const handlers = { error, redirect, view };
 const handle_handler = (handler, response) => {
     if (handler === "view") {

package/lib/private/unwrap.d.ts

@@ -1,4 +1,4 @@
-import type Dict from "@rcompat/type/Dict";
+import type { Dict } from "@rcompat/type";
 import type { PyProxy } from "pyodide/ffi";
 export default function unwrap(response: PyProxy): Dict;
 //# sourceMappingURL=unwrap.d.ts.map

package/lib/private/wrapper.d.ts

@@ -1,2 +1,5 @@
-export default function wrapper(source: string, packages: string[], primate_run: string, id: string): Promise<void>;
+export default function wrapper(source: string, packages: string[], primate_run: string, id: string, context?: {
+    i18n?: any;
+    session?: any;
+}): Promise<void>;
 //# sourceMappingURL=wrapper.d.ts.map

package/lib/private/wrapper.js

@@ -3,7 +3,6 @@ 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;
@@ -23,7 +22,33 @@ async function load_package(micropip, pkg) {
     await micropip.install(pkg, { messageCallback });
     installed.add(pkg);
 }
-export default async function wrapper(source, packages, primate_run, id) {
+function wrap_session(session) {
+    if (!session)
+        return null;
+    return {
+        get id() { return session.id; },
+        get exists() { return session.exists; },
+        create(initial) { session.create(borrow(initial)); },
+        get() { return session.get(); },
+        try_get() { return session.try(); },
+        set(data) { session.set(borrow(data)); },
+        destroy() { session.destroy(); },
+    };
+}
+function wrap_i18n(i18n) {
+    if (!i18n)
+        return null;
+    return {
+        get locale() { return i18n.locale.get(); },
+        t(key, params) {
+            if (!params)
+                return i18n(key);
+            return i18n(key, JSON.parse(params));
+        },
+        set(locale) { i18n.locale.set(locale); },
+    };
+}
+export default async function wrapper(source, packages, primate_run, id, context = {}) {
     const python = await pyodide();
     const micropip = await load_micropip(python);
     const route_id = JSON.stringify(id);
@@ -41,39 +66,19 @@ export default async function wrapper(source, packages, primate_run, id) {
     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();
-        },
-    };
+    const wrapped_session = wrap_session(context.session);
+    const wrapped_i18n = wrap_i18n(context.i18n);
     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);
+            python.globals.set("i18n_obj", wrapped_i18n);
             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)
+          await Route.call_js(${route_id}, ${verb_str}, js_req, helpers_obj, session_obj, i18n_obj)
         `);
                 return to_response(result);
             }
@@ -85,6 +90,7 @@ export default async function wrapper(source, packages, primate_run, id) {
                 python.globals.delete("js_req");
                 python.globals.delete("helpers_obj");
                 python.globals.delete("session_obj");
+                python.globals.delete("i18n_obj");
             }
         });
     }

package/package.json

@@ -1,32 +1,35 @@
 {
   "name": "@primate/python",
-  "version": "0.4.0",
-  "description": "Primate Python backend",
+  "version": "0.5.0",
+  "description": "Python backend for Primate",
   "homepage": "https://primate.run/docs/backend/python",
   "bugs": "https://github.com/primate-run/primate/issues",
+  "type": "module",
   "license": "MIT",
-  "files": [
-    "/lib/**/*.js",
-    "/lib/**/*.d.ts",
-    "!/**/*.spec.*"
-  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/primate-run/primate",
     "directory": "packages/python"
   },
+  "files": [
+    "/lib/**/*.js",
+    "/lib/**/*.d.ts",
+    "!/**/*.spec.*"
+  ],
   "dependencies": {
-    "@rcompat/assert": "^0.3.1",
-    "@rcompat/fs": "^0.22.3",
-    "@rcompat/stdio": "^0.12.2",
-    "pyodide": "^0.29.0",
-    "@primate/core": "^0.4.0",
-    "pema": "^0.4.0"
+    "@rcompat/assert": "^0.6.0",
+    "@rcompat/fs": "^0.25.2",
+    "@rcompat/io": "^0.3.0",
+    "pyodide": "^0.29.3",
+    "@primate/core": "^0.5.0",
+    "pema": "^0.5.0"
+  },
+  "devDependencies": {
+    "@rcompat/type": "^0.9.0"
   },
   "peerDependencies": {
-    "primate": "^0.35.0"
+    "primate": "^0.36.0"
   },
-  "type": "module",
   "imports": {
     "#*": {
       "apekit": "./src/private/*.ts",