small logging changes. For lpsdata if no directories are prefixed by digits it will simply create an Uploaded directory

Author: davezuckerman

mokelumne/dags/copy_files.py

@@ -239,8 +239,8 @@ def rename_temp(destination: str) -> None:
 
     @task.short_circuit()
     def sourcedir_is_lpsdata(source_dir: str) -> bool:
-        logger.info("Checking if %s volume is and lpsdata volume. If so will move files to Uploaded directory", source_dir)
-        return source_dir.lower().endswith("ready_to_upload") and source_dir.lower().startswith("/srv/lpsdata")
+        logger.info("Checking if %s volume is an lpsdata volume. If so will move files to Uploaded directory", source_dir)
+        return source_dir.lower().startswith("/srv/lpsdata")
 
     @task
     def move_lpsdata_to_uploaded(source_dir: str) -> None:

mokelumne/util/file_transfer.py

@@ -207,13 +207,13 @@ def _all_subdirs(upload_dir: Path) -> list:
     return all_subdirs
 
 def _get_next_subdir_index(parent_dir: Path) -> int:
-    """Source directories on lpsdata* is prefixed by digits. Find the highest prefixed digits"""
+    """Source directories on lpsdata* are prefixed by digits. Find the highest prefixed digits"""
 
     sub_dirs = _all_subdirs(parent_dir)
     numbers = [int(s.name.split('_')[0]) for s in sub_dirs if s.name.split('_')[0].isdigit()]
 
     if not numbers:
-        raise FileNotFoundError(f"Could not find directories prepended with numeric in: {parent_dir.name}")
+        return None    
 
     highest = max(numbers) + 1 
 
@@ -227,7 +227,7 @@ def _find_uploaded_dir(parent: Path) -> Path | None:
     )
 
 
-def _move_files(source_dir, dest_dir) -> int:
+def _move_files(source_dir: Path | str, dest_dir: Path | str) -> int:
     """Move files from one directory to another"""
     source = Path(source_dir)
     dest = Path(dest_dir)
@@ -253,9 +253,11 @@ def move_to_uploaded(source_dir: str) -> tuple[str, int]:
     # e.g. if there's a directory 03_Files_to_Review.
     # It would be 04_Uploaded
     if not uploaded_dir:
-        all_sub_dirs = _all_subdirs(parent_dir) 
         highest = _get_next_subdir_index(parent_dir)
-        uploaded_dir = f"{parent_dir}/{highest:02}_Uploaded"
+        if highest is None:
+            uploaded_dir = f"{parent_dir}/Uploaded"
+        else:
+            uploaded_dir = f"{parent_dir}/{highest:02}_Uploaded"
 
     move_count = _move_files(source_dir, uploaded_dir) 
 

test/unit/test_file_transfer.py

@@ -204,23 +204,36 @@ def test_move_to_uploaded_uses_existing_uploaded_directory(self, tmp_path: Path)
         assert not source_file.exists()
         assert (uploaded_dir / source_file.name).exists()
 
-    def test_move_to_uploaded_creates_new_uploaded_directory(self, tmp_path: Path):
-        """Ensure move_to_uploaded creates a numbered uploaded directory when needed."""
+    @pytest.mark.parametrize(
+        "existing_dir_name, expected_uploaded_name",
+        [
+            ("03_Files_to_Review", "04_Uploaded"),  # Case 1: Digit prefix exists -> Increment
+            ("No_Digits_Here", "Uploaded"),           # Case 2: No digit prefix -> Use default fallback
+        ]
+    )
 
+    def test_move_to_uploaded_creates_new_uploaded_directory(
+        self, tmp_path: Path, existing_dir_name: str, expected_uploaded_name: str
+    ):
+        """Ensure move_to_uploaded creates the correct uploaded directory based on context."""
         parent_dir = tmp_path / "review"
         source_dir = parent_dir / "source"
         source_dir.mkdir(parents=True)
-
-        review_dir = parent_dir / "03_Files_to_Review"
+        
+        # Dynamically create the environment based on the parameter
+        review_dir = parent_dir / existing_dir_name
         review_dir.mkdir()
-
+        
+        # Set up a dummy file to trace the movement
         source_file = source_dir / "some_file.tif"
         source_file.write_text("some contents", encoding="utf-8")
-
+        
+        # Execute the function under test
         result_path, moved_count = file_transfer.move_to_uploaded(str(source_dir))
-
-        expected_uploaded_dir = parent_dir / "04_Uploaded"
-
+        
+        # Verify outcomes using the parameterized target name
+        expected_uploaded_dir = parent_dir / expected_uploaded_name
+        
         assert result_path == str(expected_uploaded_dir)
         assert moved_count == 1
         assert not source_file.exists()