annet 3.16.3__py3-none-any.whl → 3.17.1__py3-none-any.whl

annet/adapters/netbox/common/query.py

@@ -5,7 +5,7 @@ from typing import cast, List, Union, Iterable, Optional, TypedDict
 from annet.storage import Query
 
 FIELD_VALUE_SEPARATOR = ":"
-ALLOWED_GLOB_GROUPS = ["site", "tag", "role", "device_type", "status", "tenant"]
+ALLOWED_GLOB_GROUPS = ["site", "tag", "role", "device_type", "status", "tenant", "asset_tag"]
 
 
 class Filter(TypedDict, total=False):
@@ -16,6 +16,7 @@ class Filter(TypedDict, total=False):
     device_type: list[str]
     status: list[str]
     tenant: list[str]
+    asset_tag: list[str]
 
 
 @dataclass

annet/adapters/netbox/provider.py

@@ -22,6 +22,7 @@ def storage_factory(opts: NetboxStorageOpts) -> Storage:
         "4.1": NetboxStorageV41,
         "4.2": NetboxStorageV42,
         "4.3": NetboxStorageV42,
+        "4.4": NetboxStorageV42,
     }
 
     status = None

annet/annlib/jsontools.py

@@ -10,6 +10,7 @@ from typing import Any, Dict, Iterable, List, Optional
 
 import jsonpatch
 import jsonpointer
+from ordered_set import OrderedSet
 
 
 def format_json(data: Any, stable: bool = False) -> str:
