annet 0.16.24__py3-none-any.whl → 0.16.26__py3-none-any.whl

annet/annlib/jsontools.py

@@ -4,6 +4,7 @@ import copy
 import fnmatch
 import json
 from collections.abc import Mapping, Sequence
+from operator import itemgetter
 from typing import Any, Dict, List, Optional
 
 import jsonpatch
@@ -73,7 +74,7 @@ def _ensure_pointer_exists(doc: Dict[str, Any], pointer: jsonpointer.JsonPointer
 
 def make_patch(old: Dict[str, Any], new: Dict[str, Any]) -> List[Dict[str, Any]]:
     """Generate a JSON patch by comparing the old document with the new one."""
-    return jsonpatch.make_patch(old, new).patch
+    return sorted(jsonpatch.make_patch(old, new).patch, key=itemgetter("path"))
 
 
 def apply_patch(content: Optional[bytes], patch_bytes: bytes) -> bytes:

annet/annlib/patching.py

@@ -54,11 +54,30 @@ class PatchItem:
     row: str
     child: "Union[PatchTree, None]"
     context: Dict[str, str]
+    sort_key: Tuple[Any, ...]
 
-    def __init__(self, row, child, context):
+    def __init__(self, row, child, context, sort_key):
         self.row = row
         self.child = child
         self.context = context
+        self.sort_key = sort_key
+
+    def to_json(self) -> dict[str, Any]:
+        return {
+            "row": self.row,
+            "child": self.child.to_json() if self.child is not None else None,
+            "context": self.context,
+            "sort_key": self.sort_key,
+        }
+
+    @classmethod
+    def from_json(cls, data: dict[str, Any]) -> "PatchItem":
+        return cls(
+            row=data["row"],
+            child=PatchTree.from_json(data["child"]) if data["child"] is not None else None,
+            context=data["context"],
+            sort_key=data["sort_key"],
+        )
 
     def __str__(self):
         return (
@@ -66,6 +85,7 @@ class PatchItem:
             f'    row="{self.row}",\n'
             f"    child={textwrap.indent(str(self.child), '    ').strip()},\n"
             f"    context={self.context}\n"
+            f"    sort_key={self.sort_key}\n"
             f")"
         )
 
@@ -78,15 +98,15 @@ class PatchTree:
         if row:
             self.add(row, {})
 
-    def add(self, row: str, context: Dict[str, str]) -> None:
-        self.itms.append(PatchItem(row, None, context))
+    def add(self, row: str, context: Dict[str, str], sort_key=()) -> None:
+        self.itms.append(PatchItem(row, None, context, sort_key))
 
-    def add_block(self, row: str, subtree: "Optional[PatchTree]" = None, context: Dict[str, str] = None) -> "PatchTree":
+    def add_block(self, row: str, subtree: "Optional[PatchTree]" = None, context: Dict[str, str] = None, sort_key=()) -> "PatchTree":
         if subtree is None:
             subtree = PatchTree()
         if context is None:
             context = {}
-        self.itms.append(PatchItem(row, subtree, context))
+        self.itms.append(PatchItem(row, subtree, context, sort_key))
         return subtree
 
     def items(self) -> "Iterator[Tuple[str, Union[PatchTree, None]]]":
@@ -106,6 +126,21 @@ class PatchTree:
                 ret[str(row)] = None
         return ret
 
+    def to_json(self) -> list[dict[str, Any]]:
+        return [i.to_json() for i in self.itms]
+
+    @classmethod
+    def from_json(cls, data: list[dict[str, Any]]) -> "PatchTree":
+        ret = cls()
+        ret.itms = [PatchItem.from_json(i) for i in data]
+        return ret
+
+    def sort(self) -> None:
+        self.itms.sort(key=operator.attrgetter("sort_key"))
+        for item in self.itms:
+            if item.child:
+                item.child.sort()
+
     def __bool__(self):
         return bool(self.itms)
 
@@ -409,18 +444,19 @@ def make_patch(pre, rb, hw, add_comments, orderer=None, _root_pre=None, do_commi
                         "context": attrs["context"],
                     })
     tree = PatchTree()
