rdm builder

Alzbeta Pokorna · Alzbeta Pokorna · commit 7f2cdf9b8299 · 2024-12-12T11:08:06.000+01:00
diff --git a/build-tests/thesis.yaml b/build-tests/thesis.yaml
@@ -3,7 +3,7 @@ record:
     metadata:
       properties:
         title:
-          type: fulltext
+          type: keyword
         status:
           type: keyword
   module:
@@ -13,5 +13,22 @@ record:
   use:
   - invenio
   - rdm
+  files:
+    properties:
+      metadata:
+        properties:
+          title:
+            type: keyword
+    permissions:
+      presets: [ 'everyone' ]
+
+  draft: { }
+
+  draft-files:
+    permissions:
+      presets: [ 'everyone' ]
 profiles:
   - record
+  - draft
+  - files
+  - draft_files
diff --git a/oarepo_model_builder_rdm/builtin_models/rdm.json b/oarepo_model_builder_rdm/builtin_models/rdm.json
@@ -3,6 +3,7 @@
     "access": {
       "marshmallow": {
         "generate": false,
+        "field-class": "marshmallow_utils.fields.nestedattr.NestedAttribute",
         "class": "invenio_rdm_records.services.schemas.access.AccessSchema"
       },
       "sample": {
@@ -42,7 +43,7 @@
               },
               "json-schema": {
                 "type": [
-                  "date",
+                  "string",
                   "null"
                 ]
               }
@@ -54,7 +55,7 @@
               },
               "json-schema": {
                 "type": [
-                  "fulltext",
+                  "string",
                   "null"
                 ]
               }
diff --git a/oarepo_model_builder_rdm/datatypes/components/__init__.py b/oarepo_model_builder_rdm/datatypes/components/__init__.py
@@ -1 +1,15 @@
+from .service import RDMServiceComponent
+from .record import RDMRecordModelComponent
+from .ext_resource import RDMExtResourceModelComponent
+from .draft_record import RDMDraftParentComponent
+from .marshmallow import RDMMarshmallowModelComponent
+from .published_service import RDMPublishedServiceComponent
 
