oarepo-runtime 1.2.19__py3-none-any.whl → 1.2.21__py3-none-any.whl

oarepo_runtime/facets/base.py

@@ -0,0 +1,9 @@
+from invenio_records_resources.services.records.facets import TermsFacet
+
+
+class LabelledValuesTermsFacet(TermsFacet):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **{"value_labels": self.value_labels, **kwargs})
+
+    def value_labels(self, values):
+        return {val: val for val in values}

oarepo_runtime/facets/date.py

@@ -1,4 +1,3 @@
-from invenio_records_resources.services.records.facets import TermsFacet
 from oarepo_runtime.ui.marshmallow import (
     LocalizedDate,
     LocalizedTime,
@@ -7,14 +6,9 @@ from oarepo_runtime.ui.marshmallow import (
     LocalizedEDTFInterval,
 )
 import re
-
-
-class LabelledValuesTermsFacet(TermsFacet):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **{"value_labels": self.value_labels, **kwargs})
-
-    def value_labels(self, values):
-        return {val: val for val in values}
+from .base import LabelledValuesTermsFacet
+from invenio_search.engine import dsl
+from invenio_records_resources.services.records.facets.facets import LabelledFacetMixin
 
 
 class DateFacet(LabelledValuesTermsFacet):
@@ -39,7 +33,13 @@ class EDTFFacet(LabelledValuesTermsFacet):
         }
 
 
