Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix refactoring errors with remote storage + SDK roll for platform-service #870

Merged
merged 2 commits into from
Dec 4, 2024
Merged

Fix refactoring errors with remote storage + SDK roll for platform-service #870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efe74c8
Roll to latest SDK
gaya3-zipstack Dec 4, 2024
3ba42c2
Commit pdm.lock changes
gaya3-zipstack Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
178 changes: 94 additions & 84 deletions backend/pdm.lock
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions backend/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 5 additions & 3 deletions backend/utils/file_storage/helpers/common_file_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
170 changes: 85 additions & 85 deletions platform-service/pdm.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions platform-service/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion unstract/filesystem/src/unstract/filesystem/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions unstract/filesystem/src/unstract/filesystem/file_storage_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 5 additions & 3 deletions unstract/filesystem/src/unstract/filesystem/filesystem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion unstract/workflow-execution/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading