oarepo-runtime 1.4.13__tar.gz → 1.4.15__tar.gz

{oarepo-runtime-1.4.13/oarepo_runtime.egg-info → oarepo-runtime-1.4.15}/PKG-INFO

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

{oarepo-runtime-1.4.13 → oarepo-runtime-1.4.15}/oarepo_runtime/cf/__init__.py

@@ -4,7 +4,7 @@ from flask import current_app
 from invenio_records.systemfields import DictField, SystemField
 from invenio_records_resources.services.custom_fields import BaseCF
 
-from oarepo_runtime.records import MappingSystemFieldMixin
+from oarepo_runtime.records.systemfields.mapping import MappingSystemFieldMixin
 
 
 class CustomFieldsMixin(MappingSystemFieldMixin):

{oarepo-runtime-1.4.13 → oarepo-runtime-1.4.15}/oarepo_runtime/cf/cli.py

@@ -1,4 +1,3 @@
-import click
 from flask.cli import with_appcontext
 
 from oarepo_runtime.cli import oarepo

{oarepo-runtime-1.4.13 → oarepo-runtime-1.4.15}/oarepo_runtime/cf/mappings.py

@@ -1,5 +1,5 @@
 import inspect
-from typing import Iterable, List
+from typing import Iterable
 
 import click
 import deepmerge
@@ -13,7 +13,7 @@ from invenio_search import current_search_client
 from invenio_search.engine import dsl, search
 from invenio_search.utils import build_alias_name
 
-from oarepo_runtime.records import MappingSystemFieldMixin
+from oarepo_runtime.records.systemfields.mapping import MappingSystemFieldMixin
 
 
 class Mapping(InvenioMapping):

{oarepo-runtime-1.4.13 → oarepo-runtime-1.4.15}/oarepo_runtime/facets/base.py

@@ -5,5 +5,8 @@ class LabelledValuesTermsFacet(TermsFacet):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **{"value_labels": self.value_labels, **kwargs})
 
+    def localized_value_labels(self, values, locale):
+        return {val: val for val in values}
+
     def value_labels(self, values):
         return {val: val for val in values}

{oarepo-runtime-1.4.13 → oarepo-runtime-1.4.15}/oarepo_runtime/facets/date.py

@@ -3,7 +3,7 @@ import re
 from invenio_records_resources.services.records.facets.facets import LabelledFacetMixin
 from invenio_search.engine import dsl
 
