annet 0.16.9__py3-none-any.whl → 0.16.10__py3-none-any.whl

annet/adapters/netbox/common/manufacturer.py

@@ -51,4 +51,6 @@ def get_breed(manufacturer: str, model: str):
         return "bcom-os"
     elif manufacturer == "MikroTik":
         return "routeros"
+    elif manufacturer == "PC":
+        return "pc"
     return ""

annet/adapters/netbox/common/models.py

@@ -207,7 +207,7 @@ class NetboxDevice(Entity):
         return type(self) is type(other) and self.url == other.url
 
     def is_pc(self) -> bool:
-        return self.device_type.manufacturer.name == "Mellanox"
+        return self.device_type.manufacturer.name == "Mellanox" or self.breed == "pc"
 
     def _make_interface(self, name: str, type: InterfaceType) -> Interface:
         return Interface(

annet/configs/context.yml

@@ -1,11 +1,3 @@
-connection:
-  default:
-    login: ~
-    passwords: ~
-    enable_ssh_conf: false
-    no_nocauth: false
-    ssh_forward_agent: ~
-    tunnel: ~
 generators:
   default:
     - annet_generators.example
@@ -17,7 +9,6 @@ storage:
 
 context:
   default:
-    connection: default
     generators: default
     storage: default
 

annet/generators/jsonfragment.py

@@ -86,9 +86,12 @@ class JSONFragment(TreeGenerator):
             self._config_pointer.pop()
 
     def __call__(self, device: Device, annotate: bool = False):
-        for cfg_fragment in self.run(device):
-            self._set_or_replace_dict(self._config_pointer, cfg_fragment)
-        return self._json_config
+        try:
+            for cfg_fragment in self.run(device):
+                self._set_or_replace_dict(self._config_pointer, cfg_fragment)
+            return self._json_config
+        finally:
+            self._json_config = {}
 
     def _set_or_replace_dict(self, pointer, value):
         if not pointer:
@@ -99,27 +102,25 @@ class JSONFragment(TreeGenerator):
         else:
             self._set_dict(self._json_config, pointer, value)
 
-    @classmethod
-    def _to_str(cls, value: Any) -> str:
+    def process_value(self, value: Any) -> Any:
         if isinstance(value, str):
             return value
         elif isinstance(value, list):
-            return [cls._to_str(x) for x in value]
+            return [self.process_value(x) for x in value]
         elif isinstance(value, dict):
             for k, v in value.items():
-                value[k] = cls._to_str(v)
+                value[k] = self.process_value(v)
             return value
         return str(value)
 
-    @classmethod
-    def _set_dict(cls, cfg, pointer, value):
+    def _set_dict(self, cfg, pointer, value):
         # pointer has at least one key
         if len(pointer) == 1:
             if pointer[0] in cfg:
-                cfg[pointer[0]] = [cfg[pointer[0]], cls._to_str(value)]
+                cfg[pointer[0]] = [cfg[pointer[0]], self.process_value(value)]
             else:
-                cfg[pointer[0]] = cls._to_str(value)
+                cfg[pointer[0]] = self.process_value(value)
         else:
             if pointer[0] not in cfg:
                 cfg[pointer[0]] = {}
-            cls._set_dict(cfg[pointer[0]], pointer[1:], cls._to_str(value))
+            self._set_dict(cfg[pointer[0]], pointer[1:], self.process_value(value))

{annet-0.16.9.dist-info → annet-0.16.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.16.9
+Version: 0.16.10
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
@@ -23,6 +23,6 @@ Requires-Dist: aiohttp >=3.8.4
 Requires-Dist: yarl >=1.8.2
 Requires-Dist: adaptix ==3.0.0b7
 Requires-Dist: dataclass-rest ==0.4
-Requires-Dist: requests >=2.32.3
-Requires-Dist: annetbox >=0.1.8 ; python_version > "3.9"
+Provides-Extra: netbox
+Requires-Dist: annetbox[sync] >=0.1.8 ; extra == 'netbox'
 

{annet-0.16.9.dist-info → annet-0.16.10.dist-info}/RECORD

@@ -32,8 +32,8 @@ annet/adapters/netbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 annet/adapters/netbox/provider.py,sha256=IIs37QFHuJHxq4A0WfBS4JENk--v3BxqgNPal1Or4Xc,1470
 annet/adapters/netbox/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/common/client.py,sha256=-lWZmphD-OPuLIHNKhW_h2bnjrVaiyKYAD_MUPasEbo,2483
-annet/adapters/netbox/common/manufacturer.py,sha256=WZsBfHq6kohbbkszxPARjMdXB5rWGBO4Gz1rA-IlqL8,1555
-annet/adapters/netbox/common/models.py,sha256=h7kP2TQrYj09BOANHoKIw9xFBT2RHm31Qlmal2dM8pc,6864
+annet/adapters/netbox/common/manufacturer.py,sha256=QoTjmuBAg5klOJqeo8HuS2HybIUGsjTkknLkQL_Tiec,1606
+annet/adapters/netbox/common/models.py,sha256=SeWQZV-zvaKvK2YT2Bwf-iapkIs5pr7I7rAI7vlFMB8,6886
 annet/adapters/netbox/common/query.py,sha256=ziUFM7cUEbEIf3k1szTll4aO-OCUa-2Ogxbebi7Tegs,646
 annet/adapters/netbox/common/status_client.py,sha256=W4nTb2yvBlJ2UkWUmUhKQ2PaSQb1shjhHj5ebb4s2s4,591
 annet/adapters/netbox/common/storage_opts.py,sha256=iadgWGMb-rfSp3SnFAw8SH5bMKjwvcAsJ74v_z0CCXQ,507
@@ -68,13 +68,13 @@ annet/annlib/rbparser/syntax.py,sha256=iZ7Y-4QQBw4L3UtjEh54qisiRDhobl7HZxFNdP8mi
 annet/annlib/rulebook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/rulebook/common.py,sha256=Kd9Xout0xC6ZZDnyaORx0W-1kSM-gTgjQbp1iIXWxic,16489
 annet/api/__init__.py,sha256=7EB3d89kGXKf4Huw7cqyOULTGC9ydL4sHiVw8K0Aeqg,33722
-annet/configs/context.yml,sha256=nZ2Rr4VIn3kvzBNVOhIPJb3tBmd6Ikmkw5ODlQakPUo,389
+annet/configs/context.yml,sha256=mzJF3K9lM-Fvj9oFOZrDEjQHWJ4W5t96ewMeeWbKDAY,224
 annet/configs/logging.yaml,sha256=EUagfir99QqA73Scc3k7sfQccbU3E1SvEQdyhLFtCl4,997
 annet/generators/__init__.py,sha256=rVHHDTPKHPZsml1eNEAj3o-8RweFTN8J7LX3tKMXdIY,16402
 annet/generators/base.py,sha256=rgQLcQBPZm4ecbKmRhVOpBR-GFJAiVfdb_y5f2-LUR8,3670
 annet/generators/entire.py,sha256=7WySkVaXNT3ZAiHcQ0JUKdlhGJAN8cNUxF6c7ilYnO8,2928
 annet/generators/exceptions.py,sha256=GPXTBgn2xZ3Ev_bdOPlfCLGRC1kQHe_dEq88S-uyi5s,151
-annet/generators/jsonfragment.py,sha256=itHDq46B50o2-zxnEtCAPb8XKyc0-ozTe-E_MjpkfHw,4020
+annet/generators/jsonfragment.py,sha256=_jcEjfX9hIiEXSbOPbDAx2WvBkTGMRNrJmluUtIE8C4,4107
 annet/generators/partial.py,sha256=XI01KDA--XwjSEU33SOQCCJZRXFq5boRz1uJA8lVA1g,3502
 annet/generators/perf.py,sha256=K72ivUuXbNXrsHrLeKWhGmczGYWsB7kUDdDzqOX6j3c,2370
 annet/generators/ref.py,sha256=QVdeL8po1D0kBsVLOpCjFR81D8yNTk-kaQj5WUM4hng,438
@@ -152,10 +152,10 @@ annet_generators/example/lldp.py,sha256=24bGvShxbio-JxUdaehyPRu31LhH9YwSwFDrWVRn
 annet_generators/mesh_example/__init__.py,sha256=NfNWgXn1TNiWI6A5tmU6Y-4QV2i33td0Qs3re0MNNMo,218
 annet_generators/mesh_example/bgp.py,sha256=ck--yU_lUdAX9DWaaVQ-C29eQN-EGf1gEpOTBxmMnWA,1317
 annet_generators/mesh_example/mesh_logic.py,sha256=5Wt17LPt-EWe126IFAdaQQGWIOR3mxTJjAMUY8K0c0w,971
-annet-0.16.9.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.16.9.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.16.9.dist-info/METADATA,sha256=XJktwf9SQc7QbBVmhoWXRelloT7i_fBf3EIdAMQc5J0,784
-annet-0.16.9.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-annet-0.16.9.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-0.16.9.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.16.9.dist-info/RECORD,,
+annet-0.16.10.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.16.10.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.16.10.dist-info/METADATA,sha256=nS_AbW4YJ7cjneZlyiKTA1CsSPnk1VcOLfi_KkMipdU,776
+annet-0.16.10.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+annet-0.16.10.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-0.16.10.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.16.10.dist-info/RECORD,,