annet 2.3.0__py3-none-any.whl → 2.3.1__py3-none-any.whl

annet/api/__init__.py

@@ -16,7 +16,7 @@ from typing import (
     Mapping,
     Set,
     Tuple,
-    Union, cast,
+    Union, cast, Any,
 )
 
 import colorama
@@ -312,16 +312,18 @@ def res_diff_patch(
 def diff(
     args: cli_args.DiffOptions,
     loader: ann_gen.Loader,
-) -> Mapping[Device, Union[Diff, PCDiff]]:
+    device_ids: List[Any]
+) -> tuple[Mapping[Device, Union[Diff, PCDiff]], Mapping[Device, Exception]]:
     """ Сгенерировать конфиг для устройств """
     stdin = args.stdin(filter_acl=args.filter_acl, config=None)
 
     filterer = filtering.filterer_connector.get()
     pool = Parallel(ann_diff.worker, args, stdin, loader, filterer).tune_args(args)
     if args.show_hosts_progress:
-        pool.add_callback(PoolProgressLogger(loader.device_fqdns))
+        fqdns = {k: v for k, v in loader.device_fqdns.items() if k in device_ids}
+        pool.add_callback(PoolProgressLogger(fqdns))
 
-    return pool.run(loader.device_ids, args.tolerate_fails, args.strict_exit_code)
+    return pool.run(device_ids, args.tolerate_fails, args.strict_exit_code)
 
 
 def collapse_texts(texts: Mapping[str, str | Generator[str, None, None]]) -> Mapping[Tuple[str, ...], str]:
@@ -500,7 +502,6 @@ class Deployer:
 
         self._collapseable_diffs = {}
         self._diff_lines: List[str] = []
-        self._filterer = filtering.filterer_connector.get()
 
     def parse_result(self, job: DeployerJob, result: ann_gen.OldNewResult):
         logger = get_logger(job.device.hostname)
@@ -594,14 +595,28 @@ class Deployer:
             self.args,
             config="running",
         )
+
         if diff_args.query:
             ann_gen.live_configs = None
-            diffs = diff(diff_args, loader, success_device_ids, self._filterer)
-            non_pc_diffs = {dev: diff for dev, diff in diffs.items() if not isinstance(diff, PCDiff)}
+
+            diffs, failed = diff(diff_args, loader, success_device_ids)
+            for device_id, exc in failed.items():
+                self.failed_configs[loader.get_device(device_id).fqdn] = exc
+
+            non_pc_diffs = {
+                loader.get_device(device_id): diff
+                for device_id, diff in diffs.items()
+                if not isinstance(diff, PCDiff)
+            }
             devices_to_diff = ann_diff.collapse_diffs(non_pc_diffs)
-            devices_to_diff.update({(dev,): diff for dev, diff in diffs.items() if isinstance(diff, PCDiff)})
+            devices_to_diff.update({
+                (loader.get_device(device_id),): diff
+                for device_id, diff in diffs.items()
+                if isinstance(diff, PCDiff)}
+            )
         else:
             devices_to_diff = {}
+
         for devices, diff_obj in devices_to_diff.items():
             if diff_obj:
                 for dev in devices:

annet/cli.py

@@ -204,7 +204,7 @@ def gen(args: cli_args.ShowGenOptions):
 def diff(args: cli_args.ShowDiffOptions):
     """ Generate configuration for devices and show a diff with current configuration using the rulebook """
     with get_loader(args, args) as loader:
-        success, fail = api.diff(args, loader)
+        success, fail = api.diff(args, loader, loader.device_ids)
 
         out = list(gen_sort_diff({loader.get_device(k): v for k, v in success.items()}, args))
         output_driver = output_driver_connector.get()

annet/deploy.py

@@ -49,8 +49,8 @@ class ProgressBar(abc.ABC):
 
 
 class DeployResult(_DeployResultBase):  # noqa: E302
-    def add_results(self, results: dict[str, tuple[list[str], list[Exception]]]) -> None:
-        for hostname, (excs, result) in results.items():
+    def add_results(self, results: dict[str, Exception]) -> None:
+        for hostname, excs in results.items():
             self.hostnames.append(hostname)
             self.results[hostname] = excs
             self.durations[hostname] = 0.0

{annet-2.3.0.dist-info → annet-2.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: annet
-Version: 2.3.0
+Version: 2.3.1
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-2.3.0.dist-info → annet-2.3.1.dist-info}/RECORD

