oarepo-runtime 1.5.132__tar.gz → 1.5.134__tar.gz

{oarepo_runtime-1.5.132/oarepo_runtime.egg-info → oarepo_runtime-1.5.134}/PKG-INFO

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

{oarepo_runtime-1.5.132 → oarepo_runtime-1.5.134}/oarepo_runtime/datastreams/writers/service.py

@@ -64,7 +64,7 @@ class ServiceWriter(BaseWriter):
         return None
 
     def _get_stream_entry_id(self, entry: StreamEntry):
-        return entry.id
+        return entry.id or entry.entry.get("id")
 
     def write(self, batch: StreamBatch):
         """Writes the input entry using the given service."""

{oarepo_runtime-1.5.132 → oarepo_runtime-1.5.134}/oarepo_runtime/services/schema/rdm.py

@@ -1,14 +1,19 @@
-import marshmallow as ma
+from functools import partial
 
-from marshmallow import fields as ma_fields
-from marshmallow import pre_load
-from marshmallow_utils.fields.nestedattr import NestedAttribute
-from invenio_rdm_records.services.schemas.versions import VersionsSchema
+import marshmallow as ma
+from invenio_i18n.selectors import get_locale
+from invenio_rdm_records.services.schemas.metadata import record_identifiers_schemes
 from invenio_rdm_records.services.schemas.tombstone import DeletionStatusSchema
-from invenio_rdm_records.services.schemas.access import AccessSchema
+from invenio_rdm_records.services.schemas.versions import VersionsSchema
 from invenio_vocabularies.contrib.awards.schema import AwardRelationSchema
 from invenio_vocabularies.contrib.funders.schema import FunderRelationSchema
-from invenio_i18n.selectors import get_locale
+from marshmallow import fields as ma_fields
+from marshmallow import pre_load
+from marshmallow_utils.fields import (
+    IdentifierSet,
+)
+from marshmallow_utils.fields.nestedattr import NestedAttribute
+from marshmallow_utils.schemas.identifier import IdentifierSchema
 
 
 class RDMRecordMixin(ma.Schema):
@@ -33,3 +38,25 @@ class FundingSchema(ma.Schema):
 
     funder = ma_fields.Nested(FunderRelationSchema, required=True)
     award = ma_fields.Nested(MultilingualAwardSchema)
+
+
+class RecordIdentifierField(IdentifierSet):
+    def __init__(self, *args, **kwargs):
+        super().__init__(
+            ma.fields.Nested(
+                partial(IdentifierSchema, allowed_schemes=record_identifiers_schemes)
+            ),
+            *args,
+            **kwargs
+        )
+
+
+class RelatedRecordIdentifierField(IdentifierSet):
+    def __init__(self, *args, **kwargs):
+        super().__init__(
+            ma.fields.Nested(
+                partial(IdentifierSchema, allowed_schemes=record_identifiers_schemes)
+            ),
+            *args,
+            **kwargs
+        )

{oarepo_runtime-1.5.132 → oarepo_runtime-1.5.134/oarepo_runtime.egg-info}/PKG-INFO

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

{oarepo_runtime-1.5.132 → oarepo_runtime-1.5.134}/setup.cfg

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