setta 0.0.13.dev0__py3-none-any.whl → 0.0.14__py3-none-any.whl

setta/__init__.py

@@ -1 +1 @@
-__version__ = "0.0.13.dev0"
+__version__ = "0.0.14"

setta/code_gen/export_selected.py

@@ -554,6 +554,7 @@ class ExporterForInMemoryFn:
                 C.DRAW,
                 C.CHAT,
                 C.GLOBAL_VARIABLES,
+                C.TEXT_BLOCK,
             ],
         )
         for id in list(self.p["projectConfig"]["children"].keys()):
@@ -594,7 +595,9 @@ class ExporterForInMemoryFn:
             value = {"image": img}
             self.create_var_mapping((id, "image"), f'{name}["image"]')
         elif type == C.DRAW:
-            value = {"drawing": get_drawing(self.p, id)}
+            value = {
+                "drawing": get_drawing(self.p, id),
+            }
             self.create_var_mapping((id, "drawing"), f'{name}["drawing"]')
         elif type == C.CHAT:
             latestChatMessage = get_chat_message(self.p, id)
@@ -608,6 +611,10 @@ class ExporterForInMemoryFn:
         elif type == C.GLOBAL_VARIABLES:
             self.output.update(self.export_section_params(id, "", is_global=True))
             value_is_returned = False
+        elif type == C.TEXT_BLOCK:
+            variant = get_selected_section_variant(self.p, id)
+            value = {"text": variant["description"]}
+            self.create_var_mapping((id, "text"), f'{name}["text"]')
         else:
             raise ValueError
         return value, value_is_returned

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

@@ -18,6 +18,7 @@ from setta.code_gen.export_selected import (
 )
 from setta.code_gen.find_placeholders import parse_template_var
 from setta.tasks.fns.utils import replace_template_vars_with_random_names
+from setta.tasks.tasks import construct_subprocess_key
 from setta.utils.constants import C
 from setta.utils.utils import multireplace
 
@@ -35,6 +36,22 @@ class FormatCodeRequest(BaseModel):
     candidateTemplateVars: dict
 
 
+@router.post(C.ROUTE_SEND_PROJECT_TO_INTERACTIVE_CODE)
+async def route_send_project_to_interactive_code(
+    x: UpdateInteractiveCodeRequest,
+    tasks=Depends(get_tasks),
+):
+    to_run = []
+    for idx, p in enumerate(x.projects):
+        exporter_obj_in_memory = export_for_in_memory_fn(p)
+        to_run.append(
+            tasks.call_in_memory_subprocess_fn_with_new_exporter_obj(
+                p["projectConfig"]["id"], idx, exporter_obj_in_memory
+            )
+        )
+    return await process_returned_content_from_multiple_tasks(tasks, to_run)
+
+
 @router.post(C.ROUTE_UPDATE_INTERACTIVE_CODE)
 async def route_update_interactive_code(
     x: UpdateInteractiveCodeRequest,
@@ -46,13 +63,12 @@ async def route_update_interactive_code(
         update_interactive_code(p, tasks, lsp_writers, idx)
         for idx, p in enumerate(x.projects)
     ]
+    return await process_returned_content_from_multiple_tasks(tasks, update_tasks)
 
-    # Run all updates in parallel and gather results
-    all_content = await asyncio.gather(*update_tasks)
 
-    # Flatten the list of content
+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]
-
     inMemorySubprocessInfo = tasks.getInMemorySubprocessInfo()
     return {"inMemorySubprocessInfo": inMemorySubprocessInfo, "content": content}
 
@@ -106,7 +122,9 @@ async def update_interactive_code(p, tasks, lsp_writers, idx):
         code_graph.append(
             {
                 "imports": imports,
-                "subprocess_key": f"{project_config_id}-{section_id}-{idx}",
+                "subprocess_key": construct_subprocess_key(
+                    project_config_id, section_id, idx
+                ),
                 "subprocessStartMethod": p["sections"][section_id][
                     "subprocessStartMethod"
                 ],
@@ -115,7 +133,7 @@ async def update_interactive_code(p, tasks, lsp_writers, idx):
 
     initialContent = await tasks.add_custom_fns(
         code_graph,
-        to_cache=exporter_obj_in_memory,
+        exporter_obj=exporter_obj_in_memory,
     )
 
     return initialContent

setta/static/constants/Settings.json

@@ -42,6 +42,7 @@
     "showProjectOverviewTabShortcut": "O",
     "runCodeShortcut": "Mod + Enter",
     "runAllCodeShortcut": "Mod + Shift + Enter",
+    "sendProjectToAllInteractiveCode": "Alt + I",
     "paramSelect": "Mod + Shift",
     "formatCode": "Shift + Alt + F",
     "selectionKeyCode": "Shift",

setta/static/constants/constants.json

@@ -70,6 +70,7 @@
   "ROUTE_SAVE_CODE_INFO": "/codeInfo/save",
   "ROUTE_COPY_SECTIONS": "/copySections",
   "ROUTE_UPDATE_INTERACTIVE_CODE": "/updateInteractiveCode",
+  "ROUTE_SEND_PROJECT_TO_INTERACTIVE_CODE": "/sendProjectTointeractiveCode",
   "ROUTE_FORMAT_CODE": "/formatCode",
   "ROUTE_SEND_ARTIFACT": "/sendArtfiact",
   "ROUTE_LOAD_ARTIFACTS": "/loadArtifacts",

setta/static/constants/defaultValues.json

@@ -40,7 +40,6 @@
       "eraserBrushSize": 16,
       "drawThrottleDelay": 0,
       "canvasTransferQueueLength": 50,
-      "artifactIdUsedToSetCanvasSize": null,
       "mode": "draw"
     },
     "chartSettings": {