oarepo-runtime 1.5.65__tar.gz → 1.5.67__tar.gz

{oarepo_runtime-1.5.65/oarepo_runtime.egg-info → oarepo_runtime-1.5.67}/PKG-INFO

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

{oarepo_runtime-1.5.65 → oarepo_runtime-1.5.67}/oarepo_runtime/info/views.py

@@ -105,6 +105,7 @@ class InfoResource(Resource):
             if model_data.get("type") != "model":
                 continue
 
+            resource_config_class = self._get_resource_config_class(model_data)
             service = self._get_service(model_data)
             service_class = self._get_service_class(model_data)
             if not service or type(service) != service_class:
@@ -143,7 +144,7 @@ class InfoResource(Resource):
                     "links": links,
                     # TODO: we also need to get previous schema versions here if we support
                     # multiple version of the same schema at the same time
-                    "schemas": self._get_model_schemas(service),
+                    "accept": self._get_model_accept_types(service, resource_config_class),
                 }
             )
         self.call_components("model", data=data)
@@ -273,16 +274,27 @@ class InfoResource(Resource):
             logger.exception("Failed to get model model endpoint")
             return None
 
-    def _get_model_schemas(self, service):
+    def _get_model_accept_types(self, service, resource_config):
         try:
             record_cls = service.config.record_cls
             schema = getattr(record_cls, "schema", None)
-            if schema is not None:
-                return {"application/json": schema.value}
+            accept_types = []
+            for accept_type, handler in resource_config.response_handlers.items():
+                curr_item = {'accept': accept_type}
+                if handler.serializer is not None and hasattr(handler.serializer, "info"):
+                    curr_item.update(handler.serializer.info(service))
+                accept_types.append(curr_item)
+
+            return accept_types
         except:  # NOSONAR noqa
             logger.exception("Failed to get model schemas")
         return {}
 
+
+    def _get_resource_config_class(self, model_data):
+        model_class = model_data['resource-config']['class']
+        return obj_or_import_string(model_class)()
+
     def _get_service(self, model_data):
         service_id = model_data["service-config"]["service-id"]
         try:

{oarepo_runtime-1.5.65 → oarepo_runtime-1.5.67}/oarepo_runtime/records/systemfields/selectors.py

@@ -1,7 +1,10 @@
-from typing import Any, Callable, List
+import dataclasses
+from typing import Any, Callable, List, Protocol, Tuple
 
+from oarepo_runtime.records.relations.lookup import lookup_key
 
-class Selector:
+
+class Selector(Protocol):
     def select(self, record) -> List[Any]:
         return []
 
@@ -25,6 +28,7 @@ class FirstItemSelector(PathSelector):
         return []
 
 
+@dataclasses.dataclass
 class FilteredSelector(Selector):
     """
     Selector which filters output of another selector
@@ -43,17 +47,9 @@ class FilteredSelector(Selector):
         }
     }
     """
-
-    def __init__(
-        self,
-        selector: Selector,
-        filter: Callable[[Any], bool],
-        projection: Callable[[Any], Any] | str = None,
-    ):
-
-        self.selector = selector
-        self.filter = filter
-        self.projection = projection
+    selector: Selector
+    filter: Callable[[Any], bool]
+    projection: Callable[[Any], Any] | str = None
 
     def select(self, record):
         selected = self.selector.select(record)
@@ -62,10 +58,7 @@ class FilteredSelector(Selector):
             ret = []
             for select_element in selected:
                 if isinstance(self.projection, str):
-                    if isinstance(select_element, dict) and self.projection in select_element:
-                        result = select_element[self.projection]
-                    else:
-                        result = []
+                    result = [x.value for x in lookup_key(select_element, self.projection)]
                 else:
                     result = self.projection(select_element)
                 if isinstance(result, list):
@@ -77,6 +70,7 @@ class FilteredSelector(Selector):
         return ret
 
 
+@dataclasses.dataclass
 class MultiSelector(Selector):
     """Selector concatenating outputs of multiple selectors"""
 

oarepo_runtime-1.5.67/oarepo_runtime/resources/json_serializer.py

@@ -0,0 +1,27 @@
+from flask import url_for
+from flask_resources import JSONSerializer as FlaskJSONSerializer
+from invenio_records_resources.services import Service
+
+
+class JSONSerializer(FlaskJSONSerializer):
+
+    def info(self, service:Service) -> dict:
+        ret = {'description': "Invenio RDM JSON Serialization",
+                'name': "JSON Serialization"
+               }
+
+        schema_value = service.config.record_cls.schema.value
+        if schema_value:
+            ret['schema'] = schema_value
+            if schema_value.startswith("local://"):
+                schema_value = schema_value.replace("local://", "")
+                ret['schema_url'] = url_for(
+                    "oarepo_runtime_info.schema",
+                    schema= schema_value,
+                    _external=True,
+                )
+            elif schema_value.startwith("http://") or schema_value.startwith("https://"):
+                ret['schema_url'] = schema_value
+
+
+        return ret

