oarepo-runtime 1.5.126__tar.gz → 1.5.128__tar.gz

{oarepo_runtime-1.5.126/oarepo_runtime.egg-info → oarepo_runtime-1.5.128}/PKG-INFO

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

{oarepo_runtime-1.5.126 → oarepo_runtime-1.5.128}/oarepo_runtime/cli/permissions/base.py

@@ -1,5 +1,5 @@
 from flask import current_app
-from flask_principal import Identity, identity_loaded
+from flask_principal import Identity, UserNeed, identity_loaded
 from invenio_access.models import User
 
 from ..base import oarepo
@@ -18,6 +18,7 @@ def get_user_and_identity(user_id_or_email):
         user = User.query.filter_by(email=user_id_or_email).one()
 
     identity = Identity(user.id)
+    identity.provides.add(UserNeed(str(user.id)))
     api_app = current_app.wsgi_app.mounts["/api"]
     with api_app.app_context():
         with current_app.test_request_context("/api"):

oarepo_runtime-1.5.128/oarepo_runtime/records/drafts.py

@@ -0,0 +1,42 @@
+from invenio_records_resources.records.api import Record
+
+from oarepo_runtime.datastreams.utils import get_record_service_for_record
+
+
+def has_draft(record: Record) -> bool:
+    return get_draft(record) is not None
+
+
+def get_draft(record: Record) -> Record | None:
+    """Get the draft of a published record, if it exists.
+
+    A record can have a draft if:
+
+    - it has a parent record (so, for vocabulary records, this will always be False)
+    - if it has a has_draft attribute (that means, it is a published record)
+    - the has_draft is True meaning that the record has a draft ('edit metadata' button)
+    - if the record has a parent and the parent has a draft (edited 'new version' of the record)
+    """
+    if getattr(record, "is_draft", False):
+        return record
+    if not hasattr(record, "parent"):
+        return None
+    if not hasattr(record, "has_draft"):
+        return None
+
+    record_service = get_record_service_for_record(record)
+    if not record_service:
+        return None
+
+    try:
+        # if there is no record service, we cannot check for draft
+        if not record_service:
+            return None
+        return next(
+            record_service.config.draft_cls.get_records_by_parent(
+                record.parent, with_deleted=False
+            )
+        )
+    except StopIteration:
+        # no draft found
+        return None

oarepo_runtime-1.5.128/oarepo_runtime/records/mappings/rdm_parent_mapping.json

