Merge pull request #192 from WengLab-InformaticsResearch/lookup_and_score

Change operation from lookup to lookup_and_score. No change in behavior

Author: CaseyTa

cohd/TRAPI14.yaml

@@ -17,7 +17,7 @@ info:
     [Athena](http://athena.ohdsi.org) (OMOP vocabularies, search, concept relationships, concept hierarchy)
     [Atlas](http://www.ohdsi.org/web/atlas/) (OMOP vocabularies, search, concept relationships, concept hierarchy,
     concept sets)
-  version: 6.3.12
+  version: 6.3.13
   title: COHD TRAPI
   contact:
     name: Casey Ta
@@ -44,7 +44,7 @@ info:
     version: 1.4.0
     asyncquery: false
     operations:
-      - lookup
+      - lookup_and_score
     batch_size_limit: 100
     rate_limit: 10
     externalDocs:

cohd/cohd_trapi.py

@@ -68,6 +68,7 @@ def operate(self):
     limit_max_results = 500
     json_inf_replacement = 999  # value to replace +/-Infinity with in JSON
     supported_query_methods = ['relativeFrequency', 'obsExpRatio', 'chiSquare']
+    supported_operation = 'lookup_and_score'
 
     # Mapping for which predicate should be used for each COHD analysis method. For now, it's all correlated_with
     default_predicate = 'biolink:correlated_with'

cohd/cohd_trapi_14.py

@@ -37,7 +37,7 @@ class CohdTrapi140(CohdTrapi):
     edge_types_negative = ['biolink:negatively_correlated_with']
     default_negative_predicate = edge_types_negative[0]
 
-    tool_version = f'{CohdTrapi._SERVICE_NAME} 6.3.12'
+    tool_version = f'{CohdTrapi._SERVICE_NAME} 6.3.13'
     schema_version = '1.4.2'
     biolink_version = bm_version
 
@@ -155,9 +155,9 @@ def _check_query_input(self):
         # Check the workflow. Should be at most a single lookup operation
         workflow = self._json_data.get('workflow')
         if workflow and type(workflow) is list:
-            if len(workflow) > 1 or workflow[0]['id'] != 'lookup':
+            if len(workflow) > 1 or workflow[0]['id'] != CohdTrapi.supported_operation:
                 self._valid_query = False
-                msg = 'Unsupported workflow. Only a single "lookup" operation is supported'
+                msg = f'Unsupported workflow. Only a single "{CohdTrapi.supported_operation}" operation is supported'
                 self.log(msg, level=logging.WARNING)
                 response = self._trapi_mini_response(TrapiStatusCode.NO_RESULTS, msg)
                 self._invalid_query_response = response, 200