Merge pull request #33 from TaskarCenterAtUW/feature-clone-delete

Added methods

Author: susrisha

freeze_version.py

@@ -11,7 +11,7 @@
 
 build_date = date.today().strftime('%Y-%m-%d')
 
-version = '0.0.19'
+version = '0.0.20'
 
 with open(version_file_path, 'w+') as version_file:
     version_file.write("version = '{}'\n".format(version))

src/python_ms_core/core/storage/abstract/file_entity.py

@@ -26,3 +26,7 @@ def upload(self, upload_stream):
     @abstractmethod
     def get_remote_url(self):
         pass
+    
+    @abstractmethod
+    def delete_file(self):
+        pass

src/python_ms_core/core/storage/abstract/storage_client.py

@@ -56,16 +56,6 @@ def get_sas_url(self, container_name: str, file_path: str, expiry_hours: int) ->
             The SAS URL as a string.
         """
         pass
-# class StorageClient(ABC):
-#     #
-#     @abstractmethod
-#     def get_container(self, name: str): pass
-
-#     @abstractmethod
-#     def get_file(self, container_name: str, file_name: str): pass
-
-#     @abstractmethod
-#     def get_file_from_url(self, container_name: str, full_url: str): pass
-
-#     @abstractmethod
-#     def get_sas_url(self, container_name:str,file_path: str, expiry_hours:int) -> str: pass
+    @abstractmethod
+    def clone_file(self, file_url:str, destination_container_name:str, destination_file_path:str):
+        pass

src/python_ms_core/core/storage/providers/azure/azure_file_entity.py

@@ -27,3 +27,7 @@ def upload(self, upload_stream):
     @ExceptionHandler.decorated
     def get_remote_url(self):
         return self._get_remote_url
+    
+    @ExceptionHandler.decorated
+    def delete_file(self):
+        self.blob_client.delete_blob()

src/python_ms_core/core/storage/providers/azure/azure_storage_client.py

@@ -97,3 +97,35 @@ def get_sas_url(self, container_name: str, file_path: str,  expiry_hours:int = 1
             )
             sas_url = f"https://{self._blob_service_client.account_name}.blob.core.windows.net/{container_name}/{file_path}?{sas_token}"
             return sas_url
+    
+    def get_container_info(self, file_url:str):
+        """
+        Retrieves the container name and file path from a file URL.
+
+        Args:
+            file_url (str): The URL of the file.
+
+        Returns:
+            tuple: A tuple containing the container name and file path.
+        """
+        container_name = file_url.split('/')[3]
+        file_path = '/'.join(file_url.split('/')[4:])
+        return container_name, file_path
+    
+
+    def clone_file(self, file_url:str, destination_container_name:str, destination_file_path:str):
+        """
+        Clones a file from one container to another.
+
+        Args:
+            file_url (str): The URL of the file to clone.
+            destination_container_name (str): The name of the destination container.
+            destination_file_path (str): The path of the destination file.
+        """
+        source_container_name, source_file_path = self.get_container_info(file_url)
+        source_container = self._blob_service_client.get_container_client(source_container_name)
+        source_blob = source_container.get_blob_client(source_file_path)
+        destination_container = self._blob_service_client.get_container_client(destination_container_name)
+        destination_blob = destination_container.get_blob_client(destination_file_path)
+        destination_blob.start_copy_from_url(source_blob.url)
+        return destination_blob

src/python_ms_core/core/storage/providers/local/local_file_entity.py

@@ -34,3 +34,8 @@ def upload(self, upload_stream):
     @ExceptionHandler.decorated
     def get_remote_url(self):
         return self._get_remote_url
+
+    @ExceptionHandler.decorated
+    def delete_file(self):
+        delete_relative_path = f'{self.config.connection_string}{self.download_path}{self.path}'
+        pass

src/python_ms_core/core/storage/providers/local/local_storage_client.py

@@ -36,4 +36,11 @@ def get_file_from_url(self, container_name: str, full_url: str):
 
     @ExceptionHandler.decorated
     def get_sas_url(self, container_name: str, file_path: str, expiry_hours: int) -> str:
-        return self.get_file_from_url(container_name, file_path).get_remote_url()
+        return self.get_file_from_url(container_name, file_path).get_remote_url()
+
+    @ExceptionHandler.decorated
+    def clone_file(self, file_url: str, destination_container_name: str, destination_file_path: str):
+        file = self.get_file_from_url('', file_url)
+        file.name = destination_file_path
+        file.upload(file.get_stream())
+        return file

tests/unit_tests/test_storage/abstract/test_file_entity.py

@@ -21,6 +21,9 @@ def upload(self, upload_stream):
     def get_remote_url(self):
         # Mock implementation for getting the remote URL
         return 'http://example.com/file.txt'
+    def delete_file(self):
+        # Mock implementation for deleting the file
+        pass
 
 
 class TestFileEntity(unittest.TestCase):