Merge pull request #56 from mit-submit/main

Update Prod to Release to t3desk

.github/workflows/dev-ci-cd.yaml

@@ -79,17 +79,17 @@ jobs:
       # stop any existing docker compose that's running
       - name: Stop Docker Compose
         run: |
-          ssh submit-dev 'bash -s' < ${{ github.workspace }}/deploy/dev-stop.sh
+          ssh submit-t3desk 'bash -s' < ${{ github.workspace }}/deploy/dev-stop.sh
 
       # copy repository to machine
       - name: Copy Repository
         run: |
-          rsync -e ssh -r ${{ github.workspace}} --exclude .git/ --delete submit-dev:~/
+          rsync -e ssh -r ${{ github.workspace}}/* --exclude .git/ --delete submit-t3desk:~/A2rchi-dev/
 
       # run deploy script
       - name: Run Deploy Script
         run: |
-          ssh submit-dev 'bash -s' < ${{ github.workspace }}/deploy/dev-install.sh
+          ssh submit-t3desk 'bash -s' < ${{ github.workspace }}/deploy/dev-install.sh
 
       # clean up secret files
       - name: Remove Secrets from Runner

.github/workflows/prod-ci-cd.yaml

@@ -79,17 +79,17 @@ jobs:
       # stop any existing docker compose that's running
       - name: Stop Docker Compose
         run: |
-          ssh submit-prod 'bash -s' < ${{ github.workspace }}/deploy/prod-stop.sh
+          ssh submit-t3desk 'bash -s' < ${{ github.workspace }}/deploy/prod-stop.sh
 
       # copy repository to machine
       - name: Copy Repository
         run: |
-          rsync -e ssh -r ${{ github.workspace}} --exclude .git/ --delete submit-prod:~/
+          rsync -e ssh -r ${{ github.workspace}}/* --exclude .git/ --delete submit-t3desk:~/A2rchi-prod/
 
       # run deploy script
       - name: Run Deploy Script
         run: |
-          ssh submit-prod 'bash -s' < ${{ github.workspace }}/deploy/prod-install.sh
+          ssh submit-t3desk 'bash -s' < ${{ github.workspace }}/deploy/prod-install.sh
 
       # clean up secret files
       - name: Remove Secrets from Runner

.gitignore

@@ -4,4 +4,9 @@ key.py
 !requirements.txt
 *.html
 *.ipynb
-__pycache__
+__pycache__
+venv
+*.DS_Store
+*.egg-info
+*sqlite_db
+.vscode

config/dev-config.yaml

@@ -75,7 +75,7 @@ utils:
     use_HTTP_chromadb_client: True   # recommended: True (use http client for the chromadb vectorstore?)
     # use_HTTP_chromadb_client: False
     vectordb_update_time: 10
-    chromadb_host: chromadb
+    chromadb_host: chromadb-dev
     chromadb_port: 8000
     collection_name: "dev_collection"
     reset_collection: True           # reset the entire collection each time it is accessed by a new data manager instance

config/prod-config.yaml

@@ -75,7 +75,7 @@ utils:
     use_HTTP_chromadb_client: True   # recommended: True (use http client for the chromadb vectorstore?)
     # use_HTTP_chromadb_client: False
     vectordb_update_time: 10
-    chromadb_host: chromadb
+    chromadb_host: chromadb-prod
     chromadb_port: 8000
     collection_name: "prod_collection"
     reset_collection: True           # reset the entire collection each time it is accessed by a new data manager instance

deploy/chat/Dockerfile-chat

@@ -11,8 +11,4 @@ COPY config config
 COPY A2rchi A2rchi
 RUN pip install --upgrade pip && pip install .
 
-# manually install 0.4.12 of chroma without telemetry
-COPY deploy/chroma/chroma deploy/chroma/chroma
-RUN pip uninstall chromadb && cd deploy/chroma/chroma && pip install . && cd /root/A2rchi
-
 CMD ["python", "-u", "A2rchi/bin/service_chat.py"]