PyOPIA 2.16.12__tar.gz → 2.16.13__tar.gz

{pyopia-2.16.12 → pyopia-2.16.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyOPIA
-Version: 2.16.12
+Version: 2.16.13
 Summary: A Python Ocean Particle Image Analysis toolbox.
 Project-URL: Repository, https://github.com/sintef/pyopia
 Project-URL: Documentation, https://pyopia.readthedocs.io

pyopia-2.16.13/pyopia/__init__.py

@@ -0,0 +1 @@
+__version__ = "2.16.13"

{pyopia-2.16.12 → pyopia-2.16.13}/pyopia/pipeline.py

@@ -351,6 +351,7 @@ class FilesToProcess:
     '''
     def __init__(self, glob_pattern=None):
         self.files = None
+        self.glob_pattern = glob_pattern
         self.background_files = []
         self.chunked_files = []
         if glob_pattern is not None:
@@ -399,6 +400,11 @@ class FilesToProcess:
         strategy : str, optional
             Strategy to use for chunking dataset, either `block` or `interleave`. Defult: `block`
         '''
+        if len(self.files) == 0:
+            raise RuntimeError(
+                f'No raw files found for "{self.glob_pattern}". '
+                'Check the general.raw_files setting in your config file.'
+            )
         if num_chunks > len(self.files) // 2:
             raise RuntimeError('Number of chunks exceeds more than half the number of files to process. Use less chunks.')
         self.chunk_files(num_chunks, strategy)

{pyopia-2.16.12 → pyopia-2.16.13}/pyopia/tests/test_pipeline.py

@@ -7,12 +7,13 @@ from glob import glob
 import tempfile
 import os
 import numpy as np
+import pytest
 import skimage.io
 
 import pyopia.exampledata as testdata
 import pyopia.io
 import pyopia.classify
-from pyopia.pipeline import Pipeline
+from pyopia.pipeline import FilesToProcess, Pipeline
 import pyopia.process
 import pyopia.statistics
 import pyopia.background  # noqa: F401
@@ -307,7 +308,23 @@ def test_per_class_concentration():
         np.testing.assert_allclose(result.loc[ts_2, 'sample_volume_L'], sample_volume)
 
 
+def test_files_to_process_raises_clear_error_for_no_matching_files(tmp_path):
+    '''Regression test for #279: an empty/non-matching raw_files pattern used to surface
+    as a misleading "Number of chunks exceeds..." RuntimeError instead of a clear
+    "no files found" error.
+    '''
+    empty_dir = tmp_path / 'empty'
+    empty_dir.mkdir()
+    glob_pattern = str(empty_dir / '*.silc')
+
+    raw_files = FilesToProcess(glob_pattern)
+
+    with pytest.raises(RuntimeError, match='No raw files found'):
+        raw_files.prepare_chunking(num_chunks=1, average_window=0, bgshift_function='pass')
+
+
 if __name__ == "__main__":
     test_holo_pipeline()
     test_silcam_pipeline()
     test_per_class_concentration()
+    test_files_to_process_raises_clear_error_for_no_matching_files()

pyopia-2.16.12/pyopia/__init__.py

@@ -1 +0,0 @@
-__version__ = "2.16.12"