[DOM-59086] Fix uploading Folder to Dataset on Windows (#207)

* Add trailing slash to directory

* Modify paths when uploading folder on Windows machine

* Update CHANGELOG

* Add tests and test assets

---------

Co-authored-by: eric.jin <[email protected]>

Author: ddl-eric-jin

CHANGELOG.md

@@ -7,6 +7,7 @@ All notable changes to the `python-domino` library will be documented in this fi
 ### Added
 
 ### Changed
+* Fixed issue with using `datasets_upload_files` function to upload folders to a snapshot on Windows
 
 ## 1.4.2
 

domino/datasets.py

@@ -51,10 +51,9 @@ def __init__(
         target_chunk_size: int,
         interrupted: bool = False
     ):
-        # When running on Windows, converts paths to Unix-style paths, which the upload chunk API expects
         cleaned_relative_local_path = os.path.relpath(os.path.normpath(local_path_to_file_or_directory), start=os.curdir)
-        if os.sep != '/':
-            cleaned_relative_local_path = cleaned_relative_local_path.replace(os.sep, '/')        
+        # in case running on windows
+        cleaned_relative_local_path = self._get_unix_style_path(cleaned_relative_local_path)        
 
         self.csrf_no_check_header = csrf_no_check_header
         self.dataset_id = dataset_id
@@ -131,8 +130,12 @@ def _create_chunk_queue(self) -> list[UploadChunk]:
             for filename in filenames:
                 # construct the relative path for each file
                 relative_path_to_file = os.path.join(dirpath, filename)
+
+                # in case running on windows
+                cleaned_relative_path = self._get_unix_style_path(relative_path_to_file)
+                
                 # append chunk to queue
-                chunk_q.extend(self._create_chunks(relative_path_to_file))
+                chunk_q.extend(self._create_chunks(cleaned_relative_path))
         return chunk_q
 
     def _create_chunks(self, local_path_file, starting_index=1) -> list[UploadChunk]:
@@ -201,3 +204,9 @@ def _test_chunk(self, chunk: UploadChunk, chunk_data: AnyStr) -> (bool, int):
                                                          chunk.total_chunks, chunk.identifier, chunk_checksum)
         # test chunk returns no content if it should upload
         return self.request_manager.get(test_chunk_url).status_code == 204, chunk_checksum
+
+    def _get_unix_style_path(self, path: str) -> str:
+        # when running on Windows, converts path to Unix-style path, which the upload chunk API expects
+        if os.sep != '/':
+            path = path.replace(os.sep, '/')
+        return path

tests/assets/back\slash.txt

@@ -0,0 +1 @@
+back slash sample content

tests/test_datasets.py

@@ -176,6 +176,23 @@ def test_datasets_upload_with_sub_dir_windows_path(mock_exists, default_domino_c
     assert "test_datasets.py" in response
 
 
+@pytest.mark.skipif(
+    not domino_is_reachable(), reason="No access to a live Domino deployment"
+)
+@patch('os.path.exists')
+def test_datasets_upload_directory_windows_path(mock_exists, default_domino_client):
+    # Simulating windows style-path for an existent file
+    mock_exists.return_value = True
+    datasets_id = default_domino_client.datasets_ids(default_domino_client.project_id)[
+        0
+    ]
+    assert os.path.isdir("tests/assets")
+    windows_local_path_to_dir = "tests/assets"
+    response  = default_domino_client.datasets_upload_files(datasets_id, 
+                                                            windows_local_path_to_dir)
+    assert "tests/assets" in response
+
+
 @pytest.mark.skipif(
     not domino_is_reachable(), reason="No access to a live Domino deployment"
 )