-    sorted_patch = sorted(patch, key=(lambda item: (
-        (item["order"] if item["order_direct"] else -item["order"]),
-        item["raw_rule"],
-        item["order_direct"],
-    )))
-    for item in sorted_patch:
+    for item in patch:
+        sort_key = (
+            (item["order"] if item["order_direct"] else -item["order"]),
+            item["raw_rule"],
+            item["order_direct"],
+        )
         if (not item["children"] and not item["parent"]) or not item["direct"]:
-            tree.add(item["row"], item["context"])
+            tree.add(item["row"], item["context"], sort_key)
         else:
-            tree.add_block(item["row"], item["children"], item["context"])
+            tree.add_block(item["row"], item["children"], item["context"], sort_key)
         if item["force_commit"]:
-            tree.add("commit", item["context"])
+            tree.add("commit", item["context"], sort_key)
+    tree.sort()
     return tree
 
 

{annet-0.16.24.dist-info → annet-0.16.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.16.24
+Version: 0.16.26
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-0.16.24.dist-info → annet-0.16.26.dist-info}/RECORD

@@ -46,10 +46,10 @@ annet/annlib/command.py,sha256=uuBddMQphtn8P5MO5kzIa8_QrtMns-k05VeKv1bcAuA,1043
 annet/annlib/diff.py,sha256=MZ6eQAU3cadQp8KaSE6uAYFtcfMDCIe_eNuVROnYkCk,4496
 annet/annlib/errors.py,sha256=jBcSFzY6Vj-FxR__vqjFm-87AwYQ0xHuAopTirii5AU,287
 annet/annlib/filter_acl.py,sha256=0w1VF6WcONiTYTQh0yWi6_j9rCTc_kMLAUMr0hbdkNU,7203
-annet/annlib/jsontools.py,sha256=DVmA6kmKGSCsKrFnag4EMR1WKe39Owlvzpfdo726ufk,5471
+annet/annlib/jsontools.py,sha256=BS7s4rI8R9c_y3zz0zYl1l6con65oQ0MvfsC1dsXZts,5535
 annet/annlib/lib.py,sha256=eJ4hcVuQ6pdYBzLs4YKCHFtq45idOfZCYp92XfF7_QI,15317
 annet/annlib/output.py,sha256=_SjJ6G6bejvnTKqNHw6xeio0FT9oO3OIkLaOC3cEga4,7569
-annet/annlib/patching.py,sha256=2CpAT3T43IUFJR57qTYSwjQ0smg0uHWN43df4n1WArs,19937
+annet/annlib/patching.py,sha256=p5u3jl3_Iod0CGcnfZsfFR3Izo_roorny_v0stjDCWs,21142
 annet/annlib/tabparser.py,sha256=Xsje7t2bEZqZ8hhgnEYgjQGaDZ5mBWgNxwE2wpCkwXQ,28961
 annet/annlib/types.py,sha256=VHU0CBADfYmO0xzB_c5f-mcuU3dUumuJczQnqGlib9M,852
 annet/annlib/netdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -164,10 +164,10 @@ annet_generators/rpl_example/__init__.py,sha256=z4-gsDv06BBpgTwRohc50VBQYFD26QVu
 annet_generators/rpl_example/items.py,sha256=6x7b0wZ7Vjn6yCaJ-aGbpTHm7fyqO77b-LRqzzhEbh4,615
 annet_generators/rpl_example/policy_generator.py,sha256=KFCqn347CIPcnllOHfINYeKgNSr6Wl-bdM5Xj_YKhYM,11183
 annet_generators/rpl_example/route_policy.py,sha256=QjxFjkePHfTo2CpMeRVaDqZXNXLM-gGlE8EocHuOR4Y,1189
-annet-0.16.24.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.16.24.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.16.24.dist-info/METADATA,sha256=130Nbd58J6hQQ0ceLhvJwc6qNBRjfTcMVbd0WXEPy8w,728
-annet-0.16.24.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-annet-0.16.24.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-0.16.24.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.16.24.dist-info/RECORD,,
+annet-0.16.26.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.16.26.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.16.26.dist-info/METADATA,sha256=PvcIlUXb9JMjCR24ySbtdw4B3m-0CNowKmQKyh1qh0s,728
+annet-0.16.26.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+annet-0.16.26.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-0.16.26.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.16.26.dist-info/RECORD,,