+RDM_COMPONENTS = [
+    RDMServiceComponent,
+    RDMRecordModelComponent,
+    RDMExtResourceModelComponent,
+    RDMDraftParentComponent,
+    RDMMarshmallowModelComponent,
+    RDMPublishedServiceComponent
+]
diff --git a/oarepo_model_builder_rdm/datatypes/components/draft_record.py b/oarepo_model_builder_rdm/datatypes/components/draft_record.py
@@ -0,0 +1,18 @@
+from oarepo_model_builder.datatypes import DataTypeComponent, ModelDataType
+from oarepo_model_builder_drafts.datatypes.components import DraftParentComponent
+
+class RDMDraftParentComponent(DataTypeComponent):
+    eligible_datatypes = [ModelDataType]
+    depends_on = [DraftParentComponent]
+
+    def process_mb_invenio_drafts_parent_additional_fields(
+        self, datatype, section, **kwargs
+    ):
+        obj = section.config.setdefault("additional-fields", {})
+        if 'owners' in obj and obj['owners'] == '{{oarepo_runtime.records.systemfields.owner.OwnersField}}()':
+            del obj['owners']
+
+
+    def before_model_prepare(self, datatype, *, context, **kwargs):
+        if "draft-parent-record" in datatype.definition:
+            datatype.definition["draft-parent-record"]["base-classes"] = ["invenio_rdm_records.records.api.RDMParent"]
diff --git a/oarepo_model_builder_rdm/datatypes/components/ext_resource.py b/oarepo_model_builder_rdm/datatypes/components/ext_resource.py
@@ -0,0 +1,15 @@
+from oarepo_model_builder.datatypes import DataTypeComponent, ModelDataType
+from oarepo_model_builder.datatypes.components import ExtResourceModelComponent
+from oarepo_model_builder.datatypes.components import AppModelComponent
+class RDMExtResourceModelComponent(DataTypeComponent):
+    eligible_datatypes = [ModelDataType]
+    depends_on = [ExtResourceModelComponent, AppModelComponent]
+
+    def before_model_prepare(self, datatype, *, context, **kwargs):
+        if not datatype.profile == "record":
+            return
+        ext_resource = datatype.definition['ext-resource']
+        print(ext_resource)
+        ext_resource['service-kwargs']["pids_service"] = "{{invenio_rdm_records.services.pids.PIDsService}}(config_class, {{invenio_rdm_records.services.pids.PIDManager}})"
+        datatype.definition['ext-resource'] = ext_resource
+
diff --git a/oarepo_model_builder_rdm/datatypes/components/marshmallow.py b/oarepo_model_builder_rdm/datatypes/components/marshmallow.py
@@ -0,0 +1,12 @@
+from oarepo_model_builder.datatypes import ModelDataType
+from oarepo_model_builder.datatypes.components import MarshmallowModelComponent
+from oarepo_model_builder.datatypes import DataTypeComponent
+
+
+class RDMMarshmallowModelComponent(DataTypeComponent):
+    eligible_datatypes = [ModelDataType]
+    depends_on = [MarshmallowModelComponent]
+
+    def before_model_prepare(self, datatype, *, context, **kwargs):
+        if datatype.root.profile == "record":
+            datatype.definition["marshmallow"]["base-classes"].append("oarepo_runtime.services.schema.rdm.RDMRecordMixin")
diff --git a/oarepo_model_builder_rdm/datatypes/components/published_service.py b/oarepo_model_builder_rdm/datatypes/components/published_service.py
@@ -0,0 +1,14 @@
+from oarepo_model_builder.datatypes import ModelDataType
+from oarepo_model_builder_drafts.datatypes.components import PublishedServiceComponent
+from oarepo_model_builder.datatypes import DataTypeComponent
+
+class RDMPublishedServiceComponent(DataTypeComponent):
+    eligible_datatypes = [ModelDataType]
+    depends_on = [PublishedServiceComponent]
+
+    def before_model_prepare(self, datatype, *, context, **kwargs):
+        pass
+        # datatype.definition["published-service"]["base-classes"] = ["invenio_rdm_records.services.services.RDMRecordService"]
+        # datatype.definition["published-service-config"]["base-classes"] = [
+        #     "oarepo_runtime.services.config.service.PermissionsPresetsConfigMixin",
+        #     "invenio_rdm_records.services.config.RDMRecordServiceConfig"]
diff --git a/oarepo_model_builder_rdm/datatypes/components/record.py b/oarepo_model_builder_rdm/datatypes/components/record.py
@@ -0,0 +1,14 @@
+from oarepo_model_builder.datatypes import ModelDataType
+from oarepo_model_builder.datatypes.components import RecordModelComponent
+from oarepo_model_builder.datatypes import DataTypeComponent
+from oarepo_model_builder_drafts.datatypes.components import DraftRecordModelComponent
+
+class RDMRecordModelComponent(DataTypeComponent):
+    eligible_datatypes = [ModelDataType]
+    depends_on = [RecordModelComponent, DraftRecordModelComponent]
+
+    def before_model_prepare(self, datatype, *, context, **kwargs):
+        if datatype.root.profile == "draft":
+            datatype.definition["record"]["base-classes"] = ["invenio_rdm_records.records.api.RDMDraft"]
+        elif datatype.root.profile == "record":
+            datatype.definition["record"]["base-classes"] = ["invenio_rdm_records.records.api.RDMRecord"]
diff --git a/oarepo_model_builder_rdm/datatypes/components/service.py b/oarepo_model_builder_rdm/datatypes/components/service.py
@@ -0,0 +1,21 @@
+from oarepo_model_builder.datatypes import DataTypeComponent
+from oarepo_model_builder.datatypes.components.model import ServiceModelComponent
+from oarepo_model_builder.datatypes.model import ModelDataType
+from oarepo_model_builder.datatypes.components.model.utils import set_default
+
+class RDMServiceComponent(DataTypeComponent):
+    eligible_datatypes = [ModelDataType]
+    depends_on = [ServiceModelComponent]
+
+    def before_model_prepare(self, datatype, *, context, **kwargs):
+        if not datatype.profile in ["record", "draft"]:
+            return
+        datatype.definition["service"]["base-classes"] = ["invenio_rdm_records.services.services.RDMRecordService"]
+        datatype.definition["service-config"]["base-classes"] = ["oarepo_runtime.services.config.service.PermissionsPresetsConfigMixin",
+                                                                 "invenio_rdm_records.services.config.RDMRecordServiceConfig"]
+        # service = set_default(datatype, "service", {})
+        # service.setdefault(
+        #     "base-classes",
+        #     ["invenio_rdm_records.services.services.RDMRecordService"],
+        # )
+        # print("jej")
diff --git a/oarepo_model_builder_rdm/invenio/__init__.py b/oarepo_model_builder_rdm/invenio/__init__.py
@@ -0,0 +1,3 @@
+TEMPLATES = {
+    "rdm-record-metadata": "templates/rdm_record_metadata.py.jinja2",
+}
diff --git a/oarepo_model_builder_rdm/invenio/invenio_rdm_record_metadata.py b/oarepo_model_builder_rdm/invenio/invenio_rdm_record_metadata.py
@@ -0,0 +1,7 @@
+from oarepo_model_builder.invenio.invenio_base import InvenioBaseClassPythonBuilder
+
+
+class InvenioRDMRecordMetadataBuilder(InvenioBaseClassPythonBuilder):
+    TYPE = "invenio_record_metadata"
+    section = "record-metadata"
+    template = "rdm-record-metadata"
diff --git a/oarepo_model_builder_rdm/invenio/templates/__init__.py b/oarepo_model_builder_rdm/invenio/templates/__init__.py
diff --git a/oarepo_model_builder_rdm/invenio/templates/rdm_record_metadata.py.jinja2 b/oarepo_model_builder_rdm/invenio/templates/rdm_record_metadata.py.jinja2
@@ -0,0 +1,21 @@
+{{ vars.record_metadata|imports }}
+from invenio_rdm_records.records.systemfields.deletion_status import RecordDeletionStatusEnum
+from sqlalchemy_utils.types import ChoiceType
+
+class {{ vars.record_metadata|class_header }}:
+    """Model for {{ vars.record.class|base_name }} metadata."""
+
+    __tablename__ = "{{ vars.record_metadata.table }}"
+
+    {% if vars.record_metadata.use_versioning %}
+    # Enables SQLAlchemy-Continuum versioning
+    __versioned__ = {}
+
+    deletion_status = db.Column(
+        ChoiceType(RecordDeletionStatusEnum, impl=db.String(1)),
+        nullable=False,
+        default=RecordDeletionStatusEnum.PUBLISHED.value,
+    )
+    {% endif %}
+
+{{ vars.record_metadata|extra_code }}
diff --git a/run-tests.sh b/run-tests.sh
@@ -2,7 +2,7 @@
 set -e
 
 OAREPO_VERSION=${OAREPO_VERSION:-12}
