annet 0.12.8__tar.gz → 0.12.10__tar.gz

{annet-0.12.8/annet.egg-info → annet-0.12.10}/PKG-INFO

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

{annet-0.12.8 → annet-0.12.10}/annet/api/__init__.py

@@ -347,21 +347,22 @@ def diff(
         acl_rules = res.get_acl_rules(args.acl_safe)
         new_files = res.get_new_files(args.acl_safe)
         new_json_fragment_files = res.get_new_file_fragments()
+
+        pc_diff_files = []
         if res.old_files or new_files:
-            ret[device] = PCDiff(
-                hostname=device.hostname,
-                diff_files=list(_pc_diff(device.hostname, res.old_files, new_files)),
-            )
-        elif res.old_json_fragment_files or new_json_fragment_files:
-            ret[device] = PCDiff(
-                hostname=device.hostname,
-                diff_files=list(_json_fragment_diff(device.hostname, res.old_json_fragment_files, new_json_fragment_files)),
-            )
+            pc_diff_files.extend(_pc_diff(device.hostname, res.old_files, new_files))
+        if res.old_json_fragment_files or new_json_fragment_files:
+            pc_diff_files.extend(_json_fragment_diff(device.hostname, res.old_json_fragment_files, new_json_fragment_files))
+
+        if pc_diff_files:
+            pc_diff_files.sort(key=lambda f: f.label)
+            ret[device] = PCDiff(hostname=device.hostname, diff_files=pc_diff_files)
         elif old is not None:
             rb = rulebook.get_rulebook(device.hw)
             diff_tree = patching.make_diff(old, new, rb, [acl_rules, res.filter_acl_rules])
             diff_tree = patching.strip_unchanged(diff_tree)
             ret[device] = diff_tree
+
     return ret
 
 

{annet-0.12.8 → annet-0.12.10}/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-0.12.8 → annet-0.12.10}/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 → annet-0.12.10/annet.egg-info}/PKG-INFO

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