PyPI - oarepo-runtime - Versions diffs - 1.2.19__tar.gz → 1.2.21__tar.gz - Mend

oarepo-runtime 1.2.19tar.gz → 1.2.21tar.gz

Files changed (70) hide show

@@ -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
 Provides-Extra: devs

@@ -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}

@@ -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))

@@ -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}

@@ -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)

@@ -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

@@ -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 = {}

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

@@ -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)

@@ -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
 Provides-Extra: devs

@@ -43,7 +43,9 @@ oarepo_runtime/expansions/__init__.py
 oarepo_runtime/expansions/expandable_fields.py
 oarepo_runtime/expansions/service.py
 oarepo_runtime/facets/__init__.py
+oarepo_runtime/facets/base.py
 oarepo_runtime/facets/date.py
+oarepo_runtime/facets/enum.py
 oarepo_runtime/facets/max_facet.py
 oarepo_runtime/facets/nested_facet.py
 oarepo_runtime/i18n/__init__.py
@@ -52,10 +54,12 @@ oarepo_runtime/i18n/ui_schema.py
 oarepo_runtime/i18n/validation.py
 oarepo_runtime/relations/__init__.py
 oarepo_runtime/relations/base.py
+oarepo_runtime/relations/components.py
 oarepo_runtime/relations/internal.py
 oarepo_runtime/relations/lookup.py
 oarepo_runtime/relations/mapping.py
 oarepo_runtime/relations/pid_relation.py
+oarepo_runtime/relations/uow.py
 oarepo_runtime/tasks/__init__.py
 oarepo_runtime/tasks/datastreams.py
 oarepo_runtime/ui/__init__.py

@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-runtime
-version = 1.2.19
+version = 1.2.21
 description = A set of runtime extensions of Invenio repository
 authors = Alzbeta
 readme = README.md