oarepo-runtime 1.5.28__py3-none-any.whl → 1.5.30__py3-none-any.whl

oarepo_runtime/resources/localized_ui_json_serializer.py

@@ -27,13 +27,15 @@ class LocalizedUIJSONSerializer(MarshmallowSerializer):
         self.object_schema_cls = object_schema_cls
         self.list_schema_cls = list_schema_cls
 
-    def dump_obj(self, obj):
+    def dump_obj(self, obj, *args, **kwargs):
         """Dump the object using object schema class."""
-        return self.object_schema_cls(
-            context={**self.schema_context, "locale": get_locale()}
-        ).dump(obj)
+        ctx = {**self.schema_context, "locale": get_locale()}
+        if "extra_context" in kwargs:
+            ctx |= kwargs["extra_context"]
 
-    def dump_list(self, obj_list):
+        return self.object_schema_cls(context=ctx).dump(obj)
+
+    def dump_list(self, obj_list, *args, **kwargs):
         """Dump the list of objects."""
         ctx = {
             "object_schema_cls": self.object_schema_cls,
@@ -41,6 +43,9 @@ class LocalizedUIJSONSerializer(MarshmallowSerializer):
         ctx.update(self.schema_context)
         ctx["locale"] = get_locale()
 
+        if "extra_context" in kwargs:
+            ctx |= kwargs["extra_context"]
+
         if self.list_schema_cls is None:
             return self.object_schema_cls(context=self.schema_context).dump(
                 obj_list, many=True

oarepo_runtime/services/schema/oneofschema.py

@@ -0,0 +1,192 @@
+import typing
+
+from marshmallow import Schema, ValidationError
+
+
+class OneOfSchema(Schema):
+    """
+    This is a special kind of schema that actually multiplexes other schemas
+    based on object type. When serializing values, it uses get_obj_type() method
+    to get object type name. Then it uses `type_schemas` name-to-Schema mapping
+    to get schema for that particular object type, serializes object using that
+    schema and adds an extra "type" field with name of object type.
+    Deserialization is reverse.
+
+    Example:
+
+        class Foo(object):
+            def __init__(self, foo):
+                self.foo = foo
+
+        class Bar(object):
+            def __init__(self, bar):
+                self.bar = bar
+
+        class FooSchema(marshmallow.Schema):
+            foo = marshmallow.fields.String(required=True)
+
+            @marshmallow.post_load
+            def make_foo(self, data, **kwargs):
+                return Foo(**data)
+
+        class BarSchema(marshmallow.Schema):
+            bar = marshmallow.fields.Integer(required=True)
+
+            @marshmallow.post_load
+            def make_bar(self, data, **kwargs):
+                return Bar(**data)
+
+        class MyUberSchema(marshmallow.OneOfSchema):
+            type_schemas = {
+                'foo': FooSchema,
+                'bar': BarSchema,
+            }
+
+            def get_obj_type(self, obj):
+                if isinstance(obj, Foo):
+                    return 'foo'
+                elif isinstance(obj, Bar):
+                    return 'bar'
+                else:
+                    raise Exception('Unknown object type: %s' % repr(obj))
+
+        MyUberSchema().dump([Foo(foo='hello'), Bar(bar=123)], many=True)
+        # => [{'type': 'foo', 'foo': 'hello'}, {'type': 'bar', 'bar': 123}]
+
+    You can control type field name added to serialized object representation by
+    setting `type_field` class property.
+    """
+
+    type_field = "type"
+    type_field_remove = True
+    type_schemas: typing.Mapping[str, typing.Union[typing.Type[Schema], Schema]] = {}
+
+    def get_obj_type(self, obj):
+        """Returns name of the schema during dump() calls, given the object
+        being dumped."""
+        return obj.__class__.__name__
+
+    def get_data_type(self, data):
+        """Returns name of the schema during load() calls, given the data being
+        loaded. Defaults to looking up `type_field` in the data."""
+        data_type = data.get(self.type_field)
+        if self.type_field in data and self.type_field_remove:
+            data.pop(self.type_field)
+        return data_type
+
+    def dump(self, obj, *, many=None, **kwargs):
+        errors = {}
+        result_data = []
+        result_errors = {}
+        many = self.many if many is None else bool(many)
+        if not many:
+            result = result_data = self._dump(obj, **kwargs)
+        else:
+            for idx, o in enumerate(obj):
+                try:
+                    result = self._dump(o, **kwargs)
+                    result_data.append(result)
+                except ValidationError as error:
+                    result_errors[idx] = error.normalized_messages()
+                    result_data.append(error.valid_data)
+
+        result = result_data
+        errors = result_errors
+
+        if not errors:
+            return result
+        else:
+            exc = ValidationError(errors, data=obj, valid_data=result)
+            raise exc
+
+    def _dump(self, obj, *, update_fields=True, **kwargs):
+        obj_type = self.get_obj_type(obj)
+        if obj_type is None:
+            return (
+                None,
+                {"_schema": "Unknown object class: %s" % obj.__class__.__name__},
+            )
+
+        type_schema = self.type_schemas.get(obj_type)
+        if not type_schema:
+            return None, {"_schema": "Unsupported object type: %s" % obj_type}
+
+        schema = type_schema if isinstance(type_schema, Schema) else type_schema()
+
+        schema.context.update(getattr(self, "context", {}))
+
+        result = schema.dump(obj, many=False, **kwargs)
+        if result is not None:
+            result[self.type_field] = obj_type
+        return result
+
+    def load(self, data, *, many=None, partial=None, unknown=None, **kwargs):
+        errors = {}
+        result_data = []
+        result_errors = {}
+        many = self.many if many is None else bool(many)
+        if partial is None:
+            partial = self.partial
+        if not many:
+            try:
+                result_data = self._load(
+                    data, partial=partial, unknown=unknown, **kwargs
+                )
+            except ValidationError as error:
+                result_errors = error.normalized_messages()
+                result_data = error.valid_data
+        else:
+            for idx, item in enumerate(data):
+                try:
+                    result = self._load(item, partial=partial, **kwargs)
+                    result_data.append(result)
+                except ValidationError as error:
+                    result_errors[idx] = error.normalized_messages()
+                    result_data.append(error.valid_data)
+
+        result = result_data
+        errors = result_errors
+
+        if not errors:
+            return result
+        else:
+            exc = ValidationError(errors, data=data, valid_data=result)
+            raise exc
+
+    def _load(self, data, *, partial=None, unknown=None, **kwargs):
+        if not isinstance(data, dict):
+            raise ValidationError({"_schema": "Invalid data type: %s" % data})
+
+        data = dict(data)
+        unknown = unknown or self.unknown
+        data_type = self.get_data_type(data)
+
+        if data_type is None:
+            raise ValidationError(
+                {self.type_field: ["Missing data for required field."]}
+            )
+
+        try:
+            type_schema = self.type_schemas.get(data_type)
+        except TypeError as error:
+            # data_type could be unhashable
+            raise ValidationError(
+                {self.type_field: ["Invalid value: %s" % data_type]}
+            ) from error
+        if not type_schema:
+            raise ValidationError(
+                {self.type_field: ["Unsupported value: %s" % data_type]}
+            )
+
+        schema = type_schema if isinstance(type_schema, Schema) else type_schema()
+
+        schema.context.update(getattr(self, "context", {}))
+
+        return schema.load(data, many=False, partial=partial, unknown=unknown, **kwargs)
+
+    def validate(self, data, *, many=None, partial=None):
+        try:
+            self.load(data, many=many, partial=partial)
+        except ValidationError as ve:
+            return ve.messages
+        return {}

oarepo_runtime/services/schema/polymorphic.py

@@ -1,8 +1,8 @@
 from functools import cached_property
 
 import marshmallow as ma
-from marshmallow_oneofschema import OneOfSchema
-
+#from marshmallow_oneofschema import OneOfSchema
+from oarepo_runtime.services.schema.oneofschema import OneOfSchema
 
 class PolymorphicSchema(OneOfSchema):
     type_field_remove = False

{oarepo_runtime-1.5.28.dist-info → oarepo_runtime-1.5.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oarepo-runtime
-Version: 1.5.28
+Version: 1.5.30
 Summary: A set of runtime extensions of Invenio repository
 Description-Content-Type: text/markdown
 License-File: LICENSE

{oarepo_runtime-1.5.28.dist-info → oarepo_runtime-1.5.30.dist-info}/RECORD

@@ -66,7 +66,7 @@ oarepo_runtime/records/systemfields/selectors.py,sha256=VlbV3FKP2h3PLU7H4-YsI4qr
 oarepo_runtime/records/systemfields/synthetic.py,sha256=zRsQdekcgsrD9R2UuI2kgVLjyQMIT8j3HAYav_e-xfM,4238
 oarepo_runtime/resources/__init__.py,sha256=v8BGrOTu_FjKzd0eozV7Q4GoGxyfybsL2cI-tbP5Pys,185
 oarepo_runtime/resources/file_resource.py,sha256=Ta3bFce7l0xwqkkOMOEu9mxbB8BbKj5HUHRHmidhnl8,414
-oarepo_runtime/resources/localized_ui_json_serializer.py,sha256=4Kle34k-_uu3Y9JJ2vAXcQ9DqYRxXgy-_iZhiFuukmE,1684
+oarepo_runtime/resources/localized_ui_json_serializer.py,sha256=3V9cJaG_e1PMXKVX_wKfBp1LmbeForwHyBNYdyha4uQ,1878
 oarepo_runtime/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/services/components.py,sha256=9wt9CmoCFA8Utbb8eNA-Mvzo5LCApHT9zHpWIWZNyXY,1506
 oarepo_runtime/services/generators.py,sha256=V582uA813AIXnFhzqUwakmDgBOI1SQe3XZeJtUXNbwM,872
@@ -100,7 +100,8 @@ oarepo_runtime/services/schema/i18n.py,sha256=myyg0tU8up0BmMt9IESKD91w5KC0V9v8Qa
 oarepo_runtime/services/schema/i18n_ui.py,sha256=18tA6uA067TP_wcit47hTel2M4hz88wYtwBgaeZDrew,1880
 oarepo_runtime/services/schema/i18n_validation.py,sha256=fyMTi2Rw-KiHv7c7HN61zGxRVa9sAjAEEkAL5wUyKNo,236
 oarepo_runtime/services/schema/marshmallow.py,sha256=LmcSxvbZ9jIhkNHCqqxt1SA2UNijoDmIzqli1MkoTrE,1153
-oarepo_runtime/services/schema/polymorphic.py,sha256=CkvXVUiXbrsLWFgoNnjjpUviQyzRMCmpsD3GWfV0WZA,494
+oarepo_runtime/services/schema/oneofschema.py,sha256=X_pXzrkYcLGGAtGN1qltrz45OzD_atrJHkHkp3L01xg,6660
+oarepo_runtime/services/schema/polymorphic.py,sha256=f9yC7MGVynAFGM0fXIq0NbqGJxI65Xpi8GaM2ZM4c6Q,561
 oarepo_runtime/services/schema/ui.py,sha256=caRca4vuUVoLew3gkhbPQYGaLXB8C67E5jxz45-9zkE,3663
 oarepo_runtime/services/schema/validation.py,sha256=fahqKGDdIYWux5ZeoljrEe8VD2fDZR9VpfvYmTYAmpw,1050
 oarepo_runtime/translations/default_translations.py,sha256=060GBlA1ghWxfeumo6NqxCCZDb-6OezOuF6pr-_GEOQ,104
@@ -114,9 +115,9 @@ oarepo_runtime/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 oarepo_runtime/utils/functools.py,sha256=gKS9YZtlIYcDvdNA9cmYO00yjiXBYV1jg8VpcRUyQyg,1324
 oarepo_runtime/utils/path.py,sha256=V1NVyk3m12_YLbj7QHYvUpE1wScO78bYsX1LOLeXDkI,3108
 tests/pkg_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime-1.5.28.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.28.dist-info/METADATA,sha256=ck-L-b49r3ffcCAjvGjsUxW173E2ay8T_-sx7q1LYkY,4680
-oarepo_runtime-1.5.28.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-oarepo_runtime-1.5.28.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
-oarepo_runtime-1.5.28.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.28.dist-info/RECORD,,
+oarepo_runtime-1.5.30.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.30.dist-info/METADATA,sha256=-RxYSie_VM-QdwV_3we-zToS-EeWEmGaYgG4HYVaOvw,4680
+oarepo_runtime-1.5.30.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+oarepo_runtime-1.5.30.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
+oarepo_runtime-1.5.30.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.30.dist-info/RECORD,,