oarepo-runtime 1.5.81__py3-none-any.whl → 1.5.83__py3-none-any.whl

oarepo_runtime/records/mappings/rdm_parent_mapping.json

@@ -0,0 +1,39 @@
+{
+  "is_verified": {
+    "type": "boolean"
+  },
+  "access": {
+    "properties": {
+      "owned_by": {
+        "properties": {
+          "user": {
+            "type": "keyword"
+          }
+        }
+      },
+      "grants": {
+        "properties": {
+          "subject": {
+            "type": "keyword"
+          },
+          "id": {
+            "type": "keyword"
+          },
+          "level": {
+            "type": "keyword"
+          }
+        }
+      },
+      "grant_tokens": {
+        "type": "keyword"
+      },
+      "links": {
+        "properties": {
+          "id": {
+            "type": "keyword"
+          }
+        }
+      }
+    }
+  }
+}

oarepo_runtime/services/custom_fields/mappings.py

@@ -13,8 +13,12 @@ from invenio_search import current_search_client
 from invenio_search.engine import dsl, search
 from invenio_search.utils import build_alias_name
 
+from deepmerge import always_merger
 from oarepo_runtime.records.systemfields.mapping import MappingSystemFieldMixin
+import json
+import os
 
+from pathlib import Path
 
 class Mapping(InvenioMapping):
     @classmethod
@@ -116,6 +120,16 @@ def prepare_cf_index(record_class, config, path=[]):
 def prepare_parent_mapping(parent_class, config):
     if not parent_class:
         return
+
+    script_dir = str(Path(__file__).resolve().parent)
+    path_parts = script_dir.split('/')
+    path_parts = path_parts[:-2]
+    base_path = '/'.join(path_parts)
+    mapping_path = f"{base_path}/records/mappings/rdm_parent_mapping.json"
+
+    with open(mapping_path, 'r') as f:
+        rdm_parent = json.load(f)
+
     parent_mapping = {
         "parent": {
             "type": "object",
@@ -142,7 +156,11 @@ def prepare_parent_mapping(parent_class, config):
             },
         }
     }
-
+    parent_mapping_merged = always_merger.merge(parent_mapping, {
+        "parent": {
+            "properties": rdm_parent
+        }
+    })
     # upload mapping
     try:
         record_index = dsl.Index(
@@ -151,7 +169,7 @@ def prepare_parent_mapping(parent_class, config):
             ),
             using=current_search_client,
         )
-        update_index(record_index, {}, parent_mapping)
+        update_index(record_index, {}, parent_mapping_merged)
 
         if hasattr(config, "draft_cls"):
             draft_index = dsl.Index(
@@ -160,7 +178,7 @@ def prepare_parent_mapping(parent_class, config):
                 ),
                 using=current_search_client,
             )
-            update_index(draft_index, {}, parent_mapping)
+            update_index(record_index, {}, parent_mapping_merged)
 
     except search.RequestError as e:
         click.secho("An error occurred while creating parent mapping.", fg="red")

oarepo_runtime/services/permissions/generators.py

@@ -1,7 +1,7 @@
 from flask_principal import RoleNeed, UserNeed
 from invenio_records_permissions.generators import Generator
 from invenio_search.engine import dsl
-
+from flask import current_app
 
 class RecordOwners(Generator):
     """Allows record owners."""
@@ -12,7 +12,10 @@ class RecordOwners(Generator):
             # 'record' is required, so if not passed we default to empty array,
             # i.e. superuser-access.
             return []
-        owners = getattr(record.parent, "owners", None)
+        if current_app.config.get('INVENIO_RDM_ENABLED', False):
+            owners = getattr(record.parent.access, "owned_by", None)
+        else:
+            owners = getattr(record.parent, "owners", None)
         if owners is not None:
             return [UserNeed(owner.id) for owner in owners]
         return []
@@ -21,8 +24,10 @@ class RecordOwners(Generator):
         """Filters for current identity as owner."""
         users = [n.value for n in identity.provides if n.method == "id"]
         if users:
-            return dsl.Q("terms", **{"parent.owners.user": users})
-
+            if current_app.config.get('INVENIO_RDM_ENABLED', False):
+                return dsl.Q("terms", **{"parent.access.owned_by.user": users})
+            else:
+                return dsl.Q("terms", **{"parent.owners.user": users})
 
 class UserWithRole(Generator):
     def __init__(self, *roles):

{oarepo_runtime-1.5.81.dist-info → oarepo_runtime-1.5.83.dist-info}/METADATA

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

{oarepo_runtime-1.5.81.dist-info → oarepo_runtime-1.5.83.dist-info}/RECORD

@@ -50,6 +50,8 @@ oarepo_runtime/records/dumpers/edtf_interval.py,sha256=YCShZAoqBQYaxVilEVotS-jXZ
 oarepo_runtime/records/dumpers/multilingual_dumper.py,sha256=PbNFCLsiH4XV3E1v8xga_fzlcEImHy8OXn_UKh_8VBU,1090
 oarepo_runtime/records/entity_resolvers/__init__.py,sha256=UiiIT54pUu9j7qPAPfqVp4UTnXnppp0c_LtKbFnyt6Y,383
 oarepo_runtime/records/entity_resolvers/proxies.py,sha256=R92Cil_sTgX-sHJtdNv82yd-F3SUfsGSNCHdwI9Zfq8,1516
