annet 0.12.4__py3-none-any.whl → 0.12.6__py3-none-any.whl

annet/api/__init__.py

@@ -221,9 +221,8 @@ def log_host_progress_cb(pool: Parallel, task_result: TaskResult):
     connector = storage_connector.get()
     storage_opts = connector.opts().from_cli_opts(args)
     with connector.storage()(storage_opts) as storage:
-        hosts = storage.resolve_fdnds_by_query(args.query)
-    fqdn = hosts[task_result.device_id]
-    PoolProgressLogger(device_fqdns=fqdn)(pool, task_result)
+        fqdns = storage.resolve_fdnds_by_query(args.query)
+    PoolProgressLogger(device_fqdns=fqdns)(pool, task_result)
 
 
 # =====

annet/gen.py

@@ -378,7 +378,11 @@ def old_new(
     do_files_download=False,
     do_print_perf=True,
 ):
-    devices = loader.devices
+    if device_ids is None:
+        devices = loader.devices
+    else:
+        devices = [loader.get_device(device_id) for device_id in device_ids]
+
     gens = loader.resolve_gens(devices)
     running, failed_running = _old_resolve_running(config, devices)
     downloaded_files, failed_files = _old_resolve_files(config, devices, gens, do_files_download)
@@ -819,7 +823,7 @@ class Loader:
         self._args = args
         self._storages = storages
         self._no_empty_warning = no_empty_warning
-        self._devices_map: Dict[int, Device] = {}
+        self._devices_map: Dict[Any, Device] = {}
         self._gens: DeviceGenerators = DeviceGenerators()
 
         self._preload()
@@ -833,22 +837,29 @@ class Loader:
                     use_mesh=not self._args.no_mesh,
                     preload_extra_fields=True,
                 )
+
                 for device in devices:
                     self._devices_map[device.id] = device
+
                 self._gens.update(_old_resolve_gens(self._args, storage, devices))
         if not devices and not self._no_empty_warning:
             get_logger().error("No devices found for %s", self._args.query)
             return
 
     @property
-    def device_fqdns(self):
+    def device_fqdns(self) -> Dict[Any, str]:
         return {
             device_id: d.fqdn
             for device_id, d in self._devices_map.items()
         }
 
+    def get_device(self, device_id: Any) -> Device:
+        if device_id not in self._devices_map:
+            raise KeyError(f"Unknown device with id {device_id}")
+        return self._devices_map[device_id]
+
     @property
-    def device_ids(self):
+    def device_ids(self) -> List[Any]:
         return list(self._devices_map)
 
     @property

annet/generators/perf.py

@@ -57,6 +57,7 @@ class GeneratorPerfMesurer:
                exc_tb=None) -> GeneratorPerf:
         total = time.monotonic() - self._start_time
         self._span_ctx.__exit__(exc_type, exc_val, exc_tb)
+        rt = self._gen.storage.flush_perf()
 
         meta = {}
         if tracing_connector.get().enabled:
@@ -68,7 +69,7 @@ class GeneratorPerfMesurer:
                 },
             }
 
-        self.last_result = GeneratorPerf(total=total, rt=total, meta=meta)
+        self.last_result = GeneratorPerf(total=total, rt=rt, meta=meta)
         return self.last_result
 
     def __enter__(self):

annet/types.py

