Fix/directory issue (#155)

* allowing directories to be part of metadata when opening a file

* poetry updates

* poetry updates

* changing variable name to directory prefix

* updating packages

* Adding tests

* patch updates

* updated change log

* updated __init__.py

* removing print

Author: vminfant

CHANGELOG.md

@@ -190,3 +190,9 @@ Changes are grouped as follows
 ### Fixed
 - Dependency updates for source code.
 - Included vendor directory as package to be included in the final distribution.
+
+## [0.3.7] - 2024-09-04
+
+### Fixed
+- Dependency updates for source code.
+- Updated to use directory names from file metadata.

cognite/cdffs/__init__.py

@@ -4,7 +4,7 @@
 
 from .spec import CdfFileSystem
 
-__version__ = "0.3.6"
+__version__ = "0.3.7"
 __all__ = ["CdfFileSystem"]
 
 fsspec.register_implementation(CdfFileSystem.protocol, CdfFileSystem)

cognite/cdffs/spec.py

@@ -1,4 +1,5 @@
 """File System Specification for CDF Files."""
+
 import logging
 import time
 from concurrent.futures import ThreadPoolExecutor
@@ -147,22 +148,26 @@ def _suffix_exists(self, path: str) -> List:
         """
         return [file_part for file_part in path.split("/") if Path(file_part).suffix]
 
-    def split_path(self, path: str, validate_suffix: bool = True) -> Tuple[str, str, str]:
+    def split_path(self, path: str, validate_suffix: bool = True, directory_prefix: str = "") -> Tuple[str, str, str]:
         """Split the path and extract root_dir, external_id and a filename.
 
         Args:
             path (str): Path to split.
             validate_suffix (bool): Flag to validate if the file name must have a valid suffix.
+            directory_prefix(str): Directory prefix.
 
         Returns:
             Tuple: Returns a tuple with root_dir, external_id_prefix and external_id.
 
         Raises:
             ValueError: When an invalid input path is given.
         """
-        if self.file_metadata.directory:
-            root_dir = self.file_metadata.directory.strip("/")
-            external_id = path.replace(root_dir, "").lstrip("/")
+        if directory_prefix or self.file_metadata.directory:
+            root_dir = directory_prefix.strip("/") if directory_prefix else self.file_metadata.directory.strip("/")
+            if root_dir in path:
+                external_id = path.replace(root_dir, "").lstrip("/")
+            else:
+                external_id = path.split("/")[-1]
             external_id_prefix = Path(external_id).parts[0]
 
         elif self._suffix_exists(path):
@@ -505,7 +510,12 @@ def open(
         Returns:
             CdfFile: An instance of a 'CdfFile' to allow reading/writing file to Cdf.
         """
-        root_dir, _, external_id = self.split_path(path)
+        if isinstance(kwargs.get("file_metadata"), FileMetadata):
+            file_metadata: FileMetadata = kwargs.get("file_metadata")
+            root_dir, _, external_id = self.split_path(path, directory_prefix=file_metadata.directory)
+        else:
+            root_dir, _, external_id = self.split_path(path)
+
         return CdfFile(
             self,
             self.cognite_client,