Rdm

oarepo_model_builder/datatypes/components/model/marshmallow.py

@@ -84,6 +84,7 @@ def before_model_prepare(self, datatype, *, context, **kwargs):
         marshmallow.setdefault("class", f"{module}.{prefix}Schema")
         marshmallow.setdefault("extra-code", "")
         marshmallow.setdefault("base-classes", ["marshmallow.Schema"])
+        marshmallow["base-classes"].append("oarepo_runtime.services.schema.rdm.RDMRecordMixin")
         convert_config_to_qualified_name(marshmallow)
 
         if "properties" in datatype.definition and "metadata" in (

oarepo_model_builder/datatypes/components/model/record.py

@@ -63,11 +63,12 @@ def before_model_prepare(self, datatype, *, context, **kwargs):
         record.setdefault("class", f"{records_module}.{record_prefix}Record")
         record.setdefault(
             "base-classes",
-            ["invenio_records_resources.records.api.Record{InvenioRecord}"],
+            ["invenio_rdm_records.records.api.RDMRecord"],
         )
         record.setdefault(
             "imports",
             [],
+
         )
         record.setdefault("extra-code", "")
         record.setdefault("fields", {})

oarepo_model_builder/datatypes/components/model/record_metadata.py

@@ -90,7 +90,8 @@ def before_model_prepare(self, datatype, context, **kwargs):
         metadata.setdefault("extra-code", "")
         metadata.setdefault(
             "imports",
-            [],
+            [{"import": "invenio_rdm_records.records.systemfields.deletion_status.RecordDeletionStatusEnum"},
+             {"import": "sqlalchemy_utils.types.ChoiceType"}],
         )
         metadata.setdefault(
             "table", f"{datatype.definition['module']['prefix-snake']}_metadata"

oarepo_model_builder/datatypes/components/model/service.py

@@ -164,7 +164,7 @@ def before_model_prepare(self, datatype, *, context, **kwargs):
         service.setdefault("extra-code", "")
         service.setdefault(
             "base-classes",
-            ["invenio_records_resources.services.RecordService{InvenioRecordService}"],
+            ["invenio_rdm_records.services.services.RDMRecordService"],
         )
         service.setdefault(
             "imports",

oarepo_model_builder/invenio/templates/ext.py.jinja2

@@ -1,4 +1,6 @@
 import re
+
+from invenio_rdm_records.services.pids import PIDsService, PIDManager
 {{ vars.config.module|generate_import(alias='config') }}
 {{ vars.ext|imports }}
 
@@ -13,6 +15,7 @@ class {{ vars.ext|class_header }}:
 
     def init_app(self, app):
         """Flask application initialization."""
+        self.app = app
         {% if vars.ext.base_classes %}
         super().init_app(app=app)
         {% endif %}
@@ -28,6 +31,8 @@ class {{ vars.ext|class_header }}:
 
     def init_config(self, app):
         """Initialize configuration."""
+        {{ vars.service }}
+        {{ vars.ext }}
         for identifier in dir(config):
             if re.match('^[A-Z_0-9]*$', identifier) and not identifier.startswith('_'):
                 if isinstance(app.config.get(identifier), list):
@@ -54,4 +59,18 @@ class {{ vars.ext|class_header }}:
                 return True
         return False
 
+    @cached_property
+    def service_records(self):
+        {{ vars.service_config.class|generate_import }}
+        {{ vars.service.class|generate_import }}
+        config_class = {{ vars.service_config.class|base_name }}.build(self.app)
+        return {{ vars.service.class|base_name }}(
+            config=config_class,
+            pids_service=PIDsService(config_class, PIDManager),
+            {% if vars.service.additional_args %}
+                {{ vars.service.additional_args|generate_list }}
+            {% endif %}
+        )
+
+
 {{ vars.ext|extra_code }}

oarepo_model_builder/invenio/templates/record_metadata.py.jinja2

@@ -10,4 +10,9 @@ class {{ vars.record_metadata|class_header }}:
     __versioned__ = {}
     {% endif %}
 
+    deletion_status = db.Column(
+        ChoiceType(RecordDeletionStatusEnum, impl=db.String(1)),
+        nullable=False,
+        default=RecordDeletionStatusEnum.PUBLISHED.value,
+    )
 {{ vars.record_metadata|extra_code }}

run-tests.sh

@@ -19,12 +19,18 @@ initialize_server_venv() {
     rm -rf $SERVER_VENV
   fi
 
-  python3 -m venv $SERVER_VENV
+  python3.12 -m venv $SERVER_VENV
   source $SERVER_VENV/bin/activate
 
-  $SERVER_VENV/bin/pip install -U setuptools pip wheel
-  $SERVER_VENV/bin/pip install "oarepo[tests]==${OAREPO_VERSION}.*"
-  $SERVER_VENV/bin/pip install -e complex-model
+
+
+
+  .venv-server/bin/pip install -U setuptools pip wheel nrp-devtools ~/cesnet/nr/temp/oarepo-runtime/
+  .venv-server/bin/nrp-devtools proxy 120 &
+  .venv-server/bin/pip install "oarepo[tests,rdm]==12.*" --index-url "http://127.0.0.1:4549/simple" --extra-index-url https://pypi.org/simple
+
+
+  .venv-server/bin/pip install -e complex-model --index-url "http://127.0.0.1:4549/simple" --extra-index-url https://pypi.org/simple
 }
 
 initialize_builder_venv() {
@@ -33,7 +39,7 @@ initialize_builder_venv() {
     rm -rf $BUILDER_VENV
   fi
 
-  python3 -m venv $BUILDER_VENV
+  python3.12 -m venv $BUILDER_VENV
   . $BUILDER_VENV/bin/activate
   $BUILDER_VENV/bin/pip install -U setuptools pip wheel
   $BUILDER_VENV/bin/pip install -e '.[tests]'
@@ -45,10 +51,11 @@ initialize_client_test_venv() {
     rm -rf $TEST_VENV
   fi
 
-  python3 -m venv $TEST_VENV
+  python3.12 -m venv $TEST_VENV
 
   $TEST_VENV/bin/pip install -U setuptools pip wheel
   $TEST_VENV/bin/pip install requests PyYAML pytest
+
 }
 
 run_builder_tests() {
@@ -156,6 +163,8 @@ if [ "$1" == "--server" ] ; then
 fi
 
 cat complex-model/data/sample_data.yaml
+
+
 $TEST_VENV/bin/pytest tests-model