@@ -25,7 +25,12 @@ class GeneratorPerf:
     Рантайм статистика времени выполнения генератора
     """
 
-    def __init__(self, total: float, rt: float, meta: Optional[Dict[str, Any]] = None):
+    def __init__(
+        self,
+        total: float,
+        rt: Optional[Dict[str, List[Dict[str, Any]]]],
+        meta: Optional[Dict[str, Any]] = None
+    ):
         self.total = total
         self.rt = rt
         self._meta = meta

{annet-0.12.4.dist-info → annet-0.12.6.dist-info}/METADATA

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

{annet-0.12.4.dist-info → annet-0.12.6.dist-info}/RECORD

@@ -8,7 +8,7 @@ annet/deploy.py,sha256=B8E0P_VvCrS2URjFvgmUiIkHp95g7pAWfmT34igaDeo,18893
 annet/diff.py,sha256=zLcaCnb4lZRUb7frpH1CstQ3kacRcCblZs1uLG8J5lk,3391
 annet/executor.py,sha256=bw7COJNtssuxIqbQehlHYJnkdUeYvvL8WO5B-c67XE0,19040
 annet/filtering.py,sha256=F4ZKUCU3Yb1RlL2zKdyHtVUaWPzjWF4vWyMcdygKNYk,852
-annet/gen.py,sha256=HCd_9GukT5OT6qm6OIi9XZH6OuGMynABeaG81gU3edU,32500
+annet/gen.py,sha256=j8ldncYAGTUmuQermnAuP8lt278Mz5ubPx0JSkeGWgc,32862
 annet/hardware.py,sha256=HYPDfji_GdRn5S0_0fl4rvM7byOY9aHxG6VMAtsLaxE,1090
 annet/implicit.py,sha256=QigK4uoxvrFho2h9yFjOq1d9rLsC5xFlAU4bKkCuMWk,5139
 annet/lib.py,sha256=zQIfNBg7fAAk2BHbHAqy_McAiXhz0RqpBAcfdU-6pAA,3742
@@ -20,7 +20,7 @@ annet/storage.py,sha256=B16iUJwxKd0RWnUaogWQs0WQtiH1YCzPypSHNpBYPDM,2395
 annet/tabparser.py,sha256=ZjiI43ZVbrpMVR8qNbTbNh_U3oZ26VDc_2Y9wkkDkYA,874
 annet/text_term_format.py,sha256=CHb6viv45vmYl-SK1A1vyPHGhaEni6jVybBusaQnct8,2813
 annet/tracing.py,sha256=ndpM-au1c88uBBpOuH_z52qWZL773edYozNyys_wA68,4044
-annet/types.py,sha256=uHfRL3Bh6B3TyS9WfdukWKyF0fpYNdIzFB6Dgjo_Pqk,7101
+annet/types.py,sha256=f2HwqoKa6AucwFwDMszoouB6m1B8n6VmdjHMktO30Kc,7175
 annet/adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/provider.py,sha256=OM7Hq2vnMHNVBfubJvx2qJlMYm3VvKhomdLMNO8YnLQ,1024
@@ -65,7 +65,7 @@ annet/annlib/rbparser/platform.py,sha256=iyqy4A-6vUKM4j6hrOA6tsgWBXk7LcvkFrS2QHg
 annet/annlib/rbparser/syntax.py,sha256=eEUmszwPjdw57aofUYNQVcaxHPNV9yx9JNapjYY-BGM,3572
 annet/annlib/rulebook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/rulebook/common.py,sha256=9kCZwZpsH5UliF2OzaN9nLs2eLlz_d__4L7_oZ3SrCw,16054
-annet/api/__init__.py,sha256=LDl_JB_azU3v-sI5EwsJkiMDm_zZ7zYFBx8FHDW3Eag,33180
+annet/api/__init__.py,sha256=nrtPSDGLk5GO6nKSXDx9PNrCyiDBCJRXuUG1ua_y9MM,33141
 annet/configs/context.yml,sha256=nt4QnzYzrG2hqmaWOUsab2wgFl-CXmFSzbto6rqqFt4,291
 annet/configs/logging.yaml,sha256=Hu42lRK248dssp9TgkbHCaZNl0E6f4IChGb0XaQnTVo,970
 annet/generators/__init__.py,sha256=ZWKdxy6XbANW8vO6Tz7TMP_5rkHHKPBiBhPK2g-NOvI,15609
@@ -74,7 +74,7 @@ annet/generators/entire.py,sha256=7WySkVaXNT3ZAiHcQ0JUKdlhGJAN8cNUxF6c7ilYnO8,29
 annet/generators/exceptions.py,sha256=GPXTBgn2xZ3Ev_bdOPlfCLGRC1kQHe_dEq88S-uyi5s,151
 annet/generators/jsonfragment.py,sha256=itHDq46B50o2-zxnEtCAPb8XKyc0-ozTe-E_MjpkfHw,4020
 annet/generators/partial.py,sha256=XI01KDA--XwjSEU33SOQCCJZRXFq5boRz1uJA8lVA1g,3502
-annet/generators/perf.py,sha256=M6qVosLxuvKBkcvVUR6be1Ak2wHMooUT_qgwBjfi558,2329
+annet/generators/perf.py,sha256=K72ivUuXbNXrsHrLeKWhGmczGYWsB7kUDdDzqOX6j3c,2370
 annet/generators/ref.py,sha256=QVdeL8po1D0kBsVLOpCjFR81D8yNTk-kaQj5WUM4hng,438
 annet/generators/result.py,sha256=boMG4mwvitBLlHdPM8rPOqlKPrrNAqdV6NAM9wwIZHc,4765
 annet/generators/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -128,10 +128,10 @@ annet/rulebook/texts/routeros.rul,sha256=ipfxjj0mjFef6IsUlupqx4BY_Je_OUb8u_U1019
 annet_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet_generators/example/__init__.py,sha256=zVd8_DrXuOASrNzg2Ab94rPyvJff83L-_HppDFxnUjM,228
 annet_generators/example/lldp.py,sha256=68CLrK7vxTQQy9XIBxtywuEdBNlIlfXGYj8_wYWs5UI,1146
-annet-0.12.4.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.12.4.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.12.4.dist-info/METADATA,sha256=bLsuZdXIPwgFBlHmOJ0WaA3wH2iXHmGtncAXlru-xwc,694
-annet-0.12.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-annet-0.12.4.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
-annet-0.12.4.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.12.4.dist-info/RECORD,,
+annet-0.12.6.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.12.6.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.12.6.dist-info/METADATA,sha256=T6AvsDaqSWsBAZ0Q2MyGJzdyWnUhb-GtI7OV0pefjxg,694
+annet-0.12.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+annet-0.12.6.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
+annet-0.12.6.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.12.6.dist-info/RECORD,,