oarepo-runtime 1.5.60__py3-none-any.whl → 1.5.62__py3-none-any.whl

oarepo_runtime/info/views.py

@@ -25,7 +25,6 @@ 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")
 
 
@@ -72,7 +71,7 @@ class InfoResource(Resource):
             "models": url_for("oarepo_runtime_info.models", _external=True),
         }
         try:
-            import invenio_requests # noqa
+            import invenio_requests  # noqa
             links["requests"] = api_url_for("requests.search", _external=True)
         except ImportError:
             pass
@@ -111,19 +110,27 @@ class InfoResource(Resource):
             if not service or type(service) != service_class:
                 continue
 
+            # check if the service class is inside OAREPO_GLOBAL_SEARCH and if not, skip it
+            global_search_models = current_app.config.get('GLOBAL_SEARCH_MODELS', [])
+            for global_model in global_search_models:
+                if global_model['model_service'] == model_data["service"]["class"]:
+                    break
+            else:
+                continue
+
             model_features = self._get_model_features(model_data)
 
             links = {
                 "api": self._get_model_api_endpoint(model_data),
                 "html": self._get_model_html_endpoint(model_data),
-                "schema": self._get_model_schema_endpoint(model_data),
+                "schemas": self._get_model_schema_endpoints(model_data),
                 "model": self._get_model_model_endpoint(model.name),
                 # "openapi": url_for(self._get_model_openapi_endpoint(model_data), _external=True)
             }
 
             links["published"] = links["api"]
             if "drafts" in model_features:
-                links["drafts"] = self._get_model_draft_endpoint(model_data)
+                links["user_records"] = self._get_model_draft_endpoint(model_data)
 
             data.append(
                 {
@@ -153,7 +160,7 @@ class InfoResource(Resource):
     def model(self):
         model = resource_requestctx.view_args["model"]
         for _model in importlib_metadata.entry_points().select(
-            group="oarepo.models", name=model
+                group="oarepo.models", name=model
         ):
             package_name, file_name = _model.value.split(":")
             model_data = json.loads(
@@ -246,13 +253,15 @@ class InfoResource(Resource):
             logger.exception("Failed to get model html endpoint")
             return None
 
-    def _get_model_schema_endpoint(self, model):
+    def _get_model_schema_endpoints(self, model):
         try:
-            return url_for(
-                "oarepo_runtime_info.schema",
-                schema=model["json-schema-settings"]["name"],
-                _external=True,
-            )
+            return {
+                'application/json': url_for(
+                    "oarepo_runtime_info.schema",
+                    schema=model["json-schema-settings"]["name"],
+                    _external=True,
+                )
+            }
         except:  # NOSONAR noqa
             logger.exception("Failed to get model schema endpoint")
             return None
@@ -269,10 +278,10 @@ class InfoResource(Resource):
             record_cls = service.config.record_cls
             schema = getattr(record_cls, "schema", None)
             if schema is not None:
-                return [schema.value]
+                return {"application/json": schema.value}
         except:  # NOSONAR noqa
             logger.exception("Failed to get model schemas")
-        return []
+        return {}
 
     def _get_service(self, model_data):
         service_id = model_data["service-config"]["service-id"]

oarepo_runtime/records/relations/pid_relation.py

@@ -35,6 +35,8 @@ class PIDRelationResult(RelationResult):
 
         try:
             obj = pid_field_context.resolve(id_)
+            if hasattr(obj, "relations") and obj.relations and hasattr(obj.relations, "dereference"):
+                obj.relations.dereference()
             # We detach the related record model from the database session when
             # we add it in the cache. Otherwise, accessing the cached record
             # model, will execute a new select query after a db.session.commit.

{oarepo_runtime-1.5.60.dist-info → oarepo_runtime-1.5.62.dist-info}/METADATA

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

{oarepo_runtime-1.5.60.dist-info → oarepo_runtime-1.5.62.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=h0knW_HwiyIt5TBHfdGqN7_BBYfpz1Fw6zhVy0C28fM,111
 oarepo_runtime/info/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime/info/views.py,sha256=YdjzwPhG5YxRfz-7WLvHlqrlHi98rmKEcZpdN4opUII,11342
+oarepo_runtime/info/views.py,sha256=UkLGzf6Vo8GLutfzJW3IAyq9sdPexICUFAvz903autY,11829
 oarepo_runtime/records/__init__.py,sha256=3vzRsAPxl4d5QOnGyls-vUg4E6PunmR4ACObtacMAIQ,1038
 oarepo_runtime/records/dumpers/__init__.py,sha256=OmzNhLdMNKibmCksnj9eTX9xPBG30dziiK3j3bAAp3k,233
 oarepo_runtime/records/dumpers/edtf_interval.py,sha256=YCShZAoqBQYaxVilEVotS-jXZsxxoXO67yu2urhkaMA,1198
@@ -54,7 +54,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=zJjSf_ocFBViYsOuMMZLbQZpNZeKiOK33dPD4tk74Qo,2786
+oarepo_runtime/records/relations/pid_relation.py,sha256=jKiwUEepJkOc0MRX3Etl5RQJw3t40rY7FOJCIPwOKmg,2932
 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=4JkMEefPLpqtPtlTgK3UT0KzTRgyw5_Qtkss2qcz5xk,1643
@@ -119,9 +119,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.60.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.60.dist-info/METADATA,sha256=8HAOuGW8hqgI2E1df2A-ux-WdXPlA5fMM7TFvok8hTY,4720
-oarepo_runtime-1.5.60.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-oarepo_runtime-1.5.60.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
-oarepo_runtime-1.5.60.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.60.dist-info/RECORD,,
+oarepo_runtime-1.5.62.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.62.dist-info/METADATA,sha256=WsZXpIjGMDuilC_1VyfG3eGhd6OTq5SzlnJLqPs3TjM,4720
+oarepo_runtime-1.5.62.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+oarepo_runtime-1.5.62.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
+oarepo_runtime-1.5.62.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.62.dist-info/RECORD,,