From 770bd174f7350cd52d8f069f55663f34d44ddfe4 Mon Sep 17 00:00:00 2001 From: choi Date: Mon, 18 Sep 2023 09:38:09 -0700 Subject: [PATCH 1/3] update chatGPT component to show error message when response state is error. --- lab/webapp/src/components/ChatGPT/index.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lab/webapp/src/components/ChatGPT/index.js b/lab/webapp/src/components/ChatGPT/index.js index f7024dd74..968a13f68 100644 --- 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 || From 72d6d937c48fdb5326d10a7b2b9ea603483699fd Mon Sep 17 00:00:00 2001 From: Jay Moran Date: Mon, 18 Sep 2023 13:33:11 -0700 Subject: [PATCH 2/3] Update release procedure instructions --- docs/guides/developerGuide.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/guides/developerGuide.md b/docs/guides/developerGuide.md index bbc57a0f2..ea6ff2ed4 100644 --- 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 From b35afb43636c1b65b5ae23cb67dbb2076d58fd24 Mon Sep 17 00:00:00 2001 From: jay-m-dev Date: Mon, 18 Sep 2023 14:29:56 -0700 Subject: [PATCH 3/3] v0.20 re-release --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index a7cb8b073..33df6859a 100644 --- a/.env +++ b/.env @@ -7,5 +7,5 @@ # Leave this set to 0 on the GitHub repo so the unit and # integration tests do not need to have wheels (until we # find a convenient way to use wheels on GitHub) -TAG=0.20.a0 +TAG=0.20 USE_WHEELS=1