annet 0.12.3__tar.gz → 0.12.5__tar.gz

{annet-0.12.3/annet.egg-info → annet-0.12.5}/PKG-INFO

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

{annet-0.12.3 → annet-0.12.5}/annet/gen.py

@@ -821,7 +821,6 @@ class Loader:
         self._no_empty_warning = no_empty_warning
         self._devices_map: Dict[int, Device] = {}
         self._gens: DeviceGenerators = DeviceGenerators()
-        self._counter = itertools.count()
 
         self._preload()
 
@@ -834,8 +833,10 @@ class Loader:
                     use_mesh=not self._args.no_mesh,
                     preload_extra_fields=True,
                 )
+
                 for device in devices:
-                    self._devices_map[next(self._counter)] = device
+                    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)

{annet-0.12.3 → annet-0.12.5}/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.3 → annet-0.12.5}/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.3 → annet-0.12.5/annet.egg-info}/PKG-INFO

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