update

sorghum_pipeline/data/preprocessor.py

@@ -1,14 +1,14 @@
 """Minimal image preprocessing following the requested composite/spectral logic.
 
-This now delegates composite building to `src.composite.process_raw_image`
-so results match the verified src pipeline exactly.
+Self-contained: builds composite/spectral directly (no external imports).
+Assumes a 2x2 mosaic: TL, TR, BL, BR → green, red, red_edge, nir.
+Composite BGR order: (green, red_edge, red) so displayed RGB = (red, red_edge, green).
 """
 
 import numpy as np
 from PIL import Image
 from typing import Dict, Tuple, Any
 from itertools import product
-from src.composite import process_raw_image as src_process_raw_image
 
 
 class ImagePreprocessor:
@@ -27,9 +27,34 @@ class ImagePreprocessor:
         return norm.astype(np.uint8)
     
     def process_raw_image(self, pil_img: Image.Image) -> Tuple[np.ndarray, Dict[str, np.ndarray]]:
-        """Use src.composite.process_raw_image for parity with src flow."""
-        comp_uint8_bgr, spectral_bands = src_process_raw_image(pil_img)
-        return comp_uint8_bgr, spectral_bands
+        """Split 4-band mosaic, return 8-bit BGR composite and spectral dict."""
+        # Determine quadrant size
+        d_w = pil_img.size[0] // 2
+        d_h = pil_img.size[1] // 2
+        boxes = [
+            (0, 0, d_w, d_h),                    # TL → green
+            (d_w, 0, d_w * 2, d_h),              # TR → red
+            (0, d_h, d_w, d_h * 2),              # BL → red_edge
+            (d_w, d_h, d_w * 2, d_h * 2),        # BR → nir
+        ]
+        # Extract each quadrant as grayscale float
+        quads = [
+            np.array(pil_img.crop(b).convert('L'), dtype=float)
+            for b in boxes
+        ]
+        green, red, red_edge, nir = quads
+
+        # Build composite in BGR order: (green, red_edge, red)
+        comp = np.dstack([green, red_edge, red])
+        comp_uint8 = self.convert_to_uint8(comp)
+
+        spectral_bands = {
+            "green": green[..., np.newaxis],
+            "red": red[..., np.newaxis],
+            "red_edge": red_edge[..., np.newaxis],
+            "nir": nir[..., np.newaxis],
+        }
+        return comp_uint8, spectral_bands
     
     def create_composites(self, plants: Dict[str, Dict[str, Any]]) -> Dict[str, Dict[str, Any]]:
         """