applied requests

LaSi5002 · LaSi5002 · commit b78d5c78f448 · 2025-07-02T17:22:18.000+02:00
diff --git a/src/fourc_webviewer/fourc_webserver.py b/src/fourc_webviewer/fourc_webserver.py
@@ -29,7 +29,9 @@
 )
 from fourc_webviewer.python_utils import (
     convert_string2number,
+    dict_leaves_to_number_if_schema,
     find_value_recursively,
+    parse_validation_error_text,
     smart_string2number_cast,
 )
 
@@ -75,7 +77,7 @@ def __init__(
         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
+        self.server.controller.on_leave_edit_field = self.on_leave_edit_field
 
         # initialize state variables for the different modes and
         # statuses of the client (e.g. view mode versus edit mode,
@@ -1116,81 +1118,25 @@ def click_save_button(self, **kwargs):
         else:
             self.state.export_status = self.state.all_export_statuses["error"]
 
-    def parse_validation_error_text(self, text):
-        """Parse a ValidationError message string (with multiple "- Parameter
-        in [...]" blocks) into a nested dict."""
-        error_dict = {}
-        # Match "- Parameter in [...]" blocks up until the next one or end of string
-        block_re = re.compile(
-            r"- Parameter in (?P<path>(?:\[[^\]]+\])+)\n"
-            r"(?P<body>.*?)(?=(?:- Parameter in )|\Z)",
-            re.DOTALL,
-        )
-        for m in block_re.finditer(text):
-            path_str = m.group("path")
-            body = m.group("body")
-
-            # extract the Error: line
-            err_m = re.search(r"Error:\s*(.+)", body)
-            if not err_m:
-                continue
-            err_msg = err_m.group(1).strip()
-
-            keys = re.findall(r'\["([^"]+)"\]', path_str)
-
-            # walk/create nested dicts, then assign the message at the leaf
-            cur = error_dict
-            for key in keys[:-1]:
-                cur = cur.setdefault(key, {})
-            cur[keys[-1]] = err_msg
-
-        return error_dict
-
     @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_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_if_schema(
-                            v, schema_path + ["properties", k]
-                        )
-                    return value
-                if isinstance(value, str) and get_by_path(
-                    CONFIG["json_schema"], schema_path + ["type"]
-                ) in ["number", "integer"]:
-                    return smart_string2number_cast(value)
-                return value
 
             dict_leaves_to_number_if_schema(fourcinput._sections)
 
             fourcinput.validate()
             self.state.input_error_dict = {}
         except ValidationError as exc:
-            self.state.input_error_dict = self.parse_validation_error_text(
+            self.state.input_error_dict = parse_validation_error_text(
                 str(exc.args[0])
             )  # exc.args[0] is the error message
             return False
 
-    def on_field_blur(self):
+    def on_leave_edit_field(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
diff --git a/src/fourc_webviewer/gui_utils.py b/src/fourc_webviewer/gui_utils.py
@@ -502,7 +502,7 @@ def _prop_value_table(server):
                             "|| 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,
+                        blur=server.controller.on_leave_edit_field,
                         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,
diff --git a/src/fourc_webviewer/python_utils.py b/src/fourc_webviewer/python_utils.py
@@ -1,5 +1,9 @@
 """Module for python utils."""
 
+import re
+
+from fourcipp import CONFIG
+
 
 def flatten_list(input_list):
     """Flattens a given (multi-level) list into a single list.
@@ -48,6 +52,63 @@ def find_value_recursively(input_dict, target_key):
     return None
 
 
+def get_by_path(dct, path):
+    """Retrieve the value at the nested path from dct.
+
+    Raises KeyError if any key is missing.
+    """
+    current = dct
+    for key in path:
+        current = current[key]
+    return current
+
+
+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_if_schema(
+                v, schema_path + ["properties", k]
+            )
+        return value
+    if isinstance(value, str) and get_by_path(
+        CONFIG["json_schema"], schema_path + ["type"]
+    ) in ["number", "integer"]:
+        return smart_string2number_cast(value)
+    return value
+
+
+def parse_validation_error_text(text):
+    """Parse a ValidationError message string (with multiple "- Parameter in
+    [...]" blocks) into a nested dict."""
+    error_dict = {}
+    # Match "- Parameter in [...]" blocks up until the next one or end of string
+    block_re = re.compile(
+        r"- Parameter in (?P<path>(?:\[[^\]]+\])+)\n"
+        r"(?P<body>.*?)(?=(?:- Parameter in )|\Z)",
+        re.DOTALL,
+    )
+    for m in block_re.finditer(text):
+        path_str = m.group("path")
+        body = m.group("body")
+
+        # extract the Error: line
+        err_m = re.search(r"Error:\s*(.+)", body)
+        if not err_m:
+            continue
+        err_msg = err_m.group(1).strip()
+
+        keys = re.findall(r'\["([^"]+)"\]', path_str)
+
+        # walk/create nested dicts, then assign the message at the leaf
+        cur = error_dict
+        for key in keys[:-1]:
+            cur = cur.setdefault(key, {})
+        cur[keys[-1]] = err_msg
+
+    return error_dict
+
+
 def smart_string2number_cast(input_string):
     """Casts an input_string to float / int if possible. Helpful when dealing
     with automatic to-string conversions from vuetify.VTextField input
