oarepo-runtime 1.5.54__tar.gz → 1.5.56__tar.gz

{oarepo_runtime-1.5.54/oarepo_runtime.egg-info → oarepo_runtime-1.5.56}/PKG-INFO

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

{oarepo_runtime-1.5.54 → oarepo_runtime-1.5.56}/oarepo_runtime/info/views.py

@@ -1,5 +1,6 @@
 import json
 import logging
+import os
 import re
 from functools import cached_property
 from urllib.parse import urljoin
@@ -24,6 +25,7 @@ from invenio_base.utils import obj_or_import_string
 from invenio_jsonschemas import current_jsonschemas
 from invenio_records_resources.proxies import current_service_registry
 
+
 logger = logging.getLogger("oarepo_runtime.info")
 
 
@@ -65,10 +67,20 @@ class InfoResource(Resource):
     @response_handler()
     def repository(self):
         """Repository endpoint."""
+        links = {
+            "self": url_for(request.endpoint, _external=True),
+            "models": url_for("oarepo_runtime_info.models", _external=True),
+        }
+        try:
+            import invenio_requests # noqa
+            links["requests"] = url_for("requests.search", _external=True)
+        except ImportError:
+            pass
+
         ret = {
             "name": current_app.config.get("THEME_SITENAME", ""),
             "description": current_app.config.get("REPOSITORY_DESCRIPTION", ""),
-            "version": get_package_version("repo"),
+            "version": os.environ.get("DEPLOYMENT_VERSION", "local development"),
             "invenio_version": get_package_version("oarepo"),
             "transfers": [
                 "local-file",
@@ -76,10 +88,7 @@ class InfoResource(Resource):
                 # TODO: where to get these? (permissions?)
                 # "direct-s3",
             ],
-            "links": {
-                "self": url_for(request.endpoint, _external=True),
-                "models": url_for("oarepo_runtime_info.models", _external=True),
-            },
+            "links": links,
         }
         self.call_components("repository", data=ret)
         return ret, 200

{oarepo_runtime-1.5.54 → oarepo_runtime-1.5.56}/oarepo_runtime/services/components.py

@@ -2,10 +2,11 @@ import inspect
 from collections import defaultdict
 from typing import Type
 
+from flask import current_app
 from invenio_accounts.models import User
 from invenio_records import Record
 
-from oarepo_runtime.services.custom_fields import CustomFieldsMixin
+from oarepo_runtime.services.custom_fields import CustomFieldsMixin, CustomFields, InlinedCustomFields
 from oarepo_runtime.services.generators import RecordOwners
 
 try:
@@ -73,10 +74,17 @@ cf_registry = CFRegistry()
 class CustomFieldsComponent(ServiceComponent):
     def create(self, identity, data=None, record=None, **kwargs):
         """Create a new record."""
-        for cf in cf_registry.lookup(type(record)):
-            setattr(record, cf.attr_name, data.get(cf.key, {}))
+        self._set_cf_to_record(record, data)
 
     def update(self, identity, data=None, record=None, **kwargs):
         """Update a record."""
+        self._set_cf_to_record(record, data)
+
+    def _set_cf_to_record(self, record, data):
         for cf in cf_registry.lookup(type(record)):
-            setattr(record, cf.attr_name, data.get(cf.key, {}))
+            if isinstance(cf, CustomFields):
+                setattr(record, cf.attr_name, data.get(cf.key, {}))
+            elif isinstance(cf, InlinedCustomFields):
+                config = current_app.config.get(cf.config_key, {})
+                for c in config:
+                    record[c.name] =data.get(c.name)

{oarepo_runtime-1.5.54 → oarepo_runtime-1.5.56/oarepo_runtime.egg-info}/PKG-INFO

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

{oarepo_runtime-1.5.54 → oarepo_runtime-1.5.56}/setup.cfg

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