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

{oarepo-runtime-1.4.14/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.14
+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.14 → 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.14 → oarepo-runtime-1.4.15}/oarepo_runtime/cf/mappings.py

@@ -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.14 → 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.14 → 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.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.14/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/services/schema/__init__.py

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

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

@@ -24,11 +24,23 @@ def current_default_locale():
     return "en"
 
 
-# localized date field
-class LocalizedDate(FormatDate):
+class LocalizedMixin:
+    def __init__(self, *args, locale=None, **kwargs):
+        super().__init__(*args, locale=locale, **kwargs)
+
     @property
     def locale(self):
-        return self.context["locale"]
+        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
+class LocalizedDate(LocalizedMixin, FormatDate):
+    pass
 
 
 class FormatTimeString(FormatTime):
@@ -56,29 +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 LocalizedEDTF(MultilayerFormatEDTF):
-    @property
-    def locale(self):
-        return self.context["locale"]
 
+class LocalizedDateTime(LocalizedMixin, FormatDatetime):
+    pass
 
-class LocalizedTime(FormatTimeString):
-    @property
-    def locale(self):
-        return self.context["locale"]
 
+class LocalizedTime(LocalizedMixin, FormatTimeString):
+    pass
 
-class LocalizedDateTime(FormatDatetime):
-    @property
-    def locale(self):
-        return self.context["locale"]
 
+class LocalizedEDTF(LocalizedMixin, MultilayerFormatEDTF):
+    pass
 
-class LocalizedEDTFInterval(FormatEDTF):
-    @property
-    def locale(self):
-        return self.context["locale"]
+
+class LocalizedEDTFInterval(LocalizedMixin, FormatEDTF):
+    pass
 
 
 class PrefixedGettextField(BabelGettextDictField):
@@ -92,13 +102,11 @@ class PrefixedGettextField(BabelGettextDictField):
         return gettext(value)
 
 
-class LocalizedEnum(PrefixedGettextField):
-    @property
-    def locale(self):
-        return self.context["locale"]
+class LocalizedEnum(LocalizedMixin, PrefixedGettextField):
+    pass
 
     def __init__(self, **kwargs):
-        super().__init__(locale=None, default_locale=current_default_locale, **kwargs)
+        super().__init__(default_locale=current_default_locale, **kwargs)
 
 
 if False:  # NOSONAR

oarepo-runtime-1.4.14/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.14 → 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.14
+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.14 → 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
@@ -85,10 +87,12 @@ 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/cf.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
@@ -97,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.14 → 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.14 → oarepo-runtime-1.4.15}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-runtime
-version = 1.4.14
+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.14/oarepo_runtime/validation/__init__.py

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