-from oarepo_runtime.ui.marshmallow import (
+from oarepo_runtime.services.schema.ui import (
     LocalizedDate,
     LocalizedDateTime,
     LocalizedEDTF,
@@ -15,24 +15,27 @@ from .base import LabelledValuesTermsFacet
 
 
 class DateFacet(LabelledValuesTermsFacet):
-    def value_labels(self, values):
-        return {val: LocalizedDate().format_value(val) for val in values}
+    def localized_value_labels(self, values, locale):
+        return {val: LocalizedDate(locale=locale).format_value(val) for val in values}
 
 
 class TimeFacet(LabelledValuesTermsFacet):
-    def value_labels(self, values):
-        return {val: LocalizedTime().format_value(val) for val in values}
+    def localized_value_labels(self, values, locale):
+        return {val: LocalizedTime(locale=locale).format_value(val) for val in values}
 
 
 class DateTimeFacet(LabelledValuesTermsFacet):
-    def value_labels(self, values):
-        return {val: LocalizedDateTime().format_value(val) for val in values}
+    def localized_value_labels(self, values, locale):
+        return {
+            val: LocalizedDateTime(locale=locale).format_value(val) for val in values
+        }
 
 
 class EDTFFacet(LabelledValuesTermsFacet):
-    def value_labels(self, values):
+    def localized_value_labels(self, values, locale):
         return {
-            val: LocalizedEDTF().format_value(convert_to_edtf(val)) for val in values
+            val: LocalizedEDTF(locale=locale).format_value(convert_to_edtf(val))
+            for val in values
         }
 
 
@@ -51,9 +54,9 @@ class EDTFIntervalFacet(LabelledFacetMixin, AutoDateHistogramFacet):
         #     kwargs["interval"] = "year"
         super().__init__(*args, **kwargs)
 
-    def value_labels(self, values):
+    def localized_value_labels(self, values, locale):
         return {
-            val: LocalizedEDTFInterval().format_value(convert_to_edtf(val))
+            val: LocalizedEDTFInterval(locale=locale).format_value(convert_to_edtf(val))
             for val in values
         }
 

{oarepo-runtime-1.4.13 → oarepo-runtime-1.4.15}/oarepo_runtime/i18n/ui_schema.py

@@ -1,7 +1,5 @@
 from functools import lru_cache
 
-from flask import current_app
-from flask_babelex import get_locale
 from marshmallow import Schema, fields
 
 
@@ -40,13 +38,9 @@ def get_i18n_localized_ui_schema(lang_field, value_field):
         def _serialize(self, value, attr=None, obj=None, **kwargs):
             if not value:
                 return None
-            locale = get_locale().language
+            language = self.context["locale"].language
             for v in value:
-                if locale == v[lang_field]:
-                    return v[value_field]
-            locale = current_app.config["BABEL_DEFAULT_LOCALE"]
-            for v in value:
-                if locale == v[lang_field]:
+                if language == v[lang_field]:
                     return v[value_field]
             return next(iter(value))[value_field]
 

oarepo-runtime-1.4.15/oarepo_runtime/records/__init__.py

@@ -0,0 +1 @@
+

oarepo-runtime-1.4.15/oarepo_runtime/records/systemfields/__init__.py

@@ -0,0 +1,10 @@
+from .icu import ICUField, ICUSuggestField, ICUSortField
+from .mapping import MappingSystemFieldMixin, SystemFieldDumperExt
+
+__all__ = (
+    "ICUField",
+    "ICUSuggestField",
+    "ICUSortField",
+    "MappingSystemFieldMixin",
+    "SystemFieldDumperExt",
+)

{oarepo-runtime-1.4.13/oarepo_runtime/records → oarepo-runtime-1.4.15/oarepo_runtime/records/systemfields}/icu.py

@@ -4,7 +4,7 @@ from typing import Dict
 from flask import current_app
 from invenio_records.systemfields import SystemField
 
-from oarepo_runtime.records import MappingSystemFieldMixin
+from oarepo_runtime.records.systemfields.mapping import MappingSystemFieldMixin
 from oarepo_runtime.relations.lookup import lookup_key
 
 

oarepo-runtime-1.4.15/oarepo_runtime/resources/__init__.py

@@ -0,0 +1,3 @@
+from .localized_ui_json_serializer import LocalizedUIJSONSerializer
+
+__all__ = ("LocalizedUIJSONSerializer",)

oarepo-runtime-1.4.15/oarepo_runtime/resources/localized_ui_json_serializer.py

@@ -0,0 +1,41 @@
+from flask_babelex import get_locale
+from flask_resources import MarshmallowSerializer
+
+
+class LocalizedUIJSONSerializer(MarshmallowSerializer):
+    def __init__(
+        self,
+        format_serializer_cls,
+        object_schema_cls,
+        list_schema_cls=None,
+        schema_context=None,
+        **serializer_options,
+    ):
+        super().__init__(
+            format_serializer_cls=format_serializer_cls,
+            object_schema_cls=object_schema_cls,
+            list_schema_cls=list_schema_cls,
+            schema_context=schema_context or {},
+            **serializer_options,
+        )
+
+    def dump_obj(self, obj):
+        """Dump the object using object schema class."""
+        return self.object_schema_cls(
+            context={**self.schema_context, "locale": get_locale()}
+        ).dump(obj)
+
+    def dump_list(self, obj_list):
+        """Dump the list of objects."""
+        ctx = {
+            "object_schema_cls": self.object_schema_cls,
+        }
+        ctx.update(self.schema_context)
+        ctx["locale"] = get_locale()
+
+        if self.list_schema_cls is None:
+            return self.object_schema_cls(context=self.schema_context).dump(
+                obj_list, many=True
+            )
+
+        return self.list_schema_cls(context=ctx).dump(obj_list)

oarepo-runtime-1.4.15/oarepo_runtime/services/schema/__init__.py

@@ -0,0 +1,3 @@
+from .polymorphic import PolymorphicSchema
+
+__all__ = ("PolymorphicSchema",)

oarepo-runtime-1.4.15/oarepo_runtime/services/schema/cf.py

@@ -0,0 +1,13 @@
+from invenio_records_resources.services.custom_fields.schema import (
+    CustomFieldsSchemaUI as InvenioCustomFieldsSchemaUI,
+)
+
+
+class CustomFieldsSchemaUI(InvenioCustomFieldsSchemaUI):
+    def _serialize(self, obj, **kwargs):
+        self._schema.context.update(self.context)
+        return super()._serialize(obj, **kwargs)
+
+    def _deserialize(self, data, **kwargs):
+        self._schema.context.update(self.context)
+        return super()._deserialize(data, **kwargs)

oarepo-runtime-1.4.13/oarepo_runtime/ui/marshmallow.py → oarepo-runtime-1.4.15/oarepo_runtime/services/schema/ui.py

@@ -1,12 +1,11 @@
 import datetime
 import re
-from functools import partial
 
 import marshmallow as ma
 from babel.dates import format_date
 from babel_edtf import format_edtf
 from flask import current_app
-from flask_babelex import get_locale, gettext
+from flask_babelex import gettext
 from marshmallow_utils.fields import (
     BabelGettextDictField,
     FormatDate,
@@ -25,8 +24,23 @@ def current_default_locale():
     return "en"
 
 
+class LocalizedMixin:
+    def __init__(self, *args, locale=None, **kwargs):
+        super().__init__(*args, locale=locale, **kwargs)
+
+    @property
+    def locale(self):
+        if self._locale:
+            return self._locale
+        if self.parent:
+            if "locale" in self.context:
+                return self.context["locale"]
+        return current_default_locale()
+
+
 # localized date field
-LocalizedDate = partial(FormatDate, locale=get_locale)
+class LocalizedDate(LocalizedMixin, FormatDate):
+    pass
 
 
 class FormatTimeString(FormatTime):
@@ -54,18 +68,27 @@ class MultilayerFormatEDTF(BabelFormatField):
         except:
             return format_edtf(value, format=self._format, locale=self.locale)
 
+    def parse(self, value, **kwargs):
+        # standard parsing is too lenient, for example returns "2000-01-01" for input "2000"
+        if re.match("^[0-9]+-[0-9]+-[0-9]+", value):
+            return super().parse(value, **kwargs)
+        raise ValueError("Not a valid date")
+
+
+class LocalizedDateTime(LocalizedMixin, FormatDatetime):
+    pass
 
-# localized edtf
-LocalizedEDTF = partial(MultilayerFormatEDTF, locale=get_locale)
 
-# localized time field
-LocalizedTime = partial(FormatTimeString, locale=get_locale)
+class LocalizedTime(LocalizedMixin, FormatTimeString):
+    pass
 
-# localized datetime field
-LocalizedDateTime = partial(FormatDatetime, locale=get_locale)
 
-# localized edtf interval uses the same class as plain EDTF
-LocalizedEDTFInterval = partial(FormatEDTF, locale=get_locale)
+class LocalizedEDTF(LocalizedMixin, MultilayerFormatEDTF):
+    pass
+
+
+class LocalizedEDTFInterval(LocalizedMixin, FormatEDTF):
+    pass
 
 
 class PrefixedGettextField(BabelGettextDictField):
@@ -79,16 +102,16 @@ class PrefixedGettextField(BabelGettextDictField):
         return gettext(value)
 
 
-LocalizedEnum = partial(
-    PrefixedGettextField,
-    # value_prefix will come from the outside
-    locale=get_locale,
-    default_locale=current_default_locale,
-)
+class LocalizedEnum(LocalizedMixin, PrefixedGettextField):
+    pass
+
+    def __init__(self, **kwargs):
+        super().__init__(default_locale=current_default_locale, **kwargs)
+
 
 if False:  # NOSONAR
     # just for the makemessages to pick up the translations
-    translations = [_("True"), _("True")]
+    translations = [_("True"), _("False")]
 
 
 class InvenioUISchema(ma.Schema):

oarepo-runtime-1.4.13/oarepo_runtime/services/icu.py → oarepo-runtime-1.4.15/oarepo_runtime/services/search.py

@@ -10,7 +10,7 @@ from invenio_records_resources.services.records import (
 )
 from invenio_records_resources.services.records.queryparser import SuggestQueryParser
 
-from oarepo_runtime.records.icu import ICUSuggestField
+from oarepo_runtime.records.systemfields.icu import ICUSuggestField
 
 try:
     from invenio_i18n import get_locale

oarepo-runtime-1.4.15/oarepo_runtime/ui/marshmallow.py

@@ -0,0 +1,9 @@
+from oarepo_runtime.services.schema.ui import InvenioUISchema
+import warnings
+
+warnings.warn(
+    "Deprecated, please use oarepo_runtime.services.schema.ui.InvenioUISchema",
+    DeprecationWarning,
+)
+
+__all__ = ("InvenioUISchema",)

{oarepo-runtime-1.4.13 → oarepo-runtime-1.4.15/oarepo_runtime.egg-info}/PKG-INFO

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

{oarepo-runtime-1.4.13 → oarepo-runtime-1.4.15}/oarepo_runtime.egg-info/SOURCES.txt

@@ -8,7 +8,6 @@ oarepo_runtime/__init__.py
 oarepo_runtime/ext.py
 oarepo_runtime/ext_config.py
 oarepo_runtime/marshmallow.py
-oarepo_runtime/polymorphic.py
 oarepo_runtime/profile.py
 oarepo_runtime/uow.py
 oarepo_runtime.egg-info/PKG-INFO
@@ -37,6 +36,7 @@ oarepo_runtime/datastreams/config.py
 oarepo_runtime/datastreams/datastreams.py
 oarepo_runtime/datastreams/errors.py
 oarepo_runtime/datastreams/fixtures.py
+oarepo_runtime/datastreams/tasks.py
 oarepo_runtime/datastreams/transformers.py
 oarepo_runtime/datastreams/utils.py
 oarepo_runtime/datastreams/readers/__init__.py
@@ -70,7 +70,9 @@ oarepo_runtime/i18n/schema.py
 oarepo_runtime/i18n/ui_schema.py
 oarepo_runtime/i18n/validation.py
 oarepo_runtime/records/__init__.py
-oarepo_runtime/records/icu.py
+oarepo_runtime/records/systemfields/__init__.py
+oarepo_runtime/records/systemfields/icu.py
+oarepo_runtime/records/systemfields/mapping.py
 oarepo_runtime/relations/__init__.py
 oarepo_runtime/relations/base.py
 oarepo_runtime/relations/components.py
@@ -82,10 +84,15 @@ oarepo_runtime/relations/pid_relation.py
 oarepo_runtime/relations/uow.py
 oarepo_runtime/resolvers/__init__.py
 oarepo_runtime/resolvers/proxies.py
+oarepo_runtime/resources/__init__.py
+oarepo_runtime/resources/localized_ui_json_serializer.py
 oarepo_runtime/services/__init__.py
-oarepo_runtime/services/icu.py
-oarepo_runtime/tasks/__init__.py
-oarepo_runtime/tasks/datastreams.py
+oarepo_runtime/services/search.py
+oarepo_runtime/services/schema/__init__.py
+oarepo_runtime/services/schema/cf.py
+oarepo_runtime/services/schema/polymorphic.py
+oarepo_runtime/services/schema/ui.py
+oarepo_runtime/services/schema/validation.py
 oarepo_runtime/translations/messages.pot
 oarepo_runtime/translations/cs/LC_MESSAGES/messages.mo
 oarepo_runtime/translations/cs/LC_MESSAGES/messages.po
@@ -94,6 +101,4 @@ oarepo_runtime/ui/__init__.py
 oarepo_runtime/ui/marshmallow.py
 oarepo_runtime/utils/__init__.py
 oarepo_runtime/utils/path.py
-oarepo_runtime/validation/__init__.py
-oarepo_runtime/validation/dates.py
 tests/pkg_data/__init__.py

{oarepo-runtime-1.4.13 → oarepo-runtime-1.4.15}/oarepo_runtime.egg-info/entry_points.txt

@@ -5,4 +5,4 @@ oarepo_runtime = oarepo_runtime.ext:OARepoRuntime
 oarepo_runtime = oarepo_runtime.ext:OARepoRuntime
 
 [invenio_celery.tasks]
-oarepo_runtime_datastreams = oarepo_runtime.tasks.datastreams
+oarepo_runtime_datastreams = oarepo_runtime.datastreams.tasks

{oarepo-runtime-1.4.13 → oarepo-runtime-1.4.15}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-runtime
-version = 1.4.13
+version = 1.4.15
 description = A set of runtime extensions of Invenio repository
 authors = Alzbeta Pokorna
 readme = README.md
@@ -59,7 +59,7 @@ invenio_base.apps =
 invenio_base.api_apps = 
 	oarepo_runtime = oarepo_runtime.ext:OARepoRuntime
 invenio_celery.tasks = 
-	oarepo_runtime_datastreams = oarepo_runtime.tasks.datastreams
+	oarepo_runtime_datastreams = oarepo_runtime.datastreams.tasks
 
 [egg_info]
 tag_build = 

oarepo-runtime-1.4.13/oarepo_runtime/validation/__init__.py

@@ -1,3 +0,0 @@
-from .dates import CachedMultilayerEDTFValidator, validate_date, validate_datetime
-
-__all__ = ["validate_date", "validate_datetime", "CachedMultilayerEDTFValidator"]