figrecipe 0.5.0__py3-none-any.whl → 0.7.4__py3-none-any.whl

figrecipe/_utils/__init__.py

@@ -2,9 +2,9 @@
 # -*- coding: utf-8 -*-
 """Utility modules for figrecipe."""
 
-from ._numpy_io import load_array, save_array
 from ._diff import get_non_default_kwargs, is_default_value
-from ._units import mm_to_inch, inch_to_mm, mm_to_pt, pt_to_mm
+from ._numpy_io import load_array, save_array
+from ._units import inch_to_mm, mm_to_inch, mm_to_pt, pt_to_mm
 
 __all__ = [
     "save_array",
@@ -19,14 +19,16 @@ __all__ = [
 
 # Optional: image comparison (requires PIL)
 try:
-    from ._image_diff import compare_images, create_comparison_figure
+    from ._image_diff import compare_images, create_comparison_figure  # noqa: F401
+
     __all__.extend(["compare_images", "create_comparison_figure"])
 except ImportError:
     pass
 
 # Optional: crop utility (requires PIL)
 try:
-    from ._crop import crop, find_content_area
+    from ._crop import crop, find_content_area  # noqa: F401
+
     __all__.extend(["crop", "find_content_area"])
 except ImportError:
     pass

figrecipe/_utils/_crop.py

@@ -8,7 +8,6 @@ and crops them, removing excess whitespace while preserving a specified margin.
 
 __all__ = ["crop", "find_content_area", "mm_to_pixels"]
 
-import os
 from pathlib import Path
 from typing import Optional, Tuple, Union
 
@@ -195,7 +194,9 @@ def crop(
     else:
         left, upper, right, lower = find_content_area(input_path)
         if verbose:
-            print(f"Content area: left={left}, upper={upper}, right={right}, lower={lower}")
+            print(
+                f"Content area: left={left}, upper={upper}, right={right}, lower={lower}"
+            )
 
         # Add margin, clamping to image boundaries
         left = max(left - margin, 0)
@@ -222,11 +223,14 @@ def crop(
 
         # Preserve PNG text chunks
         from PIL import PngImagePlugin
+
         pnginfo = PngImagePlugin.PngInfo()
         for key, value in img.info.items():
             if isinstance(value, (str, bytes)):
                 try:
-                    pnginfo.add_text(key, str(value) if isinstance(value, bytes) else value)
+                    pnginfo.add_text(
+                        key, str(value) if isinstance(value, bytes) else value
+                    )
                 except Exception:
                     pass
         save_kwargs["pnginfo"] = pnginfo
@@ -240,7 +244,9 @@ def crop(
 
     final_width, final_height = cropped_img.size
     if verbose:
-        area_reduction = 1 - ((final_width * final_height) / (original_width * original_height))
+        area_reduction = 1 - (
+            (final_width * final_height) / (original_width * original_height)
+        )
         print(f"Saved {area_reduction * 100:.1f}% of original area")
         if output_path != input_path:
             print(f"Saved to: {output_path}")

figrecipe/_utils/_image_diff.py

@@ -22,7 +22,8 @@ def load_image(path: Union[str, Path]) -> np.ndarray:
         Image as (H, W, C) array with values 0-255.
     """
     from PIL import Image
-    img = Image.open(path).convert('RGB')
+
+    img = Image.open(path).convert("RGB")
     return np.array(img)
 
 
@@ -48,16 +49,18 @@ def compute_diff(
     """
     # Ensure same shape
     if img1.shape != img2.shape:
-        raise ValueError(
-            f"Image shapes differ: {img1.shape} vs {img2.shape}"
-        )
+        raise ValueError(f"Image shapes differ: {img1.shape} vs {img2.shape}")
 
     # Compute difference
     diff = np.abs(img1.astype(float) - img2.astype(float))
-    mse = np.mean(diff ** 2)
+    mse = np.mean(diff**2)
 
     # Normalize diff for visualization
-    diff_img = (diff / diff.max() * 255).astype(np.uint8) if diff.max() > 0 else diff.astype(np.uint8)
+    diff_img = (
+        (diff / diff.max() * 255).astype(np.uint8)
+        if diff.max() > 0
+        else diff.astype(np.uint8)
+    )
 
     return mse, diff_img
 
@@ -108,14 +111,14 @@ def compare_images(
         mse, diff_img = compute_diff(img1, img2)
     else:
         # Can't compute pixel diff for different sizes
-        mse = float('nan')
+        mse = float("nan")
         diff_img = None
 
     # Peak signal-to-noise ratio
     if mse == 0:
-        psnr = float('inf')
+        psnr = float("inf")
     elif np.isnan(mse):
-        psnr = float('nan')
+        psnr = float("nan")
     else:
         psnr = 10 * np.log10(255**2 / mse)
 
@@ -123,23 +126,24 @@ def compare_images(
     if same_size:
         max_diff = np.max(np.abs(img1.astype(float) - img2.astype(float)))
     else:
-        max_diff = float('nan')
+        max_diff = float("nan")
 
     # Save diff image if requested
     if diff_path is not None and diff_img is not None:
         from PIL import Image
+
         Image.fromarray(diff_img).save(diff_path)
 
     return {
-        'identical': mse == 0,
-        'mse': float(mse),
-        'psnr': float(psnr),
-        'max_diff': float(max_diff),
-        'size1': (img1.shape[0], img1.shape[1]),
-        'size2': (img2.shape[0], img2.shape[1]),
-        'same_size': img1.shape == img2.shape,
-        'file_size1': file_size1,
-        'file_size2': file_size2,
+        "identical": mse == 0,
+        "mse": float(mse),
+        "psnr": float(psnr),
+        "max_diff": float(max_diff),
+        "size1": (img1.shape[0], img1.shape[1]),
+        "size2": (img2.shape[0], img2.shape[1]),
+        "same_size": img1.shape == img2.shape,
+        "file_size1": file_size1,
+        "file_size2": file_size2,
     }
 
 
@@ -173,32 +177,32 @@ def create_comparison_figure(
         # Different sizes, just show side by side
         fig, axes = plt.subplots(1, 2, figsize=(12, 5))
         axes[0].imshow(img1)
-        axes[0].set_title('Original')
-        axes[0].axis('off')
+        axes[0].set_title("Original")
+        axes[0].axis("off")
         axes[1].imshow(img2)
-        axes[1].set_title('Reproduced')
-        axes[1].axis('off')
-        fig.suptitle(f'{title}\n(Different sizes)', fontsize=14)
-        fig.savefig(output_path, dpi=150, bbox_inches='tight', facecolor='white')
+        axes[1].set_title("Reproduced")
+        axes[1].axis("off")
+        fig.suptitle(f"{title}\n(Different sizes)", fontsize=14)
+        fig.savefig(output_path, dpi=150, bbox_inches="tight", facecolor="white")
         plt.close(fig)
         return
 
     fig, axes = plt.subplots(1, 3, figsize=(15, 5))
 
     axes[0].imshow(img1)
-    axes[0].set_title('Original')
-    axes[0].axis('off')
+    axes[0].set_title("Original")
+    axes[0].axis("off")
 
     axes[1].imshow(img2)
-    axes[1].set_title('Reproduced')
-    axes[1].axis('off')
+    axes[1].set_title("Reproduced")
+    axes[1].axis("off")
 
     axes[2].imshow(diff_img)
-    axes[2].set_title(f'Difference (MSE: {mse:.2f})')
-    axes[2].axis('off')
+    axes[2].set_title(f"Difference (MSE: {mse:.2f})")
+    axes[2].axis("off")
 
     status = "IDENTICAL" if mse == 0 else f"MSE: {mse:.2f}"
-    fig.suptitle(f'{title}\n{status}', fontsize=14, fontweight='bold')
+    fig.suptitle(f"{title}\n{status}", fontsize=14, fontweight="bold")
 
-    fig.savefig(output_path, dpi=150, bbox_inches='tight', facecolor='white')
+    fig.savefig(output_path, dpi=150, bbox_inches="tight", facecolor="white")
     plt.close(fig)

figrecipe/_utils/_numpy_io.py

@@ -8,7 +8,6 @@ from typing import Literal, Union
 
 import numpy as np
 
-
 # Threshold for inline vs file storage (in elements)
 INLINE_THRESHOLD = 100
 

figrecipe/_utils/_units.py

@@ -11,7 +11,14 @@ Constants:
     - 1 mm = 72/25.4 points
 """
 
-__all__ = ["mm_to_inch", "inch_to_mm", "mm_to_pt", "pt_to_mm", "mm_to_scatter_size", "normalize_color"]
+__all__ = [
+    "mm_to_inch",
+    "inch_to_mm",
+    "mm_to_pt",
+    "pt_to_mm",
+    "mm_to_scatter_size",
+    "normalize_color",
+]
 
 from typing import List, Tuple, Union
 
@@ -143,12 +150,13 @@ def mm_to_scatter_size(diameter_mm: float) -> float:
     where d is diameter in points.
     """
     import math
+
     diameter_pt = mm_to_pt(diameter_mm)
     return math.pi * (diameter_pt / 2) ** 2
 
 
 def normalize_color(
-    color: Union[List[int], Tuple[int, ...], str]
+    color: Union[List[int], Tuple[int, ...], str],
 ) -> Union[Tuple[float, ...], str]:
     """Normalize color to matplotlib-compatible format.
 
@@ -195,6 +203,6 @@ if __name__ == "__main__":
     print(f"  1 inch = {inch_to_mm(1.0):.1f} mm")
     print(f"  0.2 mm = {mm_to_pt(0.2):.4f} pt")
     print(f"  1 pt = {pt_to_mm(1.0):.4f} mm")
-    print(f"\nColor normalization:")
+    print("\nColor normalization:")
     print(f"  [0, 128, 192] -> {normalize_color([0, 128, 192])}")
     print(f"  '#0080C0' -> {normalize_color('#0080C0')}")

figrecipe/_validator.py

@@ -61,7 +61,9 @@ class ValidationResult:
             f"({'match' if self.same_size else 'DIFFER'})",
             f"  Pixel MSE: {self.mse:.2f}",
             f"  Max pixel diff: {self.max_diff:.1f}",
-            f"  PSNR: {self.psnr:.1f} dB" if not np.isinf(self.psnr) else "  PSNR: inf (identical)",
+            f"  PSNR: {self.psnr:.1f} dB"
+            if not np.isinf(self.psnr)
+            else "  PSNR: inf (identical)",
             f"  File size diff: {self.file_size_diff:+d} bytes",
         ]
         if not self.valid:
@@ -95,6 +97,7 @@ def validate_recipe(
         Detailed comparison results.
     """
     import matplotlib.pyplot as plt
+
     from ._reproducer import reproduce
     from ._utils._image_diff import compare_images
 
@@ -115,7 +118,11 @@ def validate_recipe(
         reproduced_fig.savefig(reproduced_path, dpi=dpi)
 
         # Close reproduced figure to prevent double display in notebooks
-        plt.close(reproduced_fig)
+        # Use .fig to get underlying matplotlib Figure since reproduce() returns RecordingFigure
+        mpl_fig = (
+            reproduced_fig.fig if hasattr(reproduced_fig, "fig") else reproduced_fig
+        )
+        plt.close(mpl_fig)
 
         # Compare images
         diff = compare_images(original_path, reproduced_path)
@@ -137,7 +144,9 @@ def validate_recipe(
             valid=valid,
             mse=mse if not np.isnan(mse) else float("inf"),
             psnr=diff["psnr"],
-            max_diff=diff["max_diff"] if not np.isnan(diff["max_diff"]) else float("inf"),
+            max_diff=diff["max_diff"]
+            if not np.isnan(diff["max_diff"])
+            else float("inf"),
             size_original=diff["size1"],
             size_reproduced=diff["size2"],
             same_size=diff["same_size"],