(style) ruff pass: import sorting, unused imports, typing-stub cleanup

benchmarks/bench_dependency_graph.py

@@ -4,16 +4,14 @@
 volume chunked into ~1M blocks. Compares daisy (Python) vs daisy (Rust).
 """
 
-import time
 import json
+import time
 
 # --- Daisy ---
 from daisy import BlockwiseDependencyGraph as DaisyGraph
 from daisy import Roi as DaisyRoi
 
 # --- Daisy ---
-from daisy import BlockwiseDependencyGraph as DaisyGraph
-from daisy import Roi as DaisyRoi
 
 
 def bench_daisy(total_shape, block_shape, context, read_write_conflict):

benchmarks/bench_worker_scaling.py

@@ -11,12 +11,11 @@
                             via `daisy.Client`)
 """
 
-import time
 import json
+import time
 
 # Ensure both packages are importable
 import daisy
-import daisy
 
 
 # --- Daisy benchmark ---

build_wrapper.py

@@ -1,5 +1,6 @@
 import shutil
 import sys
+
 from maturin import *  # Forward everything from maturin
 
 

daisy-py/python/daisy/_daisy.pyi

@@ -6,9 +6,9 @@ pyright) read this `.pyi` instead of trying to introspect the
 compiled `.so`.
 """
 
-from collections.abc import Iterable, Iterator
+from collections.abc import Callable, Iterable, Iterator
 from pathlib import Path
-from typing import Any, Callable
+from typing import Any
 
 # -- Geometry primitives ------------------------------------------------
 
@@ -49,7 +49,6 @@ class Roi:
     def translate(self, by: Coordinate | Iterable[int]) -> Roi: ...
     def __eq__(self, other: object) -> bool: ...
     def __hash__(self) -> int: ...
-    def __repr__(self) -> str: ...
 
 
 # -- Blocks -------------------------------------------------------------
@@ -149,7 +148,7 @@ class Task:
         fit: str = ...,
         max_workers: int = ...,
         max_retries: int = ...,
-        timeout: float | int | object | None = ...,
+        timeout: float | object | None = ...,
         done_marker_path: str | bool | None = ...,
         requires: dict[str, int] | None = ...,
         max_worker_restarts: int = ...,
@@ -226,7 +225,6 @@ class Pipeline:
     def __or__(self, other: Task | Pipeline) -> Pipeline: ...
     def __radd__(self, other: Task | Pipeline) -> Pipeline: ...
     def __ror__(self, other: Task | Pipeline) -> Pipeline: ...
-    def __repr__(self) -> str: ...
 
 
 # -- Dependency graph ---------------------------------------------------
@@ -290,7 +288,6 @@ class Context:
     def to_env(self) -> str: ...
     @staticmethod
     def from_env() -> Context: ...
-    def __repr__(self) -> str: ...
 
 class SyncClient:
     def __init__(

daisy-py/python/daisy/_runner.py

@@ -11,7 +11,6 @@
 
 import daisy._daisy as _rs
 from daisy import logging as _worker_log
-
 from daisy._progress import _log_resume_summary
 from daisy._task import (
     _to_pipeline,

daisy-py/python/daisy/_task.py

@@ -10,11 +10,11 @@
 `daisy.v1_compat`, not here.
 """
 
-from contextlib import contextmanager
 import copy
 import inspect
 import logging
 import warnings
+from contextlib import contextmanager
 from pathlib import Path
 
 import daisy._daisy as _rs

daisy-py/python/daisy/_worker_processes.py

@@ -33,8 +33,8 @@
 import pickle
 import struct
 import subprocess
-import tempfile
 import sys
+import tempfile
 import types
 
 #: exit code the worker child uses when it self-terminates because a block

daisy-py/python/daisy/logging.py

@@ -22,15 +22,14 @@
 
 from __future__ import annotations
 
-import typing
 import logging as _py_logging
 import re
 import sys
 import threading
 import traceback as _py_traceback
+import typing
 from pathlib import Path
 
-
 # --- Public knobs ------------------------------------------------------------
 
 LOG_BASEDIR: Path | None = Path("./daisy_logs")
@@ -300,6 +299,7 @@ def __exit__(self, exc_type, exc, tb):
 # Path of this package, used to strip daisy-internal frames from
 # tracebacks before rendering.
 import os as _os
+
 _DAISY_PKG_DIR = _os.path.abspath(_os.path.dirname(__file__))
 
 
@@ -410,6 +410,7 @@ def format_traceback(exc_type, exc, tb) -> str:
             if _TRACEBACK_STYLE == "rich":
                 try:
                     import io
