oarepo-runtime 1.5.31__tar.gz → 1.5.33__tar.gz

{oarepo_runtime-1.5.31/oarepo_runtime.egg-info → oarepo_runtime-1.5.33}/PKG-INFO

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

{oarepo_runtime-1.5.31 → oarepo_runtime-1.5.33}/oarepo_runtime/cli/index.py

@@ -95,17 +95,6 @@ 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:
-        click.secho(f"Could not index {model_class}: {e}", fg="red", file=sys.stderr)
-
-
 @index.command()
 @with_appcontext
 @click.argument("model", required=False)
@@ -119,14 +108,22 @@ def reindex(model, bulk_size, verbose):
     for service_id in services:
         click.secho(f"Preparing to index {service_id}", file=sys.stderr)
 
-        service = current_service_registry.get(service_id)
+        try:
+            service = current_service_registry.get(service_id)
+        except KeyError:
+            click.secho(f"Service {service_id} not in known services:", color="red")
+            for known_service_id, known_service in sorted(current_service_registry._services.items()):
+                click.secho(f"    {known_service_id} -> {type(known_service).__module__}.{type(known_service).__name__}", color="red")
+            sys.exit(1)
         record_class = getattr(service.config, "record_cls", None)
 
         id_generators = []
 
+        record_generator = RECORD_GENERATORS.get(service_id,  model_records_generator)
+
         if record_class and hasattr(service, "indexer"):
             try:
-                id_generators.append(model_records_generator(record_class))
+                id_generators.append(record_generator(record_class))
             except Exception as e:
                 click.secho(
                     f"Could not get record ids for {service_id}, exception {e}",
@@ -137,7 +134,7 @@ def reindex(model, bulk_size, verbose):
 
         if draft_class and hasattr(service, "indexer"):
             try:
-                id_generators.append(model_records_generator(draft_class))
+                id_generators.append(record_generator(draft_class))
             except Exception as e:
                 click.secho(
                     f"Could not get draft record ids for {service_id}, exception {e}",
@@ -151,7 +148,6 @@ def reindex(model, bulk_size, verbose):
             for bulk in generate_bulk_data(gen, service.indexer, bulk_size=bulk_size):
                 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:
@@ -215,3 +211,28 @@ def dump_yaml(data):
     io = StringIO()
     yaml.dump(data, io, allow_unicode=True)
     return io.getvalue()
+
+
+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:
+        click.secho(f"Could not index {model_class}: {e}", fg="red", file=sys.stderr)
+
+def users_record_generator(model_class):
+    from invenio_accounts.models import User
+    from invenio_users_resources.records.api import UserAggregate
+    try:
+        for x in db.session.query(User.id):
+            rec_id = x[0]
+            yield UserAggregate.get_record(rec_id)
+    except Exception as e:
+        click.secho(f"Could not index {model_class}: {e}", fg="red", file=sys.stderr)
+
+RECORD_GENERATORS = {
+    'users': users_record_generator
+}

{oarepo_runtime-1.5.31 → oarepo_runtime-1.5.33}/oarepo_runtime/services/schema/ui.py

@@ -124,6 +124,7 @@ if False:  # NOSONAR
 
 
 class InvenioUISchema(ma.Schema):
+    _schema = ma.fields.Str(attribute="$schema", data_key="$schema")
     id = ma.fields.Str()
     created = LocalizedDateTime(dump_only=True)
     updated = LocalizedDateTime(dump_only=True)

{oarepo_runtime-1.5.31 → oarepo_runtime-1.5.33/oarepo_runtime.egg-info}/PKG-INFO

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

{oarepo_runtime-1.5.31 → oarepo_runtime-1.5.33}/setup.cfg

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