@@ -42,8 +43,7 @@ def apply_json_fragment(
 
         for pointer in new_pointers:
             new_value = pointer.get(new_fragment)
-            _ensure_pointer_exists(full_new_config, pointer)
-            pointer.set(full_new_config, new_value)
+            _pointer_set(pointer, full_new_config, new_value)
 
         # delete matched parts in old config whicn are not present in the new
         paths = {p.path for p in new_pointers}
@@ -56,36 +56,58 @@ def apply_json_fragment(
     return full_new_config
 
 
-def _ensure_pointer_exists(doc: Dict[str, Any], pointer: jsonpointer.JsonPointer) -> None:
+def _pointer_set(pointer: jsonpointer.JsonPointer, doc: Any, value: Any) -> None:
     """
-    Ensure that document has all pointer parts (if possible).
+    Resolve `pointer` against the `doc`, creating new elements if neccessary,
+    and set the target's value to `value`, all in place.
 
-    This is workaround for errors of type:
+    If `pointer` in any it's part points to the non-existing key,
+    or if value at this point is `None`, new object will be created.
+    (See https://github.com/stefankoegl/python-json-pointer/issues/41)
 
-    ```
-    jsonpointer.JsonPointerException: member 'MY_PART' not found in {}
-    ```
-
-    See for details: https://github.com/stefankoegl/python-json-pointer/issues/41
+    If `pointer` in any it's part points to the index of next to be appended
+    element of the array, new document / `value` will be appended to that list.
     """
-    parts_except_the_last = pointer.get_parts()[:-1]
-    doc_pointer: Dict[str, Any] = doc
-    for part in parts_except_the_last:
-        if isinstance(doc_pointer, dict):
-            if part not in doc_pointer or doc_pointer[part] is None:
-                # create an empty object by the pointer part
-                doc_pointer[part] = {}
-
-            # follow the pointer to delve deeper
-            doc_pointer = doc_pointer[part]
-        else:
-            # not a dict - cannot delve deeper
-            break
+    if len(pointer.parts) == 0:
+        raise jsonpointer.JsonPointerException("Cannot set root in place")
+    *parts_expect_the_last, last_part = pointer.parts
+
+    for part in parts_expect_the_last:
+        key = pointer.get_part(doc, part)
+        if isinstance(doc, dict):
+            if doc.get(key, None) is None:
+                doc[key] = {}
+        elif isinstance(doc, list):
+            if key == len(doc):
+                doc.append({})
+        doc = doc[key]
+
+    key = pointer.get_part(doc, last_part)
+    if isinstance(doc, list) and key == len(doc):
+        doc.append(value)
+    else:
+        doc[key] = value
 
 
 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 sorted(jsonpatch.make_patch(old, new).patch, key=itemgetter("path"))
+    # NOTE: changing order of the patch operations (e.g. sorting)
+    #  may interfere with the `move` logic.
+    #  E.g.:
+    #  ```python
+    #  old = [["a", "b"], ["c", "d"]]
+    #  new = [["d", "c"], ["b", "a"]]
+    #  ```
+    #  produces the following patch:
+    #  ```json
+    #  [{"op": "move", "path": "/0/0", "from": "/1/0"},
+    #   {"op": "move", "path": "/1/0", "from": "/0/2"},
+    #   {"op": "move", "path": "/0/0", "from": "/1/1"},
+    #   {"op": "move", "path": "/1/1", "from": "/0/2"}]
+    #  ```
+    #  which relies on proper ordering to be correctly applied.
+    #  See https://github.com/annetutil/annet/pull/452 for details.
+    return jsonpatch.make_patch(old, new).patch
 
 
 def apply_patch(content: Optional[bytes], patch_bytes: bytes) -> bytes:
@@ -175,12 +197,11 @@ def _apply_filters_to_json_pointers(
         pointers: Iterable[jsonpointer.JsonPointer],
         filters: Sequence[str], *,
         content: Any,
-) -> list[jsonpointer.JsonPointer]:
+) -> Sequence[jsonpointer.JsonPointer]:
 
     """
-    Takes a list of pointers, a list of filters and a document
-    and returns a list of pointers that match at least one of the filters
-    (if necessary, pointers may be deeper than from the input).
+    Takes a list of pointers, a list of filters and a document, and returns
+    a list of pointers that match at least one of the filters, preserving order.
 
     For example, given:
     pointers=["/foo", "/lorem/ipsum", "/lorem/dolor"],
@@ -205,7 +226,7 @@ def _apply_filters_to_json_pointers(
     ["/foo/bar/qux", "/lorem/ipsum", "/lorem/dolor"]
     """
 
-    ret: set[jsonpointer.JsonPointer] = set()
+    ret = OrderedSet[jsonpointer.JsonPointer]()
     for filter_item in filters:
         filter_parts = jsonpointer.JsonPointer(filter_item).parts
         for pointer in pointers:
@@ -222,7 +243,4 @@ def _apply_filters_to_json_pointers(
                 ret.update(map(pointer.join, _resolve_json_pointers(deeper_pattern, deeper_doc)))
             else:
                 ret.add(pointer)
-    # sort return value by some stable key, to decrease the chance
-    # that some bug may lead to unstable output being produced
-    # (since `type(ret) is set`)
-    return sorted(ret, key=str)
+    return ret

annet/deploy.py

@@ -193,7 +193,8 @@ def fill_cmd_params(rules: OrderedDict, cmd: Command):
     if rule:
         cmd_params = make_cmd_params(rule)
         cmd.questions = cmd_params.get("questions", None)
-        cmd.timeout = cmd_params["timeout"]
+        if cmd.timeout is None:
+            cmd.timeout = cmd_params["timeout"]
 
 
 def apply_deploy_rulebook(hw: HardwareView, cmd_paths, do_finalize=True, do_commit=True):

annet/vendors/library/h3c.py

@@ -14,7 +14,7 @@ class H3CVendor(AbstractVendor):
 
         before.add_cmd(Command("system-view"))
         if do_finalize:
-            after.add_cmd(Command("save force", timeout=90))
+            after.add_cmd(Command("save force", timeout=90, read_timeout=90))
 
         return before, after
 

annet/vendors/library/juniper.py

@@ -14,7 +14,7 @@ class JuniperVendor(AbstractVendor):
 
         before.add_cmd(Command("configure exclusive"))
         if do_commit:
-            after.add_cmd(Command("commit", timeout=30))
+            after.add_cmd(Command("commit", timeout=30, read_timeout=30))
         after.add_cmd(Command("exit"))
 
         return before, after

{annet-3.16.3.dist-info → annet-3.17.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: annet
-Version: 3.16.3
+Version: 3.17.1
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
@@ -20,8 +20,9 @@ Requires-Dist: valkit>=0.1.4
 Requires-Dist: yarl>=1.8.2
 Requires-Dist: adaptix==3.0.0b7
 Requires-Dist: dataclass-rest==0.4
+Requires-Dist: ordered-set>=4.1.0
 Provides-Extra: netbox
-Requires-Dist: annetbox[sync]>=0.7.0; extra == "netbox"
+Requires-Dist: annetbox[sync]>=0.8.0; extra == "netbox"
 Dynamic: home-page
 Dynamic: license
 Dynamic: license-file

{annet-3.16.3.dist-info → annet-3.17.1.dist-info}/RECORD

@@ -5,7 +5,7 @@ annet/bgp_models.py,sha256=roSDKhxzcg9N8iEh9zI4Jww1vOObWcwRVzMl9FJnh1M,14046
 annet/cli.py,sha256=shq3hHzrTxFL3x1_zTOR43QHo0JYs8QSwyOvGtL86Co,12733
 annet/cli_args.py,sha256=d0WuGiZfe42-nMvurX1bOb3iUMg0TSK-hxk8J1THxSY,13728
 annet/connectors.py,sha256=aoiDVLPizx8CW2p8SAwGCzyO_WW8H9xc2aujbGC4bDg,4882
-annet/deploy.py,sha256=ZTZcomYm2KJkKMyG6XzZaAMPr-Tduwcv67BhsoLARkY,7673
+annet/deploy.py,sha256=toIaR2QLvLJxpdeXoJhZzKdXfhn784ciTNZlMGT9huo,7709
 annet/deploy_ui.py,sha256=XsN1i7E9cNp1SAf1YBwhEBuwN91MvlNMSrLhnQrumA8,28672
 annet/diff.py,sha256=kD_2kxz5wc2TP10xj-BHs6IPq1yNKkXxIco8czjeC6M,9497
 annet/filtering.py,sha256=ZtqxPsKdV9reZoRxtQyBg22BqyMqd-2SotYcxZ-68AQ,903
@@ -28,13 +28,13 @@ annet/adapters/fetchers/stub/fetcher.py,sha256=FzpkIzPJBQVuNNSdXKoGzkALmIGMgo2gm
 annet/adapters/file/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/file/provider.py,sha256=Raw5DzsGS8I9XcKNeMuk5O3dPxqeRSCNmuB5JwClRqY,7687
 annet/adapters/netbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet/adapters/netbox/provider.py,sha256=iUkG0Dc0wBeck1dQMysej-olFLugKW6r-GJVutjMUYs,2375
+annet/adapters/netbox/provider.py,sha256=xxPVCLOFkiw56zK4iDKLYLCHJ0-5y3k325nZtGA0NPM,2408
 annet/adapters/netbox/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/common/adapter.py,sha256=1rR9PZAU72hIreozWFVb9CKpFVjfUH_i9kQEbaNiEUI,2639
 annet/adapters/netbox/common/client.py,sha256=PaxHG4W9H8_uunIwMBNYkLq4eQJYoO6p6gY-ciQs7Nc,2563
 annet/adapters/netbox/common/manufacturer.py,sha256=9jTfzwx5XmETrjSbIJu_FhNaByaUbGQE787c5rBor-4,1137
 annet/adapters/netbox/common/models.py,sha256=nMruBugAKNY8D63rqUnPYyMYGMIU-haxX0vnfxLGNWc,8990
-annet/adapters/netbox/common/query.py,sha256=0GeIiW_ttnESaNKHIziF61P-3DX0XD592UHQGn_1m60,1911
+annet/adapters/netbox/common/query.py,sha256=mz5oOn5vjU-lCV48TedvtXZ14GtBXU3jpcXa_cNawWg,1949
 annet/adapters/netbox/common/status_client.py,sha256=POaqiQJ0jPcqUQH-X_fWHVnKB7TBYveNriaT0eNTlfI,769
 annet/adapters/netbox/common/storage_base.py,sha256=lMRiDkzQylpA5Fxa4B6CUOWzq2d1cpjeSDbFGp8jH7o,9787
 annet/adapters/netbox/common/storage_opts.py,sha256=8LCxX0m-Wd-jNZ2iRAzkBJnbDg-MuE7RS17uPxjZo3o,2066
@@ -55,7 +55,7 @@ annet/annlib/command.py,sha256=GsgzQ8oFiHFan1Tfyo340rWgfhyU4_sCKJGhBm2jG6Y,1258
 annet/annlib/diff.py,sha256=MZ6eQAU3cadQp8KaSE6uAYFtcfMDCIe_eNuVROnYkCk,4496
 annet/annlib/errors.py,sha256=jBcSFzY6Vj-FxR__vqjFm-87AwYQ0xHuAopTirii5AU,287
 annet/annlib/filter_acl.py,sha256=ZJvNpSwE5MzJS_sKLenQpZgTuM-IrngwcbukQRq90do,7195
-annet/annlib/jsontools.py,sha256=-vTVtOL6ZplXSb9f2doNtrocIjU80OH4ua0X94vpCl4,7348
+annet/annlib/jsontools.py,sha256=licizwJye0HYm3YAOHinhNIom70DyW8rQtwodx7iCkM,8055
 annet/annlib/lib.py,sha256=lxmYrbeablFMhFtvFmADVpVShSFi9TN4gNWaBs_Ygm0,14952
 annet/annlib/output.py,sha256=g8d_LyNg5snywt0iPQuL9OFpoxKMdN59VW-vcrKitTQ,7674
 annet/annlib/patching.py,sha256=1bxlLDRx15GjB6aNk6kAx7t3WPPLHffYvSy7VLGnCig,21506
@@ -198,18 +198,18 @@ annet/vendors/library/arista.py,sha256=J4ltZ7sS_TgIECg2U7fizvxwfS4-s35Of0tNDNWWY
 annet/vendors/library/aruba.py,sha256=tvrSFSA43n0uelCv-NLQnqxO01d0y2mrfhncpOX7zoQ,1257
 annet/vendors/library/b4com.py,sha256=EABOc-w8XqFGI0hcGU5JjCfXAf9v_Uf4MVdFT5gLZ7Q,1462
 annet/vendors/library/cisco.py,sha256=3-hWdMaQPnUVFJzKX4gNwIIoGxrSqrGrrE0p7QvedyU,1176
-annet/vendors/library/h3c.py,sha256=yYvKXCrhznbiHybP5nTHR45TVYI08A4Ot_xQgVUgELU,1125
+annet/vendors/library/h3c.py,sha256=e2RIvemtLH4S1gukYJJU4MNVEukPzaHBR7FF2xht-vY,1142
 annet/vendors/library/huawei.py,sha256=79RINBbuob8KJXQvULbEGVVaGhn3-LzCYuqWQ847eds,1261
 annet/vendors/library/iosxr.py,sha256=0eFPbiE0jry_IATDxK3-UsPPMkK2gs9-avR51v2HAWw,1185
-annet/vendors/library/juniper.py,sha256=BDljknxDJ0JxEXb3HCbZSC38BuA7OF5mtcQLLftXx_o,1289
+annet/vendors/library/juniper.py,sha256=DuVpJ_Xa9PtYGC4k_dyHrLrQAnxbzGpZ9vbqymFbOAo,1306
 annet/vendors/library/nexus.py,sha256=naTtiaFzNt1YZmxUSR9UCa-z766r1oav0tPXinA2tho,1118
 annet/vendors/library/nokia.py,sha256=RhynYZpti5ftud88vaphLAA3ZrCEKdR8BESXWlUZIH8,1152
 annet/vendors/library/optixtrans.py,sha256=VdME69Ca4HAEgoaKN21fZxnmmsqqaxOe_HZjay9T8j0,632
 annet/vendors/library/pc.py,sha256=vfv31_NPi7M-4AUDL89UcpawK2E6xvCpELA209cd1ho,1086
 annet/vendors/library/ribbon.py,sha256=DDOBq-_-FL9dCxqXs2inEWZ-pvw-dJ-A-prA7cKMhec,1216
 annet/vendors/library/routeros.py,sha256=iQa7m_4wjuvcgBOI9gyZwlw1BvzJfOkvUbyoEk-NI9I,1254
-annet-3.16.3.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-3.16.3.dist-info/licenses/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-3.17.1.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-3.17.1.dist-info/licenses/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
 annet_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet_generators/example/__init__.py,sha256=OJ77uj8axc-FIyIu_Xdcnzmde3oQW5mk5qbODkhuVc8,355
 annet_generators/example/hostname.py,sha256=RloLzNVetEoWPLITzfJ13Nk3CC0yi-cZB1RTd6dnuhI,2541
@@ -222,8 +222,8 @@ annet_generators/rpl_example/generator.py,sha256=EWah19gOH8G-QyNyWqxCqdRi0BK7GbM
 annet_generators/rpl_example/items.py,sha256=HPgxScDvSqJPdz0c2SppDrH82DZYC4zUaniQwcWmh4A,1176
 annet_generators/rpl_example/mesh.py,sha256=z_WgfDZZ4xnyh3cSf75igyH09hGvtexEVwy1gCD_DzA,288
 annet_generators/rpl_example/route_policy.py,sha256=z6nPb0VDeQtKD1NIg9sFvmUxBD5tVs2frfNIuKdM-5c,2318
-annet-3.16.3.dist-info/METADATA,sha256=uYHvn35xiYFMhdKtk4gtGZX2jPG3MAlrWuzeJUjjMt8,816
-annet-3.16.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-annet-3.16.3.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-3.16.3.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-3.16.3.dist-info/RECORD,,
+annet-3.17.1.dist-info/METADATA,sha256=EQkXfefC9u4bnO2LEjZmSk1xAEHYwDpGx1tH1jcHdNk,850
+annet-3.17.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+annet-3.17.1.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-3.17.1.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-3.17.1.dist-info/RECORD,,