oarepo-runtime 1.5.33__py3-none-any.whl → 1.5.35__py3-none-any.whl

oarepo_runtime/i18n/__init__.py

@@ -1,10 +1,3 @@
-from oarepo import __version__ as oarepo_version
-
-# compatibility setting between invenio rdm 11 and invenio rdm 12
-# can be removed when invenio rdm 11 is no longer supported
-if oarepo_version.split(".")[0] == "11":
-    from flask_babelex import get_locale, gettext, lazy_gettext
-else:
-    from flask_babel import get_locale, gettext, lazy_gettext
+from flask_babel import get_locale, gettext, lazy_gettext
 
 __all__ = ("gettext", "lazy_gettext", "get_locale")

oarepo_runtime/records/entity_resolvers/__init__.py

@@ -1,90 +1,6 @@
-from oarepo import __version__ as oarepo_version
+from oarepo_runtime.records.entity_resolvers.proxies import DraftProxy, RecordProxy
 
-from oarepo_runtime.records.entity_resolvers.proxies import DraftProxy
+from invenio_records_resources.references import EntityResolver, RecordResolver
+from invenio_users_resources.entity_resolvers import UserResolver, GroupResolver
 
-# compatibility setting between invenio rdm 11 and invenio rdm 12
-# can be removed when invenio rdm 11 is no longer supported
-if oarepo_version.split(".")[0] == "11":
-    from invenio_records_resources.references import EntityResolver, RecordResolver
-    from invenio_users_resources.resolvers import UserResolver
-
-    #copyied from newer invenio_users_resources, GroupResolver isn't in older versions
-    from flask_principal import RoleNeed
-    from invenio_accounts.models import Role
-    from invenio_records_resources.references.resolvers import (
-        EntityProxy,
-        EntityResolver,
-    )
-    from invenio_users_resources.services.groups.config import GroupsServiceConfig
-    from sqlalchemy.exc import NoResultFound
-
-    class GroupProxy(EntityProxy):
-        """Resolver proxy for a Role entity."""
-
-        def _resolve(self):
-            """Resolve the User from the proxy's reference dict, or system_identity."""
-            # Resolves to role name, not id
-            role_id = self._parse_ref_dict_id()
-            try:
-                return Role.query.filter(
-                    Role.name == role_id  # TODO to be changed to role id
-                ).one()
-            except NoResultFound:
-                return {}
-
-        def pick_resolved_fields(self, identity, resolved_dict):
-            """Select which fields to return when resolving the reference."""
-            serialized_role = {}
-
-            return serialized_role
-
-        def get_needs(self, ctx=None):
-            """Return needs based on the given roles."""
-            role_id = self._parse_ref_dict_id()
-            return [RoleNeed(role_id)]
-
-        def ghost_record(self, value):
-            """Return default representation of not resolved group.
-
-            .. note::
-
-                Only groups that are not indexed should need this. Non-indexed groups include groups that were not created by users
-                e.g. user-moderation.
-            """
-            return {}
-
-
-    class GroupResolver(EntityResolver):
-        """Group entity resolver."""
-
-        type_id = "group"
-        """Type identifier for this resolver."""
-
-        def __init__(self):
-            """Constructor."""
-            # There's a bit of a mixup of type_key and type_id. Base resolver has no
-            # type_key, but RecordResolvers have.
-            self.type_key = self.type_id
-            super().__init__(GroupsServiceConfig.service_id)
-
-        def matches_reference_dict(self, ref_dict):
-            """Check if the reference dict references a role."""
-            return self._parse_ref_dict_type(ref_dict) == self.type_id
-
-        def _reference_entity(self, entity):
-            """Create a reference dict for the given user."""
-            return {"group": str(entity.id)}
-
-        def matches_entity(self, entity):
-            """Check if the entity is a Role."""
-            return isinstance(entity, Role)
-
-        def _get_entity_proxy(self, ref_dict):
-            """Return a GroupProxy for the given reference dict."""
-            return GroupProxy(self, ref_dict)
-
-else:
-    from invenio_records_resources.references import EntityResolver, RecordResolver
-    from invenio_users_resources.entity_resolvers import UserResolver, GroupResolver
-
-__all__ = ["DraftProxy", "UserResolver", "GroupResolver", "RecordResolver", "EntityResolver"]
+__all__ = ["DraftProxy", "UserResolver", "GroupResolver", "RecordResolver", "EntityResolver", "RecordProxy"]