@@ -0,0 +1,483 @@
+{
+  "access": {
+    "properties": {
+      "owned_by": {
+        "properties": {
+          "user": {
+            "type": "keyword"
+          }
+        }
+      },
+      "grants": {
+        "properties": {
+          "subject": {
+            "properties": {
+              "type": {
+                "type": "keyword"
+              },
+              "id": {
+                "type": "keyword"
+              }
+            }
+          },
+          "permission": {
+            "type": "keyword"
+          },
+          "origin": {
+            "type": "keyword"
+          }
+        }
+      },
+      "grant_tokens": {
+        "type": "keyword"
+      },
+      "links": {
+        "properties": {
+          "id": {
+            "type": "keyword"
+          }
+        }
+      },
+      "settings": {
+        "properties": {
+          "allow_user_requests": {
+            "type": "boolean"
+          },
+          "allow_guest_requests": {
+            "type": "boolean"
+          },
+          "accept_conditions_text": {
+            "type": "text"
+          },
+          "secret_link_expiration": {
+            "type": "integer"
+          }
+        }
+      }
+    }
+  },
+  "is_verified": {
+    "type": "boolean"
+  },
+  "communities": {
+    "properties": {
+      "ids": {
+        "type": "keyword"
+      },
+      "default": {
+        "type": "keyword"
+      },
+      "entries": {
+        "type": "object",
+        "properties": {
+          "uuid": {
+            "type": "keyword"
+          },
+          "created": {
+            "type": "date"
+          },
+          "updated": {
+            "type": "date"
+          },
+          "version_id": {
+            "type": "long"
+          },
+          "id": {
+            "type": "keyword"
+          },
+          "is_verified": {
+            "type": "boolean"
+          },
+          "@v": {
+            "type": "keyword"
+          },
+          "slug": {
+            "type": "keyword"
+          },
+          "children": {
+            "properties": {
+              "allow": {
+                "type": "boolean"
+              }
+            }
+          },
+          "metadata": {
+            "properties": {
+              "title": {
+                "type": "text"
+              },
+              "type": {
+                "type": "object",
+                "properties": {
+                  "@v": {
+                    "type": "keyword"
+                  },
+                  "id": {
+                    "type": "keyword"
+                  },
+                  "title": {
+                    "type": "object",
+                    "dynamic": "true",
+                    "properties": {
+                      "en": {
+                        "type": "text"
+                      }
+                    }
+                  }
+                }
+              },
+              "organizations": {
+                "type": "object",
+                "properties": {
+                  "@v": {
+                    "type": "keyword"
+                  },
+                  "id": {
+                    "type": "keyword"
+                  },
+                  "name": {
+                    "type": "text"
+                  },
+                  "identifiers": {
+                    "properties": {
+                      "identifier": {
+                        "type": "text",
+                        "fields": {
+                          "keyword": {
+                            "type": "keyword"
+                          }
+                        }
+                      },
+                      "scheme": {
+                        "type": "keyword"
+                      }
+                    }
+                  }
+                }
+              },
+              "funding": {
+                "properties": {
+                  "award": {
+                    "type": "object",
+                    "properties": {
+                      "@v": {
+                        "type": "keyword"
+                      },
+                      "id": {
+                        "type": "keyword"
+                      },
+                      "title": {
+                        "type": "object",
+                        "dynamic": "true"
+                      },
+                      "number": {
+                        "type": "text",
+                        "fields": {
+                          "keyword": {
+                            "type": "keyword"
+                          }
+                        }
+                      },
+                      "program": {
+                        "type": "keyword"
+                      },
+                      "acronym": {
+                        "type": "keyword",
+                        "fields": {
+                          "text": {
+                            "type": "text"
+                          }
+                        }
+                      },
+                      "identifiers": {
+                        "properties": {
+                          "identifier": {
+                            "type": "keyword"
+                          },
+                          "scheme": {
+                            "type": "keyword"
+                          }
+                        }
+                      },
+                      "subjects": {
+                        "properties": {
+                          "@v": {
+                            "type": "keyword"
+                          },
+                          "id": {
+                            "type": "keyword"
+                          },
+                          "subject": {
+                            "type": "keyword"
+                          },
+                          "scheme": {
+                            "type": "keyword"
+                          },
+                          "props": {
+                            "type": "object",
+                            "dynamic": "true"
+                          }
+                        }
+                      },
+                      "organizations": {
+                        "properties": {
+                          "scheme": {
+                            "type": "keyword"
+                          },
+                          "id": {
+                            "type": "keyword"
+                          },
+                          "organization": {
+                            "type": "keyword"
+                          }
+                        }
+                      }
+                    }
+                  },
+                  "funder": {
+                    "type": "object",
+                    "properties": {
+                      "@v": {
+                        "type": "keyword"
+                      },
+                      "id": {
+                        "type": "keyword"
+                      },
+                      "name": {
+                        "type": "text"
+                      }
+                    }
+                  }
+                }
+              },
+              "website": {
+                "type": "keyword"
+              }
+            }
+          },
+          "theme": {
+            "type": "object",
+            "properties": {
+              "enabled": {
+                "type": "boolean"
+              },
+              "brand": {
+                "type": "keyword"
+              },
+              "style": {
+                "type": "object",
+                "enabled": false
+              }
+            }
+          },
+          "parent": {
+            "type": "object",
+            "properties": {
+              "uuid": {
+                "type": "keyword"
+              },
+              "created": {
+                "type": "date"
+              },
+              "updated": {
+                "type": "date"
+              },
+              "version_id": {
+                "type": "long"
+              },
+              "id": {
+                "type": "keyword"
+              },
+              "@v": {
+                "type": "keyword"
+              },
+              "is_verified": {
+                "type": "boolean"
+              },
+              "slug": {
+                "type": "keyword"
+              },
+              "children": {
+                "properties": {
+                  "allow": {
+                    "type": "boolean"
+                  }
+                }
+              },
+              "metadata": {
+                "type": "object",
+                "properties": {
+                  "title": {
+                    "type": "text"
+                  },
+                  "type": {
+                    "type": "object",
+                    "properties": {
+                      "@v": {
+                        "type": "keyword"
+                      },
+                      "id": {
+                        "type": "keyword"
+                      },
+                      "title": {
+                        "type": "object",
+                        "dynamic": "true",
+                        "properties": {
+                          "en": {
+                            "type": "text"
+                          }
+                        }
+                      }
+                    }
+                  },
+                  "website": {
+                    "type": "keyword"
+                  },
+                  "organizations": {
+                    "type": "object",
+                    "properties": {
+                      "@v": {
+                        "type": "keyword"
+                      },
+                      "id": {
+                        "type": "keyword"
+                      },
+                      "name": {
+                        "type": "text"
+                      },
+                      "identifiers": {
+                        "properties": {
+                          "identifier": {
+                            "type": "text",
+                            "fields": {
+                              "keyword": {
+                                "type": "keyword"
+                              }
+                            }
+                          },
+                          "scheme": {
+                            "type": "keyword"
+                          }
+                        }
+                      }
+                    }
+                  },
+                  "funding": {
+                    "properties": {
+                      "award": {
+                        "type": "object",
+                        "properties": {
+                          "@v": {
+                            "type": "keyword"
+                          },
+                          "id": {
+                            "type": "keyword"
+                          },
+                          "title": {
+                            "type": "object",
+                            "dynamic": "true"
+                          },
+                          "number": {
+                            "type": "text",
+                            "fields": {
+                              "keyword": {
+                                "type": "keyword"
+                              }
+                            }
+                          },
+                          "program": {
+                            "type": "keyword"
+                          },
+                          "acronym": {
+                            "type": "keyword",
+                            "fields": {
+                              "text": {
+                                "type": "text"
+                              }
+                            }
+                          },
+                          "identifiers": {
+                            "properties": {
+                              "identifier": {
+                                "type": "keyword"
+                              },
+                              "scheme": {
+                                "type": "keyword"
+                              }
+                            }
+                          },
+                          "subjects": {
+                            "properties": {
+                              "@v": {
+                                "type": "keyword"
+                              },
+                              "id": {
+                                "type": "keyword"
+                              },
+                              "subject": {
+                                "type": "keyword"
+                              },
+                              "scheme": {
+                                "type": "keyword"
+                              },
+                              "props": {
+                                "type": "object",
+                                "dynamic": "true"
+                              }
+                            }
+                          },
+                          "organizations": {
+                            "properties": {
+                              "scheme": {
+                                "type": "keyword"
+                              },
+                              "id": {
+                                "type": "keyword"
+                              },
+                              "organization": {
+                                "type": "keyword"
+                              }
+                            }
+                          }
+                        }
+                      },
+                      "funder": {
+                        "type": "object",
+                        "properties": {
+                          "@v": {
+                            "type": "keyword"
+                          },
+                          "id": {
+                            "type": "keyword"
+                          },
+                          "name": {
+                            "type": "text"
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              },
+              "theme": {
+                "type": "object",
+                "properties": {
+                  "enabled": {
+                    "type": "boolean"
+                  },
+                  "brand": {
+                    "type": "keyword"
+                  },
+                  "style": {
+                    "type": "object",
+                    "enabled": false
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

{oarepo_runtime-1.5.126 → oarepo_runtime-1.5.128}/oarepo_runtime/services/config/__init__.py

@@ -1,5 +1,7 @@
+from .draft_link import DraftLink
 from .link_conditions import (
     has_draft,
+    has_draft_permission,
     has_file_permission,
     has_permission,
     has_permission_file_service,
@@ -28,4 +30,6 @@ __all__ = (
     "has_permission_file_service",
     "has_file_permission",
     "has_published_record",
+    "has_draft_permission",
+    "DraftLink",
 )

oarepo_runtime-1.5.128/oarepo_runtime/services/config/draft_link.py

@@ -0,0 +1,23 @@
+from invenio_records_resources.services import RecordLink
+
+from oarepo_runtime.records.drafts import get_draft
+
+
+class DraftLink(RecordLink):
+    """Draft link."""
+
+    def __init__(self, *args, **kwargs):
+        """Initialize draft link."""
+        super().__init__(*args, **kwargs)
+
+    @staticmethod
+    def vars(record, vars):
+        """Variables for the URI template."""
+        # Some records don't have record.pid.pid_value yet (e.g. drafts)
+        RecordLink.vars(record, vars)
+        draft_record = get_draft(record)
+
+        if draft_record:
+            pid_value = getattr(draft_record.pid, "pid_value", None)
+            if pid_value:
+                vars.update({"id": pid_value})

{oarepo_runtime-1.5.126 → oarepo_runtime-1.5.128}/oarepo_runtime/services/config/link_conditions.py

@@ -7,10 +7,10 @@ from invenio_records.api import RecordBase
 from invenio_records_resources.records.api import FileRecord, Record
 
 from ...datastreams.utils import (
-    get_file_service_for_file_record_class,
     get_file_service_for_record_class,
     get_record_service_for_record,
 )
+from ...records.drafts import get_draft
 
 log = getLogger(__name__)
 
@@ -76,6 +76,24 @@ class has_permission(Condition):
             log.exception(f"Unexpected exception {e}.")
 
 
+class has_draft_permission(Condition):
+    def __init__(self, action_name):
+        self.action_name = action_name
+
+    def __call__(self, obj: RecordBase, ctx: dict):
+        draft_record = get_draft(obj)
+        if not draft_record:
+            return False
+        service = get_record_service_for_record(obj)
+        try:
+            return service.check_permission(
+                action_name=self.action_name, record=draft_record, **ctx
+            )
+        except Exception as e:
+            log.exception(f"Unexpected exception {e}.")
+            return False
+
+
 class has_file_permission(has_permission):
     def __call__(self, obj: RecordBase, ctx: dict):
         if isinstance(obj, FileRecord):

{oarepo_runtime-1.5.126 → oarepo_runtime-1.5.128}/oarepo_runtime/services/schema/ui.py

@@ -2,27 +2,29 @@ import datetime
 import re
 
 import marshmallow as ma
-from marshmallow.fields import Dict, Nested
-from marshmallow_utils.fields import SanitizedUnicode
-from invenio_rdm_records.services.schemas.pids import PIDSchema
 from babel.dates import format_date
 from babel_edtf import format_edtf
 from flask import current_app
+from idutils import to_url
 from invenio_rdm_records.records.systemfields.access.field.record import (
     AccessStatusEnum,
 )
 from invenio_rdm_records.resources.serializers.ui.fields import (
     UIObjectAccessStatus as InvenioUIObjectAccessStatus,
 )
+from invenio_rdm_records.services.schemas.parent import RDMParentSchema
+from invenio_rdm_records.services.schemas.pids import PIDSchema
+from invenio_rdm_records.services.schemas.record import validate_scheme
 from invenio_rdm_records.services.schemas.versions import VersionsSchema
+from marshmallow.fields import Dict, Nested
 from marshmallow_utils.fields import (
     BabelGettextDictField,
     FormatDate,
     FormatDatetime,
     FormatEDTF,
     FormatTime,
+    SanitizedUnicode,
 )
-from invenio_rdm_records.services.schemas.parent import RDMParentSchema
 from marshmallow_utils.fields.babel import BabelFormatField
 
 from oarepo_runtime.i18n import gettext
@@ -30,9 +32,6 @@ from oarepo_runtime.i18n import lazy_gettext as _
 
 from .marshmallow import RDMBaseRecordSchema
 
-from invenio_rdm_records.services.schemas.record import validate_scheme
-from idutils import to_url
-
 
 def current_default_locale():
     """Get the Flask app's default locale."""
@@ -55,6 +54,15 @@ class LocalizedMixin:
                 return self.context["locale"]
         return current_default_locale()
 
+    def format_value(self, value):
+        """Format the value, gracefully handling exceptions."""
+        try:
+            return super().format_value(value)
+        except Exception as e:
+            # Handle the exception gracefully
+            current_app.logger.error(f"Error formatting value '{value}': {e}")
+            return f"«Error formatting value '{value}'»"
+
 
 # localized date field
 class LocalizedDate(LocalizedMixin, FormatDate):