-export PYTHON_VERSION=python3
+export PYTHON_VERSION=python3.12
 BUILDER_VENV=".venv-builder"
 if test -d $BUILDER_VENV ; then
 	rm -rf $BUILDER_VENV
diff --git a/setup.cfg b/setup.cfg
@@ -1,7 +1,7 @@
 [metadata]
 name = oarepo-model-builder-rdm
 version = 1.0.0
-description = xy
+description =
 authors = Alzbeta Pokorna <alzbeta.pokorna@cesnet.cz>
 readme = README.md
 long_description = file:README.md
@@ -11,8 +11,11 @@ long_description_content_type = text/markdown
 [options]
 python = >=3.12
 install_requires =
-    oarepo-model-builder-tests>=3.1.0
-    oarepo-model-builder>=3.1.2
+    oarepo-model-builder-tests>=4.0.0
+    oarepo-model-builder>=4.0.0
+    oarepo-model-builder-files>=4.0.0
+    oarepo-model-builder-drafts>=1.0.4
+    oarepo-model-builder-drafts-files>=4.0.0
 
 [options.package_data]
 * = *.json, *.rst, *.md, *.json5, *.jinja2
@@ -24,3 +27,11 @@ install_requires =
 oarepo.models =
     rdm  = oarepo_model_builder_rdm.builtin_models:rdm.json
 
+oarepo_model_builder.datatypes.components =
+    rdm = oarepo_model_builder_rdm.datatypes.components:RDM_COMPONENTS
+
+oarepo_model_builder.builders.base =
+    0999-invenio_rdm_record_metadata  = oarepo_model_builder_rdm.invenio.invenio_rdm_record_metadata:InvenioRDMRecordMetadataBuilder
+
+oarepo_model_builder.templates =
+    99-rdm_invenio_templates  = oarepo_model_builder_rdm.invenio

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`"access": {`
`4`	`4`	`"marshmallow": {`
`5`	`5`	`"generate": false,`
	`6`	`+ "field-class": "marshmallow_utils.fields.nestedattr.NestedAttribute",`
`6`	`7`	`"class": "invenio_rdm_records.services.schemas.access.AccessSchema"`
`7`	`8`	`},`
`8`	`9`	`"sample": {`
`@@ -42,7 +43,7 @@`
`42`	`43`	`},`
`43`	`44`	`"json-schema": {`
`44`	`45`	`"type": [`
`45`		`- "date",`
	`46`	`+ "string",`
`46`	`47`	`"null"`
`47`	`48`	`]`
`48`	`49`	`}`
`@@ -54,7 +55,7 @@`
`54`	`55`	`},`
`55`	`56`	`"json-schema": {`
`56`	`57`	`"type": [`
`57`		`- "fulltext",`
	`58`	`+ "string",`
`58`	`59`	`"null"`
`59`	`60`	`]`
`60`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+TEMPLATES = {`
	`2`	`+ "rdm-record-metadata": "templates/rdm_record_metadata.py.jinja2",`
	`3`	`+}`