Fixed Storage Blob stream

Author: sujata-m

.github/workflows/deploy_to_test.yml

@@ -20,8 +20,8 @@ jobs:
         with:
           python-version: '3.10'
 
-      - name: Install Requirements
-        run: pip install -r requirements.txt
+      - name: Installing git
+        run: pip install gitpython
 
       - name: Generating version file
         run: python freeze_version.py
@@ -32,9 +32,9 @@ jobs:
       - name: Building Package
         run: python setup.py bdist_wheel
 
-#      - name: Publish package
-#        uses: pypa/gh-action-pypi-publish@release/v1
-#        with:
-#          skip_existing: true
-#          password: ${{ secrets.PYPI_API_TOKEN }}
-#          repository_url: https://test.pypi.org/legacy/
+      - name: Publish package
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          skip_existing: true
+          password: ${{ secrets.PYPI_API_TOKEN }}
+          repository_url: https://test.pypi.org/legacy/

.github/workflows/publish_to_pypi.yml

@@ -41,8 +41,6 @@ jobs:
       - name: Compare local and remote version with dpkg
         run: dpkg --compare-versions ${{env.localVersion}} "gt" ${{env.remoteVersion}}
 
-      - name: Install Requirements
-        run: pip install -r requirements.txt
 
       - name: Setup python wheel
         run: pip install wheel

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change log
 
+### 0.0.5
+- Fixed Storage Blob stream
+
 ### 0.0.4
 - Fixed threading
 

freeze_version.py

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

requirements.txt

@@ -2,6 +2,19 @@ azure-common==1.1.28
 azure-core==1.26.1
 azure-servicebus==7.0.0
 azure-storage-blob==12.14.1
+certifi==2022.12.7
+cffi==1.15.1
+charset-normalizer==2.1.1
+cryptography==39.0.0
+idna==3.4
+isodate==0.6.1
+msrest==0.7.1
+oauthlib==3.2.2
+pycparser==2.21
 python-dotenv==0.21.0
 requests==2.28.1
-GitPython==3.1.29
+requests-oauthlib==1.3.1
+six==1.16.0
+typing_extensions==4.4.0
+uamqp==1.6.3
+urllib3==1.26.14

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

@@ -9,5 +9,5 @@ def get_container(self, name: str): pass
     def get_file(self, container_name: str, file_name: str): pass
 
     @abstractmethod
-    def get_file_from_url(self, full_url: str): pass
+    def get_file_from_url(self, container_name: str, full_url: str): pass
 

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

@@ -10,7 +10,7 @@ def __init__(self, name, mimetype, blob_client):
         self.blob_client = blob_client
 
     def get_stream(self):
-        return self.blob_client.download_blob(encoding='latin1').readall()
+        return self.blob_client.download_blob().readall()
 
     def get_body_text(self):
         return self.blob_client.download_blob().content_as_text()

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

@@ -1,4 +1,5 @@
 import logging
+import urllib.parse
 from azure.storage.blob import BlobServiceClient
 from ...abstract import storage_client
 from . import azure_storage_config, azure_file_entity, azure_storage_container
@@ -25,7 +26,15 @@ def get_file(self, container_name, file_name):
         client_container = self._blob_service_client.get_container_client(container_name)
         blob_client = client_container.get_blob_client(file_name)
         properties = blob_client.get_blob_properties()
-        return azure_file_entity.AzureFileEntity(file_name, properties.blob_type, blobClient=blob_client)
+        return azure_file_entity.AzureFileEntity(file_name, properties.blob_type, blob_client)
 
-    def get_file_from_url(self, full_url):
-        return super().getFileFromUrl(full_url)
+    def get_file_from_url(self, container_name, full_url):
+        path = '/'.join(urllib.parse.unquote(full_url).split('/')[4:])
+        file = azure_file_entity.AzureFileEntity
+        client_container = self._blob_service_client.get_container_client(container_name)
+        blob_client = azure_storage_container.AzureStorageContainer(container_name, client_container)
+        files = blob_client.list_files()
+        for file_info in files:
+            if file_info.file_path == path:
+                file = file_info
+        return file