Schema type Conversion and state refresh

Author: LaSi5002

src/fourc_webviewer/fourc_webserver.py

@@ -74,6 +74,9 @@ def __init__(
         # create temporary directory
         self._server_vars["temp_dir_object"] = tempfile.TemporaryDirectory()
 
+        # Register on_field_blur function, which is called when the user leaves a field
+        self.server.controller.on_field_blur = self.on_field_blur
+
         # initialize state variables for the different modes and
         # statuses of the client (e.g. view mode versus edit mode,
         # read-in and export status, ...)
@@ -1146,23 +1149,38 @@ def parse_validation_error_text(self, text):
     @change("general_sections")
     def on_sections_change(self, general_sections, **kwargs):
         """Reaction to change of state.general_sections."""
+
         self.sync_server_vars_from_state()
         try:
             fourcinput = FourCInput(self._server_vars["fourc_yaml_content"])
+            # print(CONFIG)
+
+            def get_by_path(dct, path):
+                """Retrieve the value at the nested path from dct.
+
+                Raises KeyError if any key is missing.
+                """
+                # print(f"get_by_path: {path}")
+                current = dct
+                for key in path:
+                    current = current[key]
+                return current
 
-            def dict_leaves_to_number(value):
+            def dict_leaves_to_number_if_schema(value, schema_path=[]):
                 """Convert all leaves of a dict to numbers if possible."""
                 if isinstance(value, dict):
                     for k, v in value.items():
-                        value[k] = dict_leaves_to_number(v)
+                        value[k] = dict_leaves_to_number_if_schema(
+                            v, schema_path + ["properties", k]
+                        )
                     return value
-                if isinstance(value, str):
+                if isinstance(value, str) and get_by_path(
+                    CONFIG["json_schema"], schema_path + ["type"]
+                ) in ["number", "integer"]:
                     return smart_string2number_cast(value)
                 return value
 
-            for section_name in fourcinput._sections:
-                if section_name[0:5] != "FUNCT":
-                    dict_leaves_to_number(fourcinput._sections[section_name])
+            dict_leaves_to_number_if_schema(fourcinput._sections)
 
             fourcinput.validate()
             self.state.input_error_dict = {}
@@ -1172,6 +1190,12 @@ def dict_leaves_to_number(value):
             )  # exc.args[0] is the error message
             return False
 
+    def on_field_blur(self):
+        """Reaction to user leaving the field."""
+        # also gets called when a new file is loaded
+        # basically just sets the state based on server_vars
+        self.init_general_sections_state_and_server_vars()
+
     """ --- Other helper functions"""
 
     def convert_string2num_all_sections(self):

src/fourc_webviewer/gui_utils.py

@@ -437,8 +437,9 @@ def _functions_panel(server):
             )
 
 
-def _prop_value_table():
+def _prop_value_table(server):
     """Table (property - value) layout (for general sections)."""
+
     with vuetify.VTable(
         v_if=(
             "section_names[selected_main_section_name]['content_mode'] == all_content_modes['general_section']",
@@ -501,6 +502,7 @@ def _prop_value_table():
                             "|| json_schema['properties']?.[selected_section_name]?.['properties']?.[item_key]?.['type'] == 'integer')"
                             "&& !json_schema['properties']?.[selected_section_name]?.['properties']?.[item_key]?.['enum']"
                         ),
+                        blur=server.controller.on_field_blur,
                         update_modelValue="flushState('general_sections')",  # this is required in order to flush the state changes correctly to the server, as our passed on v-model is a nested variable
                         classes="w-80 pb-1",
                         dense=True,
@@ -1178,7 +1180,7 @@ def create_gui(server, render_window):
 
                 # Further elements with conditional rendering (see above)
                 _sections_dropdown()
-                _prop_value_table()
+                _prop_value_table(server)
                 _materials_panel()
                 _functions_panel(server)
                 _design_conditions_panel()