Merge branch 'main' of https://github.com/biothings/bte_trapi_query_g…

…raph_handler into dev
biothings · Sep 26, 2024 · 3a83c6f · 3a83c6f
2 parents cb803ce + 6ebae13
commit 3a83c6f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/src/inferred_mode/inferred_mode.ts b/src/inferred_mode/inferred_mode.ts
@@ -724,7 +724,7 @@ export default class InferredQueryHandler {
 
     // add pfocr figures
     if (!this.pathfinder) {
-      this.logs = [...this.logs, ...(await enrichTrapiResultsWithPfocrFigures(response, true))];
+      this.logs = [...this.logs, ...(await enrichTrapiResultsWithPfocrFigures(response))];
     }
 
     // get the final summary log

diff --git a/src/inferred_mode/pathfinder.ts b/src/inferred_mode/pathfinder.ts
@@ -144,7 +144,7 @@ export default class PathfinderQueryHandler {
     this._pruneKg(creativeResponse);
 
     // pfocr
-    this.logs = [...this.logs, ...(await enrichTrapiResultsWithPfocrFigures(creativeResponse, true))];
+    this.logs = [...this.logs, ...(await enrichTrapiResultsWithPfocrFigures(creativeResponse))];
 
     // logs
     creativeResponse.logs = this.logs.map((log) => log.toJSON());

diff --git a/src/results_assembly/pfocr.ts b/src/results_assembly/pfocr.ts
@@ -176,7 +176,7 @@ function traverseResultForNodes(result: TrapiResult, response: TrapiResponse): S
  * t: trapiResults.length
  * f: figures.length
  */
-export async function enrichTrapiResultsWithPfocrFigures(response: TrapiResponse, checkAuxGraphs = false): Promise<StampedLog[]> {
+export async function enrichTrapiResultsWithPfocrFigures(response: TrapiResponse): Promise<StampedLog[]> {
   // NOTE: This function operates on the actual TRAPI information that will be returned
   // to the client. Don't mutate what shouldn't be mutated!
   const results = response.message.results;
@@ -192,24 +192,6 @@ export async function enrichTrapiResultsWithPfocrFigures(response: TrapiResponse
     Object.values(result.node_bindings).forEach((bindings) =>
       bindings.forEach((binding) => nodes.add(response.message.knowledge_graph.nodes[binding.id])),
     );
-    // check aux graphs if applicable
-    if (checkAuxGraphs) {
-      for (const edgeId in result.analyses[0].edge_bindings) {
-        for (const eb of result.analyses[0].edge_bindings[edgeId]) {
-          const edge = response.message.knowledge_graph.edges[eb.id];
-          const supportGraphs = edge.attributes.find((attribute) => attribute.attribute_type_id == 'biolink:support_graphs');
-          if (supportGraphs) {
-            (supportGraphs.value as string[]).forEach((auxGraphID) =>
-              response.message.auxiliary_graphs[auxGraphID].edges.forEach((edgeID) => {
-                const edge = response.message.knowledge_graph.edges[edgeID];
-                nodes.add(response.message.knowledge_graph.nodes[edge.subject]);
-                nodes.add(response.message.knowledge_graph.nodes[edge.object]);
-              }),
-            );
-          }
-        }
-      }
-    }
 
     const combo: Set<string> = new Set();
     let matchedNodes = 0;