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

…into dev
biothings · Feb 22, 2024 · cd8d2fa · cd8d2fa
2 parents ee8906b + 552dcb9
commit cd8d2fa
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 18 deletions.
diff --git a/deploy/templates/deployment.yaml b/deploy/templates/deployment.yaml
@@ -64,4 +64,4 @@ spec:
         - name: {{ include "bte.fullname" . }}-secret-volume
           secret:
             secretName: {{ include "bte.fullname" . }}-secret
-            defaultMode: 0400
+            defaultMode: 0400
diff --git a/deploy/templates/ingress.yaml b/deploy/templates/ingress.yaml
@@ -26,4 +26,4 @@ spec:
             service:
               name: {{ $fullName }}
               port:
-                number: {{ $svcPort }}
+                number: {{ $svcPort }}
diff --git a/deploy/values.yaml b/deploy/values.yaml
@@ -2,7 +2,7 @@
 
 deployment:
   strategyType: Recreate
-  replicaCount: 1
+  replicaCount: 2
 
 image:
   repository: 853771734544.dkr.ecr.us-east-1.amazonaws.com/translator-bte
@@ -47,8 +47,6 @@ env:
   REDIS_TLS_ENABLED_VALUE: true
   REDIS_CLUSTER_VALUE: true
 
-
-
 # With the following two sections, we can restrict the deployment on and only on the specific node
 # toleration to node taint such that this deployment can be scheduled on the tainted node while others without the toleration can not
 tolerations: 
@@ -80,8 +78,8 @@ affinity:
       topologyKey: "kubernetes.io/hostname"
 resources:
   requests:
-    memory: 56Gi
-    cpu: 13000m
+    memory: 50Gi
+    cpu: 10000m
   limits:
     memory: 58Gi
     cpu: 14000m 
diff --git a/performance-test/20-creative.js → performance-test/20-onehop.js b/performance-test/20-creative.js → performance-test/20-onehop.js
@@ -4,12 +4,12 @@ const async = require("async");
 
 const CONCURRENCY = 20;
 
-const TEST_URL = "https://api.bte.ncats.io";
+// const TEST_URL = "https://api.bte.ncats.io";
+const TEST_URL = "https://bte.ci.transltr.io"
 // const TEST_URL = "http://localhost:3000"
 const TEST_ENDPOINT = "/v1/asyncquery";
 
 const IDS = [
-  "MONDO:0016575",
   "MONDO:0016575",
   "MONDO:0005377",
   "MONDO:0007035",
@@ -18,6 +18,37 @@ const IDS = [
   "MONDO:0019609",
   "MONDO:0004975",
   "HP:0002014",
+  "MONDO:0011399",
+  "MONDO:0010979",
+  "MONDO:0010298",
+  "MONDO:0007739",
+  "MONDO:0009458",
+  "MONDO:0009131",
+  "MONDO:0019609",
+  "MONDO:0008078",
+  "MONDO:0016367",
+  "MONDO:0018997",
+  "MONDO:0010526",
+  "MONDO:0005147",
+  "HP:0000822",
+  "HP:0002315",
+  "MONDO:0004975",
+  "MONDO:0005155",
+  "HP:0002014",
+  "MONDO:0005148",
+  "MONDO:0002251",
+  "MONDO:0007035",
+  "HP:0003003",
+  "HP:0011015",
+  "MONDO:0008170",
+  "MONDO:0005002",
+  "MONDO:0005260",
+  "MONDO:0005015",
+  "HP:0001993",
+  "MONDO:0005789",
+  "MONDO:0005812",
+  "HP:0000717",
+  "HP:0003124",
 ];
 
 const start = performance.now();
@@ -32,7 +63,7 @@ results = async
       // jitter sendout time by a few ms
       await new Promise((resolve) => setTimeout(() => resolve(), Math.floor(Math.random() * 10)));
       const start = performance.now();
-      const id = IDS[Math.floor(Math.random() * IDS.length)]
+      const id = IDS.pop(Math.floor(Math.random() * IDS.length))
       const body = {
         message: {
           query_graph: {
@@ -41,7 +72,6 @@ results = async
                 subject: "n0",
                 predicates: ["biolink:treats"],
                 object: "n1",
-                knowledge_type: "inferred",
               },
             },
             nodes: {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/prod_revisions.txt b/prod_revisions.txt
@@ -1,14 +1,14 @@
 
-> @biothings-explorer/[email protected] get_rev /Users/jcallaghan/Projects/bte-concurrency
+> @biothings-explorer/[email protected] get_rev /Users/jcallaghan/Projects/bte-monarch
 > ./scripts/get_rev.sh
 
-# Generated from "pnpm run get_rev" on  Tue Dec 19 14:14:18 EST 2023
-https://github.com/biothings/bte-server.git ba304f2 ba304f2bb69e50161bcfcfee03c3d48b3a693dcd
-https://github.com/biothings/api-respone-transform.js.git b6d0197 b6d01976810b847dda4fae5beca0293786798194
+# Generated from "pnpm run get_rev" on  Wed Feb 21 14:50:30 EST 2024
+https://github.com/biothings/bte-server.git dcf6f01 dcf6f014fc714a894dfbf7b49dd090e341dfb33d
+https://github.com/biothings/api-respone-transform.js.git 4fe3dec 4fe3dec691e5074ff5df108ab3a5439e86e83901
 https://github.com/biothings/call-apis.js.git 547094e 547094e0bdad7cb479fd77a92b98ea14322ada28
 https://github.com/biothings/smartapi-kg.js.git 7386b43 7386b43a7e4ff4e270a4659f5766feafba4f059a
-https://github.com/biothings/bte_trapi_query_graph_handler.git 4cec8be 4cec8be7276e2ad5a5fb0655b11c67b228585264
+https://github.com/biothings/bte_trapi_query_graph_handler.git d55cad4 d55cad40852b6877a4c787a7e7d33966512ced28
 https://github.com/biothings/node-expansion.git e4bb786 e4bb7865135ffdf8b4fc30b8960888c27d29c337
 https://github.com/biothings/biolink-model.js.git ced082c ced082c25747cac03a362116574c7587152c3516
 https://github.com/biothings/biomedical_id_resolver.js.git 9918b20 9918b20821ae6e2e519741510467ae53c08165a9
-https://github.com/biothings/bte-utils.git 0855ef0 0855ef03cc833959807fdf82eb96d308d53607d9
+https://github.com/biothings/bte-utils.git 4f69547 4f695476e72a7844f8790030406f862411f53d89