setta 0.0.3.dev13__py3-none-any.whl → 0.0.4__py3-none-any.whl

setta/__init__.py

@@ -1 +1 @@
-__version__ = "0.0.3.dev13"
+__version__ = "0.0.4"

setta/database/db/artifacts/save.py

@@ -35,23 +35,28 @@ def save_artifacts(db, artifacts):
     db.executemany(query, query_params)
 
 
-def save_artifact_groups(db, artifact_groups):
+def save_artifact_groups(db, artifact_groups, sections):
     query = """
-        INSERT INTO ArtifactGroupId (id, name, data)
-        VALUES (:id, :name, :data)
+        INSERT INTO ArtifactGroupId (id, name, data, "order")
+        VALUES (:id, :name, :data, :order)
         ON CONFLICT (id)
         DO UPDATE SET
         name = :name,
-        data = :data
+        data = :data,
+        "order" = :order
     """
     query_params = []
     for k, group in artifact_groups.items():
+        order = get_artifact_group_idx(k, sections)
+        if order is None:
+            continue
         data_keys = group.keys() - {"name", "artifactTransforms"}
         query_params.append(
             {
                 "id": k,
                 "name": group["name"],
                 "data": json.dumps(filter_dict(group, data_keys)),
+                "order": order,
             }
         )
     db.executemany(query, query_params)
@@ -83,3 +88,14 @@ def save_artifact_groups(db, artifact_groups):
             )
 
     db.executemany(query, query_params)
+
+
+def get_artifact_group_idx(artifact_group_id, sections):
+    for section in sections.values():
+        try:
+            if "artifactGroupIds" in section:
+                idx = section["artifactGroupIds"].index(artifact_group_id)
+                return idx
+        except ValueError:
+            continue
+    return None

setta/database/db/projects/save.py

@@ -25,7 +25,7 @@ def save_project_details(db, p):
     save_json_source_data(p)
     remove_json_source_data(p)
     save_artifacts(db, p["artifacts"])
-    save_artifact_groups(db, p["artifactGroups"])
+    save_artifact_groups(db, p["artifactGroups"], p["sections"])
     save_code_info(db, p["codeInfo"])
     save_code_info_col(db, p["codeInfoCols"])
     save_ui_types(db, p["uiTypes"])

setta/database/db/sections/load.py

@@ -57,8 +57,11 @@ def load_sections(db, ids):
                 SELECT
                     originSectionId,
                     GROUP_CONCAT(id) AS artifactGroupIds
-                FROM
-                    ArtifactGroupId
+                FROM (
+                    SELECT id, originSectionId
+                    FROM ArtifactGroupId
+                    ORDER BY "order"
+                )
                 GROUP BY
                     originSectionId
             ) AS A ON S.id = A.originSectionId

setta/database/db/sections/save.py

@@ -110,14 +110,14 @@ def save_sections(db, sections, section_variants):
     query = """
         UPDATE ArtifactGroupId
         SET originSectionId = :sectionId
-        WHERE id = :artifactId
+        WHERE id = :artifactGroupId
     """
     for s in sections.values():
         for a in s["artifactGroupIds"]:
             query_params.append(
                 {
                     "sectionId": s["id"],
-                    "artifactId": a,
+                    "artifactGroupId": a,
                 }
             )
     db.executemany(query, query_params)

setta/routers/interactive.py

@@ -1,3 +1,5 @@
+import asyncio
+
 import black
 from fastapi import APIRouter, Depends
 from pydantic import BaseModel
@@ -39,12 +41,17 @@ async def route_update_interactive_code(
     tasks=Depends(get_tasks),
     lsp_writers=Depends(get_lsp_writers),
 ):
-    idx = 0
-    content = []
-    for p in x.projects:
-        initialContent = await update_interactive_code(p, tasks, lsp_writers, idx)
-        content.extend(initialContent)
-        idx += 1
+    # Create list of coroutines to run in parallel
+    update_tasks = [
+        update_interactive_code(p, tasks, lsp_writers, idx)
+        for idx, p in enumerate(x.projects)
+    ]
+
+    # Run all updates in parallel and gather results
+    all_content = await asyncio.gather(*update_tasks)
+
+    # Flatten the list of content
+    content = [item for sublist in all_content for item in sublist]
 
     inMemorySubprocessInfo = tasks.getInMemorySubprocessInfo()
     return {"inMemorySubprocessInfo": inMemorySubprocessInfo, "content": content}
@@ -75,20 +82,34 @@ async def update_interactive_code(p, tasks, lsp_writers, idx):
         template_var_replacement_values=template_var_replacement_values,
     )
 
+    runCodeBlocks = p["runCodeBlocks"]
+    if runCodeBlocks is None:
+        runCodeBlocks = [
+            k for k in p["sections"].keys() if get_section_type(p, k) == C.CODE
+        ]
+
     top_node_ids, section_dependencies = prune_and_find_top_nodes(
-        code_dict, p["runCodeBlocks"]
+        code_dict, runCodeBlocks
     )
     code_graph = []
     project_config_id = p["projectConfig"]["id"]
     for section_id in top_node_ids:
+        import_order = get_import_order_for_top_node(section_id, section_dependencies)
+        imports = [
+            {
+                "code": code_dict[s]["code"],
+                "module_name": create_in_memory_module_name(p, s),
+            }
+            for s in import_order
+        ]
+
         code_graph.append(
             {
+                "imports": imports,
                 "subprocess_key": f"{project_config_id}-{section_id}-{idx}",
-                "code": code_dict[section_id]["code"],
-                "imports": get_import_order_for_top_node(
-                    section_id, section_dependencies
-                ),
-                "module_name": create_in_memory_module_name(p, section_id),
+                "subprocessStartMethod": p["sections"][section_id][
+                    "subprocessStartMethod"
+                ],
             }
         )
 

setta/static/constants/Settings.json

@@ -58,7 +58,7 @@
     "gridPattern": "Dots",
     "gridPatternSize": 2,
     "gridColor": "#afbacf",
-    "gridColorDarkMode": "#222a3a",
+    "gridColorDarkMode": "#2b364a",
     "defaultZoomLevel": 1,
     "minZoom": 0.1,
     "maxZoom": 10,

setta/static/constants/db_init.sql

@@ -207,6 +207,7 @@ CREATE TABLE IF NOT EXISTS ArtifactGroupId (
     name TEXT,
     data TEXT,
     originSectionId TEXT,
+    "order" INTEGER,
     FOREIGN KEY (originSectionId) REFERENCES Section(id) ON DELETE CASCADE
 
 );
@@ -214,7 +215,7 @@ CREATE TABLE IF NOT EXISTS ArtifactGroup (
     idid TEXT,
     artifactId TEXT,
     data TEXT,
-    "order", INTEGER,
+    "order" INTEGER,
     PRIMARY KEY (idid, "order"),
     FOREIGN KEY (idid) REFERENCES ArtifactGroupId(id) ON DELETE CASCADE,
     FOREIGN KEY (artifactId) REFERENCES Artifact(id) ON DELETE CASCADE

setta/static/constants/defaultValues.json

@@ -64,7 +64,8 @@
     "aspectRatioExtraHeight": 0,
     "aspectRatioExtraWidth": 0,
     "columnWidth": null,
-    "renderedValue": null
+    "renderedValue": null,
+    "subprocessStartMethod": "fork"
   },
   "sectionVariant": {
     "name": "",