oarepo-runtime 1.4.4__py3-none-any.whl → 1.4.6__py3-none-any.whl

oarepo_runtime/cli/index.py

@@ -1,3 +1,4 @@
+import itertools
 import sys
 
 import click
@@ -85,6 +86,18 @@ def record_or_service(model):
     return record
 
 
+def model_records_generator(model_class):
+    try:
+        for x in db.session.query(model_class.model_cls.id).filter(
+            model_class.model_cls.is_deleted.is_(False)
+        ):
+            rec_id = x[0]
+            yield model_class.get_record(rec_id)
+    except Exception as e:
+        if "Column expression or FROM clause expected" not in str(e):
+            raise
+
+
 @index.command()
 @with_appcontext
 @click.argument("model", required=False)
@@ -99,30 +112,38 @@ def reindex(model):
         service = current_service_registry.get(service_id)
         record_class = getattr(service.config, "record_cls", None)
 
-        if not record_class or not hasattr(service, "indexer"):
-            continue
+        id_generators = []
 
-        try:
-            id_generator = (
-                x[0]
-                for x in db.session.query(record_class.model_cls.id).filter(
-                    record_class.model_cls.is_deleted.is_(False)
+        if record_class and hasattr(service, "indexer"):
+            try:
+                id_generators.append(model_records_generator(record_class))
+            except Exception as e:
+                click.secho(
+                    f"Could not get record ids for {service_id}, exception {e}",
+                    file=sys.stderr,
+                )
+
+        draft_class = getattr(service.config, "draft_cls", None)
+
+        if draft_class and hasattr(service, "indexer"):
+            try:
+                id_generators.append(model_records_generator(draft_class))
+            except Exception as e:
+                click.secho(
+                    f"Could not get draft record ids for {service_id}, exception {e}",
+                    file=sys.stderr,
                 )
-            )
-        except Exception as e:
-            click.secho(
-                f"Could not get record ids for {service_id}, exception {e}",
-                file=sys.stderr,
-            )
-            continue
 
         click.secho(f"Indexing {service_id}", file=sys.stderr)
-        ids = list(id_generator)
-        for rec_id in ids:
-            record = record_class.get_record(rec_id)
-            service.indexer.index(record)
-        service.indexer.refresh()
+        count = 0
+        for gen in id_generators:
+            for record in gen:
+                service.indexer.index(record)
+                count += 1
+        if count:
+            service.indexer.refresh()
+
         click.secho(
-            f"Indexing {service_id} finished, indexed {len(ids)} records",
+            f"Indexing {service_id} finished, indexed {count} records",
             file=sys.stderr,
         )

oarepo_runtime/cli/validate.py

@@ -22,6 +22,12 @@ class CheckOk(Exception):
     pass
 
 
+def dump_data(d):
+    io = StringIO()
+    yaml.safe_dump(d, io, allow_unicode=True)
+    return io.getvalue()
+
+
 @oarepo.command(
     help="Validate a record. Takes one or two parameters - service name as "
     "the first one, file name or stdin with record data as the second"
@@ -51,12 +57,22 @@ def validate(service_name, record_file, verbose):
     if file_content.startswith("{"):
         data = json.loads(file_content)
     else:
-        data = yaml.safe_load(StringIO(file_content))
+        data = list(yaml.safe_load_all(StringIO(file_content)))
 
     if not isinstance(data, list):
         data = [data]
     for idx, d in enumerate(data):
-        loaded = schema().load(d)
+        try:
+            loaded = schema().load(d)
+        except Exception as e:
+            click.secho(
+                f"Marshmallow validation of record idx {idx + 1} failed",
+                fg="red",
+            )
+            click.secho(dump_data(d))
+            click.secho(e)
+            continue
+
         click.secho(
             f"Marshmallow validation of record idx {idx+1} has been successful",
             fg="green",
@@ -74,6 +90,14 @@ def validate(service_name, record_file, verbose):
             click.secho(
                 f"Pre-commit hook of record idx {idx+1} has been successful", fg="green"
             )
+        except Exception as e:
+            click.secho(
+                f"Pre-commit validation of record idx {idx + 1} failed",
+                fg="red",
+            )
+            click.secho(dump_data(d))
+            click.secho(e)
+            continue
 
         if verbose:
             yaml.safe_dump(loaded, sys.stdout, allow_unicode=True)

oarepo_runtime/relations/errors.py

@@ -0,0 +1,5 @@
+class InvalidRelationError(KeyError):
+    def __init__(self, message, related_id, location):
+        self.related_id = related_id
+        self.location = location
+        super().__init__(message)

oarepo_runtime/relations/pid_relation.py

@@ -1,6 +1,7 @@
 from invenio_db import db
 
 from .base import Relation, RelationResult
+from .errors import InvalidRelationError
 from .lookup import LookupResult
 
 
@@ -8,19 +9,23 @@ class PIDRelationResult(RelationResult):
     def resolve(self, id_):
         """Resolve the value using the record class."""
         # TODO: handle permissions here !!!!!!
-        pid_field = self.field.pid_field.field
-        cache_key = (
-            pid_field._provider.pid_type
-            if pid_field._provider
-            else pid_field._pid_type,
-            id_,
-        )
+        pid_field_context = self.field.pid_field
+        if hasattr(pid_field_context, "pid_type"):
+            pid_type = pid_field_context.pid_type
+        else:
+            pid_field = pid_field_context.field
+            pid_type = (
+                pid_field._provider.pid_type
+                if pid_field._provider
+                else pid_field._pid_type
+            )
+        cache_key = (pid_type, id_)
         if cache_key in self.cache:
             obj = self.cache[cache_key]
             return obj
 
         try:
-            obj = self.field.pid_field.resolve(id_)
+            obj = pid_field_context.resolve(id_)
             # We detach the related record model from the database session when
             # we add it in the cache. Otherwise, accessing the cached record
             # model, will execute a new select query after a db.session.commit.
@@ -28,8 +33,10 @@ class PIDRelationResult(RelationResult):
             self.cache[cache_key] = obj
             return obj
         except Exception as e:
-            raise KeyError(
-                f"Repository object {cache_key} has not been found or there was an exception accessing it"
+            raise InvalidRelationError(
+                f"Repository object {cache_key} has not been found or there was an exception accessing it. Referenced from {self.field.key}.",
+                related_id=id_,
+                location=self.field.key,
             ) from e
 
     def _needs_update_relation_value(self, relation: LookupResult):

{oarepo_runtime-1.4.4.dist-info → oarepo_runtime-1.4.6.dist-info}/METADATA

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

{oarepo_runtime-1.4.4.dist-info → oarepo_runtime-1.4.6.dist-info}/RECORD

@@ -12,8 +12,8 @@ oarepo_runtime/cli/__init__.py,sha256=-WGXmjHoSqiApR_LvYnZTimuL-frR7SynrsSklnjb3
 oarepo_runtime/cli/assets.py,sha256=XLZTnsGb88O5N8R2D3AYpZqtnO4JrbybUtRLKnL1p3w,2430
 oarepo_runtime/cli/base.py,sha256=xZMsR2rati5Mz0DZzmnlhVI7E6ePCfnOiTayrxT9cWU,259
 oarepo_runtime/cli/check.py,sha256=zQ6txhfN6LWvdWgRa3ZFdOifbuazoRQd-7ml0qwIBWg,2358
-oarepo_runtime/cli/index.py,sha256=2QMCEijHJeYJrf1WPFR8UhgsRwmBVIaiKx-gCFNTWM4,4010
-oarepo_runtime/cli/validate.py,sha256=jzvCicXibYhIK10m7aOePv1icljlCjXaZlH67rY4JAg,2177
+oarepo_runtime/cli/index.py,sha256=fZMMw0Z4vwJ9fe7g8tb4wyoAMKeushxORvIUgxWQA40,4701
+oarepo_runtime/cli/validate.py,sha256=HpSvHQCGHlrdgdpKix9cIlzlBoJEiT1vACZdMnOUGEY,2827
 oarepo_runtime/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/config/permissions_presets.py,sha256=4gWNYwOi7CmS69PnxpbjHY45sc0q7BcrvkhSFdn1SlU,5786
 oarepo_runtime/config/service.py,sha256=IDDEQJ3LWYBLTFhE_8jPXiinIDNDY52fI0zigDJ_usQ,1095
@@ -60,10 +60,11 @@ oarepo_runtime/i18n/validation.py,sha256=fyMTi2Rw-KiHv7c7HN61zGxRVa9sAjAEEkAL5wU
 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=J9rvzaAoRDbSVuA01hIOlXKQP-OE5VJI5w5xuMsFO70,602
+oarepo_runtime/relations/errors.py,sha256=t-vVyefGPP07-_-YmhWjjGbhXU3GQ3sVtUPt5_IZ-5E,197
 oarepo_runtime/relations/internal.py,sha256=OTp8iJqyl80sWDk0Q0AK42l6UsxZDABspVU_GwWza9o,1556
 oarepo_runtime/relations/lookup.py,sha256=wi3jPfOedazOmhOMrgu50PUETc1jfSdpmjK0wvOFsEM,848
 oarepo_runtime/relations/mapping.py,sha256=jwFCWCnW8hb44ZZBeVf96QR79S9FT2hvm4L8EuCBo5U,1277
-oarepo_runtime/relations/pid_relation.py,sha256=OrF0Ihgua3tC7j5VBH116D5zHNHyodoeWux3ThLAZ3c,2063
+oarepo_runtime/relations/pid_relation.py,sha256=SEAZ99x9lOj91EPSIDZuVCTWW1a13A5iv9RrO7GRdUY,2424
 oarepo_runtime/relations/uow.py,sha256=KrN8B-wVbmb0kOErxb7bAhPmOR6-mMRgBr-ab-ir6hQ,151
 oarepo_runtime/resolvers/__init__.py,sha256=kTlvSiympib59YQV7wEKpIXGprPWRuvxLIwmeeQdUec,89
 oarepo_runtime/resolvers/proxies.py,sha256=egtT7uXL91KswWI7gqUIaz1vWIHezdsiI_M-xRKXWww,547
@@ -80,9 +81,9 @@ oarepo_runtime/utils/path.py,sha256=V1NVyk3m12_YLbj7QHYvUpE1wScO78bYsX1LOLeXDkI,
 oarepo_runtime/validation/__init__.py,sha256=lU7DgZq8pGD5Pa-QqL9gvLsib3IYtM-Y56k-NwHrPG0,166
 oarepo_runtime/validation/dates.py,sha256=fahqKGDdIYWux5ZeoljrEe8VD2fDZR9VpfvYmTYAmpw,1050
 tests/pkg_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime-1.4.4.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.4.4.dist-info/METADATA,sha256=LU2TYx23EA8qBbeGJr1mjtDd4hueMPOrhphaAzMsAa0,2694
-oarepo_runtime-1.4.4.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-oarepo_runtime-1.4.4.dist-info/entry_points.txt,sha256=C32W4eT-8OypMCfwOO5WREioVKSneDfY51D78Uvdbp0,231
-oarepo_runtime-1.4.4.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.4.4.dist-info/RECORD,,
+oarepo_runtime-1.4.6.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.4.6.dist-info/METADATA,sha256=Qz4fu5lS2SVdr_-opBBEtzkFsWoGIMF78prI4eW-EyY,2694
+oarepo_runtime-1.4.6.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+oarepo_runtime-1.4.6.dist-info/entry_points.txt,sha256=C32W4eT-8OypMCfwOO5WREioVKSneDfY51D78Uvdbp0,231
+oarepo_runtime-1.4.6.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.4.6.dist-info/RECORD,,