oarepo-runtime 1.5.16__tar.gz → 1.5.18__tar.gz

{oarepo-runtime-1.5.16/oarepo_runtime.egg-info → oarepo-runtime-1.5.18}/PKG-INFO

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

{oarepo-runtime-1.5.16 → oarepo-runtime-1.5.18}/oarepo_runtime/cli/fixtures.py

@@ -7,9 +7,10 @@ from oarepo_runtime.cli import oarepo
 from oarepo_runtime.datastreams import SynchronousDataStream
 from oarepo_runtime.datastreams.asynchronous import AsynchronousDataStream
 from oarepo_runtime.datastreams.fixtures import (
+    FixturesCallback,
     dump_fixtures,
     fixtures_asynchronous_callback,
-    load_fixtures, FixturesCallback,
+    load_fixtures,
 )
 from oarepo_runtime.datastreams.types import StatsKeepingDataStreamCallback
 
@@ -33,11 +34,7 @@ def fixtures():
     help="Size for bulk indexing - this number of records "
     "will be committed in a single transaction and indexed together",
 )
-@click.option(
-    "--batch-size",
-    help="Alias for --bulk-size",
-    type=int
-)
+@click.option("--batch-size", help="Alias for --bulk-size", type=int)
 @with_appcontext
 def load(
     fixture_dir=None,
@@ -47,7 +44,7 @@ def load(
     verbose=False,
     bulk_size=100,
     on_background=False,
-    batch_size=None
+    batch_size=None,
 ):
     """Loads fixtures"""
     if batch_size:
@@ -104,7 +101,7 @@ def _show_stats(callback: StatsKeepingDataStreamCallback, title: str):
 
 
 class TQDMCallback(FixturesCallback):
-    def __init__(self, message_prefix = 'Loading ', verbose=False):
+    def __init__(self, message_prefix="Loading ", verbose=False):
         super().__init__()
         self._tqdm = tqdm.tqdm(unit=" item(s)")
         self._message_prefix = message_prefix

{oarepo-runtime-1.5.16 → oarepo-runtime-1.5.18}/oarepo_runtime/cli/index.py

@@ -1,13 +1,13 @@
 import sys
+from io import StringIO
 
 import click
+import yaml
 from flask.cli import with_appcontext
 from invenio_db import db
 from invenio_records_resources.proxies import current_service_registry
 from invenio_search.proxies import current_search
 from werkzeug.utils import ImportStringError, import_string
-from io import StringIO
-import yaml
 
 try:
     from tqdm import tqdm
@@ -152,15 +152,25 @@ def reindex(model, bulk_size, verbose):
                 index_result = service.indexer.client.bulk(bulk)
                 count += len(bulk) // 2
 
-                for index_item_result in index_result['items']:
-                    result = index_item_result['index']
-                    if result['status'] != 200:
+                for index_item_result in index_result["items"]:
+                    result = index_item_result["index"]
+                    if result["status"] != 200:
                         errors += 1
-                        click.secho(f"Error indexing record with id {result['_id']}", fg="red", file=sys.stderr)
-                        click.secho(dump_yaml(result.get('error')), fg="red", file=sys.stderr)
+                        click.secho(
+                            f"Error indexing record with id {result['_id']}",
+                            fg="red",
+                            file=sys.stderr,
+                        )
+                        click.secho(
+                            dump_yaml(result.get("error")), fg="red", file=sys.stderr
+                        )
                         if verbose:
                             click.secho("Record:", file=sys.stderr)
-                            rec = [bulk[idx+1] for idx in range(0, len(bulk), 2) if bulk[idx]['index']['_id'] == result['_id']]
+                            rec = [
+                                bulk[idx + 1]
+                                for idx in range(0, len(bulk), 2)
+                                if bulk[idx]["index"]["_id"] == result["_id"]
+                            ]
                             if rec:
                                 click.secho(dump_yaml(rec[0]))
                             else:
@@ -204,4 +214,4 @@ def generate_bulk_data(record_generator, record_indexer, bulk_size):
 def dump_yaml(data):
     io = StringIO()
     yaml.dump(data, io, allow_unicode=True)
-    return io.getvalue()
+    return io.getvalue()

{oarepo-runtime-1.5.16 → oarepo-runtime-1.5.18}/oarepo_runtime/datastreams/fixtures.py

@@ -27,7 +27,6 @@ class FixturesCallback(StatsKeepingDataStreamCallback):
         pass
 
 
-
 def load_fixtures(
     fixture_dir=None,
     include=None,

{oarepo-runtime-1.5.16 → oarepo-runtime-1.5.18}/oarepo_runtime/datastreams/utils.py

@@ -32,6 +32,7 @@ def get_record_service_for_record(record):
         if service_record == type(record):
             return svc
 
+
 def get_file_service_for_record_class(record_class):
     if not record_class:
         return None

{oarepo-runtime-1.5.16 → oarepo-runtime-1.5.18}/oarepo_runtime/ext.py

@@ -28,9 +28,9 @@ class OARepoRuntime(object):
 
         for k in ext_config.OAREPO_PERMISSIONS_PRESETS:
             if k not in app.config["OAREPO_PERMISSIONS_PRESETS"]:
-                app.config["OAREPO_PERMISSIONS_PRESETS"][k] = (
-                    ext_config.OAREPO_PERMISSIONS_PRESETS[k]
-                )
+                app.config["OAREPO_PERMISSIONS_PRESETS"][
+                    k
+                ] = ext_config.OAREPO_PERMISSIONS_PRESETS[k]
 
         for k in dir(ext_config):
             if k == "DEFAULT_DATASTREAMS_EXCLUDES":

{oarepo-runtime-1.5.16 → oarepo-runtime-1.5.18}/oarepo_runtime/records/systemfields/selectors.py

@@ -22,6 +22,7 @@ class FirstItemSelector(PathSelector):
     def select(self, record):
         for rec in super().select(record):
             return [rec]
+        return []
 
 
 def getter(data, path: List):

{oarepo-runtime-1.5.16 → oarepo-runtime-1.5.18}/oarepo_runtime/records/systemfields/synthetic.py

@@ -2,6 +2,10 @@ from invenio_records.systemfields import SystemField
 
 from .mapping import MappingSystemFieldMixin
 
+import logging
+
+log = logging.getLogger(__name__)
+
 
 class SyntheticSystemField(MappingSystemFieldMixin, SystemField):
     """
@@ -90,6 +94,7 @@ class SyntheticSystemField(MappingSystemFieldMixin, SystemField):
                 remove_key(d[key[0]], key[1:])
                 if not d[key[0]]:
                     d.pop(key[0])
+
         remove_key(data, self.key.split("."))
 
     def __get__(self, record, owner=None):
@@ -99,20 +104,24 @@ class SyntheticSystemField(MappingSystemFieldMixin, SystemField):
 
     def _value(self, data):
         if self.selector:
-            value = list(self.selector.select(data))
-            value = [x for x in value if x is not None]
-            if self.filter:
-                value = [x for x in value if self.filter(x)]
-            if self.map:
-                ret = []
-                for x in value:
-                    mapped = self.map(x)
-                    if isinstance(mapped, list):
-                        ret.extend(mapped)
-                    elif mapped is not None:
-                        ret.append(mapped)
-                value = ret
-            return value
+            try:
+                value = list(self.selector.select(data) or [])
+                value = [x for x in value if x is not None]
+                if self.filter:
+                    value = [x for x in value if self.filter(x)]
+                if self.map:
+                    ret = []
+                    for x in value:
+                        mapped = self.map(x)
+                        if isinstance(mapped, list):
+                            ret.extend(mapped)
+                        elif mapped is not None:
+                            ret.append(mapped)
+                    value = ret
+                return value
+            except:
+                log.exception(f"Error in selector {self.selector} for {self.key}")
+                return []
         raise ValueError(
             "Please either provide a selector or subclass this class and implement a _value method"
         )

{oarepo-runtime-1.5.16 → oarepo-runtime-1.5.18}/oarepo_runtime/services/config/__init__.py

@@ -1,5 +1,9 @@
-from .permissions_presets import (OaiHarvesterPermissionPolicy, ReadOnlyPermissionPolicy, EveryonePermissionPolicy,
-                                  AuthenticatedPermissionPolicy)
+from .permissions_presets import (
+    AuthenticatedPermissionPolicy,
+    EveryonePermissionPolicy,
+    OaiHarvesterPermissionPolicy,
+    ReadOnlyPermissionPolicy,
+)
 from .service import PermissionsPresetsConfigMixin, UserWithRole
 
 __all__ = (
@@ -9,4 +13,4 @@ __all__ = (
     "ReadOnlyPermissionPolicy",
     "EveryonePermissionPolicy",
     "AuthenticatedPermissionPolicy",
-)
+)

{oarepo-runtime-1.5.16 → oarepo-runtime-1.5.18}/oarepo_runtime/services/schema/ui.py

@@ -88,10 +88,18 @@ class LocalizedEDTF(LocalizedMixin, MultilayerFormatEDTF):
     pass
 
 
+class LocalizedEDTFTime(LocalizedMixin, MultilayerFormatEDTF):
+    pass
+
+
 class LocalizedEDTFInterval(LocalizedMixin, FormatEDTF):
     pass
 
 
+class LocalizedEDTFTimeInterval(LocalizedMixin, FormatEDTF):
+    pass
+
+
 class PrefixedGettextField(BabelGettextDictField):
     def __init__(self, *, value_prefix, locale, default_locale, **kwargs):
         super().__init__(locale, default_locale, **kwargs)

{oarepo-runtime-1.5.16 → oarepo-runtime-1.5.18}/oarepo_runtime/utils/functools.py

@@ -9,7 +9,6 @@ def try_sequence(*funcs, ignored_exceptions=(), raised_exception=Exception):
 
 
 class class_property:
-
     def __init__(self, getter=None, setter=None):
         if getter is not None and not isinstance(getter, classmethod):
             getter = classmethod(getter)

{oarepo-runtime-1.5.16 → oarepo-runtime-1.5.18/oarepo_runtime.egg-info}/PKG-INFO

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

{oarepo-runtime-1.5.16 → oarepo-runtime-1.5.18}/setup.cfg

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

{oarepo-runtime-1.5.16 → oarepo-runtime-1.5.18}/oarepo_runtime/services/config/service.py

@@ -7,9 +7,9 @@ from flask_principal import RoleNeed
 from invenio_accounts.models import User
 from invenio_records_permissions import BasePermissionPolicy
 from invenio_records_permissions.generators import Generator
+from invenio_search.engine import dsl
 
 from oarepo_runtime.utils.functools import class_property
-from invenio_search.engine import dsl
 
 
 class PermissionsPresetsConfigMixin: