annet 0.12.7__tar.gz → 0.12.9__tar.gz

{annet-0.12.7/annet.egg-info → annet-0.12.9}/PKG-INFO

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

{annet-0.12.7 → annet-0.12.9}/annet/executor.py

@@ -359,7 +359,7 @@ async def bulk(
     tasks = []
     res = {}
     pending = set()
-    tasks_to_hostname = {}
+    tasks_to_device = {}
     time_of_start = {}
     deploy_durations = {}
     now = None
@@ -391,10 +391,15 @@ async def bulk(
             return task.result()
 
     for device in devices:
-        conn = await executor.amake_connection(device=device)
+        try:
+            conn = await executor.amake_connection(device=device)
+        except Exception as exc:
+            _logger.error("failed to connect to %s %r", device.hostname, exc)
+            res[device] = exc
+            continue
         start_hook(device)
         task = asyncio.create_task(coro_gen(conn=conn, device=device, **kwargs))
-        tasks_to_hostname[task] = device
+        tasks_to_device[task] = device
         tasks.append(task)
     try:
         ndone = 0
@@ -415,21 +420,21 @@ async def bulk(
 
                 now = time.monotonic()
                 for task in done:
-                    hostname = tasks_to_hostname[task]
-                    res[hostname] = end_hook(hostname, task)
+                    device = tasks_to_device[task]
+                    res[device] = end_hook(device, task)
                     ndone += 1
     except CancelAllTasks:
         exc = asyncio.CancelledError()
 
         now = time.monotonic()
-        for hostname, task in _get_remaining(tasks, pending, tasks_to_hostname):
-            res[hostname] = exc
+        for device, task in _get_remaining(tasks, pending, tasks_to_device):
+            res[device] = exc
 
-            if hostname in time_of_start:
-                duration = now - time_of_start[hostname]
+            if device.hostname in time_of_start:
+                duration = now - time_of_start[device.hostname]
             else:
                 duration = None
-            deploy_durations[hostname] = duration
+            deploy_durations[device.hostname] = duration
 
             if not asyncio.iscoroutine(task):
                 _logger.info("task %s", task)
@@ -471,11 +476,11 @@ class CancelAllTasks(Exception):
     pass
 
 
-def _get_remaining(tasks, pending, tasks_to_hostname):
+def _get_remaining(tasks, pending, tasks_to_device):
     for task in pending:
-        yield (tasks_to_hostname[task], task)
+        yield (tasks_to_device[task], task)
     for task in tasks:
-        yield (tasks_to_hostname[task], task)
+        yield (tasks_to_device[task], task)
 
 
 _platform = platform.system()

{annet-0.12.7 → annet-0.12.9}/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)
@@ -711,7 +728,7 @@ def _old_new_get_config_cli(ctx: OldNewDeviceContext, device: Device) -> str:
         if text is None:
             exc = (ctx.failed_running.get(device) or
                    Exception("I can't get device config and I don't know why"))
-            get_logger(host=device.hostname).error("config error %s", exc)
+            get_logger(host=device.hostname).error("config error %r", exc)
             raise exc
     elif ctx.config == "-":
         text = ctx.stdin["config"]
@@ -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.7 → annet-0.12.9}/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.7 → annet-0.12.9/annet.egg-info}/PKG-INFO

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