oarepo_runtime/records/entity_resolvers/proxies.py

@@ -1,22 +1,46 @@
 from invenio_pidstore.errors import PIDUnregistered
-from oarepo import __version__ as oarepo_version
 
-# compatibility setting between invenio rdm 11 and invenio rdm 12
-# can be removed when invenio rdm 11 is no longer supported
-if oarepo_version.split(".")[0] == "11":
-    from invenio_records_resources.references.resolvers.records import RecordProxy
-else:
-    from invenio_records_resources.references.entity_resolvers.records import (
-        RecordProxy,
-    )
+from invenio_records_resources.references.entity_resolvers.records import (
+    RecordProxy as InvenioRecordProxy,
+)
 
 from sqlalchemy.exc import NoResultFound
 
 
+def set_field(result, resolved_dict, field_name):
+    from_metadata = resolved_dict.get("metadata", {}).get(field_name)
+    from_data = resolved_dict.get(field_name)
+
+    if from_metadata:
+        result.setdefault("metadata", {})[field_name] = from_metadata
+    if from_data:
+        result[field_name] = from_data
+
+
+class RecordProxy(InvenioRecordProxy):
+    picked_fields = ["title", "creators", "contributors"]
+
+    def pick_resolved_fields(self, identity, resolved_dict):
+        """Select which fields to return when resolving the reference."""
+        resolved_fields = super().pick_resolved_fields(identity, resolved_dict)
+
+        for fld in self.picked_fields:
+            set_field(resolved_fields, resolved_dict, fld)
+
+        return resolved_fields
+
+    def ghost_record(self, value):
+        return {
+            **value,
+            "metadata": {
+                "title": "Deleted record",
+            },
+        }
+
+
 class DraftProxy(RecordProxy):
     def _resolve(self):
         pid_value = self._parse_ref_dict_id()
-
         try:
             return self.record_cls.pid.resolve(pid_value, registered_only=False)
         except (PIDUnregistered, NoResultFound):

oarepo_runtime/services/results.py

@@ -34,6 +34,28 @@ class RecordItem(BaseRecordItem):
 class RecordList(BaseRecordList):
     components = []
 
+    @property
+    def aggregations(self):
+        """Get the search result aggregations."""
+        try:
+            result = super().aggregations
+            if result is None:
+                return result
+
+            for key in result.keys():
+                if 'buckets' in result[key]:
+                    for bucket in result[key]['buckets']:
+                        val = bucket['key']
+                        label = bucket.get('label', '')
+
+                        if not isinstance(val, str):
+                            bucket['key'] = str(val)
+                        if not isinstance(label, str):
+                            bucket['label'] = str(label)
+            return result
+        except AttributeError:
+            return None
+
     @property
     def hits(self):
         """Iterator over the hits."""

oarepo_runtime/services/schema/i18n.py

@@ -1,6 +1,7 @@
 from functools import lru_cache
-
+import importlib
 import langcodes
