oarepo-runtime 1.5.135__py3-none-any.whl → 1.5.136__py3-none-any.whl

oarepo_runtime/resources/config.py

@@ -1,21 +1,6 @@
-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."""
@@ -23,28 +8,5 @@ class BaseRecordResourceConfig(RDMRecordResourceConfig):
     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
+    routes = RDMRecordResourceConfig.routes
+    routes["all-prefix"] = "/all"

oarepo_runtime/resources/resource.py

@@ -12,7 +12,6 @@ from invenio_records_resources.resources.records.resource import (
 )
 from invenio_records_resources.resources.records.utils import search_preference
 
-
 class BaseRecordResource(RDMRecordResource):
 
     def create_url_rules(self):
@@ -29,11 +28,6 @@ class BaseRecordResource(RDMRecordResource):
         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),
         ]
 

oarepo_runtime/services/config/service.py

@@ -100,3 +100,18 @@ class PermissionsPresetsConfigMixin:
             name = name[:-6]
         name = re.sub(r"(?<!^)(?=[A-Z])", "_", name).upper()
         return f"{name}_PERMISSIONS_PRESETS"
+
+class SearchAllConfigMixin:
+    @property
+    def search_all(self):
+        from invenio_rdm_records.services.search_params import MyDraftsParam
+        if hasattr(self, "search_drafts"):
+            class AllSearchOptions(self.search_drafts):
+                @class_property
+                def params_interpreters_cls(cls):
+                    param_interpreters = [*super().params_interpreters_cls]
+                    param_interpreters.remove(MyDraftsParam)
+                    return param_interpreters
+            return AllSearchOptions
+        else:
+            return self.search

oarepo_runtime/services/service.py

@@ -30,7 +30,7 @@ class SearchAllRecordsService(RDMRecordService):
         params = params or {}
 
         search_opts = (
-            getattr(self.config, "search_all", None) or self.config.search_drafts
+            getattr(self.config, "search_all", None) or self.config.search
         )
 
         search_result = self._search(

{oarepo_runtime-1.5.135.dist-info → oarepo_runtime-1.5.136.dist-info}/METADATA

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

{oarepo_runtime-1.5.135.dist-info → oarepo_runtime-1.5.136.dist-info}/RECORD

@@ -79,23 +79,23 @@ 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/config.py,sha256=34kfNh2hVYYS9q1CYziiNdFzTvDuSXKd4W1n1OQtm-c,308
 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=GK5yGnJIjH60wGqqDoOfwMQQFQDLZhJpU4zBJOmABI8,2063
+oarepo_runtime/resources/resource.py,sha256=dSpaPW6l_kTTzaq5LkZODyOzbL_T3-lU2uX65SQ46gE,1718
 oarepo_runtime/resources/responses.py,sha256=Pj-K_r-QO9B2n9STcfqsrBQu1e3iYhdEBFSVTeWR7cM,738
 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=MxkoMkquISMKyP6De_xOF-IzQE9wRYtq3d_OFAqqIVo,6156
 oarepo_runtime/services/search.py,sha256=t0WEe2VrbCzZ06-Jgz7C9-pc9y27BqAgTEXldEHskfk,9409
-oarepo_runtime/services/service.py,sha256=TI2ulEVlSR7HZnfPYltLl8Vf4O9fhJ7rHaV6G4HWbrc,1893
+oarepo_runtime/services/service.py,sha256=-Cd7R6Y8UW01Gsyprhtm4-iyBVBKFs4kOaka7mUGH7o,1886
 oarepo_runtime/services/config/__init__.py,sha256=aRxCBLN9pqCgdYlF-KJYtDzt2mwJ66npdceOAZkMfa0,888
 oarepo_runtime/services/config/draft_link.py,sha256=Hq541t33F3lEZo6XTexzdxneKJOmLBLujFdyT1w1TbE,698
 oarepo_runtime/services/config/link_conditions.py,sha256=5hDEtCaQt1tzjb9gGdeimsmKNoWWPicIeYKfI8Fg8Qw,3866
 oarepo_runtime/services/config/permissions_presets.py,sha256=b1wm3JjL8KgkaH7VMkNfdMk5fXtf3X87rB7gkvaNxns,7369
-oarepo_runtime/services/config/service.py,sha256=s-dVbGkLICpsce6jgu7b5kzYFz9opWjSQFDBgbIhKio,4002
+oarepo_runtime/services/config/service.py,sha256=KS1eKXjRzusD_UAKanzKezua2lmo9vObwqd63dky1ik,4593
 oarepo_runtime/services/custom_fields/__init__.py,sha256=_gqMcA_I3rdEZcBtCuDjO4wdVCqFML5NzaccuPx5a3o,2565
 oarepo_runtime/services/custom_fields/mappings.py,sha256=3CIvjWzVRO3fZ2r-3taK1rwuLH9wj5Lguo-GvsbLBf4,7515
 oarepo_runtime/services/entity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -148,13 +148,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.135.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.136.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.135.dist-info/METADATA,sha256=uMODFmdnyZJqbJaDsyHQN7LTXl0UHs2vL0OJfehbees,4743
-oarepo_runtime-1.5.135.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-oarepo_runtime-1.5.135.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
-oarepo_runtime-1.5.135.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.135.dist-info/RECORD,,
+oarepo_runtime-1.5.136.dist-info/METADATA,sha256=foAVOZLkwGL0Cy5jxIjhykmpwEkVxTHp8ry3C2zBIR4,4743
+oarepo_runtime-1.5.136.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+oarepo_runtime-1.5.136.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
+oarepo_runtime-1.5.136.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.136.dist-info/RECORD,,

{oarepo_runtime-1.5.135.dist-info → oarepo_runtime-1.5.136.dist-info}/WHEEL

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