annet 0.12.4__tar.gz → 0.12.6__tar.gz

{annet-0.12.4/annet.egg-info → annet-0.12.6}/PKG-INFO

@@ -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 → annet-0.12.6}/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-0.12.4 → annet-0.12.6}/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-0.12.4 → annet-0.12.6}/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-0.12.4 → annet-0.12.6}/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 → annet-0.12.6/annet.egg-info}/PKG-INFO

@@ -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