migrate redis client to utils

biothings · Feb 6, 2024 · 5b61684 · 5b61684
1 parent d55cad4
commit 5b61684
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 377 deletions.
diff --git a/__test__/unittest/redisClient.test.ts b/__test__/unittest/redisClient.test.ts
diff --git a/src/batch_edge_query.ts b/src/batch_edge_query.ts
@@ -6,8 +6,8 @@ const debug = Debug('bte:biothings-explorer-trapi:batch_edge_query');
 import CacheHandler from './cache_handler';
 import { threadId } from 'worker_threads';
 import MetaKG from '@biothings-explorer/smartapi-kg';
-import { StampedLog } from '@biothings-explorer/utils';
-import { QueryHandlerOptions, redisClient } from '.';
+import { StampedLog, redisClient } from '@biothings-explorer/utils';
+import { QueryHandlerOptions } from '.';
 import QEdge from './query_edge';
 import { UnavailableAPITracker } from './types';
 import { Record } from '@biothings-explorer/api-response-transform';

diff --git a/src/cache_handler.ts b/src/cache_handler.ts
@@ -1,4 +1,4 @@
-import { redisClient } from './redis-client';
+import { redisClient } from '@biothings-explorer/utils';
 import Debug from 'debug';
 const debug = Debug('bte:biothings-explorer-trapi:cache_handler');
 import { LogEntry, StampedLog } from '@biothings-explorer/utils';

diff --git a/src/index.ts b/src/index.ts
@@ -28,11 +28,10 @@ import {
 } from './types';
 import BTEGraph from './graph/graph';
 import QEdge from './query_edge';
-import { Telemetry } from '@biothings-explorer/utils';
+import { Telemetry, redisClient } from '@biothings-explorer/utils';
 
 // Exports for external availability
 export * from './types';
-export { redisClient, getNewRedisClient } from './redis-client';
 export { getTemplates, supportedLookups } from './inferred_mode/template_lookup';
 export { default as QEdge } from './query_edge';
 export { default as QNode } from './query_node';
@@ -87,14 +86,27 @@ export default class TRAPIQueryHandler {
 
   async findUnregisteredAPIs() {
     const configListAPIs = this.options.apiList['include'];
-    const smartapiRegistry = await fs.readFile(this.path, { encoding: 'utf8' });
+
+    let smartapiRegistry;
+    if (redisClient.clientEnabled) {
+        const redisData = await redisClient.client.getTimeout(`bte:smartapi:smartapi`).catch(console.log)
+        debug(redisData);
+        if (redisData) {
+            smartapiRegistry = (JSON.parse(redisData))?.smartapi;
+        }
+    }
+
+    if (!smartapiRegistry) {
+        const file = await fs.readFile(this.path, "utf-8");
+        smartapiRegistry = JSON.parse(file);
+    }
 
     const smartapiIds: string[] = [];
     const inforesIds: string[] = [];
     const unregisteredAPIs: string[] = [];
 
     // TODO typing for smartapiRegistration
-    JSON.parse(smartapiRegistry).hits.forEach((smartapiRegistration) => {
+    smartapiRegistry.hits.forEach((smartapiRegistration) => {
       smartapiIds.push(smartapiRegistration._id);
       inforesIds.push(smartapiRegistration.info?.['x-translator']?.infores);
     });
@@ -110,7 +122,7 @@ export default class TRAPIQueryHandler {
     return unregisteredAPIs;
   }
 
-  _loadMetaKG(): MetaKG {
+  async _loadMetaKG(): Promise<MetaKG> {
     const metaKG = new MetaKG(this.path, this.predicatePath);
     debug(
       `Query options are: ${JSON.stringify({
@@ -119,7 +131,7 @@ export default class TRAPIQueryHandler {
       })}`,
     );
     debug(`SmartAPI Specs read from path: ${this.path}`);
-    metaKG.constructMetaKGSync(this.includeReasoner, this.options);
+    await metaKG.constructMetaKGSync(this.includeReasoner, this.options);
     return metaKG;
   }
 
@@ -313,6 +325,7 @@ export default class TRAPIQueryHandler {
   }
 
   async addQueryNodes(): Promise<void> {
+    debug("c1");
     const qNodeIDsByOriginalID: Map<string, TrapiQNode> = new Map();
     const curiesToResolve = [
       ...Object.values(this.queryGraph.nodes).reduce((set: Set<string>, qNode) => {
@@ -323,7 +336,9 @@ export default class TRAPIQueryHandler {
         return set;
       }, new Set()),
     ] as string[];
-    const resolvedCuries = await resolveSRI({ unknown: curiesToResolve });
+    debug("d1");
+    const resolvedCuries = {} as {[n: string]: any} /*await resolveSRI({ unknown: curiesToResolve })*/;
+    debug("e1");
     Object.entries(resolvedCuries).forEach(([originalCurie, resolvedEntity]) => {
       if (!this.bteGraph.nodes[resolvedEntity.primaryID]) {
         const category = resolvedEntity.primaryTypes?.[0]
@@ -340,6 +355,7 @@ export default class TRAPIQueryHandler {
         });
       }
     });
+    debug("f1");
   }
 
   getResponse(): TrapiResponse {
@@ -620,13 +636,17 @@ export default class TRAPIQueryHandler {
   };
 
   async query(): Promise<void> {
+    debug("a");
     this._initializeResponse();
+    debug("b");
     await this.addQueryNodes();
+    debug("c");
 
     const span1 = Telemetry.startSpan({ description: 'loadMetaKG' });
 
     debug('Start to load metakg.');
-    const metaKG = this._loadMetaKG();
+    let metaKG;
+    try { metaKG = await this._loadMetaKG(); } catch (err) { console.log("an error");console.log(err);console.log(err.stack);}
     if (!metaKG.ops.length) {
       let error: string;
       if (this.options.smartAPIID) {