oarepo-runtime 1.5.132__py3-none-any.whl → 1.5.134__py3-none-any.whl

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/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.dist-info → oarepo_runtime-1.5.134.dist-info}/METADATA

@@ -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.dist-info → oarepo_runtime-1.5.134.dist-info}/RECORD

@@ -42,7 +42,7 @@ oarepo_runtime/datastreams/writers/__init__.py,sha256=PWufWNrixFhXv5wSv3_pzmrimr
 oarepo_runtime/datastreams/writers/attachments_file.py,sha256=kV_IPAWawJ9PX-IfoncmLQXpdTbzRMsJie8uKX1vNp0,3161
 oarepo_runtime/datastreams/writers/attachments_service.py,sha256=g_tbjUA3YnTE5gP21zlG2kIxneZsn0q95EVjlxB8s1M,4152
 oarepo_runtime/datastreams/writers/publish.py,sha256=x_ipun8TQiYNvGokVnEppYw9ko1AyrSzHu3D8b3ZWzI,2126
-oarepo_runtime/datastreams/writers/service.py,sha256=PAMo0t_d-T4xGcO4VIIVaMOAqj7_tahXo-v-fTqKG8A,6199
+oarepo_runtime/datastreams/writers/service.py,sha256=8oXGG365ro_XEoZUncFltule_6TAbPPbSr-SBgcbWRA,6224
 oarepo_runtime/datastreams/writers/utils.py,sha256=Lk_ZLNeXTLuFEn04lw1-6bJ7duG6kwA8X4wf9c_GiL4,1067
 oarepo_runtime/datastreams/writers/validation_errors.py,sha256=wOCXdniR6so_4ExpdFYYgBRyENp7_6kVFZM2L-Hy3G8,661
 oarepo_runtime/datastreams/writers/yaml.py,sha256=XchUJHQ58E2Mfgs8elImXbL38jFtI8Hfoye6yaR0gKI,1482
@@ -134,7 +134,7 @@ oarepo_runtime/services/schema/marshmallow.py,sha256=iAMMH5MlYs59qetXAHOROvERNSc
 oarepo_runtime/services/schema/marshmallow_to_json_schema.py,sha256=VYLnVWHOoaxWCD_gqJO8-8u1SbaPEFBjDZ5HGgGr0Ow,2027
 oarepo_runtime/services/schema/oneofschema.py,sha256=GnWH4Or_G5M0NgSmCoqMI6PBrJg5AC9RHrcB5QDKRq0,6661
 oarepo_runtime/services/schema/polymorphic.py,sha256=bAbUoTIeDBiJPYPhpLEKKZekEdkHlpqkmNxk1hN3PDw,564
-oarepo_runtime/services/schema/rdm.py,sha256=dBy1KCJ_XYAN_cffoRqLfQVEdZOKwmSpqGdEP4OL64k,1280
+oarepo_runtime/services/schema/rdm.py,sha256=TkWqtMlCosm4mL7nCHUW3RSGUQypk3wViTMwyqz2Ezs,2047
 oarepo_runtime/services/schema/rdm_ui.py,sha256=oXV8wGFChL84Y1xtkhZ89eZ4Ngr6RV8iavf32e4nCVI,3544
 oarepo_runtime/services/schema/ui.py,sha256=ae75YON8yNGxblywCgqX2OS9ACXHGzcN_adlLKIRUYk,7937
 oarepo_runtime/services/schema/validation.py,sha256=aRfeR-2D1XXYqI3_U5FHoFvJrYjZlpM8nB35-M_u3Qs,2300
@@ -147,13 +147,13 @@ oarepo_runtime/translations/en/LC_MESSAGES/messages.po,sha256=7-5S3iINOSFSI5gVdR
 oarepo_runtime/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/utils/functools.py,sha256=gKS9YZtlIYcDvdNA9cmYO00yjiXBYV1jg8VpcRUyQyg,1324
 oarepo_runtime/utils/path.py,sha256=V1NVyk3m12_YLbj7QHYvUpE1wScO78bYsX1LOLeXDkI,3108
-oarepo_runtime-1.5.132.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.134.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
 tests/marshmallow_to_json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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.132.dist-info/METADATA,sha256=N8ZqyVaKnHlbzZMniukRmlW4Jp0U4UlTAEjciSgI7k8,4743
-oarepo_runtime-1.5.132.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-oarepo_runtime-1.5.132.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
-oarepo_runtime-1.5.132.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.132.dist-info/RECORD,,
+oarepo_runtime-1.5.134.dist-info/METADATA,sha256=ULtV0UvrWzxilo4uh30rjFK794pJswnkz1j0CJg-aKg,4743
+oarepo_runtime-1.5.134.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+oarepo_runtime-1.5.134.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
+oarepo_runtime-1.5.134.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.134.dist-info/RECORD,,

{oarepo_runtime-1.5.132.dist-info → oarepo_runtime-1.5.134.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: true
 Tag: py3-none-any