+from invenio_base.utils import obj_or_import_string
 from marshmallow import Schema, ValidationError, fields, validates
 
 """
@@ -10,39 +11,41 @@ it for each project.
 
 
 @lru_cache
-def get_i18n_schema(lang_field, value_field):
-    @validates(lang_field)
+def get_i18n_schema(lang_name, value_name, value_field="marshmallow_utils.fields.SanitizedHTML"):
+    @validates(lang_name)
     def validate_lang(self, value):
         if value != "_" and not langcodes.Language.get(value).is_valid():
             raise ValidationError("Invalid language code")
 
+    value_field_class = obj_or_import_string(value_field)
+
     return type(
-        f"I18nSchema_{lang_field}_{value_field}",
+        f"I18nSchema_{lang_name}_{value_name}",
         (Schema,),
         {
             "validate_lang": validate_lang,
-            lang_field: fields.String(required=True),
-            value_field: fields.String(required=True),
+            lang_name: fields.String(required=True),
+            value_name: value_field_class(required=True),
         },
     )
 
 
 def MultilingualField(  # noqa NOSONAR
-    *args, lang_field="lang", value_field="value", **kwargs
+    *args, lang_name="lang", value_name="value", value_field="marshmallow_utils.fields.SanitizedHTML", **kwargs
 ):
     # TODO: args are not used but oarepo-model-builder-multilingual generates them
     # should be fixed there and subsequently removed here
     return fields.List(
-        fields.Nested(get_i18n_schema(lang_field, value_field)),
+        fields.Nested(get_i18n_schema(lang_name, value_name, value_field)),
         **kwargs,
     )
 
 
 def I18nStrField(  # noqa NOSONAR
-    *args, lang_field="lang", value_field="value", **kwargs
+    *args, lang_name="lang", value_name="value", value_field="marshmallow_utils.fields.SanitizedHTML", **kwargs
 ):
     return fields.Nested(
-        get_i18n_schema(lang_field, value_field),
+        get_i18n_schema(lang_name, value_name, value_field),
         *args,
         **kwargs,
     )

oarepo_runtime/services/schema/i18n_ui.py

@@ -1,72 +1,74 @@
 from functools import lru_cache
 
 from marshmallow import Schema, fields
-
+from marshmallow_utils.fields import SanitizedHTML
+from invenio_base.utils import obj_or_import_string
 
 @lru_cache
-def get_i18n_ui_schema(lang_field, value_field):
+def get_i18n_ui_schema(lang_name, value_name, value_field="marshmallow_utils.fields.SanitizedHTML"):
+    value_field_class = obj_or_import_string(value_field)
     return type(
-        f"I18nUISchema_{lang_field}_{value_field}",
+        f"I18nUISchema_{lang_name}_{value_name}",
         (Schema,),
         {
-            lang_field: fields.String(required=True),
-            value_field: fields.String(required=True),
+            lang_name: fields.String(required=True),
+            value_name: value_field_class(required=True),
         },
     )
 
 
 def MultilingualUIField(  # noqa NOSONAR
-    *args, lang_field="lang", value_field="value", **kwargs
+    *args, lang_name="lang", value_name="value", value_field="marshmallow_utils.fields.SanitizedHTML", **kwargs
 ):
     return fields.List(
-        fields.Nested(get_i18n_ui_schema(lang_field, value_field)),
+        fields.Nested(get_i18n_ui_schema(lang_name, value_name, value_field)),
         **kwargs,
     )
 
 
 def I18nStrUIField(  # noqa NOSONAR
-    *args, lang_field="lang", value_field="value", **kwargs
+    *args, lang_name="lang", value_name="value", value_field="marshmallow_utils.fields.SanitizedHTML", **kwargs
 ):
     return fields.Nested(
-        get_i18n_ui_schema(lang_field, value_field),
+        get_i18n_ui_schema(lang_name, value_name, value_field),
         *args,
         **kwargs,
     )
 
 
 @lru_cache
-def get_i18n_localized_ui_schema(lang_field, value_field):
+def get_i18n_localized_ui_schema(lang_name, value_name):
     class I18nLocalizedUISchema(Schema):
         def _serialize(self, value, attr=None, obj=None, **kwargs):
             if not value:
                 return None
             language = self.context["locale"].language
             for v in value:
-                if language == v[lang_field]:
-                    return v[value_field]
-            return next(iter(value))[value_field]
+                if language == v[lang_name]:
+                    return v[value_name]
+            return next(iter(value))[value_name]
 
     # inherit to get a nice name for debugging
     return type(
-        f"I18nLocalizedUISchema_{lang_field}_{value_field}",
+        f"I18nLocalizedUISchema_{lang_name}_{value_name}",
         (I18nLocalizedUISchema,),
         {},
     )
 
 
 def MultilingualLocalizedUIField(  # noqa NOSONAR
-    *args, lang_field="lang", value_field="value", **kwargs
+    *args, lang_name="lang", value_name="value", **kwargs
 ):
     return fields.Nested(
-        get_i18n_localized_ui_schema(lang_field, value_field), **kwargs
+        get_i18n_localized_ui_schema(lang_name, value_name), **kwargs
     )
 
 
 def I18nStrLocalizedUIField(  # noqa NOSONAR
-    *args, lang_field="lang", value_field="value", **kwargs
+    *args, lang_name="lang", value_name="value", **kwargs
 ):
     return fields.Nested(
-        get_i18n_ui_schema(lang_field, value_field),
+        get_i18n_ui_schema(lang_name, value_name),
         *args,
         **kwargs,
     )

{oarepo_runtime-1.5.33.dist-info → oarepo_runtime-1.5.35.dist-info}/METADATA

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

{oarepo_runtime-1.5.33.dist-info → oarepo_runtime-1.5.35.dist-info}/RECORD

@@ -39,15 +39,15 @@ oarepo_runtime/datastreams/writers/service.py,sha256=PvCxYASDxOqT6iyL6cjw0aH41La
 oarepo_runtime/datastreams/writers/utils.py,sha256=Lk_ZLNeXTLuFEn04lw1-6bJ7duG6kwA8X4wf9c_GiL4,1067
 oarepo_runtime/datastreams/writers/validation_errors.py,sha256=wOCXdniR6so_4ExpdFYYgBRyENp7_6kVFZM2L-Hy3G8,661
 oarepo_runtime/datastreams/writers/yaml.py,sha256=XchUJHQ58E2Mfgs8elImXbL38jFtI8Hfoye6yaR0gKI,1482
-oarepo_runtime/i18n/__init__.py,sha256=G4PJ_kQlPDiBW6ntjQZ-O4qHQgkJWAXsNLUuOBcglNM,402
+oarepo_runtime/i18n/__init__.py,sha256=h0knW_HwiyIt5TBHfdGqN7_BBYfpz1Fw6zhVy0C28fM,111
 oarepo_runtime/info/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/info/views.py,sha256=jtI2JJBdApuT5ZIxU2kskJBz6GpJVTgUGrM8EMNIiAk,11137
 oarepo_runtime/records/__init__.py,sha256=w1vtMmGDpcn9PQ2gbwihrYBZhawhzDWWOpnDdeaOPVo,1038
 oarepo_runtime/records/dumpers/__init__.py,sha256=OmzNhLdMNKibmCksnj9eTX9xPBG30dziiK3j3bAAp3k,233
 oarepo_runtime/records/dumpers/edtf_interval.py,sha256=YCShZAoqBQYaxVilEVotS-jXZsxxoXO67yu2urhkaMA,1198
 oarepo_runtime/records/dumpers/multilingual_dumper.py,sha256=PbNFCLsiH4XV3E1v8xga_fzlcEImHy8OXn_UKh_8VBU,1090
-oarepo_runtime/records/entity_resolvers/__init__.py,sha256=QvGxjfDRCg21eD5zDjWf0TSGFotEYG1PydrjT2wG7DY,3465
-oarepo_runtime/records/entity_resolvers/proxies.py,sha256=hHUzJA1yDhp7nM35gHoAAv7w4zWuaSE-tLBNvIR0tD8,882
+oarepo_runtime/records/entity_resolvers/__init__.py,sha256=fZFUh53idLswFIlF-5miLPQXMlDX6YEHAolJGgxgh6k,356
+oarepo_runtime/records/entity_resolvers/proxies.py,sha256=dhWYIjjWzXdoAooHvGeT2PHlfuvFHPSw_839TMXW8jA,1518
 oarepo_runtime/records/owners/__init__.py,sha256=R4hudCBqLRRzgCnkEjXIL7hSp068z-s6YOwYSkWyuaw,93
 oarepo_runtime/records/owners/registry.py,sha256=fYgBuW5nBKn6pyz2OBgfNlynk64_yhQ9J7FzPk8QU1U,795
 oarepo_runtime/records/relations/__init__.py,sha256=bDAgxl_LdKsqpGG3qluxAkQnn5u2ItJngnHQKkqzlkE,373
@@ -70,7 +70,7 @@ oarepo_runtime/resources/localized_ui_json_serializer.py,sha256=3V9cJaG_e1PMXKVX
 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
-oarepo_runtime/services/results.py,sha256=gcITj-bWPwrGdNGGEiNWroRC-JLUoBaZbAMOZeDrQRg,1955
+oarepo_runtime/services/results.py,sha256=ocEXdTl1Gdu-OmAkmB98Yf5t4IwsbESDf1r3GV73FTg,2706
 oarepo_runtime/services/search.py,sha256=ywfwGH7oAM44WeOSjlIsY_qoCMZJ1TlTLd_NgE2ow3Y,5296
 oarepo_runtime/services/config/__init__.py,sha256=SCqww5sV8qh3gmev6TE8EyJbD58juIEDCm_7MEHxtSg,440
 oarepo_runtime/services/config/permissions_presets.py,sha256=zApeA-2DYAlD--SzVz3vq_OFjq48Ko0pe08e4o2vxr4,6114
@@ -96,8 +96,8 @@ oarepo_runtime/services/relations/errors.py,sha256=VtlOKq9MEUeJ4IsiZhY7lWoshrusA
 oarepo_runtime/services/relations/mapping.py,sha256=D7IYk83SXVgTv-0ohSnHOCzvCwbFLXJsayO1eQfQn0U,1285
 oarepo_runtime/services/schema/__init__.py,sha256=gD0II1Lz6fnW1Cgt4gtneZeyKWl_YZ47Wu0gmeKqtH8,1395
 oarepo_runtime/services/schema/cf.py,sha256=-m9seIH5VYUdxDsJlPVXS0-8f7xkpN7YfW1q9E1GacI,475
-oarepo_runtime/services/schema/i18n.py,sha256=myyg0tU8up0BmMt9IESKD91w5KC0V9v8Qa-9fF0ptIs,1341
-oarepo_runtime/services/schema/i18n_ui.py,sha256=18tA6uA067TP_wcit47hTel2M4hz88wYtwBgaeZDrew,1880
+oarepo_runtime/services/schema/i18n.py,sha256=rCO8hZqRA_653uLn7eobJIsibbjgSLO9Q9Ka-2RG5r0,1645
+oarepo_runtime/services/schema/i18n_ui.py,sha256=D3YGKToB3MZVqGyiPf_xWPtg9PhGUuOZ5VNfm7fwf68,2203
 oarepo_runtime/services/schema/i18n_validation.py,sha256=fyMTi2Rw-KiHv7c7HN61zGxRVa9sAjAEEkAL5wUyKNo,236
 oarepo_runtime/services/schema/marshmallow.py,sha256=LmcSxvbZ9jIhkNHCqqxt1SA2UNijoDmIzqli1MkoTrE,1153
 oarepo_runtime/services/schema/oneofschema.py,sha256=X_pXzrkYcLGGAtGN1qltrz45OzD_atrJHkHkp3L01xg,6660
@@ -115,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.33.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.33.dist-info/METADATA,sha256=8SWJONfiL0aijLAY7T3HCmdN4RegicsAM3feIB68qRU,4680
-oarepo_runtime-1.5.33.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-oarepo_runtime-1.5.33.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
-oarepo_runtime-1.5.33.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.33.dist-info/RECORD,,
+oarepo_runtime-1.5.35.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.35.dist-info/METADATA,sha256=ov1D4zGmQwPC2LNFD5obBpcphrCt9GsW3dfByS_XNYc,4680
+oarepo_runtime-1.5.35.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+oarepo_runtime-1.5.35.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
+oarepo_runtime-1.5.35.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.35.dist-info/RECORD,,