Refactor: Apply auto raw edit only on raw by default (#27)

* refactor: Remove auto edit photos feature and enable RAW processing by default

Author: duartebarbosadev

DEVELOPER_GUIDE.md

@@ -15,6 +15,7 @@ The application is structured into two main packages: `core` and `ui`.
   - **`model_rotation_detector.py`**: Lazy-loading ONNX orientation detector. Heavy dependencies (onnxruntime / torchvision / Pillow) are imported only on first prediction request. Never gate imports with environment variables—extend the lazy loader if further deferral is needed.
   - **`rotation_detector.py`**: Orchestrates batch rotation detection using the model rotation detector (instantiated lazily on demand).
     - **`image_processing/`**: Low-level image manipulation, such as RAW processing and rotation.
+      - **RAW Processing**: RAW images (.arw, .cr2, .cr3, .nef, .dng, etc.) are automatically detected by file extension and receive brightness and contrast adjustments during preview and thumbnail generation. This behavior is built into the image pipeline using internal `is_raw_extension()` detection and applies to all RAW files without requiring external parameters. The system uses `RAW_AUTO_EDIT_BRIGHTNESS_STANDARD = 1.15` for automatic brightness adjustment.
       - **`image_orientation_handler.py`**: Handles EXIF-based image orientation correction and composite rotation calculations.
     - **`file_scanner.py`**: Scans directories for image files.
     - **`image_file_ops.py`**: Handles all file system operations, such as moving, renaming, and deleting files. This is the single source of truth for file manipulations.
@@ -93,7 +94,7 @@ The application is structured into two main packages: `core` and `ui`.
 
 ## 3. Coding Conventions
 
-- **Configuration Constants**: All hardcoded values, thresholds, and configurable parameters must be centralized in `src/core/app_settings.py`. This includes UI dimensions, processing thresholds, cache sizes, AI/ML parameters, and other constants. Never use hardcoded values directly in the code - always import from `app_settings.py`.
+- **Configuration Constants**: All hardcoded values, thresholds, and configurable parameters must be centralized in `src/core/app_settings.py`. This includes UI dimensions, processing thresholds, cache sizes, AI/ML parameters, RAW processing constants (like `RAW_AUTO_EDIT_BRIGHTNESS_STANDARD`), and other constants. Never use hardcoded values directly in the code - always import from `app_settings.py`.
 
 - **Logging**: Use Python's `logging` module for all logging. **Do not use `print()`**.
 
@@ -171,12 +172,14 @@ Current layers:
 - Integration tests for rotation acceptance (skipped automatically if `sample/` assets absent or GUI constraints unmet).
 - Lazy loader tests ensure model instantiation is deferred and disabled mode returns 0.
 - About dialog test runs with `block=False` to avoid modal blocking.
+- Automatic RAW processing tests validate that file extension detection works correctly and that RAW files receive appropriate processing without external parameters.
 
 Guidelines for new tests:
 1. Favor pure function extraction for logic heavy UI code to enable headless unit tests.
 2. Use non-blocking dialog patterns (`block=False`) where modal exec would hang CI.
 3. Skip GUI-heavy tests gracefully when prerequisites (sample assets, GPU libs) are missing instead of failing.
 4. When asserting selection advancement, test the helper function directly with synthetic path lists—only one integration test should cover the end-to-end GUI path.
+5. **Critical Windows Testing Requirement**: All test files must start with `import pyexiv2  # noqa: F401  # Must be first to avoid Windows crash with pyexiv2` to prevent access violations in the native library. This import must be the very first import in every test file.
 
 
 ## 7. Adding New Image Feature Pipelines
@@ -217,6 +220,8 @@ When adding new controllers, follow the listed Extension Pattern to maintain con
 | Rotation view crashes due to empty model | Guard with early returns; tests should skip rather than fail |
 | Adding file operations outside `ImageFileOperations` | Refactor into `ImageFileOperations` to centralize side effects |
 | Blocking modal dialogs in CI | Use `block=False` in tests, keep blocking in production UI |
+| Test suite fails with Windows access violations | Ensure every test file starts with `import pyexiv2` as the first import |
+| RAW processing not working | Check that `is_raw_extension()` detection is used instead of external `apply_auto_edits` parameters |
 
 ---
-This guide reflects the state after introducing auto-advance rotation acceptance, selection heuristic refactor, lazy model loading, and updated testing patterns.
+This guide reflects the state after introducing auto-advance rotation acceptance, selection heuristic refactor, lazy model loading, automatic RAW processing refactor, and updated testing patterns.

README.md

@@ -231,7 +231,6 @@ Logs will be saved to `~/.photosort_logs/photosort_app.log`.
 **Application Settings**
 
 * **Manage Cache:** `F9`
-* **Enable Auto RAW Edits:** `F10`
 
 **Help**
 

src/core/app_settings.py

@@ -16,7 +16,6 @@
 PREVIEW_CACHE_SIZE_GB_KEY = "Cache/PreviewCacheSizeGB"
 EXIF_CACHE_SIZE_MB_KEY = "Cache/ExifCacheSizeMB"  # For EXIF metadata cache
 ROTATION_CONFIRM_LOSSY_KEY = "UI/RotationConfirmLossy"  # Ask before lossy rotation
-AUTO_EDIT_PHOTOS_KEY = "UI/AutoEditPhotos"  # Key for auto edit photos setting
 RECENT_FOLDERS_KEY = "UI/RecentFolders"  # Key for recent folders list
 ORIENTATION_MODEL_NAME_KEY = (
     "Models/OrientationModelName"  # Key for the orientation model file name
@@ -26,7 +25,6 @@
 DEFAULT_PREVIEW_CACHE_SIZE_GB = 2.0  # Default to 2 GB for preview cache
 DEFAULT_EXIF_CACHE_SIZE_MB = 256  # Default to 256 MB for EXIF cache
 DEFAULT_ROTATION_CONFIRM_LOSSY = True  # Default to asking before lossy rotation
-DEFAULT_AUTO_EDIT_PHOTOS = False  # Default auto edit photos setting
 MAX_RECENT_FOLDERS = 10  # Max number of recent folders to store
 DEFAULT_ORIENTATION_MODEL_NAME = None  # Default to None, so we can auto-detect
 
@@ -167,19 +165,6 @@ def set_rotation_confirm_lossy(confirm: bool):
     settings.setValue(ROTATION_CONFIRM_LOSSY_KEY, confirm)
 
 
-# --- Auto Edit Photos Setting ---
-def get_auto_edit_photos() -> bool:
-    """Get whether auto edit photos is enabled."""
-    settings = _get_settings()
-    return settings.value(AUTO_EDIT_PHOTOS_KEY, DEFAULT_AUTO_EDIT_PHOTOS, type=bool)
-
-
-def set_auto_edit_photos(enabled: bool):
-    """Set whether auto edit photos is enabled."""
-    settings = _get_settings()
-    settings.setValue(AUTO_EDIT_PHOTOS_KEY, enabled)
-
-
 # --- Recent Folders ---
 def get_recent_folders() -> list[str]:
     """Gets the list of recent folders from settings."""

src/core/file_scanner.py

@@ -85,13 +85,8 @@ async def _scan_directory_async(self, directory_path):
                 if ext in SUPPORTED_EXTENSIONS:
                     full_path = os.path.normpath(os.path.join(root, filename))
                     # Blur detection would be added here if this method were active
-                    # Assuming self.apply_auto_edits_for_raw_preview is available if this method is used
                     is_blurred = BlurDetector.is_image_blurred(
-                        full_path,
-                        threshold=self.blur_detection_threshold,
-                        apply_auto_edits_for_raw_preview=getattr(
-                            self, "apply_auto_edits_for_raw_preview", False
-                        ),  # Fallback
+                        full_path, threshold=self.blur_detection_threshold
                     )
                     self.files_found.emit(
                         [{"path": full_path, "is_blurred": is_blurred}]
@@ -101,21 +96,16 @@ async def _scan_directory_async(self, directory_path):
     def scan_directory(
         self,
         directory_path: str,
-        apply_auto_edits: bool = False,
         perform_blur_detection: bool = False,
         blur_threshold: float = 100.0,
     ):
         """
         Starts the directory scanning process.
         Optionally detects blur for each image.
-        apply_auto_edits: bool - Flag for thumbnail preloading AND for RAW preview used in blur detection.
         perform_blur_detection: bool - If True, performs blur detection.
         blur_threshold: float - Threshold for blur detection if performed.
         """
         self._is_running = True
-        # self.blur_detection_threshold = blur_threshold # Threshold is passed directly to is_image_blurred if needed
-        # Store apply_auto_edits for use in async or other methods if needed
-        self.apply_auto_edits_for_raw_preview = apply_auto_edits
         all_file_data = []  # Collect all file data (path and blur status)
         thumbnail_paths_only = []  # For ImageHandler.preload_thumbnails
 
@@ -150,9 +140,7 @@ def scan_directory(
                             )
                             try:
                                 is_blurred = BlurDetector.is_image_blurred(
-                                    full_path,
-                                    threshold=blur_threshold,
-                                    apply_auto_edits_for_raw_preview=apply_auto_edits,
+                                    full_path, threshold=blur_threshold
                                 )
                             except Exception as e:
                                 # Do not break scanning on blur detection failure; mark unknown
@@ -181,14 +169,10 @@ def scan_directory(
                     p for p in thumbnail_paths_only if os.path.isfile(p)
                 ]
                 if existing_for_thumbs:
-                    logger.info(
-                        f"Preloading {len(existing_for_thumbs)} thumbnails (Auto-Edits: {apply_auto_edits})."
-                    )
+                    logger.info(f"Preloading {len(existing_for_thumbs)} thumbnails.")
 
                     try:
-                        self.image_pipeline.preload_thumbnails(
-                            existing_for_thumbs, apply_auto_edits=apply_auto_edits
-                        )
+                        self.image_pipeline.preload_thumbnails(existing_for_thumbs)
                     except Exception as e:
                         logger.error(f"Thumbnail preloading failed: {e}", exc_info=True)
                 else:

src/core/image_features/model_rotation_detector.py

@@ -43,7 +43,6 @@ def predict_rotation_angle(
         self,
         image_path: str,
         image: Optional[object] = None,
-        apply_auto_edits: bool = False,
     ) -> int: ...
 
 
@@ -79,13 +78,12 @@ def predict_rotation_angle(
         self,
         image_path: str,
         image: Optional[object] = None,
-        apply_auto_edits: bool = False,
     ) -> int:
         if not self._ensure_session_loaded():
             return 0
 
         if image is None:
-            image = self._load_image(image_path, apply_auto_edits=apply_auto_edits)
+            image = self._load_image(image_path)
 
         if image is None:
             return 0
@@ -202,13 +200,14 @@ def _resolve_model_path(self) -> Optional[str]:
                 return None
         return model_path
 
-    def _load_image(self, path: str, apply_auto_edits: bool):
+    def _load_image(self, path: str):
         try:
             norm = os.path.normpath(path)
             _, ext = os.path.splitext(norm)
             if is_raw_extension(ext):
+                # Always apply auto-edits for RAW files in rotation detection
                 return RawImageProcessor.load_raw_as_pil(
-                    norm, half_size=True, apply_auto_edits=apply_auto_edits
+                    norm, half_size=True, apply_auto_edits=True
                 )
             from PIL import Image, ImageOps  # type: ignore
 

src/core/image_features/rotation_detector.py

@@ -29,7 +29,6 @@ def _detect_rotation_task(
         self,
         image_path: str,
         result_callback: Optional[Callable[[str, int], None]],
-        apply_auto_edits: bool,
     ) -> None:
         """
         Worker task for detecting rotation for a single image.
@@ -38,15 +37,15 @@ def _detect_rotation_task(
         """
         try:
             # Get the image with EXIF orientation already applied by the pipeline.
+            # Auto-edits are automatically applied for RAW files by the pipeline.
             pil_image = self.image_pipeline.get_pil_image_for_processing(
                 image_path,
-                apply_auto_edits=apply_auto_edits,
                 use_preloaded_preview_if_available=False,
                 apply_exif_transpose=True,  # This is the key change.
             )
 
             final_suggested_rotation = self.model_detector.predict_rotation_angle(
-                image_path, image=pil_image, apply_auto_edits=apply_auto_edits
+                image_path, image=pil_image
             )
 
             if result_callback:
@@ -71,10 +70,10 @@ def detect_rotation_in_batch(
     ) -> None:
         """
         Detects rotation suggestions for a batch of images in parallel.
+        Auto-edits are automatically applied for RAW files.
         """
         total_files = len(image_paths)
         processed_count = 0
-        apply_auto_edits = kwargs.get("apply_auto_edits", False)
 
         effective_num_workers = (
             num_workers if num_workers is not None else DEFAULT_NUM_WORKERS
@@ -87,9 +86,7 @@ def detect_rotation_in_batch(
             max_workers=effective_num_workers
         ) as executor:
             futures_map: Dict[concurrent.futures.Future, str] = {
-                executor.submit(
-                    self._detect_rotation_task, path, result_callback, apply_auto_edits
-                ): path
+                executor.submit(self._detect_rotation_task, path, result_callback): path
                 for path in image_paths
                 if not (should_continue_callback and not should_continue_callback())
             }