Merge pull request #244 from flatironinstitute/improve-pyodide-errors

Improve errors from pyodide by using filename
flatironinstitute · Nov 5, 2024 · a8f439c · a8f439c
2 parents 03430c8 + aff1622
commit a8f439c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/gui/src/app/Scripting/Analysis/AnalysisPyWindow.tsx b/gui/src/app/Scripting/Analysis/AnalysisPyWindow.tsx
@@ -59,6 +59,7 @@ const AnalysisPyWindow: FunctionComponent<AnalysisWindowProps> = ({
           loadsDraws: true,
           showsPlots: true,
           producesData: false,
+          filenameForErrors: FileNames.ANALYSISPYFILE,
         },
         files,
       });

diff --git a/gui/src/app/Scripting/DataGeneration/DataPyWindow.tsx b/gui/src/app/Scripting/DataGeneration/DataPyWindow.tsx
@@ -45,6 +45,7 @@ const DataPyWindow: FunctionComponent<Props> = () => {
           loadsDraws: false,
           showsPlots: false,
           producesData: true,
+          filenameForErrors: FileNames.DATAPYFILE,
         },
       });
     },

diff --git a/gui/src/app/Scripting/pyodide/pyodideWorker.ts b/gui/src/app/Scripting/pyodide/pyodideWorker.ts
@@ -122,7 +122,10 @@ const run = async (
       }
 
       setStatus("running");
-      pyodide.runPython(script, { globals });
+      await pyodide.runPythonAsync(script, {
+        globals,
+        filename: spPySettings.filenameForErrors,
+      });
       succeeded = true;
     } catch (e: any) {
       console.error(e);

diff --git a/gui/src/app/Scripting/pyodide/pyodideWorkerTypes.ts b/gui/src/app/Scripting/pyodide/pyodideWorkerTypes.ts
@@ -8,6 +8,7 @@ export type PyodideRunSettings = Partial<{
   loadsDraws: boolean;
   showsPlots: boolean;
   producesData: boolean;
+  filenameForErrors: string;
 }>;
 
 export type MessageToPyodideWorker = {