feat: handle bypass_cache

BioPack-team · May 9, 2024 · 3d2c02c · 3d2c02c
1 parent e509fb7
commit 3d2c02c
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 15 deletions.
diff --git a/packages/call-apis/src/queries/trapi_subquery.ts b/packages/call-apis/src/queries/trapi_subquery.ts
@@ -69,6 +69,9 @@ export default class TrapiSubquery extends Subquery {
       queryBody.message.query_graph.edges.e01.qualifier_constraints =
         qualifierConstraints;
     }
+    if (this.options.caching === false) {
+      queryBody.bypass_cache = true;
+    }
     const xmaturityMap = {
       ci: "staging",
       test: "test",

diff --git a/packages/server/src/controllers/threading/threadHandler.ts b/packages/server/src/controllers/threading/threadHandler.ts
@@ -270,6 +270,10 @@ export async function runTask(req: Request, res: Response, route: string, useBul
     },
   };
 
+  if ((req.body as TrapiQuery)?.bypass_cache) {
+    taskInfo.data.options.caching = false;
+  }
+
   if (process.env.USE_THREADING === "false") {
     // Threading disabled, just use the provided function in main event loop
     const response = (await tasks[route](taskInfo)) as TrapiResponse;

diff --git a/packages/server/src/routes/v1/asyncquery_v1.ts b/packages/server/src/routes/v1/asyncquery_v1.ts
@@ -33,15 +33,18 @@ class V1AsyncQuery implements BteRoute {
       ) => {
         const queueData: QueueData = {
           route: req.route.path,
-          queryGraph: req.body.message.query_graph,
-          workflow: req.body.workflow,
-          callback_url: req.body.callback,
+          queryGraph: req.body?.message.query_graph,
+          workflow: req.body?.workflow,
+          callback_url: req.body?.callback,
           options: {
-            logLevel: req.body.log_level,
-            submitter: req.body.submitter,
+            logLevel: req.body?.log_level,
+            submitter: req.body?.submitter,
             ...req.query,
           },
         };
+        if (req.body?.bypass_cache) {
+          queueData.options.caching = false;
+        }
         await asyncquery(req, res, next, queueData, global.queryQueue.bte_query_queue);
       }) as RequestHandler)
       .all(utils.methodNotAllowed);

diff --git a/packages/server/src/routes/v1/asyncquery_v1_by_api.ts b/packages/server/src/routes/v1/asyncquery_v1_by_api.ts
@@ -24,16 +24,19 @@ class V1AsyncQueryByAPI implements BteRoute {
       .post(swaggerValidation.validate, async (req: Request, res: Response, next: NextFunction) => {
         const queueData: QueueData = {
           route: req.route.path,
-          queryGraph: req.body.message.query_graph,
+          queryGraph: req.body?.message.query_graph,
           smartAPIID: req.params.smartapi_id,
-          workflow: req.body.workflow,
-          callback_url: req.body.callback,
+          workflow: req.body?.workflow,
+          callback_url: req.body?.callback,
           options: {
-            logLevel: req.body.log_level,
-            submitter: req.body.submitter,
+            logLevel: req.body?.log_level,
+            submitter: req.body?.submitter,
             ...req.query,
           },
         };
+        if (req.body?.bypass_cache) {
+          queueData.options.caching = false;
+        }
         await asyncquery(req, res, next, queueData, global.queryQueue["bte_query_queue_by_api"]);
       })
       .all(utils.methodNotAllowed);

diff --git a/packages/server/src/routes/v1/asyncquery_v1_by_team.ts b/packages/server/src/routes/v1/asyncquery_v1_by_team.ts
@@ -25,16 +25,19 @@ class V1AsyncQueryByTeam implements BteRoute {
       .post(swaggerValidation.validate, (async (req: Request, res: Response, next: NextFunction) => {
         const queueData: QueueData = {
           route: req.route.path,
-          queryGraph: req.body.message.query_graph,
+          queryGraph: req.body?.message.query_graph,
           teamName: req.params.team_name,
-          workflow: req.body.workflow,
-          callback_url: req.body.callback,
+          workflow: req.body?.workflow,
+          callback_url: req.body?.callback,
           options: {
-            logLevel: req.body.log_level,
-            submitter: req.body.submitter,
+            logLevel: req.body?.log_level,
+            submitter: req.body?.submitter,
             ...req.query,
           },
         };
+        if (req.body?.bypass_cache) {
+          queueData.options.caching = false;
+        }
         await asyncquery(req, res, next, queueData, global.queryQueue["bte_query_queue_by_team"]);
       }) as RequestHandler)
       .all(utils.methodNotAllowed);

diff --git a/packages/types/src/trapi.ts b/packages/types/src/trapi.ts
@@ -161,6 +161,7 @@ export interface TrapiResponseMessage {
 }
 
 export interface TrapiQuery {
+  bypass_cache?: boolean;
   message: TrapiQueryMessage;
   log_level?: string;
   workflow?: TrapiWorkflow[];