use exec() instead of importlib

MecSimCalc · Jun 2, 2023 · 508f09c · 508f09c
1 parent 900325c
commit 508f09c
Show file tree

Hide file tree

Showing 4 changed files with 2,787 additions and 2,768 deletions.
diff --git a/back-end/server.py b/back-end/server.py
@@ -1,8 +1,6 @@
-import importlib
 import io
 import json
 import os
-import tempfile
 import traceback
 from contextlib import redirect_stdout
 
@@ -57,27 +55,21 @@ def run_code(code):
     response = {}
     # (1) Get user inputs as json
     inputs = request.get_json(force=True)
-    with tempfile.NamedTemporaryFile(mode="w", suffix=".py") as code_file:
-        # (2) Write code to a temp file
-        code_file.write(code)
-        code_file.flush()
-        # (3) Capture stdout
-        stdout = io.StringIO()
-        with redirect_stdout(stdout):
-            # (4) Compile and run the app code
-            try:
-                # https://stackoverflow.com/a/67692
-                # Compile the functions
-                spec = importlib.util.spec_from_file_location(
-                    "app_code", code_file.name
-                )
-                script = importlib.util.module_from_spec(spec)
-                spec.loader.exec_module(script)
-                # Execute the main() function
-                response["outputs"] = clean_json(script.main(inputs))
-            except Exception as e:
-                response["error"] = traceback.format_exc()
-        response["stdout"] = stdout.getvalue()
+    # (3) Capture stdout
+    stdout = io.StringIO()
+    with redirect_stdout(stdout):
+        # (4) Compile and run the app code
+        try:
+            g = {}
+            exec(code, g)
+
+            assert "main" in g, "'def main(inputs):' is not defined"
+            outputs = g["main"](inputs)
+
+            response["outputs"] = clean_json(outputs)
+        except Exception as e:
+            response["error"] = traceback.format_exc()
+    response["stdout"] = stdout.getvalue()
     return response
 
 

diff --git a/front-end/package-lock.json b/front-end/package-lock.json
diff --git a/front-end/package.json b/front-end/package.json
@@ -14,10 +14,6 @@
     "@mui/icons-material": "^5.6.0",
     "@mui/lab": "^5.0.0-alpha.77",
     "@mui/material": "^5.6.0",
-    "@types/katex": "^0.14.0",
-    "@types/lodash": "^4.14.181",
-    "@types/nunjucks": "^3.2.1",
-    "@types/react-grid-layout": "^1.3.2",
     "axios": "^0.26.1",
     "date-fns": "^2.28.0",
     "formik": "^2.2.9",
@@ -32,13 +28,17 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-dropzone": "^12.0.5",
-    "react-grid-layout": "^1.3.4",
+    "react-grid-layout": "^1.2.3",
     "react-quill": "^2.0.0-beta.4"
   },
   "devDependencies": {
+    "@types/katex": "^0.16.0",
+    "@types/lodash": "^4.14.195",
     "@types/node": "17.0.23",
+    "@types/nunjucks": "^3.2.2",
     "@types/react": "18.0.1",
     "@types/react-dom": "18.0.0",
+    "@types/react-grid-layout": "^1.3.2",
     "eslint": "8.13.0",
     "eslint-config-next": "12.1.4",
     "typescript": "4.6.3"