+
                     from rich.console import Console
                     from rich.traceback import Traceback
                     tb_obj = Traceback.from_exception(

daisy-py/python/daisy/v1_compat.py

@@ -30,7 +30,7 @@
 from daisy import v2 as _v2
 from daisy._runner import _run_serial
 from daisy._task import _record_task_upstream
-from daisy.v2 import (  # noqa: F401 — re-exported compat surface
+from daisy.v2 import (
     BlockStatus,
     BlockwiseDependencyGraph,
     Client,
@@ -133,6 +133,7 @@ def _install_compat_block_boundary():
     wire block so daisy's bookkeeping (auto-SUCCESS, failure reporting)
     is unaffected."""
     from contextlib import contextmanager
+
     from daisy._task import Client
 
     _orig_acquire = Client.acquire_block

daisy-py/python/daisy/v2.py

@@ -16,7 +16,8 @@
     daisy.run_blockwise([task])
 """
 
-from importlib.metadata import PackageNotFoundError, version as _version
+from importlib.metadata import PackageNotFoundError
+from importlib.metadata import version as _version
 
 import daisy._daisy as _rs
 from daisy._progress import JsonProgressObserver

examples/astronaut_pipeline.py

@@ -25,16 +25,15 @@
 import time
 from pathlib import Path
 
+import daisy.logging as gl
+import daisy.v2 as daisy
 import matplotlib.pyplot as plt
 import numpy as np
 from scipy.ndimage import label as scipy_label
 from skimage.data import astronaut
 from skimage.filters import sobel
 from skimage.segmentation import watershed
 
-import daisy.v2 as daisy
-import daisy.logging as gl
-
 _TMP = Path(tempfile.mkdtemp(prefix="daisy_astronaut_pipeline_"))
 gl.set_log_basedir(_TMP / "logs")
 print(f"output paths under: {_TMP}")

examples/mws.py

@@ -56,20 +56,18 @@
 
 # %%
 import tempfile
-import threading
 import time
 from pathlib import Path
 
+import daisy.logging as gl
+import daisy.v2 as daisy
 import lsd_lite
 import matplotlib.patches as mpatches
 import matplotlib.pyplot as plt
 import mwatershed
 import numpy as np
 import zarr
 
-import daisy.v2 as daisy
-import daisy.logging as gl
-
 _TMP = Path(tempfile.mkdtemp(prefix="daisy_mws_"))
 gl.set_log_basedir(_TMP / "logs")
 # Tee worker stdout/stderr to both file and terminal so the run-3

examples/stress_test.py

@@ -27,8 +27,8 @@
 import time
 from pathlib import Path
 
-import daisy.v2 as daisy
 import daisy.logging as gl
+import daisy.v2 as daisy
 
 _TMP = Path(tempfile.mkdtemp(prefix="daisy_stress_"))
 gl.set_log_basedir(_TMP / "logs")

tests/conftest.py

@@ -11,9 +11,8 @@
 is idempotent.
 """
 
-import pytest
-
 import daisy.logging as gl
+import pytest
 
 
 @pytest.fixture(autouse=True)

tests/daisy_compat/process_block.py

@@ -1,9 +1,8 @@
-import daisy as daisy
-
-import time
 import random
 import sys
+import time
 
+import daisy as daisy
 from filelock import FileLock
 
 tmp_path = sys.argv[1]

tests/daisy_compat/process_block_or_die.py

@@ -6,11 +6,11 @@
 workers see the marker and process blocks normally.
 """
 
-import daisy as daisy
-
 import os
 import sys
 
+import daisy as daisy
+
 tmp_path = sys.argv[1]
 marker = os.path.join(tmp_path, "worker_crashed")
 

tests/daisy_compat/test_client.py

@@ -1,8 +1,7 @@
 import multiprocessing as mp
 
-import pytest
-
 import daisy
+import pytest
 
 # `daisy.messages` and `daisy.tcp` were daisy 1.x's internal protocol modules
 # (pickle-over-tornado). daisy v2's wire protocol is bincode over tokio TCP,

tests/daisy_compat/test_clients_close.py

@@ -2,11 +2,9 @@
 import subprocess
 import sys
 
-import pytest
-from filelock import FileLock
-
 import daisy
 from daisy.logging import set_log_basedir
+from filelock import FileLock
 
 logging.basicConfig(level=logging.DEBUG)
 

tests/daisy_compat/test_dead_workers.py

@@ -10,8 +10,6 @@
 import subprocess
 import sys
 
-import pytest
-
 import daisy
 from daisy.logging import set_log_basedir
 

tests/daisy_compat/test_dependency_graph.py

@@ -1,11 +1,7 @@
-from daisy import BlockwiseDependencyGraph
-from daisy import Task
-from daisy import Block
-from daisy import Roi
+import logging
 
 import pytest
-
-import logging
+from daisy import Block, BlockwiseDependencyGraph, Roi, Task
 
 logger = logging.getLogger(__name__)
 

tests/daisy_compat/test_scheduler.py

@@ -1,11 +1,7 @@
-from daisy import Scheduler
-from daisy import Task
-from daisy import Block, BlockStatus
-from daisy import Roi
+import logging
 
 import pytest
-
-import logging
+from daisy import Block, BlockStatus, Roi, Scheduler, Task
 
 logger = logging.getLogger(__name__)
 

tests/daisy_compat/test_server.py

@@ -1,8 +1,7 @@
 import logging
 
-import pytest
-
 import daisy
+import pytest
 
 logging.basicConfig(level=logging.DEBUG)
 

tests/test_block_compat.py

@@ -2,11 +2,10 @@
 ROIs — v1 parity for code that constructs blocks directly, e.g.
 "process this one ROI without a blockwise job" helpers."""
 
+import daisy
 import funlib.geometry as fg
 import pytest
 
-import daisy
-
 
 def test_block_constructs_from_funlib_rois():
     b = daisy.Block(fg.Roi((0,), (40,)), fg.Roi((0,), (10,)), fg.Roi((5,), (5,)))

tests/test_check_function_warning.py

@@ -2,9 +2,8 @@
 
 import warnings
 
-import pytest
-
 import daisy
+import pytest
 
 
 def _mk(**kw):

tests/test_client_graceful.py

@@ -12,9 +12,8 @@
 import subprocess
 import sys
 
-import pytest
-
 import daisy
+import pytest
 
 
 def _dead_port() -> int:

tests/test_context_passing.py

@@ -12,13 +12,10 @@
 """
 
 import os
-import subprocess
-import sys
 import time
 
-import pytest
-
 import daisy
+import pytest
 
 
 def _mk_task(spawn_fn, n_blocks=16, max_workers=8, **kw):

tests/test_default_timeout.py

@@ -4,9 +4,8 @@
 import os
 import time
 
-import pytest
-
 import daisy
+import pytest
 
 
 def _task(fn, **kw):