oarepo-runtime 1.5.106__py3-none-any.whl → 1.5.108__py3-none-any.whl

oarepo_runtime/records/relations/pid_relation.py

@@ -5,22 +5,29 @@ from oarepo_runtime.services.relations.errors import InvalidRelationError
 from .base import Relation, RelationResult
 from .lookup import LookupResult
 
-
 class PIDRelationResult(RelationResult):
     def resolve(self, id_):
         """Resolve the value using the record class."""
         # TODO: handle permissions here !!!!!!
         try:
             pid_field_context = self.field.pid_field
-            if hasattr(pid_field_context, "pid_type"):
-                pid_type = pid_field_context.pid_type
-            else:
+            try:
+                pid_type = getattr(pid_field_context, "pid_type", None)
+            except:
+                pass
+
+            if pid_type is None:
                 pid_field = pid_field_context.field
-                pid_type = (
-                    pid_field._provider.pid_type
-                    if pid_field._provider
-                    else pid_field._pid_type
-                )
+                if pid_field._provider:
+                    if hasattr(pid_field._provider, "pid_type"):
+                        pid_type = pid_field._provider.pid_type
+                    else:
+                        pid_type = self.field.pid_field.record_cls.__name__
+                else:
+                    if hasattr(pid_field, "_pid_type"):
+                        pid_type = pid_field._pid_type
+                    else:
+                        pid_type = self.field.pid_field.record_cls.__name__
         except Exception as e:
             raise InvalidRelationError(
                 f"PID type for field {self.field.key} has not been found or there was an exception accessing it.",

oarepo_runtime/resources/config.py

@@ -0,0 +1,50 @@
+import marshmallow as ma
+from flask_resources import (
+    JSONDeserializer,
+    JSONSerializer,
+    RequestBodyParser,
+    ResponseHandler,
+)
+from invenio_drafts_resources.resources import RecordResourceConfig
+from invenio_rdm_records.resources.args import RDMSearchRequestArgsSchema
+from invenio_rdm_records.resources.config import (
+    RDMRecordResourceConfig,
+)
+from invenio_records_resources.resources.records.headers import etag_headers
+
+record_serializers = {
+    "application/json": ResponseHandler(JSONSerializer(), headers=etag_headers),
+}
+
+
+class BaseRecordResourceConfig(RDMRecordResourceConfig):
+    """Record resource configuration."""
+
+    blueprint_name = None
+    url_prefix = None
+
+    routes = RecordResourceConfig.routes
+
+    routes["delete-record"] = "/<pid_value>/delete"
+    routes["restore-record"] = "/<pid_value>/restore"
+    routes["set-record-quota"] = "/<pid_value>/quota"
+    routes["set-user-quota"] = "/users/<pid_value>/quota"
+    routes["all-prefix"] = "/all"
+
+    request_view_args = {
+        "pid_value": ma.fields.Str(),
+    }
+
+    request_read_args = {
+        "style": ma.fields.Str(),
+        "locale": ma.fields.Str(),
+        "include_deleted": ma.fields.Bool(),
+    }
+
+    request_body_parsers = {
+        "application/json": RequestBodyParser(JSONDeserializer()),
+    }
+
+    request_search_args = RDMSearchRequestArgsSchema
+
+    response_handlers = record_serializers

oarepo_runtime/resources/resource.py

@@ -0,0 +1,59 @@
+from flask import g
+from flask_resources import (
+    resource_requestctx,
+    response_handler,
+    route,
+)
+from invenio_rdm_records.resources import RDMRecordResource
+from invenio_records_resources.resources.records.resource import (
+    request_extra_args,
+    request_search_args,
+    request_view_args,
+)
+from invenio_records_resources.resources.records.utils import search_preference
+
+
+class BaseRecordResource(RDMRecordResource):
+
+    def create_url_rules(self):
+        """Create the URL rules for the record resource."""
+
+        def p(route):
+            """Prefix a route with the URL prefix."""
+            return f"{self.config.url_prefix}{route}"
+
+        def s(route):
+            """Suffix a route with the URL prefix."""
+            return f"{route}{self.config.url_prefix}"
+
+        routes = self.config.routes
+        url_rules = super(RDMRecordResource, self).create_url_rules()
+        url_rules += [
+            route("DELETE", p(routes["delete-record"]), self.delete_record),
+            route("POST", p(routes["restore-record"]), self.restore_record),
+            route("POST", p(routes["set-record-quota"]), self.set_record_quota),
+            # TODO: move to users?
+            route("POST", routes["set-user-quota"], self.set_user_quota),
+            route("GET", s(routes["all-prefix"]), self.search_all_records),
+        ]
+
+        return url_rules
+
+    @request_extra_args
+    @request_search_args
+    @request_view_args
+    @response_handler(many=True)
+    def search_all_records(self):
+        """Perform a search over all records. Permission generators for search_all_records
+        and read_all_records must be in place and must be used to filter the results so that
+        no information is leaked.
+
+        GET /all/records
+        """
+        hits = self.service.search_all(
+            identity=g.identity,
+            params=resource_requestctx.args,
+            search_preference=search_preference(),
+            expand=resource_requestctx.args.get("expand", False),
+        )
+        return hits.to_dict(), 200

oarepo_runtime/services/schema/rdm_ui.py

@@ -33,7 +33,7 @@ class RDMFunderVocabularyUISchema(DictOnlySchema):
 
     name = VocabularyI18nStrUIField()
 
-    identifier = ma.fields.Nested(RDMIdentifierWithSchemaUISchema())
+    identifiers = ma.fields.List(ma.fields.Nested(RDMIdentifierWithSchemaUISchema()))
 
 
 class RDMRoleVocabularyUISchema(DictOnlySchema):

oarepo_runtime/services/service.py

@@ -0,0 +1,61 @@
+"""An extension to invenio RDM service that includes a search across all records
+(published, draft and deleted).
+without any filtering. Permission `can_read_all_records` and `search_all_records`
+were added and must be used to filter the results so that no information is leaked.
+"""
+
+from invenio_rdm_records.services import RDMRecordService
+from invenio_records_resources.services import LinksTemplate
+
+
+class SearchAllRecordsService(RDMRecordService):
+    def search_all(
+        self,
+        identity,
+        params=None,
+        search_preference=None,
+        expand=False,
+        extra_filter=None,
+        **kwargs,
+    ):
+        """Search for drafts records matching the querystring."""
+        self.require_permission(
+            identity,
+            "search_all_records",
+            params=params,
+            extra_filter=extra_filter,
+            **kwargs,
+        )
+        # Prepare and execute the search
+        params = params or {}
+
+        search_opts = (
+            getattr(self.config, "search_all", None) or self.config.search_drafts
+        )
+
+        search_result = self._search(
+            "search_all",
+            identity,
+            params,
+            search_preference,
+            record_cls=self.draft_cls,
+            search_opts=search_opts,
+            extra_filter=extra_filter,
+            permission_action="read_all_records",
+            **kwargs,
+        ).execute()
+
+        return self.result_list(
+            self,
+            identity,
+            search_result,
+            params,
+            links_tpl=LinksTemplate(
+                getattr(self.config, "links_search_drafts")
+                or self.config.links_search_drafts,
+                context={"args": params},
+            ),
+            links_item_tpl=self.links_item_tpl,
+            expandable_fields=self.expandable_fields,
+            expand=expand,
+        )

{oarepo_runtime-1.5.106.dist-info → oarepo_runtime-1.5.108.dist-info}/METADATA

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

{oarepo_runtime-1.5.106.dist-info → oarepo_runtime-1.5.108.dist-info}/RECORD

@@ -65,7 +65,7 @@ oarepo_runtime/records/relations/__init__.py,sha256=bDAgxl_LdKsqpGG3qluxAkQnn5u2
 oarepo_runtime/records/relations/base.py,sha256=XQpRt6-MfIKIClZ0IoGJr0GGl2Ru3RcqMoowOxrFG_E,8981
 oarepo_runtime/records/relations/internal.py,sha256=OTp8iJqyl80sWDk0Q0AK42l6UsxZDABspVU_GwWza9o,1556
 oarepo_runtime/records/relations/lookup.py,sha256=wi3jPfOedazOmhOMrgu50PUETc1jfSdpmjK0wvOFsEM,848
-oarepo_runtime/records/relations/pid_relation.py,sha256=jKiwUEepJkOc0MRX3Etl5RQJw3t40rY7FOJCIPwOKmg,2932
+oarepo_runtime/records/relations/pid_relation.py,sha256=G8ahoiQgp-PFPjQq0Fqu81z5YM7YKs8e2Hd_xqr3G8U,3290
 oarepo_runtime/records/systemfields/__init__.py,sha256=LL1R64RUakA_4r0IkTq9MtwqD5eV-AQaj5u96zkWa74,533
 oarepo_runtime/records/systemfields/featured_file.py,sha256=MbSaYR130_o5S9gEOblnChq-PVK4xGPGpSCrzwG3cwc,1720
 oarepo_runtime/records/systemfields/has_draftcheck.py,sha256=4JkMEefPLpqtPtlTgK3UT0KzTRgyw5_Qtkss2qcz5xk,1643
@@ -76,14 +76,17 @@ oarepo_runtime/records/systemfields/record_status.py,sha256=U3kem4-JkNsT17e0iAl3
 oarepo_runtime/records/systemfields/selectors.py,sha256=Q9jE1smSN3heT2LIpK_jB6bIRjll1kX0AW9AhTsIYiU,2830
 oarepo_runtime/records/systemfields/synthetic.py,sha256=UustvhzcDGuaNZLDeHbWwshoxQR-qRIuHDCct5RXmrI,4287
 oarepo_runtime/resources/__init__.py,sha256=v8BGrOTu_FjKzd0eozV7Q4GoGxyfybsL2cI-tbP5Pys,185
+oarepo_runtime/resources/config.py,sha256=GEM3A7lvGgWUdhBR85uJbaQDKg2-Xk5U-Jm4JmogfFg,1414
 oarepo_runtime/resources/file_resource.py,sha256=Ta3bFce7l0xwqkkOMOEu9mxbB8BbKj5HUHRHmidhnl8,414
 oarepo_runtime/resources/json_serializer.py,sha256=82_-xQEtxKaPakv8R1oBAFbGnxskF_Ve4tcfcy4PetI,963
 oarepo_runtime/resources/localized_ui_json_serializer.py,sha256=3V9cJaG_e1PMXKVX_wKfBp1LmbeForwHyBNYdyha4uQ,1878
+oarepo_runtime/resources/resource.py,sha256=BQ6sxgjHLAdQLtCMUggNG0Fq7NVRJPdVkpiHDH6tvDs,2055
 oarepo_runtime/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/services/components.py,sha256=0aqmuNbGCQhfOI22f6mM2DxuKSTqstGOGyisOiqw9KE,15481
 oarepo_runtime/services/generators.py,sha256=j87HitHA_w2awsz0C5IAAJ0qjg9JMtvdO3dvh6FQyfg,250
 oarepo_runtime/services/results.py,sha256=Ap2mUJHl3V4BSduTrBWPuco0inQVq0QsuCbVhez48uY,5705
 oarepo_runtime/services/search.py,sha256=t0WEe2VrbCzZ06-Jgz7C9-pc9y27BqAgTEXldEHskfk,9409
+oarepo_runtime/services/service.py,sha256=A0VJ3jvMu7JTLcYKCAUH2LX7xXVxpm6Wm4rEnG358bU,1885
 oarepo_runtime/services/config/__init__.py,sha256=559w4vphVAipa420OwTsxGUP-b7idoqSIX13FSJyVz0,783
 oarepo_runtime/services/config/link_conditions.py,sha256=evPRd5XU76Ok4J-08bBfplbHZ019rl74FpJmO8iM5yg,3298
 oarepo_runtime/services/config/permissions_presets.py,sha256=jV3Ft7xFdBaeShoa3Q3Q-HHWP-wOX4XYDTRzWwUVL7g,7151
@@ -127,7 +130,7 @@ oarepo_runtime/services/schema/marshmallow_to_json_schema.py,sha256=VYLnVWHOoaxW
 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=BDmjWrBQmBN4QbQE9t7EUNUuZ4uCtAAtJ0bQvJWQLtc,1249
-oarepo_runtime/services/schema/rdm_ui.py,sha256=Vs9kOaQ0ZPPZpSqEXlu0vQrt-458Aci9u9T4YONSJLs,3026
+oarepo_runtime/services/schema/rdm_ui.py,sha256=zXdaS6-YUaIcTkZDustqLufoHtpVKp5PcgUnwgJ0skE,3043
 oarepo_runtime/services/schema/ui.py,sha256=hHbj1S-DW1WqgYX31f6UjarY4wrE-qFLpH3oUhvGLyE,6192
 oarepo_runtime/services/schema/validation.py,sha256=VFOKSxQLHwFb7bW8BJAFXWe_iTAZFOfqOnb2Ko_Yxxc,2085
 oarepo_runtime/translations/default_translations.py,sha256=060GBlA1ghWxfeumo6NqxCCZDb-6OezOuF6pr-_GEOQ,104
@@ -143,9 +146,9 @@ tests/marshmallow_to_json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 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.106.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.106.dist-info/METADATA,sha256=nth_2oEsi3Ee8Ztqan5Tt-b7b72d25C7KrjbhpvL9eU,4721
-oarepo_runtime-1.5.106.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-oarepo_runtime-1.5.106.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
-oarepo_runtime-1.5.106.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.106.dist-info/RECORD,,
+oarepo_runtime-1.5.108.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.108.dist-info/METADATA,sha256=pOE9SKeX_Zr1boKtFOupbeS3T6xxjxHasxx_Ea4Hu0c,4721
+oarepo_runtime-1.5.108.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+oarepo_runtime-1.5.108.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
+oarepo_runtime-1.5.108.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.108.dist-info/RECORD,,