setta 0.0.14.dev8__py3-none-any.whl → 0.0.15__py3-none-any.whl

setta/__init__.py

@@ -1 +1 @@
-__version__ = "0.0.14.dev8"
+__version__ = "0.0.15"

setta/database/export_db/export_readable.py

@@ -232,11 +232,11 @@ def get_exporter_fn(config, section_id):
         return export_param_sweep_section
     elif stype == C.GLOBAL_PARAM_SWEEP:
         return export_global_param_sweep_section
-    elif stype == C.DRAW:
-        return export_canvas_rendered_value
-    elif stype == C.IMAGE:
-        return export_image_section
+    # elif stype == C.DRAW:
+    #     return export_canvas_rendered_value
+    # elif stype == C.IMAGE:
+    #     return export_image_section
     elif stype == C.SOCIAL:
         return export_social_section
-    elif stype == C.CHART:
-        return export_canvas_rendered_value
+    # elif stype == C.CHART:
+    #     return export_canvas_rendered_value

setta/routers/interactive.py

@@ -68,9 +68,20 @@ async def route_update_interactive_code(
 
 async def process_returned_content_from_multiple_tasks(tasks, to_run):
     all_content = await asyncio.gather(*to_run)
-    content = [item for sublist in all_content for item in sublist]
+    content = []
+    exception_occurred = False
+    for sublist in all_content:
+        for item in sublist:
+            if isinstance(item, Exception):
+                exception_occurred = True
+            else:
+                content.append(item)
     inMemorySubprocessInfo = tasks.getInMemorySubprocessInfo()
-    return {"inMemorySubprocessInfo": inMemorySubprocessInfo, "content": content}
+    return {
+        "inMemorySubprocessInfo": inMemorySubprocessInfo,
+        "content": content,
+        "exceptionOccurred": exception_occurred,
+    }
 
 
 async def update_interactive_code(p, tasks, lsp_writers, idx):
@@ -139,6 +150,11 @@ async def update_interactive_code(p, tasks, lsp_writers, idx):
     return initialContent
 
 
+@router.post(C.ROUTE_KILL_IN_MEMORY_SUBPROCESSES)
+async def route_kill_in_memory_subprocesses(tasks=Depends(get_tasks)):
+    tasks.kill_in_memory_subprocesses()
+
+
 @router.post(C.ROUTE_FORMAT_CODE)
 async def route_format_code(x: FormatCodeRequest):
     p = x.project

setta/static/constants/Settings.json

@@ -17,7 +17,7 @@
     "copyShortcut": "Mod + C",
     "pasteShortcut": "Mod + V",
     "pasteAsRefShortcut": "Mod + Shift + V",
-    "sortingShortcut": "Shift",
+    "sortingShortcut": "Mod + Alt",
     "movingFreeShortcut": "Alt",
     "showTooltipShortcut": "Q",
     "tooltipToPlaintextShortcut": "Q + S",

setta/static/constants/constants.json

@@ -71,6 +71,7 @@
   "ROUTE_COPY_SECTIONS": "/copySections",
   "ROUTE_UPDATE_INTERACTIVE_CODE": "/updateInteractiveCode",
   "ROUTE_SEND_PROJECT_TO_INTERACTIVE_CODE": "/sendProjectTointeractiveCode",
+  "ROUTE_KILL_IN_MEMORY_SUBPROCESSES": "/killInMemorySubprocesses",
   "ROUTE_FORMAT_CODE": "/formatCode",
   "ROUTE_SEND_ARTIFACT": "/sendArtfiact",
   "ROUTE_LOAD_ARTIFACTS": "/loadArtifacts",