Merge branch 'master' into production

v0.20 re-release
EpistasisLab · Sep 18, 2023 · 803b64a · 803b64a
2 parents 0a91473 + b35afb4
commit 803b64a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/docs/guides/developerGuide.md b/docs/guides/developerGuide.md
@@ -366,20 +366,21 @@ branch and push the changes to github.
 build the production images and generate the user production .zip by running
 `bash release/generate_production_release.sh`.  This will:
 
-    - Create local lab, machine, and dbmongo production docker images with the
+    - Create lab, machine, and dbmongo production docker images with the
     tag defined in the .env file
     - Create the production .zip named `target/production/Aliro-${VERSION}.zip`
+    - Build multi-architecture (amd64, arm64) docker images using `buildx bake` and push the images to docker hub.
 
     ```bash
     git checkout production
     bash release/generate_production_release.sh
     ```
 
-4. **Push docker images to DockerHub and tag the production git branch by
+4. **Check that the docker images were pushed to DockerHub and tag the production git branch by
 running `deploy_production_release.sh`.**  While in the produciton branch, run
 `bash release/deploy_production_release.sh`.  This will:
 
-    - Push the production lab, machine and dbmongo production docker images to dockerHub
+    - Check that the production lab, machine and dbmongo production docker images exist in dockerHub
     - Tag the production git branch with the version defined in `.env`
 
     ```bash

diff --git a/lab/webapp/src/components/ChatGPT/index.js b/lab/webapp/src/components/ChatGPT/index.js
@@ -1811,6 +1811,10 @@ export default function ChatGPT({ experiment }) {
 
     let resultMessage = resp["result"];
 
+    if (resp["status"] === "error") {
+      resultMessage = "Error: " + resultMessage;
+    }
+
     // if resultMessage is undefined, resultMessage = "Undefined"
     if (
       resultMessage === undefined ||