PySerials 0.0.0.dev48__tar.gz → 0.0.0.dev50__tar.gz

{pyserials-0.0.0.dev48 → pyserials-0.0.0.dev50}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySerials
-Version: 0.0.0.dev48
+Version: 0.0.0.dev50
 Requires-Python: >=3.10
 Requires-Dist: jsonschema<5,>=4.21.0
 Requires-Dist: referencing>=0.35.1
@@ -8,6 +8,6 @@ Requires-Dist: jsonpath-ng<2,>=1.6.1
 Requires-Dist: ruamel.yaml<0.18,>=0.17.32
 Requires-Dist: ruamel.yaml.string<1,>=0.1.1
 Requires-Dist: tomlkit<0.12,>=0.11.8
-Requires-Dist: MDit==0.0.0.dev45
-Requires-Dist: ExceptionMan==0.0.0.dev45
+Requires-Dist: MDit==0.0.0.dev47
+Requires-Dist: ExceptionMan==0.0.0.dev47
 Requires-Dist: ProtocolMan==0.0.0.dev2

{pyserials-0.0.0.dev48 → pyserials-0.0.0.dev50}/pyproject.toml

@@ -17,7 +17,7 @@ namespaces = true
 # ----------------------------------------- Project Metadata -------------------------------------
 #
 [project]
-version = "0.0.0.dev48"
+version = "0.0.0.dev50"
 name = "PySerials"
 dependencies = [
     "jsonschema >= 4.21.0, < 5",
@@ -26,8 +26,8 @@ dependencies = [
     "ruamel.yaml >= 0.17.32, < 0.18", # https://yaml.readthedocs.io/en/stable/
     "ruamel.yaml.string >= 0.1.1, < 1",
     "tomlkit >= 0.11.8, < 0.12", # https://tomlkit.readthedocs.io/en/stable/,
-    "MDit == 0.0.0.dev45",
-    "ExceptionMan == 0.0.0.dev45",
+    "MDit == 0.0.0.dev47",
+    "ExceptionMan == 0.0.0.dev47",
     "ProtocolMan == 0.0.0.dev2",
 ]
 requires-python = ">=3.10"

{pyserials-0.0.0.dev48 → pyserials-0.0.0.dev50}/src/PySerials.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySerials
-Version: 0.0.0.dev48
+Version: 0.0.0.dev50
 Requires-Python: >=3.10
 Requires-Dist: jsonschema<5,>=4.21.0
 Requires-Dist: referencing>=0.35.1
@@ -8,6 +8,6 @@ Requires-Dist: jsonpath-ng<2,>=1.6.1
 Requires-Dist: ruamel.yaml<0.18,>=0.17.32
 Requires-Dist: ruamel.yaml.string<1,>=0.1.1
 Requires-Dist: tomlkit<0.12,>=0.11.8
-Requires-Dist: MDit==0.0.0.dev45
-Requires-Dist: ExceptionMan==0.0.0.dev45
+Requires-Dist: MDit==0.0.0.dev47
+Requires-Dist: ExceptionMan==0.0.0.dev47
 Requires-Dist: ProtocolMan==0.0.0.dev2

{pyserials-0.0.0.dev48 → pyserials-0.0.0.dev50}/src/PySerials.egg-info/requires.txt

@@ -4,6 +4,6 @@ jsonpath-ng<2,>=1.6.1
 ruamel.yaml<0.18,>=0.17.32
 ruamel.yaml.string<1,>=0.1.1
 tomlkit<0.12,>=0.11.8
-MDit==0.0.0.dev45
-ExceptionMan==0.0.0.dev45
+MDit==0.0.0.dev47
+ExceptionMan==0.0.0.dev47
 ProtocolMan==0.0.0.dev2

{pyserials-0.0.0.dev48 → pyserials-0.0.0.dev50}/src/pyserials/exception/update.py

@@ -123,14 +123,15 @@ class PySerialsUpdateTemplatedDataError(PySerialsUpdateException):
         template_start: str,
         template_end: str,
     ):
-        self.path_invalid = path_invalid.replace("'", "")
+        self.path_invalid = path_invalid
         self.data_source = data_source
         self.template_start = template_start
         self.template_end = template_end
         parts = description_template.split("{path_invalid}")
