Fix refactoring errors with remote storage + SDK roll for platform-se…

…rvice (#870) * Roll to latest SDK * Commit pdm.lock changes --------- Co-authored-by: gaya3-zipstack <[email protected]>
Zipstack · Dec 4, 2024 · 1a7c794 · 1a7c794
1 parent 7b6b64b
commit 1a7c794
Show file tree

Hide file tree

Showing 9 changed files with 196 additions and 181 deletions.
diff --git a/backend/pdm.lock b/backend/pdm.lock
diff --git a/backend/pyproject.toml b/backend/pyproject.toml
@@ -48,6 +48,7 @@ dependencies = [
     "unstract-tool-registry @ file:///${PROJECT_ROOT}/../unstract/tool-registry",
     "unstract-tool-sandbox @ file:///${PROJECT_ROOT}/../unstract/tool-sandbox",
     "unstract-workflow-execution @ file:///${PROJECT_ROOT}/../unstract/workflow-execution",
+    "unstract-filesystem @ file:///${PROJECT_ROOT}/../unstract/filesystem",
     "azure-identity==1.16.0",
     "azure-mgmt-apimanagement==3.0.0",
     "croniter>=3.0.3",

diff --git a/backend/utils/file_storage/helpers/common_file_helper.py b/backend/utils/file_storage/helpers/common_file_helper.py
@@ -1,9 +1,11 @@
 import json
 from typing import Any, Union
 
-from unstract.sdk.file_storage.fs_permanent import PermanentFileStorage
-from unstract.sdk.file_storage.fs_provider import FileStorageProvider
-from unstract.sdk.file_storage.fs_shared_temporary import SharedTemporaryFileStorage
+from unstract.sdk.file_storage import (
+    FileStorageProvider,
+    PermanentFileStorage,
+    SharedTemporaryFileStorage,
+)
 from utils.file_storage.constants import FileStorageKeys, FileStorageType
 
 from unstract.core.utilities import UnstractUtils

diff --git a/platform-service/pdm.lock b/platform-service/pdm.lock
diff --git a/platform-service/pyproject.toml b/platform-service/pyproject.toml
@@ -12,10 +12,10 @@ dependencies = [
     "python-dotenv~=1.0",
     "redis~=5.0.1",
     "cryptography>=41.0.7",
-    "unstract-flags @ file:///${PROJECT_ROOT}/../unstract/flags",
     "requests>=2.31.0",
-    "unstract-sdk==0.54.0rc2",
+    "unstract-sdk==0.54.0rc5",
     "gcsfs==2024.10.0",
+    "unstract-flags @ file:///${PROJECT_ROOT}/../unstract/flags",
 ]
 requires-python = ">=3.9,<3.11.1"
 readme = "README.md"

diff --git a/unstract/filesystem/src/unstract/filesystem/__init__.py b/unstract/filesystem/src/unstract/filesystem/__init__.py
@@ -2,7 +2,7 @@
 This module exposes the main classes for file storage handling.
 """
 
-from unstract.sdk.file_storage.fs_shared_temporary import SharedTemporaryFileStorage
+from unstract.sdk.file_storage.shared_temporary import SharedTemporaryFileStorage
 
 from .file_storage_types import FileStorageType
 from .filesystem import FileSystem

diff --git a/unstract/filesystem/src/unstract/filesystem/file_storage_config.py b/unstract/filesystem/src/unstract/filesystem/file_storage_config.py
@@ -2,8 +2,7 @@
 import logging
 import os
 
-from unstract.sdk.file_storage import FileStorageProvider
-from unstract.sdk.file_storage.fs_shared_temporary import SharedTemporaryFileStorage
+from unstract.sdk.file_storage import FileStorageProvider, SharedTemporaryFileStorage
 
 from .exceptions import ProviderNotFound
 from .file_storage_types import FileStorageType  # Import the shared enum

diff --git a/unstract/filesystem/src/unstract/filesystem/filesystem.py b/unstract/filesystem/src/unstract/filesystem/filesystem.py
@@ -2,9 +2,11 @@
 import os
 from typing import Any
 
-from unstract.sdk.file_storage import FileStorageProvider
-from unstract.sdk.file_storage.fs_impl import FileStorage
-from unstract.sdk.file_storage.fs_permanent import PermanentFileStorage
+from unstract.sdk.file_storage import (
+    FileStorage,
+    FileStorageProvider,
+    PermanentFileStorage,
+)
 
 from unstract.filesystem.file_storage_types import FileStorageType
 

diff --git a/unstract/workflow-execution/pyproject.toml b/unstract/workflow-execution/pyproject.toml
@@ -23,7 +23,8 @@ dependencies = [
     "unstract-core",
     "unstract-tool-registry",
     "unstract-tool-sandbox",
-    "unstract-flags"
+    "unstract-flags",
+    "unstract-filesystem"
 ]
 requires-python = ">=3.9"
 readme = "README.md"