oarepo-runtime 1.5.20__py3-none-any.whl → 1.5.22__py3-none-any.whl

oarepo_runtime/info/views.py

@@ -8,6 +8,8 @@ import importlib_metadata
 import importlib_resources
 import marshmallow as ma
 from flask import current_app, request, url_for
+from flask.ctx import RequestContext
+from flask.globals import _cv_request
 from flask_resources import (
     Resource,
     ResourceConfig,
@@ -91,12 +93,13 @@ class InfoResource(Resource):
             model_data = json.loads(
                 importlib_resources.files(package_name).joinpath(file_name).read_text()
             )
-            model_data = model_data["model"]
-            if model_data["type"] != "model":
+            model_data = model_data.get("model", {})
+            if model_data.get("type") != "model":
                 continue
 
             service = self._get_service(model_data)
-            if not service:
+            service_class = self._get_service_class(model_data)
+            if not service or type(service) != service_class:
                 continue
 
             model_features = self._get_model_features(model_data)
@@ -271,6 +274,11 @@ class InfoResource(Resource):
         return service
 
 
+    def _get_service_class(self, model_data):
+        service_id = model_data["service"]["class"]
+        return obj_or_import_string(service_id)
+
+
 def create_wellknown_blueprint(app):
     """Create blueprint."""
     config_class = obj_or_import_string(
@@ -292,11 +300,23 @@ def get_package_version(package_name):
 
 def api_url_for(endpoint, _external=True, **values):
     """API url_for."""
+    try:
+        api_app = current_app.wsgi_app.mounts['/api']
+    except:
+        api_app = current_app
+
     site_api_url = current_app.config["SITE_API_URL"]
     site_url = current_app.config["SITE_UI_URL"]
-    base_url = url_for(endpoint, **values, _external=_external)
-    if base_url.startswith(site_api_url):
-        return base_url
-    if base_url.startswith(site_url):
-        return base_url.replace(site_url, site_api_url)
-    raise ValueError(f"URL {base_url} does not start with {site_url} or {site_api_url}")
+    current_request_context = _cv_request.get()
+    try:
+        new_context = RequestContext(app=api_app,
+                                     environ=request.environ)
+        _cv_request.set(new_context)
+        base_url = api_app.url_for(endpoint, **values, _external=_external)
+        if base_url.startswith(site_api_url):
+            return base_url
+        if base_url.startswith(site_url):
+            return base_url.replace(site_url, site_api_url)
+        raise ValueError(f"URL {base_url} does not start with {site_url} or {site_api_url}")
+    finally:
+        _cv_request.set(current_request_context)

oarepo_runtime/records/systemfields/has_draftcheck.py

@@ -1,3 +1,5 @@
+from inspect import isfunction
+
 from invenio_records.dictutils import dict_set
 from invenio_records.systemfields import SystemField
 from sqlalchemy.orm.exc import NoResultFound
@@ -34,6 +36,8 @@ class HasDraftCheckField(CustomFieldsMixin, SystemField):
             return False
 
         try:
+            if isfunction(self.draft_cls):
+                self.draft_cls = self.draft_cls()
             self.draft_cls.get_record(record.id)
             return True
         except NoResultFound:

{oarepo_runtime-1.5.20.dist-info → oarepo_runtime-1.5.22.dist-info}/METADATA

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

{oarepo_runtime-1.5.20.dist-info → oarepo_runtime-1.5.22.dist-info}/RECORD

@@ -41,7 +41,7 @@ oarepo_runtime/datastreams/writers/validation_errors.py,sha256=wOCXdniR6so_4Expd
 oarepo_runtime/datastreams/writers/yaml.py,sha256=XchUJHQ58E2Mfgs8elImXbL38jFtI8Hfoye6yaR0gKI,1482
 oarepo_runtime/i18n/__init__.py,sha256=G4PJ_kQlPDiBW6ntjQZ-O4qHQgkJWAXsNLUuOBcglNM,402
 oarepo_runtime/info/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime/info/views.py,sha256=W1aa6c6ZYABcjSgH3DfjadHrFHqn2Myc1XarkEvWxU0,10399
+oarepo_runtime/info/views.py,sha256=jtI2JJBdApuT5ZIxU2kskJBz6GpJVTgUGrM8EMNIiAk,11137
 oarepo_runtime/records/__init__.py,sha256=Bxm2XNtB9j6iOAKGSVsjXTKIZS-iXKPzakCqyNkEix8,432
 oarepo_runtime/records/dumpers/__init__.py,sha256=OmzNhLdMNKibmCksnj9eTX9xPBG30dziiK3j3bAAp3k,233
 oarepo_runtime/records/dumpers/edtf_interval.py,sha256=YCShZAoqBQYaxVilEVotS-jXZsxxoXO67yu2urhkaMA,1198
@@ -57,7 +57,7 @@ oarepo_runtime/records/relations/lookup.py,sha256=wi3jPfOedazOmhOMrgu50PUETc1jfS
 oarepo_runtime/records/relations/pid_relation.py,sha256=zJjSf_ocFBViYsOuMMZLbQZpNZeKiOK33dPD4tk74Qo,2786
 oarepo_runtime/records/systemfields/__init__.py,sha256=SPaMWM6t-azz6gZLUKvvXbOyE2_-LW6i_szQk8nhbAc,455
 oarepo_runtime/records/systemfields/featured_file.py,sha256=MbSaYR130_o5S9gEOblnChq-PVK4xGPGpSCrzwG3cwc,1720
-oarepo_runtime/records/systemfields/has_draftcheck.py,sha256=3XLRsZJWRpT4BFF1HTg6C27ECVmIcZ4RrdGzYC8S7v0,1518
+oarepo_runtime/records/systemfields/has_draftcheck.py,sha256=4JkMEefPLpqtPtlTgK3UT0KzTRgyw5_Qtkss2qcz5xk,1643
 oarepo_runtime/records/systemfields/icu.py,sha256=tAwplzy9y7C9Dm7HqcGZsDu2AKqVGXhCbKLsFlgVWg8,5921
 oarepo_runtime/records/systemfields/mapping.py,sha256=tXOK_jkdY1pOUO7_VfChfDNB8UTi21GUXaidpugTnO8,1017
 oarepo_runtime/records/systemfields/owner.py,sha256=46-EKkGq77FYQgZFvUhWxvaVlu9KbRWg5nveZL4cAP4,3633
@@ -114,9 +114,9 @@ oarepo_runtime/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 oarepo_runtime/utils/functools.py,sha256=gKS9YZtlIYcDvdNA9cmYO00yjiXBYV1jg8VpcRUyQyg,1324
 oarepo_runtime/utils/path.py,sha256=V1NVyk3m12_YLbj7QHYvUpE1wScO78bYsX1LOLeXDkI,3108
 tests/pkg_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime-1.5.20.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.20.dist-info/METADATA,sha256=KmFlgRvnRSdxUggzIcCQgMlWcgUiWpGhSd-s0UiqlbU,4680
-oarepo_runtime-1.5.20.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-oarepo_runtime-1.5.20.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
-oarepo_runtime-1.5.20.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.20.dist-info/RECORD,,
+oarepo_runtime-1.5.22.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.22.dist-info/METADATA,sha256=Pj8uJfDhVkrJiFU2SsjLs0lBrriYCG-qx7uEVnVm1mQ,4680
+oarepo_runtime-1.5.22.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+oarepo_runtime-1.5.22.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
+oarepo_runtime-1.5.22.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.22.dist-info/RECORD,,