oarepo-runtime 1.5.135__tar.gz → 1.6.0__tar.gz

{oarepo_runtime-1.5.135/oarepo_runtime.egg-info → oarepo_runtime-1.6.0}/PKG-INFO

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

oarepo_runtime-1.6.0/oarepo_runtime/config.py

@@ -0,0 +1,15 @@
+from typing import cast
+
+from flask import Flask
+
+
+def build_config[T: type](config_class: T, app: Flask) -> T:
+    """
+    Builds the configuration for the service
+
+    This function is used to build the configuration for the service
+    """
+    if hasattr(config_class, "build") and callable(config_class.build):
+        return cast(T, config_class.build(app))
+    else:
+        return config_class()

oarepo_runtime-1.6.0/oarepo_runtime/resources/config.py

@@ -0,0 +1,12 @@
+from invenio_rdm_records.resources.config import (
+    RDMRecordResourceConfig,
+)
+
+class BaseRecordResourceConfig(RDMRecordResourceConfig):
+    """Record resource configuration."""
+
+    blueprint_name = None
+    url_prefix = None
+
+    routes = RDMRecordResourceConfig.routes
+    routes["all-prefix"] = "/all"

{oarepo_runtime-1.5.135 → oarepo_runtime-1.6.0}/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-1.5.135 → oarepo_runtime-1.6.0}/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-1.5.135 → oarepo_runtime-1.6.0}/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 → oarepo_runtime-1.6.0/oarepo_runtime.egg-info}/PKG-INFO

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

{oarepo_runtime-1.5.135 → oarepo_runtime-1.6.0}/oarepo_runtime.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ pyproject.toml
 setup.cfg
 setup.py
 oarepo_runtime/__init__.py
+oarepo_runtime/config.py
 oarepo_runtime/ext.py
 oarepo_runtime/ext_config.py
 oarepo_runtime/profile.py

{oarepo_runtime-1.5.135 → oarepo_runtime-1.6.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-runtime
-version = 1.5.135
+version = 1.6.0
 description = A set of runtime extensions of Invenio repository
 authors = Alzbeta Pokorna
 readme = README.md

oarepo_runtime-1.5.135/oarepo_runtime/resources/config.py

@@ -1,50 +0,0 @@
-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