oarepo-runtime 1.5.129__tar.gz → 1.5.130__tar.gz

{oarepo_runtime-1.5.129/oarepo_runtime.egg-info → oarepo_runtime-1.5.130}/PKG-INFO

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

{oarepo_runtime-1.5.129 → oarepo_runtime-1.5.130}/oarepo_runtime/cli/validate.py

@@ -1,4 +1,5 @@
 import sys
+import traceback
 
 import click
 import yaml
@@ -6,6 +7,7 @@ from flask.cli import with_appcontext
 from invenio_db import db
 from invenio_records import Record
 from invenio_records_resources.proxies import current_service_registry
+from tqdm import tqdm
 
 from .base import oarepo
 
@@ -14,7 +16,6 @@ try:
 except ImportError:
     import json
 
-import sys
 from io import StringIO
 
 
@@ -34,9 +35,18 @@ def dump_data(d):
 )
 @click.argument("service-name")
 @click.argument("record-file", required=False)
+@click.option("--community", help="Community name")
 @click.option("--verbose/--no-verbose", is_flag=True)
+@click.option("--with-stacktrace", is_flag=True)
+@click.option(
+    "--fail-on-error",
+    is_flag=True,
+    help="Fail on the first error (for multiple records)",
+)
 @with_appcontext
-def validate(service_name, record_file, verbose):
+def validate(
+    service_name, record_file, community, verbose, with_stacktrace, fail_on_error
+):
     try:
         service = current_service_registry.get(service_name)
     except KeyError:
@@ -61,7 +71,13 @@ def validate(service_name, record_file, verbose):
 
     if not isinstance(data, list):
         data = [data]
-    for idx, d in enumerate(data):
+
+    errors_count = 0
+    for idx, d in enumerate(tqdm(data)):
+        if community:
+            d.setdefault("parent", {}).setdefault("communities", {})[
+                "default"
+            ] = community
         try:
             loaded = schema().load(d)
         except Exception as e:
@@ -71,25 +87,44 @@ def validate(service_name, record_file, verbose):
             )
             click.secho(dump_data(d))
             click.secho(e)
+            if with_stacktrace:
+                traceback.print_exc()
+            if fail_on_error:
+                sys.exit(1)
+            errors_count += 1
             continue
 
-        click.secho(
-            f"Marshmallow validation of record idx {idx+1} has been successful",
-            fg="green",
-        )
+        if verbose:
+            click.secho(
+                f"Marshmallow validation of record idx {idx+1} has been successful",
+                fg="green",
+            )
 
-        rec: Record = config.record_cls(loaded)
+        if hasattr(config, "draft_cls"):
+            record_cls = config.draft_cls
+        else:
+            record_cls = config.record_cls
 
         # Run pre create extensions to check vocabularies
         try:
             with db.session.begin_nested():
+
+                rec: Record = record_cls(
+                    loaded, model=record_cls.model_cls(id=None, data=data)
+                )
+                if record_cls.parent_record_cls:
+                    parent = record_cls.parent_record_cls(loaded["parent"])
+                    rec.parent = parent
+
                 for e in rec._extensions:
                     e.pre_commit(rec)
                 raise CheckOk()
         except CheckOk:
-            click.secho(
-                f"Pre-commit hook of record idx {idx+1} has been successful", fg="green"
-            )
+            if 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",
@@ -97,7 +132,19 @@ def validate(service_name, record_file, verbose):
             )
             click.secho(dump_data(d))
             click.secho(e)
+            if with_stacktrace:
+                traceback.print_exc()
+            if fail_on_error:
+                sys.exit(1)
+            errors_count += 1
             continue
 
         if verbose:
             yaml.safe_dump(loaded, sys.stdout, allow_unicode=True)
+
+    if errors_count:
+        click.secho(f"Validation finished with {errors_count} errors", fg="red")
+        sys.exit(1)
+    else:
+        click.secho("Validation finished successfully", fg="green")
+        sys.exit(0)

{oarepo_runtime-1.5.129 → oarepo_runtime-1.5.130/oarepo_runtime.egg-info}/PKG-INFO

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

{oarepo_runtime-1.5.129 → oarepo_runtime-1.5.130}/setup.cfg

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