Fix path with spaces

Author: kks32

dapi/files.py

@@ -19,7 +19,7 @@ def _parse_tapis_uri(tapis_uri: str) -> (str, str):
         tapis_uri (str): URI in the format 'tapis://system_id/path'.
 
     Returns:
-        tuple: A tuple containing (system_id, path) where path is URL-decoded.
+        tuple: A tuple containing (system_id, path).
 
     Raises:
         ValueError: If the URI format is invalid or missing required components.
@@ -36,7 +36,7 @@ def _parse_tapis_uri(tapis_uri: str) -> (str, str):
     try:
         parsed = urllib.parse.urlparse(tapis_uri)
         system_id = parsed.netloc
-        path = urllib.parse.unquote(parsed.path.lstrip("/")) if parsed.path else ""
+        path = parsed.path.lstrip("/") if parsed.path else ""
         if not system_id:
             raise ValueError(f"Invalid Tapis URI: '{tapis_uri}'. Missing system ID.")
         return system_id, path
@@ -190,8 +190,7 @@ def get_ds_path_uri(t: Tapis, path: str, verify_exists: bool = False) -> str:
                 )
             else:
                 tapis_path = path_remainder
-            encoded_path = urllib.parse.quote(tapis_path)
-            input_uri = f"tapis://{storage_system_id}/{encoded_path}"
+            input_uri = f"tapis://{storage_system_id}/{tapis_path}"
             print(f"Translated '{path}' to '{input_uri}' using t.username")
             break  # Found match, exit loop
 
@@ -206,8 +205,7 @@ def get_ds_path_uri(t: Tapis, path: str, verify_exists: bool = False) -> str:
             if pattern in path:
                 path_remainder = path.split(pattern, 1)[1].lstrip("/")
                 tapis_path = path_remainder
-                encoded_path = urllib.parse.quote(tapis_path)
-                input_uri = f"tapis://{storage_system_id}/{encoded_path}"
+                input_uri = f"tapis://{storage_system_id}/{tapis_path}"
                 print(f"Translated '{path}' to '{input_uri}'")
                 break  # Found match, exit loop
 
@@ -295,8 +293,7 @@ def get_ds_path_uri(t: Tapis, path: str, verify_exists: bool = False) -> str:
                         f"Could not resolve project ID '{project_id_part}' to a Tapis system ID."
                     )
 
-                encoded_path_within_project = urllib.parse.quote(path_within_project)
-                input_uri = f"tapis://{found_system_id}/{encoded_path_within_project}"
+                input_uri = f"tapis://{found_system_id}/{path_within_project}"
                 print(f"Translated '{path}' to '{input_uri}' using Tapis v3 lookup")
                 break  # Found match, exit loop
 

dapi/jobs.py

@@ -1008,7 +1008,7 @@ def archive_uri(self) -> Optional[str]:
         if details.archiveSystemId and details.archiveSystemDir:
             archive_path = details.archiveSystemDir.lstrip("/")
             return (
-                f"tapis://{details.archiveSystemId}/{urllib.parse.quote(archive_path)}"
+                f"tapis://{details.archiveSystemId}/{archive_path}"
             )
         return None
 
@@ -1048,7 +1048,7 @@ def list_outputs(
         full_archive_path = os.path.join(details.archiveSystemDir, path.lstrip("/"))
         full_archive_path = os.path.normpath(full_archive_path).lstrip("/")
         try:
-            archive_base_uri = f"tapis://{details.archiveSystemId}/{urllib.parse.quote(full_archive_path)}"
+            archive_base_uri = f"tapis://{details.archiveSystemId}/{full_archive_path}"
             from .files import list_files
 
             return list_files(self._tapis, archive_base_uri, limit=limit, offset=offset)
@@ -1085,7 +1085,7 @@ def download_output(self, remote_path: str, local_target: str):
         )
         full_archive_path = os.path.normpath(full_archive_path).lstrip("/")
         remote_uri = (
-            f"tapis://{details.archiveSystemId}/{urllib.parse.quote(full_archive_path)}"
+            f"tapis://{details.archiveSystemId}/{full_archive_path}"
         )
         try:
             from .files import download_file

tests/files/test_uri_translation.py

@@ -62,22 +62,22 @@ def test_empty_path(self):
         self.assertEqual(result, expected)
 
     def test_path_with_spaces(self):
-        """Test handling of paths with spaces (URL encoded)"""
-        input_uri = "tapis://designsafe.storage.default/kks32/DS%20input/file.txt"
+        """Test handling of paths with spaces"""
+        input_uri = "tapis://designsafe.storage.default/kks32/DS input/file.txt"
         expected = "/home/jupyter/MyData/DS input/file.txt"
         result = tapis_uri_to_local_path(input_uri)
         self.assertEqual(result, expected)
 
     def test_community_path_with_spaces(self):
         """Test handling of community paths with spaces"""
-        input_uri = "tapis://designsafe.storage.community/My%20Dataset/data.csv"
+        input_uri = "tapis://designsafe.storage.community/My Dataset/data.csv"
         expected = "/home/jupyter/CommunityData/My Dataset/data.csv"
         result = tapis_uri_to_local_path(input_uri)
         self.assertEqual(result, expected)
 
     def test_project_path_with_spaces(self):
         """Test handling of project paths with spaces"""
-        input_uri = "tapis://project-1234-abcd/simulation%20results/output.txt"
+        input_uri = "tapis://project-1234-abcd/simulation results/output.txt"
         expected = "/home/jupyter/MyProjects/simulation results/output.txt"
         result = tapis_uri_to_local_path(input_uri)
         self.assertEqual(result, expected)

tests/jobs/test_dir_uri.py

@@ -52,7 +52,7 @@ def test_no_matching_pattern(self):
 
     def test_space_in_path(self):
         path = "jupyter/MyData/path with spaces"
-        expected = "tapis://designsafe.storage.default/testuser/path%20with%20spaces"
+        expected = "tapis://designsafe.storage.default/testuser/path with spaces"
         self.assertEqual(get_ds_path_uri(self.t, path), expected)