@@ -2,10 +2,10 @@ annet/__init__.py,sha256=0OKkFkqog8As7B6ApdpKQkrEAcEELUREWp82D8WvGA8,1846
 annet/annet.py,sha256=8Hc-n0S6d-YhcMpMiMET_SsYKfHFJeCA_E2gKgzK-2Y,790
 annet/argparse.py,sha256=v1MfhjR0B8qahza0WinmXClpR8UiDFhmwDDWtNroJPA,12855
 annet/bgp_models.py,sha256=oibTSdipNkGL4t8Xn94bhyKHMOtwbPBqmYaAy4FmTxQ,12361
-annet/cli.py,sha256=II1R_HFdr4NAwVojffAy8JEJpFEnU6q8BMr16-f1T4w,12714
+annet/cli.py,sha256=shq3hHzrTxFL3x1_zTOR43QHo0JYs8QSwyOvGtL86Co,12733
 annet/cli_args.py,sha256=jzMKRezWe_87k7VBNzgwPjWGMROJksbgrlX-GDd6oQs,13533
 annet/connectors.py,sha256=aoiDVLPizx8CW2p8SAwGCzyO_WW8H9xc2aujbGC4bDg,4882
-annet/deploy.py,sha256=Dp-l0z7gmVIGpFB4snj6P_5G4siEeGC6vBWGJayJcn0,7732
+annet/deploy.py,sha256=JCcJ2hUmUsaOSrcxFuW8SlN0ubXSnHQ7H_nP_tx-PgE,7698
 annet/deploy_ui.py,sha256=KcP1g_c1HSA3n5qFxbGHd8t_arL4_xJV46PFO-7FLg8,28650
 annet/diff.py,sha256=vz51az7RrXdYXsPbNMi9Y2awbjNRPQSFl6zzvE36Kx4,9441
 annet/executor.py,sha256=lcKI-EbYqeCiBNpL729kSltduzxbAzOkQ1L_QK7tNv8,5112
@@ -68,7 +68,7 @@ annet/annlib/rbparser/platform.py,sha256=65-r9mboRA3gaz9DRkSwPCdCRQneItqxppdMB6z
 annet/annlib/rbparser/syntax.py,sha256=iZ7Y-4QQBw4L3UtjEh54qisiRDhobl7HZxFNdP8mi54,3577
 annet/annlib/rulebook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/rulebook/common.py,sha256=hqwmmNofm5q2f-hV2usMY-IPMeiANLth28tZcRBYJTw,16640
-annet/api/__init__.py,sha256=SIxUCX3u91ioFw-_AIy3aGCqdQav9Mtd2fBczy8zdeg,32616
+annet/api/__init__.py,sha256=BnFu1BbGZVgiT4GKa5x8reIHV40hl8UGR4vtwD8VREI,32992
 annet/configs/context.yml,sha256=RVLrKLIHpCty7AGwOnmqf7Uu0iZQCn-AjYhophDJer8,259
 annet/configs/logging.yaml,sha256=EUagfir99QqA73Scc3k7sfQccbU3E1SvEQdyhLFtCl4,997
 annet/generators/__init__.py,sha256=rVHHDTPKHPZsml1eNEAj3o-8RweFTN8J7LX3tKMXdIY,16402
@@ -178,10 +178,10 @@ annet_generators/rpl_example/generator.py,sha256=zndIGfV4ZlTxPgAGYs7bMQvTc_tYScO
 annet_generators/rpl_example/items.py,sha256=d99HSXDHFjZq511EvGhIqRTWK3F4ZsCWfdUqFYQcyhE,772
 annet_generators/rpl_example/mesh.py,sha256=z_WgfDZZ4xnyh3cSf75igyH09hGvtexEVwy1gCD_DzA,288
 annet_generators/rpl_example/route_policy.py,sha256=z6nPb0VDeQtKD1NIg9sFvmUxBD5tVs2frfNIuKdM-5c,2318
-annet-2.3.0.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-2.3.0.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-2.3.0.dist-info/METADATA,sha256=5m1CMIWY8pk9goNCLOvHma1A2z7vGN5tVYJ0utQwDIM,793
-annet-2.3.0.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-annet-2.3.0.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-2.3.0.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-2.3.0.dist-info/RECORD,,
+annet-2.3.1.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-2.3.1.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-2.3.1.dist-info/METADATA,sha256=U_8hFGlPprmgg8gwixbZkAinKUK9VW--rWrkVGPNiC0,793
+annet-2.3.1.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+annet-2.3.1.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-2.3.1.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-2.3.1.dist-info/RECORD,,