+oarepo_runtime/records/mappings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+oarepo_runtime/records/mappings/rdm_parent_mapping.json,sha256=9yRjlGs8-TZZiKN9MtAzNhRzYq9AEJFY9E80FN0wYoM,647
 oarepo_runtime/records/owners/__init__.py,sha256=R4hudCBqLRRzgCnkEjXIL7hSp068z-s6YOwYSkWyuaw,93
 oarepo_runtime/records/owners/registry.py,sha256=fYgBuW5nBKn6pyz2OBgfNlynk64_yhQ9J7FzPk8QU1U,795
 oarepo_runtime/records/relations/__init__.py,sha256=bDAgxl_LdKsqpGG3qluxAkQnn5u2ItJngnHQKkqzlkE,373
@@ -80,7 +82,7 @@ oarepo_runtime/services/config/link_conditions.py,sha256=evPRd5XU76Ok4J-08bBfplb
 oarepo_runtime/services/config/permissions_presets.py,sha256=V0dMrikzTzTiM2NRtdGgTML7AtXlrlYZ_vm3btzbJd4,6472
 oarepo_runtime/services/config/service.py,sha256=s-dVbGkLICpsce6jgu7b5kzYFz9opWjSQFDBgbIhKio,4002
 oarepo_runtime/services/custom_fields/__init__.py,sha256=_gqMcA_I3rdEZcBtCuDjO4wdVCqFML5NzaccuPx5a3o,2565
-oarepo_runtime/services/custom_fields/mappings.py,sha256=tg9CAdxGOkd_n6RB5Z2_wSwo_A0wqEey8RMcZ79AHo0,6906
+oarepo_runtime/services/custom_fields/mappings.py,sha256=Y1d0s9lG_VThkzSNlxAS94_9eOFZe9N2C1hpYDZvnvI,7457
 oarepo_runtime/services/entity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/services/entity/config.py,sha256=1jfdPrxSbMuKj7eOUNKRWTCPbBPyRV6MrWE4Vgf9rX0,399
 oarepo_runtime/services/entity/schema.py,sha256=8TBpUFRITaBO7qCMz36cly1Hj4I1nLa9PeSAfWSa2YM,157
@@ -101,7 +103,7 @@ oarepo_runtime/services/files/__init__.py,sha256=K8MStrEQf_BUhvzhwPTF93Hkhwrd1dt
 oarepo_runtime/services/files/components.py,sha256=x6Wd-vvkqTqB1phj2a6h42DNQksN8PuR2XKaOGoNHfw,2400
 oarepo_runtime/services/files/service.py,sha256=8DH0Pefr9kilM2JnOb-UYsnqerE8Z1Mu4p6DOJ4j_ZU,608
 oarepo_runtime/services/permissions/__init__.py,sha256=Cgin2Zr1fpaYr-aZcUotdmv0hsrPTUJVQt8ouvU8tuU,95
-oarepo_runtime/services/permissions/generators.py,sha256=YEOBCCvU-RG0BSWMtg76sv8qLcMbXxNu3rRJPDLtvvQ,1371
+oarepo_runtime/services/permissions/generators.py,sha256=OAJ_1W5eiLPkNvSXnWTDq0Z4-FU799qHa9tOufiOL3c,1722
 oarepo_runtime/services/records/__init__.py,sha256=hIoa2fx1AkDr6c-MgY561U2oN9LFeUCtfbVnetpBUOg,78
 oarepo_runtime/services/records/links.py,sha256=gVe-_hGkLtX7pd6sS6jTbRIhBby2FTn9PXyYPy3yxzs,737
 oarepo_runtime/services/relations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -133,9 +135,9 @@ tests/marshmallow_to_json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 tests/marshmallow_to_json/test_datacite_ui_schema.py,sha256=82iLj8nW45lZOUewpWbLX3mpSkpa9lxo-vK-Qtv_1bU,48552
 tests/marshmallow_to_json/test_simple_schema.py,sha256=izZN9p0v6kovtSZ6AdxBYmK_c6ZOti2_z_wPT_zXIr0,1500
 tests/pkg_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime-1.5.81.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.81.dist-info/METADATA,sha256=4kKkMZOQFm_CX7OxDmX3CBV2YTnlQ8vuHEFH42QY96o,4720
-oarepo_runtime-1.5.81.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-oarepo_runtime-1.5.81.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
-oarepo_runtime-1.5.81.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.81.dist-info/RECORD,,
+oarepo_runtime-1.5.83.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.83.dist-info/METADATA,sha256=nYdGP3yxN7VOCngVCzEe--YtLAiDdIESmcxGdL5zxqM,4720
+oarepo_runtime-1.5.83.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+oarepo_runtime-1.5.83.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
+oarepo_runtime-1.5.83.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.83.dist-info/RECORD,,