setta 0.0.6.dev0__py3-none-any.whl → 0.0.8__py3-none-any.whl

setta/__init__.py

@@ -1 +1 @@
-__version__ = "0.0.6.dev0"
+__version__ = "0.0.8"

setta/code_gen/export_selected.py

@@ -18,13 +18,22 @@ def get_section_type(p, id):
 
 
 def get_artifacts(p, id):
-    return p["sections"][id]["artifacts"]
+    artifactGroupIds = p["sections"][id]["artifactGroupIds"]
+    artifacts = []
+    for groupId in artifactGroupIds:
+        for transform in p["artifactGroups"][groupId]["artifactTransforms"]:
+            artifacts.append(p["artifacts"][transform["artifactId"]])
+    return artifacts
 
 
 def get_drawing(p, id):
     return p["sections"][id]["drawing"]
 
 
+def get_chat_message(p, id):
+    return p["sections"][id]["latestChatMessage"]
+
+
 def get_section_name(p, id):
     return p["sections"][id]["name"]
 
@@ -266,19 +275,20 @@ class Exporter:
                 "section": section_details,
                 "sectionVariant": section_variant,
             }
-        self.types_to_process = [
+        self.section_types_to_process = [
             C.SECTION,
             C.LIST_ROOT,
             C.DICT_ROOT,
             C.GROUP,
             C.CODE,
             C.GLOBAL_VARIABLES,
+            C.TEXT_BLOCK,
         ]
 
     def export(self):
         remove_unneeded_sections(
             self.p,
-            self.types_to_process,
+            self.section_types_to_process,
         )
         self.export_sections(list(self.p["projectConfig"]["children"].keys()))
 
@@ -334,7 +344,7 @@ class Exporter:
                 children = [
                     c
                     for c in children
-                    if get_section_type(self.p, c) in self.types_to_process
+                    if get_section_type(self.p, c) in self.section_types_to_process
                 ]
                 # some sections (like CODE) don't get added to self.output
                 info["value"] = [
@@ -367,6 +377,12 @@ class Exporter:
                 # don't need to process the output since the global variables get added directly to the output
                 # i.e. they aren't children of anything
                 self.export_section_params(id)
+            elif type == C.TEXT_BLOCK:
+                variant = get_selected_section_variant(self.p, id)
+                info["value"] = variant["description"]
+                info["dependencies"] = []
+                info["ref_var_name_positions"] = []
+                self.output[var_name] = info
             else:
                 raise ValueError
         return var_name
@@ -536,6 +552,7 @@ class ExporterForInMemoryFn:
                 # C.IMAGE,
                 # C.CHART,
                 C.DRAW,
+                C.CHAT,
                 C.GLOBAL_VARIABLES,
             ],
         )
@@ -577,6 +594,15 @@ class ExporterForInMemoryFn:
         elif type == C.DRAW:
             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)
+            artifacts = get_artifacts(self.p, id)
+            chatHistory = artifacts[0]["value"] if len(artifacts) > 0 else None
+            value = {"latestChatMessage": latestChatMessage, "chatHistory": chatHistory}
+            self.create_var_mapping(
+                (id, "latestChatMessage"), f'{name}["latestChatMessage"]'
+            )
+            self.create_var_mapping((id, "chatHistory"), f'{name}["chatHistory"]')
         elif type == C.GLOBAL_VARIABLES:
             self.output.update(self.export_section_params(id, "", is_global=True))
             value_is_returned = False

setta/code_gen/python/generate_code.py

@@ -70,18 +70,23 @@ def var_declaration(
 # TODO: remove str(x["value"]). I don't think it's necessary since x["value"] should always be a string already.
 def get_value(x, selected):
     type_value = x["type"]
-    if type_value == C.TEXT:
-        output = str(x["value"])
-        relative_positions = []
-    elif type_value == C.SLIDER or type_value == C.DROPDOWN:
+    if (
+        type_value == C.TEXT
+        or type_value == C.SLIDER
+        or type_value == C.DROPDOWN
+        or type_value == C.PASSWORD
+    ):
         output = str(x["value"])
         relative_positions = []
     elif type_value == C.SWITCH:
         output = str(get_boolean(x["value"]))
         relative_positions = []
-    elif type_value == C.COLOR_PICKER or type_value == C.PASSWORD:
+    elif type_value == C.COLOR_PICKER:
         output = f'"{x["value"]}"'
         relative_positions = []
+    elif type_value == C.TEXT_BLOCK:
+        output = f'"""{x["value"]}"""'
+        relative_positions = []
     elif type_value == C.SECTION:
         if not x["value"]["callable"]:
             output, relative_positions = get_dict_contents(

setta/database/db/projects/load.py

@@ -113,7 +113,7 @@ def load_project_config_metadata(db, config_name):
     return list(output.values())[0]
 
 
-def load_project_config(db, project_config_name):
+def load_project_config(db, project_config_name, do_load_json_sources=True):
     projectConfig = load_project_config_metadata(db, project_config_name)
     sections_data = load_sections(db, list(projectConfig["children"].keys()))
     sectionConfigs = load_section_configs(db, projectConfig["id"])
@@ -127,9 +127,10 @@ def load_project_config(db, project_config_name):
     codeInfo, codeInfoCols = load_code_info_cols(db, sectionVariants)
     load_ev_refs_into_data_structures(db, sectionVariants, codeInfo)
     load_template_vars_into_data_structures(db, sectionVariants)
-    load_json_sources_into_data_structures(
-        sections, codeInfo, codeInfoCols, sectionVariants
-    )
+    if do_load_json_sources:
+        load_json_sources_into_data_structures(
+            sections, codeInfo, codeInfoCols, sectionVariants
+        )
 
     return {
         "projectConfig": projectConfig,
@@ -159,11 +160,11 @@ def load_project_config_names(db, excludeProjectConfigName=None):
     return [r[0] for r in db.fetchall()]
 
 
-def load_full_project(db, excludeProjectConfigName=None):
+def load_full_project(db, excludeProjectConfigName=None, do_load_json_sources=True):
     config_names = load_project_config_names(db, excludeProjectConfigName)
     configs = []
     for c in config_names:
-        p = load_project_config(db, c)
+        p = load_project_config(db, c, do_load_json_sources)
         configs.append(p)
 
     return configs

setta/database/db/projects/save.py

@@ -21,8 +21,9 @@ from ..sectionVariants.save import save_section_variants
 from ..uiTypes.save import save_ui_type_cols, save_ui_types
 
 
-def save_project_details(db, p):
-    save_json_source_data(p)
+def save_project_details(db, p, do_save_json_source_data=True):
+    if do_save_json_source_data:
+        save_json_source_data(p)
     remove_json_source_data(p)
     save_artifacts(db, p["artifacts"])
     save_artifact_groups(db, p["artifactGroups"], p["sections"])

setta/database/db/projects/utils.py

@@ -5,6 +5,7 @@ from setta.database.db.codeInfo.utils import (
     add_defaults_to_code_info,
     add_defaults_to_code_info_cols,
 )
+from setta.database.db.sections.jsonSource import remove_json_source_data
 from setta.database.db.sections.load import load_json_sources_into_data_structures
 from setta.database.db.sections.utils import add_defaults_to_sections
 from setta.database.db.sectionVariants.utils import add_defaults_to_section_variants
@@ -42,7 +43,9 @@ def remove_empty(x):
     return {k: v for k, v in x.items() if len(v) > 0}
 
 
-def filter_data_for_json_export(p):
+def filter_data_for_json_export(p, keepCodeInfoThatHaveUITypes):
+    remove_json_source_data(p, keepCodeInfoThatHaveUITypes)
+
     p["projectConfig"] = filter_dict(
         p["projectConfig"],
         DEFAULT_VALUES["projectConfig"].keys(),

setta/database/db/sections/load.py

@@ -262,6 +262,9 @@ def load_json_sources_into_data_structures(
         elif s["variantId"] not in s["variantIds"]:
             s["variantId"] = s["variantIds"][0]
 
+        if s["defaultVariantId"] not in s["variantIds"]:
+            s["defaultVariantId"] = s["variantId"]
+
 
 def load_json_source(filename_glob, jsonSourceKeys):
     new_data = {}

setta/database/export_db/export_db.py

@@ -21,13 +21,13 @@ def _export_database(
         export_readable(db, filename, with_variants=True)
 
 
-def export_database(path):
+def export_database(path, raw, readable, readable_with_variants):
     # Connect to the SQLite database
     dbq = DBQueue(path)
     dbq.connect()
     with dbq as db:
         # Export the database, including schema and data, to JSON and YAML
-        _export_database(db, path, True, True, True)
+        _export_database(db, path, raw, readable, readable_with_variants)
     dbq.disconnect()
 
 

setta/database/export_db/export_readable.py

@@ -138,7 +138,7 @@ def export_list_section(folder, config, section_id, variant_id, with_variants):
         export_section(children_folder, config, c, with_variants)
 
 
-def export_info_section(folder, config, section_id, variant_id, with_variants):
+def export_text_block_section(folder, config, section_id, variant_id, with_variants):
     base = maybe_with_variant_in_filename(config, section_id, variant_id, with_variants)
     section = config["sections"][section_id]
     description = get_section_variant_attr(config, variant_id, "description")
@@ -226,8 +226,8 @@ def get_exporter_fn(config, section_id):
         return export_regular_section
     elif stype in [C.LIST_ROOT, C.DICT_ROOT, C.GROUP]:
         return export_list_section
-    elif stype == C.INFO:
-        return export_info_section
+    elif stype == C.TEXT_BLOCK:
+        return export_text_block_section
     elif stype == C.PARAM_SWEEP:
         return export_param_sweep_section
     elif stype == C.GLOBAL_PARAM_SWEEP:

setta/database/export_db/utils.py

@@ -10,6 +10,6 @@ from setta.utils.constants import SETTA_FILES_FOLDER
 def get_configs_and_root_folder(db, filename):
     # export defaultdict the same way as dict
     yaml.add_representer(defaultdict, Representer.represent_dict)
-    configs = load_full_project(db)
+    configs = load_full_project(db, do_load_json_sources=False)
     root_folder = SETTA_FILES_FOLDER / f"{filename}_export"
     return configs, root_folder

setta/database/seed.py

@@ -31,7 +31,7 @@ def seed_examples(db):
         with open(filepath, "r") as f:
             data = json.load(f)
         add_defaults_to_project(data)  # json files don't have all the defaults
-        save_project_details(db, data)
+        save_project_details(db, data, do_save_json_source_data=False)
 
 
 def seed(db, with_examples=False, with_base_ui_types=False):

setta/database/settings_file.py

@@ -7,10 +7,7 @@ from setta.database.db.projects.utils import (
     add_defaults_to_project_and_load_json_sources,
     filter_data_for_json_export,
 )
-from setta.database.db.sections.jsonSource import (
-    remove_json_source_data,
-    save_json_source_data,
-)
+from setta.database.db.sections.jsonSource import save_json_source_data
 from setta.utils.constants import CONSTANTS_FOLDER, SETTA_FILES_FOLDER, USER_SETTINGS
 from setta.utils.utils import get_absolute_path, save_json_to_file
 
@@ -113,6 +110,5 @@ class MetaSettingsFile:
 
     def save_settings_project(self, p):
         save_json_source_data(p)
-        remove_json_source_data(p, keepCodeInfoThatHaveUITypes=False)
-        filter_data_for_json_export(p)
+        filter_data_for_json_export(p, keepCodeInfoThatHaveUITypes=False)
         save_json_to_file(self.path_meta_settings, p)

setta/routers/projects.py

@@ -178,7 +178,7 @@ def router_set_as_default_project(x: SetAsDefaultProjectRequest, dbq=Depends(get
 
 @router.post(C.ROUTE_FILTER_DATA_FOR_JSON_EXPORT)
 def router_filter_data_for_json_export(x: FilterDataForJSONExportRequest):
-    filter_data_for_json_export(x.project)
+    filter_data_for_json_export(x.project, keepCodeInfoThatHaveUITypes=True)
     return x.project
 
 

setta/start.py

@@ -43,8 +43,19 @@ def init_db(path, with_examples):
 
 @click.command()
 @click.argument("path", default=get_default_db_path(), required=False)
-def export_db(path):
-    export_database(path)
+@click.option("--raw", is_flag=True, help="Export raw database format")
+@click.option("--readable", is_flag=True, help="Export in human-readable format")
+@click.option(
+    "--readable-with-variants",
+    is_flag=True,
+    help="Export in readable format with variants",
+)
+def export_db(path, raw, readable, readable_with_variants):
+    # If no export options are specified, default to raw format
+    if not any([raw, readable, readable_with_variants]):
+        readable_with_variants = True
+
+    export_database(path, raw, readable, readable_with_variants)
 
 
 @click.command()

setta/static/constants/BaseUITypes.json

@@ -96,7 +96,7 @@
   },
   "2b06a83b-b96a-490d-a2d7-3631619e6495": {
     "id": "2b06a83b-b96a-490d-a2d7-3631619e6495",
-    "type": "INFO",
+    "type": "TEXT_BLOCK",
     "name": "",
     "presetType": "BASE",
     "config": {}
@@ -149,5 +149,12 @@
     "name": "",
     "presetType": "BASE",
     "config": {}
+  },
+  "5d7859dd-fd3f-4f5f-9b8c-fe9bede13c33": {
+    "id": "5d7859dd-fd3f-4f5f-9b8c-fe9bede13c33",
+    "type": "CHAT",
+    "name": "",
+    "presetType": "BASE",
+    "config": {}
   }
 }

setta/static/constants/Settings.json

@@ -68,7 +68,7 @@
     "panOnScrollMode": "free",
     "zoomOnScroll": true,
     "zoomOnPinch": true,
-    "zoomOnDoubleClick": true,
+    "zoomOnDoubleClick": false,
     "selectionMode": "partial",
     "leftSidePaneShiftsMap": true,
     "transitionDuration": 50
@@ -105,9 +105,11 @@
     "GLOBAL_PARAM_SWEEP": {
       "name": "Global Param Sweep"
     },
-    "INFO": {
-      "name": "Empty Info Section",
+    "TEXT_BLOCK": {
       "displayMode": "RENDER"
+    },
+    "CHAT": {
+      "size": { "width": 405, "height": 405 }
     }
   }
 }

setta/static/constants/constants.json

@@ -15,7 +15,7 @@
   "GROUP": "GROUP",
   "GLOBAL_VARIABLES": "GLOBAL_VARIABLES",
   "CODE": "CODE",
-  "INFO": "INFO",
+  "TEXT_BLOCK": "TEXT_BLOCK",
   "PARAM_SWEEP": "PARAM_SWEEP",
   "TERMINAL": "TERMINAL",
   "GLOBAL_PARAM_SWEEP": "GLOBAL_PARAM_SWEEP",
@@ -24,6 +24,7 @@
   "DRAW": "DRAW",
   "SOCIAL": "SOCIAL",
   "IFRAME": "IFRAME",
+  "CHAT": "CHAT",
   "NON_SECTION_TYPES": [
     "TEXT",
     "SLIDER",
@@ -116,6 +117,7 @@
   "ALLOWED_ARTIFACT_TYPES": {
     "DRAW": ["img", "brushStrokes"],
     "IMAGE": ["img"],
-    "CHART": ["list"]
+    "CHART": ["list"],
+    "CHAT": ["chatHistory"]
   }
 }

setta/static/constants/defaultValues.json

@@ -65,7 +65,8 @@
     "aspectRatioExtraWidth": 0,
     "columnWidth": null,
     "renderedValue": null,
-    "subprocessStartMethod": "fork"
+    "subprocessStartMethod": "fork",
+    "headingAsSectionName": false
   },
   "sectionVariant": {
     "name": "",