-class EDTFIntervalFacet(LabelledValuesTermsFacet):
+class EDTFIntervalFacet(LabelledFacetMixin, dsl.DateHistogramFacet):
+    # auto_date_histogram
+    def __init__(self, *args, **kwargs):
+        if "interval" not in kwargs:
+            kwargs["interval"] = "year"
+        super().__init__(*args, **kwargs)
+
     def value_labels(self, values):
         return {
             val: LocalizedEDTFInterval().format_value(convert_to_edtf(val))

oarepo_runtime/facets/enum.py

@@ -0,0 +1,10 @@
+from .base import LabelledValuesTermsFacet
+from flask_babelex import lazy_gettext
+
+
+class EnumTermsFacet(LabelledValuesTermsFacet):
+    def value_labels(self, values):
+        field = self._params["field"]
+        field_path = field.replace(".", "/")
+        field_enum = f"{field_path}.enum."
+        return {val: lazy_gettext(f"{field_enum}{val}") for val in values}

oarepo_runtime/relations/components.py

@@ -0,0 +1,15 @@
+from invenio_records_resources.services.records.components import ServiceComponent
+
+from oarepo_runtime.relations import PIDRelation
+from oarepo_runtime.relations.uow import CachingUnitOfWork
+
+
+class CachingRelationsComponent(ServiceComponent):
+    def create(self, identity, *, record, **kwargs):
+        """Create handler."""
+        # skutecny jmeno relations atributu
+        if isinstance(self.uow, CachingUnitOfWork) and hasattr(record, "relations"):
+            record.relations.set_cache(self.uow.cache)
+    def update(self, identity, *, record, **kwargs):
+        """Update handler."""
+        self.create(identity, record=record, **kwargs)

oarepo_runtime/relations/mapping.py

@@ -1,3 +1,6 @@
+
+
+
 class RelationsMapping:
     """Helper class for managing relation fields."""
 
@@ -28,3 +31,10 @@ class RelationsMapping:
         """Clean dereferenced relation fields."""
         for name in fields or self:
             getattr(self, name).clean()
+
+    def set_cache(self, cache):
+        from oarepo_runtime.relations import PIDRelation
+        for key, fld in self._fields.items():
+            if isinstance(fld, PIDRelation):
+                fld.cache = cache
+                getattr(self, key).cache = cache

oarepo_runtime/relations/uow.py

@@ -0,0 +1,7 @@
+from invenio_records_resources.services.uow import UnitOfWork
+
+
+class CachingUnitOfWork(UnitOfWork):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.cache = {}

oarepo_runtime/validation/__init__.py

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

oarepo_runtime/validation/dates.py

@@ -1,6 +1,8 @@
+import functools
+import re
 from datetime import datetime
-
 from marshmallow.exceptions import ValidationError
+from marshmallow_utils.fields.edtfdatestring import EDTFValidator
 
 
 def validate_date(date_format):
@@ -14,7 +16,6 @@ def validate_date(date_format):
 
     return validate
 
-
 def validate_datetime(value):
     try:
         datetime.fromisoformat(value)
@@ -22,3 +23,16 @@ def validate_datetime(value):
         raise ValidationError(
             f"Invalid datetime format, expecting iso format, got {value}"
         ) from e
+
+class CachedMultilayerEDTFValidator(EDTFValidator):
+
+    @functools.lru_cache(maxsize=1024)
+    def __call__(self, value):
+        if re.match(r"^\d{4}$", value):
+            return value
+        try:
+            datetime.strptime(value, "%Y-%m-%d")
+            return value
+        except:
+            return super().__call__(value)
+

{oarepo_runtime-1.2.19.dist-info → oarepo_runtime-1.2.21.dist-info}/METADATA

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

{oarepo_runtime-1.2.19.dist-info → oarepo_runtime-1.2.21.dist-info}/RECORD

@@ -31,7 +31,9 @@ oarepo_runtime/expansions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 oarepo_runtime/expansions/expandable_fields.py,sha256=7DWKFL6ml8J7zGI6wm9LO7Xd6R0LSylsuq4lyRumNHQ,745
 oarepo_runtime/expansions/service.py,sha256=HaEy76XOhDf__sQ91hi-8iH1hthM9q07pRhOmyZyVrs,144
 oarepo_runtime/facets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime/facets/date.py,sha256=pkG8tZjXyBxp-9BNbCM3vbCZitfCnT9I2ZO9tdh967g,1611
+oarepo_runtime/facets/base.py,sha256=McdE4OxIVqmYj-Eqig-TVVMnSevi-jnR0cV89Kg-Ygs,322
+oarepo_runtime/facets/date.py,sha256=-x0od8-WJrD8i8CPSFOZoKN1BJMppzTv5iuUO7MILjI,1663
+oarepo_runtime/facets/enum.py,sha256=COH3yqL5X9ksNtwRIPS3LJqDTi29I0IPXnRQOS7yIFI,369
 oarepo_runtime/facets/max_facet.py,sha256=XbkDBN5toidGC1mTw6-vMr0eyIoFZON8TQDRNWZOaz4,410
 oarepo_runtime/facets/nested_facet.py,sha256=kNOR_YXoMjA1REhG_DidLdFG6ZqM40kp85yvatFCd3g,962
 oarepo_runtime/i18n/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -40,19 +42,21 @@ oarepo_runtime/i18n/ui_schema.py,sha256=iJMVvdFmEXSoY8bjI-dZshDxwa-pnWxdZkdz4uWv
 oarepo_runtime/i18n/validation.py,sha256=fyMTi2Rw-KiHv7c7HN61zGxRVa9sAjAEEkAL5wUyKNo,236
 oarepo_runtime/relations/__init__.py,sha256=bDAgxl_LdKsqpGG3qluxAkQnn5u2ItJngnHQKkqzlkE,373
 oarepo_runtime/relations/base.py,sha256=YLfZ_AKGv1uf-d22U01e7OwiBgW00lBmsPQbknhTFLI,8329
+oarepo_runtime/relations/components.py,sha256=jgfVFxQspafiMWveWoN-8xPGdW7AdbYRJsmTyDq-Gww,650
 oarepo_runtime/relations/internal.py,sha256=OTp8iJqyl80sWDk0Q0AK42l6UsxZDABspVU_GwWza9o,1556
 oarepo_runtime/relations/lookup.py,sha256=wi3jPfOedazOmhOMrgu50PUETc1jfSdpmjK0wvOFsEM,848
-oarepo_runtime/relations/mapping.py,sha256=o7reFyfYoDAtj5Um-Me6GqiEIcG-tRRgN9gCe0sL4C0,1012
+oarepo_runtime/relations/mapping.py,sha256=aafwCk75Avr6pPzlyUmBEmroFtJ_a5htKevuj1EBrkM,1279
 oarepo_runtime/relations/pid_relation.py,sha256=OrF0Ihgua3tC7j5VBH116D5zHNHyodoeWux3ThLAZ3c,2063
+oarepo_runtime/relations/uow.py,sha256=srF82vHNkbRegrwySTxMH4cUb9_WXZEiTsjIGKSzFH8,208
 oarepo_runtime/tasks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/tasks/datastreams.py,sha256=PLIPmKw1dwhVxtdJRENVsDWncOKEMIy2MuM7lwbc75E,11165
 oarepo_runtime/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/ui/marshmallow.py,sha256=6nusRVhzmlDU55tsLyaZL1TNeqOhrf0SVbEl_Bkbo_M,2601
-oarepo_runtime/validation/__init__.py,sha256=ThKT-mxOdyzzR06wh-IkDuGaNRQtea4FLF_zX3WVk9Y,102
-oarepo_runtime/validation/dates.py,sha256=SBEyakvavsSPciHhLYHax2p98pnmuZCMGdgYLFBT6vY,622
-oarepo_runtime-1.2.19.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.2.19.dist-info/METADATA,sha256=6XM6JAiE3E-FqL4NvOMZgbs8PQ38pvMWWY_COHI7d94,2527
-oarepo_runtime-1.2.19.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-oarepo_runtime-1.2.19.dist-info/entry_points.txt,sha256=C32W4eT-8OypMCfwOO5WREioVKSneDfY51D78Uvdbp0,231
-oarepo_runtime-1.2.19.dist-info/top_level.txt,sha256=Vdo5ohKvEHniyXfcy3hv92nVSYIngDYGQtinWviujlw,15
-oarepo_runtime-1.2.19.dist-info/RECORD,,
+oarepo_runtime/validation/__init__.py,sha256=azOovv-cGpNDySLftlsJYQUIoqLOxUPKEduq4bN3btc,166
+oarepo_runtime/validation/dates.py,sha256=SxjinCYX71wdGdz_UQXptUxeXpS77NvDh2cgV-kIUeM,1049
+oarepo_runtime-1.2.21.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.2.21.dist-info/METADATA,sha256=e2-sx4Sbl8n5LZ8UUXxy2rcOuU0DsGAFCHueK7OEoxo,2527
+oarepo_runtime-1.2.21.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+oarepo_runtime-1.2.21.dist-info/entry_points.txt,sha256=C32W4eT-8OypMCfwOO5WREioVKSneDfY51D78Uvdbp0,231
+oarepo_runtime-1.2.21.dist-info/top_level.txt,sha256=Vdo5ohKvEHniyXfcy3hv92nVSYIngDYGQtinWviujlw,15
+oarepo_runtime-1.2.21.dist-info/RECORD,,