oarepo_runtime-1.5.67/oarepo_runtime/services/schema/marshmallow_to_json_schema.py

@@ -0,0 +1,72 @@
+from marshmallow import Schema, fields
+from oarepo_runtime.services.schema.ui import (
+    LocalizedEDTFTime,
+    LocalizedDateTime,
+    LocalizedEDTF,
+    LocalizedEDTFInterval,
+    LocalizedEDTFTimeInterval,
+    LocalizedTime
+)
+
+field_type_converters = {
+    fields.String : lambda field: {"type" : "string"},
+    fields.Integer: lambda field: {"type": "integer"},
+    fields.Float: lambda field: {"type": "number"},
+    fields.Boolean: lambda field: {"type": "boolean"},
+    fields.List: lambda field: {
+        "type": "array",
+        "items": convert_field_to_json_schema(field.inner)
+    },
+    fields.Nested: lambda field: {
+        "type": "object",
+        "properties": marshmallow_to_json_schema(field.schema)["properties"]
+    },
+    fields.Raw: lambda field: {
+        "type": "object",
+        'additionalProperties' : True
+    },
+    LocalizedEDTFTime: lambda field: {
+        "type": "string",
+        "format": "date-time",
+    },
+    LocalizedDateTime: lambda field: {
+        "type": "string",
+        "format": "date-time",
+    },
+    LocalizedTime: lambda field: {
+        "type": "string",
+        "format": "time",
+    },
+    LocalizedEDTF: lambda field: {
+        "type": "string",
+        "format": "date",
+    },
+    LocalizedEDTFInterval: lambda field: {
+        "type": "string",
+        "format": "date-time",
+    },
+    LocalizedEDTFTimeInterval: lambda field: {
+        "type": "string",
+        "format": "date-time",
+    }
+}
+
+def marshmallow_to_json_schema(schema:Schema) -> dict:
+    json_schema = {
+        'type': 'object',
+        'properties': {}
+    }
+
+    for field_name, field in schema.fields.items():
+        json_schema["properties"][field_name] = convert_field_to_json_schema(field)
+
+    return json_schema
+
+
+def convert_field_to_json_schema(field:fields) -> dict:
+    for field_type in type(field).mro():
+        if field_type in field_type_converters:
+            return field_type_converters[field_type](field)
+
+    # no converter found, just string
+    return {"type":"string"}

{oarepo_runtime-1.5.65 → oarepo_runtime-1.5.67/oarepo_runtime.egg-info}/PKG-INFO

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

{oarepo_runtime-1.5.65 → oarepo_runtime-1.5.67}/oarepo_runtime.egg-info/SOURCES.txt

@@ -80,6 +80,7 @@ oarepo_runtime/records/systemfields/selectors.py
 oarepo_runtime/records/systemfields/synthetic.py
 oarepo_runtime/resources/__init__.py
 oarepo_runtime/resources/file_resource.py
+oarepo_runtime/resources/json_serializer.py
 oarepo_runtime/resources/localized_ui_json_serializer.py
 oarepo_runtime/services/__init__.py
 oarepo_runtime/services/components.py
@@ -118,6 +119,7 @@ oarepo_runtime/services/schema/i18n.py
 oarepo_runtime/services/schema/i18n_ui.py
 oarepo_runtime/services/schema/i18n_validation.py
 oarepo_runtime/services/schema/marshmallow.py
+oarepo_runtime/services/schema/marshmallow_to_json_schema.py
 oarepo_runtime/services/schema/oneofschema.py
 oarepo_runtime/services/schema/polymorphic.py
 oarepo_runtime/services/schema/ui.py
@@ -132,4 +134,7 @@ oarepo_runtime/translations/en/LC_MESSAGES/messages.po
 oarepo_runtime/utils/__init__.py
 oarepo_runtime/utils/functools.py
 oarepo_runtime/utils/path.py
+tests/marshmallow_to_json/__init__.py
+tests/marshmallow_to_json/test_datacite_ui_schema.py
+tests/marshmallow_to_json/test_simple_schema.py
 tests/pkg_data/__init__.py

{oarepo_runtime-1.5.65 → oarepo_runtime-1.5.67}/setup.cfg

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