fix: make sync kg construction support async file locks

biothings · Nov 5, 2024 · 7745a7a · 7745a7a
1 parent f2f6f54
commit 7745a7a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/controllers/cron/update_local_smartapi.ts b/src/controllers/cron/update_local_smartapi.ts
@@ -326,18 +326,18 @@ async function updateSmartAPISpecs() {
     delete obj._score;
   });
 
-  await lockWithActionAsync(localFilePath, async () => {
+  await lockWithActionAsync([localFilePath], async () => {
     await fs.writeFile(localFilePath, JSON.stringify({ hits: hits }));
   }, debug)
 
   const predicatesInfo = await getOpsFromPredicatesEndpoints(res.data.hits);
-  await lockWithActionAsync(predicatesFilePath, async () => {
+  await lockWithActionAsync([predicatesFilePath], async () => {
     await fs.writeFile(predicatesFilePath, JSON.stringify(predicatesInfo));
   }, debug);
 
   // Create a new metakg
   const metakg = new MetaKG();
-  metakg.constructMetaKGSync(true, { predicates: predicatesInfo, smartapiSpecs: { hits: hits as any }, apiList });
+  await metakg.constructMetaKGWithFileLock(true, { predicates: predicatesInfo, smartapiSpecs: { hits: hits as any }, apiList });
   global.metakg = metakg;
   global.smartapi = { hits };  // hits is an array, but smartapi must be a dict
 };
@@ -348,11 +348,11 @@ async function loadGlobalMetaKGReadOnly() {
   const predicatesFilePath = path.resolve(__dirname, "../../../data/predicates.json");
 
   const metakg = new MetaKG(localFilePath, predicatesFilePath);
-  metakg.constructMetaKGSync(true, { apiList });
+  await metakg.constructMetaKGWithFileLock(true, { apiList });
   global.metakg = metakg;
 
   global.smartapi = await lockWithActionAsync(
-    localFilePath,
+    [localFilePath],
     async () => {
       const file = await fs.readFile(localFilePath, 'utf-8');
       const hits = JSON.parse(file);

diff --git a/src/controllers/meta_knowledge_graph.ts b/src/controllers/meta_knowledge_graph.ts
@@ -37,13 +37,13 @@ export default class MetaKnowledgeGraphHandler {
     try {
       if (smartAPIID !== undefined) {
         debug(`Constructing with SmartAPI ID ${smartAPIID}`);
-        kg.constructMetaKGSync(false, { apiList, smartAPIID: smartAPIID });
+        await kg.constructMetaKGWithFileLock(false, { apiList, smartAPIID: smartAPIID });
       } else if (teamName !== undefined) {
         debug(`Constructing with team ${teamName}`);
-        kg.constructMetaKGSync(false, { apiList, teamName: teamName });
+        await kg.constructMetaKGWithFileLock(false, { apiList, teamName: teamName });
       } else {
         debug(`Constructing with default`);
-        kg.constructMetaKGSync(true, { apiList });
+        await kg.constructMetaKGWithFileLock(true, { apiList });
       }
       if (kg.ops.length === 0) {
         debug(`Found 0 operations`);

diff --git a/src/routes/metakg.ts b/src/routes/metakg.ts
@@ -18,7 +18,7 @@ class MetaKG {
           if (req.query.provided_by !== undefined) {
             source = utils.removeQuotesFromQuery(req.query.provided_by as string);
           }
-          const assocs = assoc(
+          const assocs = await assoc(
             req.query.subject as string,
             req.query.object as string,
             req.query.predicate as string,