fix: fsspec is not installed (#432)

Corrects an import issue when fsspec and obstore are both missing.

Author: cofin

advanced_alchemy/extensions/litestar/plugins/init/plugin.py

@@ -15,13 +15,23 @@
 from advanced_alchemy.filters import (
     BeforeAfter,
     CollectionFilter,
+    ComparisonFilter,
+    ExistsFilter,
+    FilterGroup,
+    FilterMap,
     FilterTypes,
+    InAnyFilter,
     LimitOffset,
+    LogicalOperatorMap,
+    MultiFilter,
+    NotExistsFilter,
     NotInCollectionFilter,
     NotInSearchFilter,
     OnBeforeAfter,
     OrderBy,
     SearchFilter,
+    StatementFilter,
+    StatementTypeT,
 )
 from advanced_alchemy.service import ModelDictListT, ModelDictT, ModelDTOT, ModelOrRowMappingT, ModelT, OffsetPagination
 
@@ -45,6 +55,7 @@
     "NotInSearchFilter": NotInSearchFilter,
     "FilterTypes": FilterTypes,
     "OffsetPagination": OffsetPagination,
+    "ExistsFilter": ExistsFilter,
     "Parameter": Parameter,
     "Dependency": Dependency,
     "DTOData": DTOData,
@@ -58,6 +69,15 @@
     "scoped_session": scoped_session,
     "AsyncSession": AsyncSession,
     "async_scoped_session": async_scoped_session,
+    "FilterGroup": FilterGroup,
+    "NotExistsFilter": NotExistsFilter,
+    "MultiFilter": MultiFilter,
+    "ComparisonFilter": ComparisonFilter,
+    "StatementTypeT": StatementTypeT,
+    "StatementFilter": StatementFilter,
+    "LogicalOperatorMap": LogicalOperatorMap,
+    "InAnyFilter": InAnyFilter,
+    "FilterMap": FilterMap,
 }
 
 

advanced_alchemy/types/file_object/registry.py

@@ -1,5 +1,5 @@
 from importlib.util import find_spec
-from typing import TYPE_CHECKING, Any, Callable, Optional, Union, cast, overload
+from typing import TYPE_CHECKING, Any, Callable, Optional, Union, overload
 
 from advanced_alchemy._serialization import decode_json, encode_json
 from advanced_alchemy.exceptions import ImproperConfigurationError
@@ -29,10 +29,8 @@ def __init__(
         self._registry: dict[str, StorageBackend] = {}
         self.json_serializer = json_serializer
         self.json_deserializer = json_deserializer
-        self.default_backend = (
-            cast("type[StorageBackend]", import_string(default_backend))
-            if isinstance(default_backend, str)
-            else default_backend
+        self.default_backend: str = (
+            DEFAULT_BACKEND if isinstance(default_backend, str) else default_backend.__qualname__
         )
 
     def set_default_backend(self, default_backend: "Union[str, type[StorageBackend]]") -> None:
@@ -41,11 +39,7 @@ def set_default_backend(self, default_backend: "Union[str, type[StorageBackend]]
         Args:
             default_backend: The default storage backend
         """
-        self.default_backend = (
-            cast("type[StorageBackend]", import_string(default_backend))
-            if isinstance(default_backend, str)
-            else default_backend
-        )
+        self.default_backend = default_backend if isinstance(default_backend, str) else default_backend.__qualname__
 
     def is_registered(self, key: str) -> bool:
         """Check if a storage backend is registered in the registry.
@@ -97,7 +91,7 @@ def register_backend(self, value: "Union[StorageBackend, str]", key: "Optional[s
             if key is None:
                 msg = "key is required when registering a string value"
                 raise ImproperConfigurationError(msg)
-            self._registry[key] = self.default_backend(fs=value, key=key)
+            self._registry[key] = import_string(self.default_backend)(fs=value, key=key)
         else:
             if key is not None:
                 msg = "key is not allowed when registering a StorageBackend"

pyproject.toml

@@ -44,7 +44,7 @@ maintainers = [
 name = "advanced_alchemy"
 readme = "README.md"
 requires-python = ">=3.9"
-version = "1.1.0"
+version = "1.1.1"
 
 [project.urls]
 Changelog = "https://docs.advanced-alchemy.litestar.dev/latest/changelog"
@@ -162,7 +162,7 @@ test = [
 allow_dirty = true
 commit = false
 commit_args = "--no-verify"
-current_version = "1.1.0"
+current_version = "1.1.1"
 ignore_missing_files = false
 ignore_missing_version = false
 message = "chore(release): bump to v{new_version}"