annet 0.12.8__py3-none-any.whl → 0.12.9__py3-none-any.whl

annet/gen.py

@@ -79,6 +79,19 @@ class DeviceGenerators:
                 for gen in gen_list:
                     yield gen
 
+    def for_devices(self, devices: Iterable[Device]) -> "DeviceGenerators":
+        result = DeviceGenerators()
+        for device in devices:
+            if device in self.partial:
+                result.partial[device] = self.partial[device]
+            if device in self.ref:
+                result.ref[device] = self.ref[device]
+            if device in self.entire:
+                result.entire[device] = self.entire[device]
+            if device in self.json_fragment:
+                result.json_fragment[device] = self.json_fragment[device]
+        return result
+
     def file_gens(self, device: Any) -> Iterator[Union[Entire, JSONFragment]]:
         """Iterate over generators that generate files or file parts."""
         yield from itertools.chain(
@@ -514,7 +527,7 @@ def worker(device_id, args: ShowGenOptions, stdin, loader: "Loader", filterer: F
 
 
 def old_new_worker(device_id, args: DeployOptions, config, stdin, loader: "Loader", filterer: Filterer):
-    yield from old_new(
+    for res in old_new(
         args,
         config=config,
         loader=loader,
@@ -523,7 +536,10 @@ def old_new_worker(device_id, args: DeployOptions, config, stdin, loader: "Loade
         device_ids=[device_id],
         no_new=args.clear,
         do_files_download=True,
-    )
+    ):
+        if res.err is not None and not args.tolerate_fails:
+            raise res.err
+        yield res
 
 
 class OldNewParallel(Parallel):
@@ -538,12 +554,13 @@ class OldNewParallel(Parallel):
             filterer=filterer,
         )
         self.tune_args(args)
+        self.tolerate_fails = args.tolerate_fails
 
     def generated_configs(self, devices: List[Device]) -> Generator[OldNewResult, None, None]:
         devices_by_id = {device.id: device for device in devices}
         device_ids = list(devices_by_id)
 
-        for task_result in self.irun(device_ids):
+        for task_result in self.irun(device_ids, self.tolerate_fails):
             if task_result.exc is not None:
                 device = devices_by_id.pop(task_result.device_id)
                 yield OldNewResult(device=device, err=task_result.exc)
@@ -868,8 +885,4 @@ class Loader:
         return []
 
     def resolve_gens(self, devices: Iterable[Device]) -> DeviceGenerators:
-        if self._gens is not None:
-            return self._gens
-
-        with tracing_connector.get().start_as_current_span("Resolve gens"):
-            return _old_resolve_gens(self._args, self._storage, devices)
+        return self._gens.for_devices(devices)

annet/lib.py

@@ -84,6 +84,7 @@ def get_context_path(touch: Optional[bool] = False) -> str:
     return str(path)
 
 
+@lru_cache(maxsize=1)
 def get_context() -> dict:
     with open(get_context_path()) as f:
         raw = yaml.safe_load(f)

{annet-0.12.8.dist-info → annet-0.12.9.dist-info}/METADATA

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

{annet-0.12.8.dist-info → annet-0.12.9.dist-info}/RECORD

@@ -8,10 +8,10 @@ annet/deploy.py,sha256=B8E0P_VvCrS2URjFvgmUiIkHp95g7pAWfmT34igaDeo,18893
 annet/diff.py,sha256=zLcaCnb4lZRUb7frpH1CstQ3kacRcCblZs1uLG8J5lk,3391
 annet/executor.py,sha256=EaeQ_JeRFuUUHUoR2LXDcNvY7IVg0eA2d6zSmQVJt-M,19216
 annet/filtering.py,sha256=F4ZKUCU3Yb1RlL2zKdyHtVUaWPzjWF4vWyMcdygKNYk,852
-annet/gen.py,sha256=J3TKaD61HzHo2etEpStpTFcC19pbVwYUNSKX5YycpHg,32795
+annet/gen.py,sha256=Gl2-6A1ekuz4mDf7SjGAmI8CMoLXoOtjNcgOvY3SoP0,33376
 annet/hardware.py,sha256=HYPDfji_GdRn5S0_0fl4rvM7byOY9aHxG6VMAtsLaxE,1090
 annet/implicit.py,sha256=QigK4uoxvrFho2h9yFjOq1d9rLsC5xFlAU4bKkCuMWk,5139
-annet/lib.py,sha256=zQIfNBg7fAAk2BHbHAqy_McAiXhz0RqpBAcfdU-6pAA,3742
+annet/lib.py,sha256=tQQlxZg1A2Q-tp18PoqBuORQmvP5dAAmAPvP6bBA6a0,3764
 annet/output.py,sha256=hJNGzL4Z3KgvqaCBkkmuuiXPhb64F1QV8YHkwnfhaaI,6852
 annet/parallel.py,sha256=hLkzEht0KhzmzUWDdO4QFYQHzhxs3wPlTA8DxbB2ziw,17160
 annet/patching.py,sha256=nILbY5oJajN0b1j3f0HEJm05H3HVThnWvB7vDVh7UQw,559
@@ -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.8.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.12.8.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.12.8.dist-info/METADATA,sha256=QV1U3C_eS9t_pCWA0arAfZqULlZCqE9_oteoCCv68vc,694
-annet-0.12.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-annet-0.12.8.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
-annet-0.12.8.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.12.8.dist-info/RECORD,,
+annet-0.12.9.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.12.9.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.12.9.dist-info/METADATA,sha256=hjKE9aLTjcAEbaFDVvQOgNyOgL7NXHwT5l-7KNoK0SI,694
+annet-0.12.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+annet-0.12.9.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
+annet-0.12.9.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.12.9.dist-info/RECORD,,