Add TRAPI query validation back in

Author: CaseyTa

cohd/cohd_trapi_15.py

@@ -11,7 +11,7 @@
 from .cohd_utilities import omop_concept_curie
 from .cohd_trapi import *
 from .biolink_mapper import *
-from .trapi.reasoner_validator_ext import validate_trapi_14x as validate_trapi
+from .trapi.reasoner_validator_ext import validate_trapi_15x as validate_trapi
 from .translator import bm_toolkit, bm_version
 from .translator.ubergraph import Ubergraph
 
@@ -41,7 +41,7 @@ class CohdTrapi150(CohdTrapi):
     edge_types_negative = ['biolink:negatively_correlated_with']
     default_negative_predicate = edge_types_negative[0]
 
-    tool_version = f'{CohdTrapi._SERVICE_NAME} 6.4.3'
+    tool_version = f'{CohdTrapi._SERVICE_NAME} 6.5.0'
     schema_version = '1.5.0'
     biolink_version = bm_version
 
@@ -126,9 +126,8 @@ def _check_query_input(self):
             return self._valid_query, self._invalid_query_response
 
         # Use TRAPI Reasoner Validator to validate the query
-        try:
-            # For now, bypass the TRAPI validation because reasoner_validator doesn't work with TRAPI 1.5
-            # validate_trapi(self._json_data, "Query")
+        try:            
+            validate_trapi(self._json_data, "Query")
             self.log('Query passed reasoner validator')
         except ValidationError as err:
             self._valid_query = False

cohd/trapi/reasoner_validator_ext.py

@@ -134,6 +134,30 @@ def validate_trapi_14x(instance, component):
     return validator.validate(instance, component)
 
 
+def validate_trapi_15x(instance, component):
+    """Validate instance against TRAPI 1.5 schema.
+
+    Parameters
+    ----------
+    instance
+        instance to validate
+    component : str
+        component to validate against
+
+    Raises
+    ------
+    `ValidationError <https://python-jsonschema.readthedocs.io/en/latest/errors/#jsonschema.exceptions.ValidationError>`_
+        If the instance is invalid.
+
+    Examples
+    --------
+    >>> validate({"message": {}}, "Query")
+    """
+    # Validate against official TRAPI 1.4 release
+    validator = TRAPISchemaValidator(trapi_version='1.5.0')
+    return validator.validate(instance, component)
+
+
 def validate_trapi_response(trapi_version, bl_version, response):
     """ Uses the reasoner_validator's more advanced TRAPIResponseValidator to perform thorough validation