fix warnings, fmt

Author: Lillecarl

python/nix_csi/copytocache.py

@@ -34,7 +34,9 @@ async def copyToCache(packagePath: Path):
         if pathInfoDrv.returncode == 0:
             paths += pathInfoDrv.stdout.splitlines()
         else:
-            logger.debug(f"No derivation paths found for {packagePath} (normal if fetched from substituters)")
+            logger.debug(
+                f"No derivation paths found for {packagePath} (normal if fetched from substituters)"
+            )
 
         # Filter out .drv files and deduplicate (path-info runs return overlapping results)
         # Set comprehension {x for x in ...} creates a set with unique values
@@ -44,7 +46,9 @@ async def copyToCache(packagePath: Path):
             for attempt in range(6):
                 if attempt > 0:
                     exp_backoff = min(5 * (2 ** (attempt - 1)), 60)
-                    logger.warning(f"Retry {attempt}/6 copying to cache after {exp_backoff}s: {packagePath}")
+                    logger.warning(
+                        f"Retry {attempt}/6 copying to cache after {exp_backoff}s: {packagePath}"
+                    )
                     await sleep(exp_backoff)
 
                 nixCopy = await run_captured(

python/nix_csi/identityservicer.py

@@ -12,7 +12,9 @@ class IdentityServicer(csi_grpc.IdentityBase):
     async def GetPluginInfo(self, stream):
         request: csi_pb2.GetPluginInfoRequest | None = await stream.recv_message()
         if request is None:
-            raise GRPCError(Status.INVALID_ARGUMENT, "Received None request in GetPluginInfo")
+            raise GRPCError(
+                Status.INVALID_ARGUMENT, "Received None request in GetPluginInfo"
+            )
         reply = csi_pb2.GetPluginInfoResponse(
             name=CSI_PLUGIN_NAME, vendor_version=CSI_VENDOR_VERSION
         )
@@ -23,7 +25,10 @@ async def GetPluginCapabilities(self, stream):
             csi_pb2.GetPluginCapabilitiesRequest | None
         ) = await stream.recv_message()
         if request is None:
-            raise GRPCError(Status.INVALID_ARGUMENT, "Received None request in GetPluginCapabilities")
+            raise GRPCError(
+                Status.INVALID_ARGUMENT,
+                "Received None request in GetPluginCapabilities",
+            )
         reply = csi_pb2.GetPluginCapabilitiesResponse(
             capabilities=[
                 csi_pb2.PluginCapability(

python/nix_csi/service.py

@@ -119,9 +119,10 @@ async def NodePublishVolume(self, stream):
 
         logger.info(f"Publish {request.target_path}")
 
-
         if not request.volume_context.get("csi.storage.k8s.io/ephemeral"):
-            raise GRPCError(Status.INTERNAL, "This CSI driver only supports ephemeral volumes")
+            raise GRPCError(
+                Status.INTERNAL, "This CSI driver only supports ephemeral volumes"
+            )
 
         async with self.volumeLocks[request.volume_id]:
             targetPath = Path(request.target_path)
@@ -509,16 +510,16 @@ async def NodeGetInfo(self, stream):
         reply = csi_pb2.NodeGetInfoResponse(node_id=node_name)
         await stream.send_message(reply)
 
-    async def NodeGetVolumeStats(self, _stream):
+    async def NodeGetVolumeStats(self, stream):
         raise GRPCError(Status.UNIMPLEMENTED, "NodeGetVolumeStats not implemented")
 
-    async def NodeExpandVolume(self, _stream):
+    async def NodeExpandVolume(self, stream):
         raise GRPCError(Status.UNIMPLEMENTED, "NodeExpandVolume not implemented")
 
-    async def NodeStageVolume(self, _stream):
+    async def NodeStageVolume(self, stream):
         raise GRPCError(Status.UNIMPLEMENTED, "NodeStageVolume not implemented")
 
-    async def NodeUnstageVolume(self, _stream):
+    async def NodeUnstageVolume(self, stream):
         raise GRPCError(Status.UNIMPLEMENTED, "NodeUnstageVolume not implemented")
 
 

python/nix_csi/subprocessing.py

@@ -31,18 +31,20 @@ async def try_captured(*args, timeout: float | None = None):
         raise GRPCError(
             Status.INTERNAL,
             f"{_format_command_preview(args)} failed: {result.returncode=}",
-            result.combined
+            result.combined,
         )
     return result
 
 
-async def try_console(*args, log_level: int = logging.DEBUG, timeout: float | None = None):
+async def try_console(
+    *args, log_level: int = logging.DEBUG, timeout: float | None = None
+):
     result = await run_console(*args, log_level=log_level, timeout=timeout)
     if result.returncode != 0:
         raise GRPCError(
             Status.INTERNAL,
             f"{_format_command_preview(args)} failed: {result.returncode=}",
-            result.combined
+            result.combined,
         )
     return result
 
@@ -53,7 +55,9 @@ async def run_captured(*args, timeout: float | None = None):
 
 
 # Run async subprocess, forward output to console and return returncode
-async def run_console(*args, log_level: int = logging.DEBUG, timeout: float | None = None):
+async def run_console(
+    *args, log_level: int = logging.DEBUG, timeout: float | None = None
+):
     start_time = time.perf_counter()
     log_command(*args, log_level=log_level)
     proc = await asyncio.create_subprocess_exec(
@@ -84,12 +88,15 @@ async def stream_output(stream, buffer):
                 stream_output(proc.stderr, stderr_data),
                 proc.wait(),
             ),
-            timeout=timeout
+            timeout=timeout,
         )
     except asyncio.TimeoutError:
         proc.kill()
         await proc.wait()
-        raise GRPCError(Status.DEADLINE_EXCEEDED, f"Command timed out after {timeout}s: {_format_command_preview(args)}")
+        raise GRPCError(
+            Status.DEADLINE_EXCEEDED,
+            f"Command timed out after {timeout}s: {_format_command_preview(args)}",
+        )
 
     elapsed_time = time.perf_counter() - start_time
     if elapsed_time > 5: