zea 0.0.6__py3-none-any.whl → 0.0.7__py3-none-any.whl

zea/tools/hf.py

@@ -41,7 +41,7 @@ def load_model_from_hf(repo_id, revision="main", verbose=True):
     if verbose:
         log.info(
             log.yellow(
-                f"Succesfully loaded model {commit_message} from "
+                f"Successfully loaded model {commit_message} from "
                 f"'https://huggingface.co/{repo_id}'. Last updated on {commit_time}."
             )
         )

zea/tools/selection_tool.py

@@ -17,19 +17,20 @@ Key Features
 
 Example
 -------
-.. code-block:: python
 
-    import matplotlib.pyplot as plt
-    from zea.tools.selection_tool import interactive_selector
+.. doctest::
 
-    image = ...  # Load your 2D image array
-    fig, ax = plt.subplots()
-    ax.imshow(image, cmap="gray")
-    patches, masks = interactive_selector(image, ax, selector="rectangle")
+    >>> import matplotlib.pyplot as plt
+    >>> import numpy as np
+    >>> from zea.tools.selection_tool import interactive_selector
+
+    >>> image = np.zeros((100, 100))  # Load your 2D image array
+    >>> fig, ax = plt.subplots()
+    >>> _ = ax.imshow(image, cmap="gray")
+    >>> patches, masks = interactive_selector(image, ax, selector="rectangle")  # doctest: +SKIP
 
 """
 
-import tkinter as tk
 from collections.abc import Iterable
 from pathlib import Path
 from typing import Union
@@ -43,7 +44,6 @@ from matplotlib.path import Path as pltPath
 from matplotlib.widgets import LassoSelector, RectangleSelector
 from PIL import Image, ImageDraw
 from scipy.interpolate import interp1d
-from skimage import measure
 from skimage.measure import approximate_polygon, find_contours
 from sklearn.metrics import pairwise_distances
 
@@ -55,7 +55,8 @@ from zea.internal.viewer import (
 )
 from zea.io_lib import _SUPPORTED_VID_TYPES, load_image, load_video
 from zea.metrics import get_metric
-from zea.utils import translate
+from zea.tensor_ops import translate
+from zea.visualize import plot_rectangle_from_mask, plot_shape_from_mask
 
 
 def crop_array(array, value=None):
@@ -180,16 +181,30 @@ def interactive_selector(
     for mask in masks:
         patches.append(crop_array(data * mask, value=0))
 
-    like_selection = not bool(confirm_selection)
+    # Early return if no confirmation is required
+    if not confirm_selection:
+        return patches, masks
+
+    try:
+        from tkinter import Tk, messagebox
+    except ImportError as e:
+        raise ImportError(
+            log.error("Failed to import tkinter. Please install it with 'apt install python3-tk'.")
+        ) from e
+
+    # Create root window once for messagebox dialogs
+    root = Tk()
+    root.withdraw()
 
+    like_selection = False
     while not like_selection:
         print(f"You have made {len(patches)} selection(s).")
         # draw masks on top of data
-        for mask in masks:
-            add_shape_from_mask(ax, mask, alpha=0.5)
+        for current_mask in masks:
+            plot_shape_from_mask(ax, current_mask, alpha=0.5)
         plt.draw()
-        # tkinter yes / no dialog
-        like_selection = tk.messagebox.askyesno("Like Selection", "Do you like your selection?")
+
+        like_selection = messagebox.askyesno("Like Selection", "Do you like your selection?")
 
         if not like_selection:
             remove_masks_from_axs(ax)
@@ -199,68 +214,12 @@ def interactive_selector(
             _execute_selector()
 
             patches = []
-            for mask in masks:
-                patches.append(crop_array(data * mask, value=0))
-
-    return patches, masks
-
-
-def add_rectangle_from_mask(ax, mask, **kwargs):
-    """add a rectangle box to axis from mask array.
-
-    Args:
-        ax (plt.ax): matplotlib axis
-        mask (ndarray): numpy array with rectangle non-zero
-            box defining the region of interest.
-    Kwargs:
-        edgecolor (str): color of the shape's edge
-        facecolor (str): color of the shape's face
-        linewidth (int): width of the shape's edge
+            for current_mask in masks:
+                patches.append(crop_array(data * current_mask, value=0))
 
-    Returns:
-        plt.ax: matplotlib axis with rectangle added
-    """
-    # Create a Rectangle patch
-    y1, y2 = np.where(np.diff(mask, axis=0).sum(axis=1))[0]
-    x1, x2 = np.where(np.diff(mask, axis=1).sum(axis=0))[0]
-    rect = Rectangle(
-        (x1, y1),
-        (x2 - x1),
-        (y2 - y1),
-        **kwargs,
-    )
-
-    # Add the patch to the Axes
-    rect_obj = ax.add_patch(rect)
-    return rect_obj
+    root.destroy()
 
-
-def add_shape_from_mask(ax, mask, **kwargs):
-    """add a shape to axis from mask array.
-
-    Args:
-        ax (plt.ax): matplotlib axis
-        mask (ndarray): numpy array with non-zero
-            shape defining the region of interest.
-    Kwargs:
-        edgecolor (str): color of the shape's edge
-        facecolor (str): color of the shape's face
-        linewidth (int): width of the shape's edge
-
-    Returns:
-        plt.ax: matplotlib axis with shape added
-    """
-    # Pad mask to ensure edge contours are found
-    padded_mask = np.pad(mask, pad_width=1, mode="constant", constant_values=0)
-    contours = measure.find_contours(padded_mask, 0.5)
-    patches = []
-    for contour in contours:
-        # Remove padding offset
-        contour -= 1
-        path = pltPath(contour[:, ::-1])
-        patch = PathPatch(path, **kwargs)
-        patches.append(ax.add_patch(patch))
-    return patches
+    return patches, masks
 
 
 def interactive_selector_with_plot_and_metric(
@@ -334,9 +293,9 @@ def interactive_selector_with_plot_and_metric(
             _ax.set_title(title + "\n" + f"{metric}: {score:.3f}")
             for mask in masks:
                 if selector == "rectangle":
-                    add_rectangle_from_mask(_ax, mask, alpha=0.5)
+                    plot_rectangle_from_mask(_ax, mask, alpha=0.5)
                 else:
-                    add_shape_from_mask(_ax, mask, alpha=0.5)
+                    plot_shape_from_mask(_ax, mask, alpha=0.5)
             plt.tight_layout()
 
     # plot patches and masks
@@ -350,7 +309,7 @@ def interactive_selector_with_plot_and_metric(
             ax_new[2].imshow(mask, aspect="auto")
 
             if selector == "rectangle":
-                add_rectangle_from_mask(ax_base, mask)
+                plot_rectangle_from_mask(ax_base, mask)
 
             for _ax in ax_new:
                 _ax.axis("off")
@@ -723,9 +682,9 @@ def update_imshow_with_mask(
     imshow_obj.set_array(images[frame_no])
     remove_masks_from_axs(axs)
     if selector == "rectangle":
-        mask_obj = add_rectangle_from_mask(axs, masks[frame_no])
+        mask_obj = plot_rectangle_from_mask(axs, masks[frame_no])
     else:
-        mask_obj = add_shape_from_mask(axs, masks[frame_no], alpha=0.5)
+        mask_obj = plot_shape_from_mask(axs, masks[frame_no], alpha=0.5)
     return imshow_obj, mask_obj
 
 
@@ -821,9 +780,9 @@ def main():
                 pos, size = get_matplotlib_figure_props(fig)
 
                 if selector == "rectangle":
-                    add_rectangle_from_mask(axs, mask[0], alpha=0.5)
+                    plot_rectangle_from_mask(axs, mask[0], alpha=0.5)
                 else:
-                    add_shape_from_mask(axs, mask[0], alpha=0.5)
+                    plot_shape_from_mask(axs, mask[0], alpha=0.5)
                 plt.close()
                 selection_masks.append(mask[0])
 
@@ -840,13 +799,15 @@ def main():
         imshow_obj = axs.imshow(images[0], cmap="gray")
 
         if selector == "rectangle":
-            add_rectangle_from_mask(axs, interpolated_masks[0])
+            plot_rectangle_from_mask(axs, interpolated_masks[0])
         else:
-            add_shape_from_mask(axs, interpolated_masks[0], alpha=0.5)
+            plot_shape_from_mask(axs, interpolated_masks[0], alpha=0.5)
 
         filestem = Path(file.parent / f"{file.stem}_{title}_annotations.gif")
         np.save(filestem.with_suffix(".npy"), interpolated_masks)
-        print(f"Succesfully saved interpolated masks to {log.yellow(filestem.with_suffix('.npy'))}")
+        print(
+            f"Successfully saved interpolated masks to {log.yellow(filestem.with_suffix('.npy'))}"
+        )
 
         fps = ask_save_animation_with_fps()
 
@@ -859,7 +820,7 @@ def main():
         )
         filename = filestem.with_suffix(".gif")
         ani.save(filename, writer="pillow")
-        print(f"Succesfully saved animation as {log.yellow(filename)}")
+        print(f"Successfully saved animation as {log.yellow(filename)}")
 
 
 if __name__ == "__main__":