BLE001: fix

pkgs/clan-cli/clan_cli/network/list.py

@@ -1,6 +1,7 @@
 import argparse
 import logging
 
+from clan_lib.errors import ClanError
 from clan_lib.flake import require_flake
 from clan_lib.network.network import networks_from_flake
 
@@ -54,7 +55,7 @@ def list_command(args: argparse.Namespace) -> None:
         try:
             is_running = network.is_running()
             running_status = "Yes" if is_running else "No"
-        except Exception:
+        except ClanError:
             running_status = "Error"
 
         print(

pkgs/clan-cli/clan_cli/secrets/sops.py

@@ -83,7 +83,7 @@ class KeyType(enum.Enum):
 
                 except FileNotFoundError:
                     return
-                except Exception as ex:
+                except OSError as ex:
                     log.warning(f"Could not read age keys from {key_path}", exc_info=ex)
 
             if keys := os.environ.get("SOPS_AGE_KEY"):

pkgs/clan-cli/clan_lib/async_run/__init__.py

@@ -155,7 +155,7 @@ class AsyncThread[**P, R](threading.Thread):
             set_should_cancel(lambda: self.stop_event.is_set())
             # Arguments for ParamSpec "P@AsyncThread" are missing
             self.result = AsyncResult(_result=self.function(*self.args, **self.kwargs))
-        except Exception as ex:
+        except Exception as ex:  # noqa: BLE001
             self.result = AsyncResult(_result=ex)
         finally:
             self.finished = True

pkgs/clan-cli/clan_lib/flake/flake.py

@@ -846,7 +846,7 @@ class Flake:
             return
         try:
             self._cache.load_from_file(path)
-        except Exception as e:
+        except (OSError, json.JSONDecodeError, KeyError, ValueError) as e:
             log.warning(f"Failed load eval cache: {e}. Continue without cache")
 
     def prefetch(self) -> None:

pkgs/clan-cli/clan_lib/machines/update.py

@@ -234,7 +234,7 @@ def run_machine_update(
                 is_mobile = machine.select(
                     "config.system.clan.deployment.nixosMobileWorkaround",
                 )
-            except Exception:
+            except ClanError:
                 is_mobile = False
             # if the machine is mobile, we retry to deploy with the mobile workaround method
             if is_mobile:

pkgs/clan-cli/clan_lib/network/network.py

@@ -161,12 +161,9 @@ def get_best_remote(machine: "Machine") -> Iterator["Remote"]:
     if target_host:
         log.debug(f"Using targetHost from inventory for {machine.name}: {target_host}")
         # Create a direct network with just this machine
-        try:
-            remote = Remote.from_ssh_uri(machine_name=machine.name, address=target_host)
-            yield remote
-            return
-        except Exception as e:
-            log.debug(f"Inventory targetHost not reachable for {machine.name}: {e}")
+        remote = Remote.from_ssh_uri(machine_name=machine.name, address=target_host)
+        yield remote
+        return
 
     # Step 2: Try existing networks by priority
     try:
@@ -189,7 +186,7 @@ def get_best_remote(machine: "Machine") -> Iterator["Remote"]:
                         )
                         yield network.remote(machine.name)
                         return
-                except Exception as e:
+                except ClanError as e:
                     log.debug(f"Failed to reach {machine.name} via {network_name}: {e}")
             else:
                 try:
@@ -202,34 +199,26 @@ def get_best_remote(machine: "Machine") -> Iterator["Remote"]:
                             )
                             yield connected_network.remote(machine.name)
                             return
-                except Exception as e:
+                except ClanError as e:
                     log.debug(
                         f"Failed to establish connection to {machine.name} via {network_name}: {e}",
                     )
-    except Exception as e:
+    except (ImportError, AttributeError, KeyError) as e:
         log.debug(f"Failed to use networking modules to determine machines remote: {e}")
 
     # Step 3: Try targetHost from machine nixos config
