Merge pull request #1117 from stanford-oval/wip/nrser/skill-perf

Merge changes that ended up in wip/nrser/skill-perf
stanford-oval · Oct 27, 2021 · 6ed58f2 · 6ed58f2
2 parents 5da517f + 0c74d45
commit 6ed58f2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/k8s/config/dev/manager-config/developer-deployment.json b/k8s/config/dev/manager-config/developer-deployment.json
@@ -27,7 +27,7 @@
                             "run-worker",
                             "--thingpedia-url=http://frontend:8080/thingpedia",
                             "--nl-server-url=https://nlp-staging.almond.stanford.edu",
-                            "--oauth-redirect-origin=http://frontend:8080",
+                            "--oauth-redirect-origin=http://localhost:8080",
                             "--faq-models={}",
                             "--notification-config={}",
                             "--locale=en-US",

diff --git a/k8s/frontend/base/ingress.yaml b/k8s/frontend/base/ingress.yaml
@@ -8,6 +8,8 @@ metadata:
     nginx.ingress.kubernetes.io/proxy-read-timeout: "3600"
     # set a very large value so we can upload string datasets
     nginx.ingress.kubernetes.io/proxy-body-size: "64m"
+    nginx.ingress.kubernetes.io/proxy-max-temp-file-size: "1024m"
+    nginx.org/client-max-body-size: "64m"
   labels:
     app: frontend
 spec:
@@ -17,7 +19,7 @@ spec:
       port:
         number: 8080
   rules:
-  - host: almond-cloud.test
+  - host: localhost
     http:
       paths:
       - backend:

diff --git a/model/schema.sql b/model/schema.sql
@@ -992,7 +992,7 @@ CREATE TABLE `user_conversation` (
   `intermediateContext` text COLLATE utf8mb4_bin NULL,
   `user` varchar(255) COLLATE utf8mb4_bin NOT NULL,
   -- iso 8601 string (for sqlite compatibility)
-  `userTimestamp` char(24) COLLATE utf8mb4_bin NOT NULL,
+  `userTimestamp` char(24) COLLATE utf8mb4_bin NULL,
   `userTarget` text COLLATE utf8mb4_bin NOT NULL,
   `vote` ENUM('up', 'down') COLLATE utf8mb4_bin NULL,
   `comment` text COLLATE utf8mb4_bin NULL,
@@ -1092,4 +1092,4 @@ CREATE TABLE `user_conversation_state` (
   `lastMessageId` int(11) NULL,
   PRIMARY KEY (`userId`, `uniqueId`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
-/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET character_set_client = @saved_cs_client */;
diff --git a/src/nlp/nlp_model.ts b/src/nlp/nlp_model.ts
@@ -197,7 +197,7 @@ export default class NLPModel {
             [
                 "options",
                 NLPModel.orderedPairsFor(
-                    options, ["tokenized", "expect", "choices", "store"]
+                    options, ["context", "entities", "tokenized", "expect", "choices", "store"]
                 )
             ],
         ]);