gwchq-textjam 0.1.67 → 0.1.69

package/dist/assets/{PyodideWorker442c933f736a86f038a9.js → PyodideWorkeraf47e97605454ed8ba8f.js}

@@ -71,13 +71,10 @@ const PyodideWorker = () => {
         }
         break;
       case "writeFile":
-        pyodide.FS.writeFile(
-          `${WORKING_DIR}/${data.filename}`,
-          encoder.encode(data.content),
-        );
+        pyodide.FS.writeFile(`${WORKING_DIR}/${data.filename}`, encoder.encode(data.content));
         break;
       case "runPython":
-        runPython(data.python);
+        runPython(data.python, data.userModuleNames);
         break;
       case "stopPython":
         stopped = true;
@@ -92,7 +89,7 @@ const PyodideWorker = () => {
     onmessage(event);
   });
 
-  const runPython = async (python) => {
+  const runPython = async (python, userModuleNames) => {
     stopped = false;
 
     try {
@@ -106,7 +103,7 @@ const PyodideWorker = () => {
       postMessage({ method: "handleError", ...parsePythonError(error) });
     }
 
-    await clearPyodideData();
+    await clearPyodideData(userModuleNames);
   };
 
   const checkIfStopped = () => {
@@ -413,15 +410,25 @@ const PyodideWorker = () => {
     },
   };
 
-  const clearPyodideData = async () => {
+  const clearPyodideData = async (userModuleNames) => {
     postMessage({ method: "handleLoading" });
-    console.log("clearPyodideData");
-    await pyodide.runPythonAsync(`
+    try {
+      await pyodide.runPythonAsync(`
         # Clear all user-defined variables and modules
-        for name in dir():
-            if not name.startswith('_') and not name=='basthon':
-                del globals()[name]
-      `);
+        for name in list(globals()):
+          if not name.startswith('_') and not name=='basthon':
+            del globals()[name]
+
+        import sys
+        # Remove user modules from sys.modules
+        user_modules = ${JSON.stringify(userModuleNames)}
+        for name in user_modules:
+          if name in sys.modules:
+            del sys.modules[name]
+        `);
+    } catch (error) {
+      console.error("Error while clearing Pyodide data:", error);
+    }
     console.log("clearPyodideData done");
     postMessage({ method: "handleLoaded", stdinBuffer, interruptBuffer });
   };
@@ -472,13 +479,6 @@ const PyodideWorker = () => {
       pyodide.setInterruptBuffer(interruptBuffer);
     }
 
-    // add root directory to sys.path for allowing imports of user files
-    await pyodide.runPythonAsync(`
-      import sys
-      if '/' not in sys.path:
-          sys.path.insert(0, '/')
-      `);
-
     postMessage({ method: "handleLoaded", stdinBuffer, interruptBuffer });
   };
 

package/dist/index.js

@@ -369691,6 +369691,7 @@ const preview_svg_1 = __importDefault(__webpack_require__(80417));
 const ProjectTypes_1 = __webpack_require__(27130);
 const projectHelpers_1 = __webpack_require__(2610);
 const Errors_1 = __webpack_require__(20339);
+const helpers_1 = __webpack_require__(55717);
 const PYTHON_ENTRY_FILE_PATH = "/main.py";
 const url = new URL(PyodideWorker_url_1.default, window.origin).href;
 const PyodideRunner = ({ active, packageApiUrl, }) => {
@@ -369722,6 +369723,7 @@ const PyodideRunner = ({ active, packageApiUrl, }) => {
     const project = (0, stores_1.useAppSelector)((s) => s.editor.project);
     const projectComponents = project.components || [];
     const projectCode = (0, react_1.useMemo)(() => projectComponents.filter((component) => component.type === ProjectTypes_1.ProjectComponentType.FILE), [projectComponents]);
+    const userModuleNames = (0, react_1.useMemo)(() => (0, helpers_1.getPythonUserModuleNames)(projectCode), [projectCode]);
     const focussedFileIndex = (0, stores_1.useAppSelector)((state) => state.editor.focussedFileIndices)[0];
     const openedFiles = (0, stores_1.useAppSelector)((state) => state.editor.openedFiles)[0];
     const codeRunTriggered = (0, stores_1.useAppSelector)((s) => s.editor.codeRunTriggered);
@@ -369924,6 +369926,7 @@ const PyodideRunner = ({ active, packageApiUrl, }) => {
         pyodideWorker?.postMessage({
             method: "runPython",
             python: entryFile.content,
+            userModuleNames,
         });
     };
     const handleStop = () => {
@@ -370127,6 +370130,28 @@ const PythonRunner = ({ packageApiUrl }) => {
 exports["default"] = PythonRunner;
 
 
+/***/ }),
+
+/***/ 55717:
+/***/ ((__unused_webpack_module, exports) => {
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.getPythonUserModuleNames = void 0;
+const getPythonUserModuleNames = (projectFiles) => {
+    return projectFiles.reduce((moduleNames, component) => {
+        if (component.path) {
+            moduleNames.push(component.path
+                .replace(/^\//, "") // remove leading slash
+                .replace(/\.py$/, "") // remove .py extension
+                .replace(/\//g, "."));
+        }
+        return moduleNames;
+    }, []);
+};
+exports.getPythonUserModuleNames = getPythonUserModuleNames;
+
+
 /***/ }),
 
 /***/ 78329:
@@ -381158,7 +381183,7 @@ module.exports = webpackAsyncContext;
 /***/ 24427:
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
-module.exports = __webpack_require__.p + "assets/PyodideWorker442c933f736a86f038a9.js";
+module.exports = __webpack_require__.p + "assets/PyodideWorkeraf47e97605454ed8ba8f.js";
 
 /***/ }),
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gwchq-textjam",
   "description": "Embeddable React editor used in Raspberry Pi text-based projects.",
-  "version": "0.1.67",
+  "version": "0.1.69",
   "license": "Apache-2.0",
   "homepage": "https://github.com/GirlsFirst/gwchq-textjam",
   "author": "Girls Who Code HQ",