amsdal_server 0.3.0__tar.gz → 0.3.2__tar.gz

{amsdal_server-0.3.0 → amsdal_server-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: amsdal_server
-Version: 0.3.0
+Version: 0.3.2
 Summary: Rest API server for AMSDAL framework
 Project-URL: Documentation, https://pypi.org/project/amsdal_server/#readme
 Project-URL: Issues, https://pypi.org/project/amsdal_server/

{amsdal_server-0.3.0 → amsdal_server-0.3.2}/change-logs.md

@@ -1,3 +1,15 @@
+## [v0.3.2](https://pypi.org/project/amsdal_server/0.3.2/) - 2024-12-07
+
+
+### Added
+
+- Async support (async-support)
+## [v0.3.1](https://pypi.org/project/amsdal_server/0.3.1/) - 2024-12-02
+
+
+### Added
+
+- Added support for Inf values (inf-values)
 ## [v0.3.0](https://pypi.org/project/amsdal_server/0.3.0/) - 2024-11-28
 
 

amsdal_server-0.3.2/latest-changelogs.md

@@ -0,0 +1,6 @@
+## [v0.3.2](https://pypi.org/project/amsdal_server/0.3.2/) - 2024-12-07
+
+
+### Added
+
+- Async support (async-support)

{amsdal_server-0.3.0 → amsdal_server-0.3.2}/pyproject.toml

@@ -70,15 +70,17 @@ python = ["3.10", "3.11", "3.12"]
 path = "../.venv/amsdal_server"
 dependencies = [
     "coverage[toml]>=7.4",
-    "pytest==8.1.1",
-    "pytest-mock==3.12.0",
-    "pytest-subtests==0.12.1",
+    "pytest==8.3.3",
+    "pytest-mock==3.14.0",
+    "pytest-subtests==0.13.1",
+    "pytest-asyncio>=0.24.0",
     "black>=24.3.0",
     "mypy>=1.9.0",
     "ruff>=0.3.3",
     "httpx==0.27.*",
     "types-openpyxl==3.*",
     "towncrier==23.11.0",
+    "aiosqlite>=0.20.0",
 ]
 
 [tool.hatch.envs.default.scripts]
@@ -114,18 +116,20 @@ template = "local"
 path = "../.venv/amsdal_server_local"
 dependencies = [
     "coverage[toml]>=7.4",
-    "pytest==8.1.1",
-    "pytest-mock==3.12.0",
-    "pytest-subtests==0.12.1",
+    "pytest==8.3.3",
+    "pytest-mock==3.14.0",
+    "pytest-subtests==0.13.1",
+    "pytest-asyncio>=0.24.0",
     "black>=24.3.0",
     "mypy>=1.9.0",
     "ruff>=0.3.3",
     "httpx==0.27.*",
     "types-openpyxl==3.*",
+    "aiosqlite>=0.20.0",
 ]
 pre-install-commands = [
   "pip install -e ../amsdal-glue/libs/core/",
-  "pip install -e ../amsdal-glue/libs/connections/[postgres-binary]",
+  "pip install -e ../amsdal-glue/libs/connections/[postgres-binary,async-sqlite]",
   "pip install -e ../amsdal-glue/libs/amsdal-glue/",
   "pip install -e ../amsdal_utils/",
   "pip install -e ../amsdal_data/",

{amsdal_server-0.3.0 → amsdal_server-0.3.2}/src/amsdal_server/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2023-present
 #
 # SPDX-License-Identifier: AMSDAL End User License Agreement
-__version__ = '0.3.0'
+__version__ = '0.3.2'

{amsdal_server-0.3.0 → amsdal_server-0.3.2}/src/amsdal_server/apps/classes/controllers/class_detail.py

@@ -16,7 +16,7 @@ CLASS_DETAIL_CACHE = {}
 
 
 async def _cache_class_details(request: Request, class_name: str) -> tuple[dict[str, Any], str]:
-    _data = ClassesApi.get_class_by_name(request.user, class_name).model_dump()
+    _data = (await ClassesApi.get_class_by_name(request.user, class_name)).model_dump()
 
     content_bytes = json.dumps(_data, default=str).encode('utf-8')
 

{amsdal_server-0.3.0 → amsdal_server-0.3.2}/src/amsdal_server/apps/classes/controllers/class_list.py

@@ -18,7 +18,7 @@ CLASS_LIST_CACHE = {}
 
 
 async def _cache_class_list(request: Request) -> tuple[dict[str, Any], str]:
-    class_items = ClassesApi.get_classes(request.user)
+    class_items = await ClassesApi.get_classes(request.user)
     _data = ObjectsResponse(
         columns=[
             ColumnInfo(

{amsdal_server-0.3.0 → amsdal_server-0.3.2}/src/amsdal_server/apps/classes/mixins/model_class_info.py

@@ -23,6 +23,18 @@ class ModelClassMixin:
 
         return cls.get_model_class(class_item)
 
+    @classmethod
+    async def async_get_model_class_by_name(cls, class_name: str) -> type[Model]:
+        class_item: Model | None = (
+            await cls.get_class_objects_qs().latest().filter(_address__object_id=class_name).first().aexecute()
+        )
+
+        if not class_item:
+            msg = f'Class not found: {class_name}'
+            raise ClassNotFoundError(class_name, msg)
+
+        return cls.get_model_class(class_item)
+
     @classmethod
     def get_model_class(cls, class_item: Model) -> type[Model]:
         class_manager = ClassManager()

{amsdal_server-0.3.0 → amsdal_server-0.3.2}/src/amsdal_server/apps/classes/services/classes_api.py

@@ -14,6 +14,7 @@ from amsdal_models.classes.utils import resolve_base_class_for_schema
 from amsdal_models.classes.writer import ClassWriter
 from amsdal_models.querysets.executor import LAKEHOUSE_DB_ALIAS
 from amsdal_models.schemas.manager import BuildSchemasManager
+from amsdal_utils.config.manager import AmsdalConfigManager
 from amsdal_utils.models.data_models.enums import MetaClasses
 from amsdal_utils.models.data_models.schema import ObjectSchema
 from amsdal_utils.models.data_models.schema import PropertyData
@@ -34,7 +35,32 @@ from amsdal_server.apps.objects.mixins.object_data_mixin import ObjectDataMixin
 
 class ClassesApi(PermissionsMixin, ModelClassMixin, ColumnInfoMixin, ObjectDataMixin):
     @classmethod
-    def get_classes(cls, user: BaseUser) -> list[ClassInfo]:
+    async def get_classes(cls, user: BaseUser) -> list[ClassInfo]:
+        if AmsdalConfigManager().get_config().async_mode:
+            return await cls._aget_classes(user)
+
+        return await cls._get_classes(user)
+
+    @classmethod
+    async def _aget_classes(cls, user: BaseUser) -> list[ClassInfo]:
+        classes: list[Model] = await cls.get_class_objects_qs().aexecute()
+        class_metas: dict[str, Model] = {
+            _item.object_id: _item for _item in await cls.get_class_object_metas_qs(classes).aexecute()
+        }
+        result: list[ClassInfo] = []
+
+        for class_item in classes:
+            if class_item.object_id not in class_metas:
+                # some core class, skip it
+                continue
+
+            class_meta_item = class_metas[class_item.object_id]  # type: ignore[index]
+            result.append(await cls.get_class(user, class_item, class_meta_item))
+
+        return result
+
+    @classmethod
+    async def _get_classes(cls, user: BaseUser) -> list[ClassInfo]:
         classes: list[Model] = cls.get_class_objects_qs().execute()
         class_metas: dict[str, Model] = {
             _item.object_id: _item for _item in cls.get_class_object_metas_qs(classes).execute()
@@ -47,28 +73,79 @@ class ClassesApi(PermissionsMixin, ModelClassMixin, ColumnInfoMixin, ObjectDataM
                 continue
 
             class_meta_item = class_metas[class_item.object_id]  # type: ignore[index]
-            result.append(cls.get_class(user, class_item, class_meta_item))
+            result.append(await cls.get_class(user, class_item, class_meta_item))
 
         return result
 
     @classmethod
-    def get_class_by_name(
+    async def get_class_by_name(
         cls,
         user: BaseUser,
         class_name: str,
     ) -> ClassInfo:
-        class_item: Model | None = cls.get_class_objects_qs().filter(_address__object_id=class_name).first().execute()
+
+        class_item: Model | None
+        if AmsdalConfigManager().get_config().async_mode:
+            class_item = await cls.get_class_objects_qs().filter(_address__object_id=class_name).first().aexecute()
+        else:
+            class_item = cls.get_class_objects_qs().filter(_address__object_id=class_name).first().execute()
 
         if not class_item:
             msg = f'Class not found: {class_name}'
             raise ClassNotFoundError(class_name, msg)
 
-        class_meta_item: Model = cls.get_class_object_metas_qs().get(_address__object_id=class_item.object_id).execute()
+        class_meta_item: Model
+        if AmsdalConfigManager().get_config().async_mode:
+            class_meta_item = (
+                await cls.get_class_object_metas_qs().get(_address__object_id=class_item.object_id).aexecute()
+            )
+        else:
+            class_meta_item = cls.get_class_object_metas_qs().get(_address__object_id=class_item.object_id).execute()
+
+        return await cls.get_class(user, class_item, class_meta_item)
+
+    @classmethod
+    async def get_class(
+        cls,
+        user: BaseUser,
+        class_item: Model,
+        class_meta_item: Model,
+    ) -> ClassInfo:
+        if AmsdalConfigManager().get_config().async_mode:
+            return await cls._aget_class(user, class_item, class_meta_item)
+
+        return await cls._get_class(user, class_item, class_meta_item)
+
+    @classmethod
+    async def _aget_class(
+        cls,
+        user: BaseUser,
+        class_item: Model,
+        class_meta_item: Model,
+    ) -> ClassInfo:
+        model_class = cls.get_model_class(class_item)
 
-        return cls.get_class(user, class_item, class_meta_item)
+        try:
+            permissions_info = await cls.async_get_permissions_info(model_class, user)
+            has_read_permission = permissions_info.has_read_permission
+        except AmsdalPermissionError:
+            has_read_permission = False
+
+        class_properties = cls.get_class_properties_by_class_and_meta(class_item, class_meta_item)
+        data: dict[str, Any] = {
+            'class': class_item.object_id,
+            'count': 0,
+            'properties': class_properties,
+        }
+        class_info = ClassInfo(**data)
+
+        if has_read_permission:
+            class_info.count = await model_class.objects.latest().filter(_metadata__is_deleted=False).count().aexecute()
+
+        return class_info
 
     @classmethod
-    def get_class(
+    async def _get_class(
         cls,
         user: BaseUser,
         class_item: Model,

{amsdal_server-0.3.0 → amsdal_server-0.3.2}/src/amsdal_server/apps/common/authentication.py

@@ -1,5 +1,6 @@
 from typing import Any
 
+from amsdal_utils.config.manager import AmsdalConfigManager
 from starlette.authentication import AuthCredentials
 from starlette.authentication import AuthenticationBackend
 from starlette.authentication import BaseUser
@@ -59,11 +60,18 @@ class AmsdalAuthenticationBackend(AuthenticationBackend):
         if settings.AUTHORIZATION_HEADER in conn.headers:
             auth = conn.headers[settings.AUTHORIZATION_HEADER]
 
-            LifecycleProducer.publish(
-                LifecycleEvent.ON_AUTHENTICATE,
-                auth_header=auth,
-                authentication_info=authentication_info,
-            )
+            if AmsdalConfigManager().get_config().async_mode:
+                await LifecycleProducer.publish_async(
+                    LifecycleEvent.ON_AUTHENTICATE,
+                    auth_header=auth,
+                    authentication_info=authentication_info,
+                )
+            else:
+                LifecycleProducer.publish(
+                    LifecycleEvent.ON_AUTHENTICATE,
+                    auth_header=auth,
+                    authentication_info=authentication_info,
+                )
             conn.scope['user'] = authentication_info.user
 
         return authentication_info.credentials, authentication_info.user

{amsdal_server-0.3.0 → amsdal_server-0.3.2}/src/amsdal_server/apps/common/middlewares/response_event.py

@@ -3,6 +3,7 @@ import logging
 from collections.abc import AsyncGenerator
 
 from amsdal.contrib.frontend_configs.constants import ON_RESPONSE_EVENT
+from amsdal_utils.config.manager import AmsdalConfigManager
 from amsdal_utils.lifecycle.producer import LifecycleProducer
 from starlette.middleware.base import BaseHTTPMiddleware
 from starlette.middleware.base import RequestResponseEndpoint
@@ -37,11 +38,19 @@ class ResponseEventMiddleware(BaseHTTPMiddleware):
             if data:
                 response_dict = json.loads(data)
 
-                LifecycleProducer.publish(
-                    ON_RESPONSE_EVENT,  # type: ignore[arg-type]
-                    request=request,
-                    response=response_dict,
-                )
+                if AmsdalConfigManager().get_config().async_mode:
+                    await LifecycleProducer.publish_async(
+                        ON_RESPONSE_EVENT,  # type: ignore[arg-type]
+                        request=request,
+                        response=response_dict,
+                    )
+                else:
+                    LifecycleProducer.publish(
+                        ON_RESPONSE_EVENT,  # type: ignore[arg-type]
+                        request=request,
+                        response=response_dict,
+                    )
+
                 _result = JSONResponse.render(
                     response,  # type: ignore[arg-type]
                     response_dict,

{amsdal_server-0.3.0 → amsdal_server-0.3.2}/src/amsdal_server/apps/common/mixins/permissions_mixin.py

@@ -37,3 +37,31 @@ class PermissionsMixin:
         )
 
         return permissions_info
+
+    @classmethod
+    async def async_get_permissions_info(
+        cls,
+        class_item: type[Model],
+        user: BaseUser,
+        access_types: list[AccessTypes] | None = None,
+        obj: Model | None = None,
+    ) -> PermissionsInfo:
+        permissions_info = PermissionsInfo()
+        _access_types = access_types or [AccessTypes.READ]
+
+        if getattr(user, 'permissions', None):
+            user.permissions = [  # type: ignore[attr-defined]
+                await ReferenceLoader(p).aload_reference() if isinstance(p, Reference) else p
+                for p in user.permissions  # type: ignore[attr-defined]
+            ]
+
+        await LifecycleProducer.publish_async(
+            LifecycleEvent.ON_PERMISSION_CHECK,
+            object_class=class_item,
+            user=user,
+            access_types=_access_types,
+            permissions_info=permissions_info,
+            obj=obj,
+        )
+
+        return permissions_info

amsdal_server-0.3.2/src/amsdal_server/apps/common/response.py

@@ -0,0 +1,97 @@
+import json
+from datetime import datetime
+from json import JSONEncoder
+from json.encoder import _make_iterencode  # type: ignore[attr-defined]
+from json.encoder import encode_basestring
+from json.encoder import encode_basestring_ascii
+from typing import Any
+
+from starlette.responses import JSONResponse
+
+try:
+    from _json import make_encoder as c_make_encoder
+except ImportError:
+    c_make_encoder = None  # type: ignore[misc, assignment]
+
+INFINITY = float('inf')
+
+
+class CustomJSONEncoder(JSONEncoder):
+    def iterencode(self, o: Any, _one_shot: bool = False) -> Any:  # noqa: FBT001, FBT002
+        """Encode the given object and yield each string
+        representation as available.
+
+        For example::
+
+            for chunk in JSONEncoder().iterencode(bigobject):
+                mysocket.write(chunk)
+
+        """
+
+        markers: dict[Any, Any] | None = {} if self.check_circular else None
+
+        if self.ensure_ascii:
+            _encoder = encode_basestring_ascii
+        else:
+            _encoder = encode_basestring
+
+        def floatstr(  # type: ignore[no-untyped-def]
+            o,
+            allow_nan=self.allow_nan,
+            _repr=float.__repr__,
+            _inf=INFINITY,
+            _neginf=-INFINITY,
+        ):
+            # Check for specials.  Note that this type of test is processor
+            # and/or platform-specific, so do tests which don't depend on the
+            # internals.
+
+            if o != o:  # noqa: PLR0124
+                text = 'NaN'
+            elif o == _inf:
+                # TODO: our custom implementation
+                return '"Infinity"'
+            elif o == _neginf:
+                # TODO: our custom implementation
+                return '"-Infinity"'
+            else:
+                return _repr(o)
+
+            if not allow_nan:
+                raise ValueError('Out of range float values are not JSON compliant: ' + repr(o))
+
+            return text
+
+        # TODO: due to the way we handle Infinity, we cannot use c_make_iterencode
+        _iterencode = _make_iterencode(
+            markers,
+            self.default,
+            _encoder,
+            self.indent,
+            floatstr,
+            self.key_separator,
+            self.item_separator,
+            self.sort_keys,
+            self.skipkeys,
+            _one_shot,
+        )
+        return _iterencode(o, 0)
+
+
+def default_json_encoder(obj: Any) -> Any:
+    if isinstance(obj, datetime):
+        return obj.isoformat()
+    return str(obj)
+
+
+class AmsdalJSONResponse(JSONResponse):
+    def render(self, content: Any) -> bytes:
+        return json.dumps(
+            content,
+            ensure_ascii=False,
+            allow_nan=False,
+            indent=None,
+            separators=(',', ':'),
+            default=default_json_encoder,
+            cls=CustomJSONEncoder,
+        ).encode('utf-8')

{amsdal_server-0.3.0 → amsdal_server-0.3.2}/src/amsdal_server/apps/common/utils.py

@@ -8,6 +8,7 @@ from amsdal_models.classes.data_models.dependencies import DependencyModelNames
 from amsdal_models.classes.errors import AmsdalClassNotFoundError
 from amsdal_models.classes.helpers.reference_loader import ReferenceLoader
 from amsdal_models.classes.manager import ClassManager
+from amsdal_models.classes.model import Model
 from amsdal_models.classes.utils import resolve_base_class_for_schema
 from amsdal_models.classes.writer import ClassWriter
 from amsdal_models.querysets.executor import LAKEHOUSE_DB_ALIAS
@@ -37,12 +38,8 @@ def build_missing_models() -> list[str]:
         )
 
         model = None
-        for _schema_type in [SchemaTypes.USER, SchemaTypes.CONTRIB, SchemaTypes.CORE]:
-            with contextlib.suppress(AmsdalClassNotFoundError):
-                model = ClassManager().import_model_class(object_meta.title, _schema_type)
-
-            if model:
-                break
+        with contextlib.suppress(AmsdalClassNotFoundError):
+            model = import_class_model(object_meta.title)
 
         if not model:
             missed_models.append(object_meta.title)
@@ -85,3 +82,13 @@ def get_subclasses(class_item: type[ModelBase] | None) -> Iterator[type[ModelBas
                 subclass_name,
                 schema_type,
             )
+
+
+def import_class_model(class_name: str) -> type[Model]:
+    class_manager = ClassManager()
+
+    for _schema_type in [SchemaTypes.USER, SchemaTypes.CONTRIB]:
+        with contextlib.suppress(AmsdalClassNotFoundError):
+            return class_manager.import_model_class(class_name, _schema_type)
+
+    return class_manager.import_model_class(class_name, SchemaTypes.CORE)

{amsdal_server-0.3.0 → amsdal_server-0.3.2}/src/amsdal_server/apps/healthcheck/services/checkers/connections.py

@@ -1,4 +1,6 @@
+from amsdal_data.application import AsyncDataApplication
 from amsdal_data.application import DataApplication
+from amsdal_utils.config.manager import AmsdalConfigManager
 
 from amsdal_server.apps.healthcheck.enums import StatusEnum
 from amsdal_server.apps.healthcheck.serializers.healthcheck_result import HealthcheckServiceResult
@@ -7,9 +9,13 @@ from amsdal_server.apps.healthcheck.services.checkers.base import BaseHealthchec
 
 class ConnectionsHealthchecker(BaseHealthchecker):
     async def check(self) -> HealthcheckServiceResult:
-        data_app = DataApplication()
+        if AmsdalConfigManager().get_config().async_mode:
+            connections_statuses = await AsyncDataApplication().connections_statuses
 
-        for connection in data_app.connections_statuses:
+        else:
+            connections_statuses = DataApplication().connections_statuses
+
+        for connection in connections_statuses:
             if not connection.is_connected:
                 return HealthcheckServiceResult(
                     status=StatusEnum.error,

{amsdal_server-0.3.0 → amsdal_server-0.3.2}/src/amsdal_server/apps/objects/controllers/bulk_operations.py

@@ -18,7 +18,7 @@ async def object_bulk_create(
     load_references: bool = False,
     data: list[dict[str, Any]] = Body(...),
 ) -> list[dict[str, Any]]:
-    return ObjectApi.bulk_create_objects(
+    return await ObjectApi.bulk_create_objects(
         request.user,
         base_url=str(request.base_url),
         class_name=class_name,
@@ -35,7 +35,7 @@ async def object_bulk_update(
     data: list[BulkUpdateBody] = Body(...),
     load_references: bool = False,
 ) -> Any:
-    return ObjectApi.bulk_update_objects(  # type: ignore[call-arg]
+    return await ObjectApi.bulk_update_objects(
         request.user,
         base_url=str(request.base_url),
         data=data,
@@ -50,7 +50,7 @@ async def object_bulk_partial_update(
     data: list[BulkUpdateBody] = Body(...),
     load_references: bool = False,
 ) -> Any:
-    return ObjectApi.bulk_partial_update_objects(  # type: ignore[call-arg]
+    return await ObjectApi.bulk_partial_update_objects(
         request.user,
         base_url=str(request.base_url),
         data=data,
@@ -64,4 +64,4 @@ async def object_bulk_delete(
     *,
     data: list[BulkAddressBody] = Body(...),
 ) -> None:
-    ObjectApi.bulk_delete_objects(request.user, data=data)  # type: ignore[call-arg]
+    await ObjectApi.bulk_delete_objects(request.user, data=data)

{amsdal_server-0.3.0 → amsdal_server-0.3.2}/src/amsdal_server/apps/objects/controllers/file_download.py

@@ -18,14 +18,14 @@ from amsdal_server.apps.objects.services.file_object import ObjectFileApi
 logger = logging.getLogger(__name__)
 
 
-def _download_file(
+async def _download_file(
     object_id: str,
     request: Request,
     version_id: str = '',
     width: int | None = None,
     height: int | None = None,
 ) -> Response:
-    file_obj = ObjectFileApi.get_file(
+    file_obj = await ObjectFileApi.get_file(
         request.user,
         object_id,
         version_id or Versions.LATEST,
@@ -84,7 +84,7 @@ async def file_download(
     width: Optional[int] = Query(None),  # noqa: UP007
     height: Optional[int] = Query(None),  # noqa: UP007
 ) -> Response:
-    return _download_file(object_id, request, version_id, width, height)
+    return await _download_file(object_id, request, version_id, width, height)
 
 
 @router.get('/api/objects/download-file/')
@@ -95,4 +95,4 @@ async def download_file(
     width: Optional[int] = Query(None),  # noqa: UP007
     height: Optional[int] = Query(None),  # noqa: UP007
 ) -> Response:
-    return _download_file(unquote(object_id), request, version_id, width, height)
+    return await _download_file(unquote(object_id), request, version_id, width, height)

{amsdal_server-0.3.0 → amsdal_server-0.3.2}/src/amsdal_server/apps/objects/controllers/object_create.py

@@ -16,7 +16,7 @@ async def object_create(
     load_references: bool = False,
     data: dict[str, Any] = Body(...),
 ) -> dict[str, Any]:
-    return ObjectApi.create_object(
+    return await ObjectApi.create_object(
         request.user,
         base_url=str(request.base_url),
         class_name=class_name,

{amsdal_server-0.3.0 → amsdal_server-0.3.2}/src/amsdal_server/apps/objects/controllers/object_detail.py

@@ -27,15 +27,17 @@ async def _cache_object_detail(
 ) -> tuple[dict[str, Any], str]:
     _select_related = select_related.split(',') if select_related else None
 
-    _data = ObjectVersionsApi.get_object_versions(
-        request.user,
-        base_url=str(request.base_url),
-        address=urllib.parse.unquote(address),
-        version_id=version_id,
-        all_versions=all_versions,
-        include_metadata=include_metadata,
-        file_optimized=file_optimized,
-        select_related=_select_related,
+    _data = (
+        await ObjectVersionsApi.get_object_versions(
+            request.user,
+            base_url=str(request.base_url),
+            address=urllib.parse.unquote(address),
+            version_id=version_id,
+            all_versions=all_versions,
+            include_metadata=include_metadata,
+            file_optimized=file_optimized,
+            select_related=_select_related,
+        )
     ).model_dump()
 
     content_bytes = json.dumps(_data, default=str).encode('utf-8')

{amsdal_server-0.3.0 → amsdal_server-0.3.2}/src/amsdal_server/apps/objects/controllers/object_list.py

@@ -38,21 +38,23 @@ async def _cache_object_list(
 ) -> tuple[dict[str, Any], str]:
     _select_related = select_related.split(',') if select_related else None
 
-    _data = ObjectListApi.fetch_objects(
-        request.user,
-        base_url=str(request.base_url),
-        class_name=class_name,
-        filters=filters,
-        fields_restrictions=fields_restrictions,
-        include_metadata=include_metadata,
-        include_subclasses=include_subclasses,
-        load_references=load_references,
-        all_versions=all_versions,
-        file_optimized=file_optimized,
-        page=page,
-        page_size=page_size,
-        ordering=ordering,
-        select_related=_select_related,
+    _data = (
+        await ObjectListApi.fetch_objects(
+            request.user,
+            base_url=str(request.base_url),
+            class_name=class_name,
+            filters=filters,
+            fields_restrictions=fields_restrictions,
+            include_metadata=include_metadata,
+            include_subclasses=include_subclasses,
+            load_references=load_references,
+            all_versions=all_versions,
+            file_optimized=file_optimized,
+            page=page,
+            page_size=page_size,
+            ordering=ordering,
+            select_related=_select_related,
+        )
     ).model_dump()
 
     content_bytes = json.dumps(_data, default=str).encode('utf-8')