setta 0.0.7__tar.gz → 0.0.8.dev0__tar.gz

{setta-0.0.7/backend/setta.egg-info → setta-0.0.8.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: setta
-Version: 0.0.7
+Version: 0.0.8.dev0
 Summary: Python without the donkeywork.
 Home-page: https://setta.dev
 Author: Kevin Musgrave, Jeff Musgrave

setta-0.0.8.dev0/backend/setta/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.0.8.dev0"

{setta-0.0.7 → setta-0.0.8.dev0}/backend/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-0.0.7 → setta-0.0.8.dev0}/backend/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-0.0.7 → setta-0.0.8.dev0}/backend/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-0.0.7 → setta-0.0.8.dev0}/backend/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-0.0.7 → setta-0.0.8.dev0}/backend/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-0.0.7 → setta-0.0.8.dev0}/backend/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-0.0.7 → setta-0.0.8.dev0}/backend/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-0.0.7 → setta-0.0.8.dev0/backend/setta.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: setta
-Version: 0.0.7
+Version: 0.0.8.dev0
 Summary: Python without the donkeywork.
 Home-page: https://setta.dev
 Author: Kevin Musgrave, Jeff Musgrave

setta-0.0.7/backend/setta/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.0.7"