-        parts.insert(1, _mdit.element.code_span(self.path_invalid))
+        if len(parts) > 1:
+            parts.insert(1, _mdit.element.code_span(str(self.path_invalid)))
         super().__init__(
-            path=path.replace("'", ""),
+            path=str(path),
             data=data,
             data_full=data_full,
             problem=_mdit.inline_container(*parts),

{pyserials-0.0.0.dev48 → pyserials-0.0.0.dev50}/src/pyserials/update.py

@@ -152,6 +152,7 @@ class TemplateFiller:
 
         self._pattern_value: dict[int, _RegexPattern] = {}
         self._data = None
+        self._visited_paths = {}
         return
 
     def fill(
@@ -161,16 +162,17 @@ class TemplateFiller:
         current_path: str = "",
     ):
         self._data = data
-        path = (f"$.{current_path}" if self._add_prefix else current_path) if current_path else "$"
+        self._visited_paths = {}
+        path = _jsonpath.parse((f"$.{current_path}" if self._add_prefix else current_path) if current_path else "$")
         return self._recursive_subst(
             templ=template or data,
             current_path=path,
             relative_path_anchor=path,
             level=0,
-            current_chain=[path],
+            current_chain=(path,),
         )
 
-    def _recursive_subst(self, templ, current_path: str, relative_path_anchor: str, level: int, current_chain: list[str]):
+    def _recursive_subst(self, templ, current_path: str, relative_path_anchor: str, level: int, current_chain: tuple[str, ...]):
 
         def get_code_value(match: _re.Match | str):
 
@@ -198,13 +200,15 @@ class TemplateFiller:
             local_context = {}
             try:
                 exec(code_str_full, global_context, local_context)
-                return local_context["__inline_code__"]()
+                output = local_context["__inline_code__"]()
             except Exception as e:
                 raise_error(
                     description_template=f"Code at {{path_invalid}} raised an exception: {e}\n{code_str_full}",
                     path_invalid=current_path,
                     exception=e,
                 )
+            self._visited_paths[current_path] = (output, True)
+            return output
 
         def get_address_value(match: _re.Match | str, return_all_matches: bool = False, from_code: bool = False):
             raw_path = match if isinstance(match, str) else str(match.group(1))
@@ -215,21 +219,21 @@ class TemplateFiller:
                 path_expr = _jsonpath.parse(path)
             except _jsonpath_exceptions.JSONPathError:
                 raise_error(
-                    path_invalid=path,
+                    path_invalid=path_expr,
                     description_template="JSONPath expression {path_invalid} is invalid.",
                 )
             if num_periods:
                 if relative_path_anchor != current_path:
-                    path_fields = self._extract_fields(_jsonpath.parse(current_path))
+                    path_fields = self._extract_fields(current_path)
                     has_template_key = any(field in self._template_keys for field in path_fields)
                     anchor_path = relative_path_anchor if has_template_key else current_path
                 else:
                     anchor_path = current_path
-                root_path_expr = _jsonpath.parse(anchor_path)
+                root_path_expr = anchor_path
                 for period in range(num_periods):
                     if isinstance(root_path_expr, _jsonpath.Root):
                         raise_error(
-                            path_invalid=path,
+                            path_invalid=path_expr,
                             description_template=(
                                 "Relative path {path_invalid} is invalid; "
                                 f"reached root but still {num_periods - period} levels remaining."
@@ -237,7 +241,8 @@ class TemplateFiller:
                         )
                     root_path_expr = root_path_expr.left
                 path_expr = self._concat_json_paths(root_path_expr, path_expr)
-            value, matched = get_value(path_expr, return_all_matches, from_code)
+            value, matched = self._visited_paths.get(path_expr) or get_value(path_expr, return_all_matches, from_code)
+            self._visited_paths[path_expr] = (value, matched)
             if from_code:
                 return value, matched
             if matched:
@@ -255,7 +260,7 @@ class TemplateFiller:
                     return [], True
                 if self._raise_no_match:
                     raise_error(
-                        path_invalid=str(jsonpath),
+                        path_invalid=jsonpath,
                         description_template="JSONPath expression {path_invalid} did not match any data.",
                     )
                 return None, False
@@ -269,10 +274,10 @@ class TemplateFiller:
                 _rel_path_anchor = relative_path_anchor
             return self._recursive_subst(
                 output,
-                current_path=str(jsonpath),
+                current_path=jsonpath,
                 relative_path_anchor=_rel_path_anchor,
                 level=0,
-                current_chain=current_chain + [str(jsonpath)],
+                current_chain=current_chain + (jsonpath,),
             ), True
 
         def _rec_match(expr) -> list:
@@ -286,10 +291,10 @@ class TemplateFiller:
             for left_match in left_matches:
                 left_match_filled = self._recursive_subst(
                     templ=left_match.value,
-                    current_path=str(expr.left),
-                    relative_path_anchor=str(expr.left),
+                    current_path=expr.left,
+                    relative_path_anchor=expr.left,
                     level=0,
-                    current_chain=current_chain + [str(expr.left)],
+                    current_chain=current_chain + (expr.left,),
                 ) if isinstance(left_match.value, str) else left_match.value
                 right_matches = expr.right.find(left_match_filled)
                 whole_matches.extend(right_matches)
@@ -336,6 +341,9 @@ class TemplateFiller:
                 template_end=self._marker_end_value,
             ) from exception
 
+        if current_path in self._visited_paths:
+            return self._visited_paths[current_path][0]
+
         self._check_endless_loop(templ, current_chain)
 
         if isinstance(templ, str):
@@ -384,18 +392,25 @@ class TemplateFiller:
         if isinstance(templ, list):
             out = []
             for idx, elem in enumerate(templ):
-                new_path = f"{current_path}[{idx}]"
+                new_path = _jsonpath.Child(current_path, _jsonpath.Index(idx))
                 elem_filled = self._recursive_subst(
                     templ=elem,
                     current_path=new_path,
                     relative_path_anchor=get_relative_path(new_path),
                     level=0,
-                    current_chain=current_chain + [new_path],
+                    current_chain=current_chain + (new_path,),
                 )
                 if isinstance(elem, str) and self._pattern_unpack.fullmatch(elem):
-                    out.extend(elem_filled)
+                    try:
+                        out.extend(elem_filled)
+                    except TypeError as e:
+                        raise_error(
+                            path_invalid=current_path,
+                            description_template=str(e)
+                        )
                 else:
                     out.append(elem_filled)
+            self._visited_paths[current_path] = (out, True)
             return out
 
         if isinstance(templ, dict):
@@ -414,28 +429,30 @@ class TemplateFiller:
                 if key_filled in self._template_keys:
                     new_dict[key_filled] = val
                     continue
-                new_path = f"{current_path}.'{key_filled}'"
+                new_path = _jsonpath.Child(current_path, _jsonpath.Fields(key_filled))
                 new_dict[key_filled] = self._recursive_subst(
                     templ=val,
                     current_path=new_path,
                     relative_path_anchor=get_relative_path(new_path),
                     level=0,
-                    current_chain=current_chain + [new_path],
+                    current_chain=current_chain + (new_path,),
                 )
+            self._visited_paths[current_path] = (new_dict, True)
             return new_dict
         return templ
 
-    def _check_endless_loop(self,templ, chain: list[str]):
-        last_idx = len(chain) -1
+    def _check_endless_loop(self,templ, chain: tuple[str, ...]):
+        last_idx = len(chain) - 1
         first_idx = chain.index(chain[-1])
         if first_idx == last_idx:
             return
-        loop = chain[first_idx - 1: -1]
-        loop_str = "\n".join([f"- {path.replace("'", "")}" for path in loop])
+        loop = [chain[-2], *chain[first_idx: -2]]
+        loop_str = "\n".join([f"- {path}" for path in loop])
+        history_str = "\n".join([f"- {path}" for path in chain])
         raise _exception.update.PySerialsUpdateTemplatedDataError(
-            description_template=f"Path {{path_invalid}} starts a loop:\n{loop_str}",
-            path_invalid=loop[0],
-            path=chain[-1],
+            description_template=f"Path {{path_invalid}} starts a loop:\n{loop_str}\nHistory:\n{history_str}",
+            path_invalid=chain[-2],
+            path=chain[0],
             data=templ,
             data_full=self._data,
             data_source=self._data,
@@ -480,6 +497,10 @@ class TemplateFiller:
         _recursive_extract(jsonpath)
         return fields
 
+    @staticmethod
+    def _normalize_path(path: str) -> str:
+        return path.replace("'", "")
+
     def _concat_json_paths(self, path1, path2):
         if not isinstance(path2, _jsonpath.Child):
             return _jsonpath.Child(path1, path2)

{pyserials-0.0.0.dev48 → pyserials-0.0.0.dev50}/src/pyserials/write.py

@@ -2,6 +2,7 @@ from typing import Literal as _Literal
 from pathlib import Path as _Path
 import json as _json
 import ruamel.yaml as _yaml
+from ruamel.yaml import scalarstring as _yaml_scalar_string
 import tomlkit as _tomlkit
 
 
@@ -22,8 +23,16 @@ def to_string(
 def to_yaml_string(
     data: dict | list | str | int | float | bool | _yaml.CommentedMap | _yaml.CommentedSeq,
     end_of_file_newline: bool = True,
+    indent_mapping: int = 2,
+    indent_sequence: int = 4,
+    indent_sequence_offset: int = 2,
+    multiline_string_to_block: bool = True,
 ) -> str:
-    yaml_syntax = _yaml.YAML(typ=["rt", "string"]).dumps(data, add_final_eol=False).removesuffix("\n...")
+    yaml = _yaml.YAML(typ=["rt", "string"])
+    yaml.indent(mapping=indent_mapping, sequence=indent_sequence, offset=indent_sequence_offset)
+    if multiline_string_to_block:
+        _yaml_scalar_string.walk_tree(data)
+    yaml_syntax = yaml.dumps(data, add_final_eol=False).removesuffix("\n...")
     return f"{yaml_syntax}\n" if end_of_file_newline else yaml_syntax
 
 
@@ -46,9 +55,17 @@ def to_yaml_file(
     data: dict | list | str | int | float | bool | _yaml.CommentedMap | _yaml.CommentedSeq,
     path: str | _Path,
     make_dirs: bool = True,
+    indent_mapping: int = 2,
+    indent_sequence: int = 4,
+    indent_sequence_offset: int = 2,
+    multiline_string_to_block: bool = True,
 ):
     path = _Path(path).resolve()
     if make_dirs:
         path.parent.mkdir(parents=True, exist_ok=True)
-    _yaml.YAML().dump(data, path)
+    yaml = _yaml.YAML()
+    yaml.indent(mapping=indent_mapping, sequence=indent_sequence, offset=indent_sequence_offset)
+    if multiline_string_to_block:
+        _yaml_scalar_string.walk_tree(data)
+    yaml.dump(data, path)
     return