-    try:
-        target_host = machine.select('config.clan.core.networking."targetHost"')
-        if target_host:
-            log.debug(
-                f"Using targetHost from machine config for {machine.name}: {target_host}",
-            )
-            # Check if reachable
-            try:
-                remote = Remote.from_ssh_uri(
-                    machine_name=machine.name,
-                    address=target_host,
-                )
-                yield remote
-                return
-            except Exception as e:
-                log.debug(
-                    f"Machine config targetHost not reachable for {machine.name}: {e}",
-                )
-    except Exception as e:
-        log.debug(f"Could not get targetHost from machine config: {e}")
+    target_host = machine.select('config.clan.core.networking."targetHost"')
+    if target_host:
+        log.debug(
+            f"Using targetHost from machine config for {machine.name}: {target_host}",
+        )
+        # Check if reachable
+        remote = Remote.from_ssh_uri(
+            machine_name=machine.name,
+            address=target_host,
+        )
+        yield remote
+        return
 
     # No connection method found
     msg = f"Could not find any way to connect to machine '{machine.name}'. No targetHost configured and machine not reachable via any network."
@@ -249,12 +238,7 @@ def get_network_overview(networks: dict[str, Network]) -> dict:
         else:
             with module.connection(network) as conn:
                 for peer_name in conn.peers:
-                    try:
-                        result[network_name]["peers"][peer_name] = conn.ping(
-                            peer_name,
-                        )
-                    except ClanError:
-                        log.warning(
-                            f"getting host for machine: {peer_name} in network: {network_name} failed",
-                        )
+                    result[network_name]["peers"][peer_name] = conn.ping(
+                        peer_name,
+                    )
     return result

pkgs/clan-cli/clan_lib/network/qr_code.py

@@ -29,6 +29,7 @@ class QRCodeData:
 
     @contextmanager
     def get_best_remote(self) -> Iterator[Remote]:
+        errors = []
         for address in self.addresses:
             try:
                 log.debug(f"Establishing connection via {address}")
@@ -39,8 +40,13 @@ class QRCodeData:
                     if ping_time is not None:
                         log.info(f"reachable via {address} after connection")
                         yield address.remote
-            except Exception as e:
-                log.debug(f"Failed to establish connection via {address}: {e}")
+            except ClanError as e:
+                errors.append((address, e))
+        if not errors:
+            msg = "No reachable remote found in QR code data: " + ", ".join(
+                f"{addr.remote} ({err})" for addr, err in errors
+            )
+            raise ClanError(msg)
 
 
 def read_qr_json(qr_data: dict[str, Any], flake: Flake) -> QRCodeData:

pkgs/clan-cli/clan_lib/ssh/remote_test.py

@@ -239,7 +239,7 @@ def test_run_exception(hosts: list[Remote], runtime: AsyncRuntime) -> None:
             runtime.async_run(None, host.run_local, ["exit 1"], RunOpts(shell=True))  # noqa: S604
         runtime.join_all()
         runtime.check_all()
-    except Exception:  # noqa: S110
+    except ClanError:
         pass
     else:
         msg = "should have raised Exception"
@@ -255,7 +255,7 @@ def test_run_function_exception(hosts: list[Remote], runtime: AsyncRuntime) -> N
             runtime.async_run(None, some_func, host)
         runtime.join_all()
         runtime.check_all()
-    except Exception:  # noqa: S110
+    except ClanError:
         pass
     else:
         msg = "should have raised Exception"

pkgs/clan-cli/clan_lib/ssh/sudo_askpass_proxy.py

@@ -90,7 +90,7 @@ class SudoAskpassProxy:
                     ssh_process.stdin.flush()
                 else:
                     print(stripped_line)
-        except Exception as e:
+        except (OSError, ClanError) as e:
             logger.error(f"Error processing passwords requests output: {e}")
 
     def run(self) -> str: