From 7a015de56c29bed5eb7db22ba4bbefe2ac7f0ea8 Mon Sep 17 00:00:00 2001
From: rkuo-danswer <rkuo@danswer.ai>
Date: Fri, 6 Sep 2024 12:21:29 -0700
Subject: [PATCH] first cut at redis (#2226)

* first cut at redis

* fix startup dependencies on redis

* kombu cleanup - fail silently

* mypy

* add redis_host environment override

* update REDIS_HOST env var in docker-compose.dev.yml

* update the rest of the docker files

* update contributing guide

* renaming cache to cache_volume

* add redis password to various deployments

* try setting up pr testing for helm

* fix indent

* hopefully this release version actually exists

* fix command line option to --chart-dirs

* fetch-depth 0

* edit values.yaml

* try setting ct working directory

* bypass testing only on change for now

* move files and lint them

* update helm testing

* some issues suggest using --config works

* add vespa repo

* add postgresql repo

* increase timeout

* try amd64 runner

* fix redis password reference

* add comment to helm chart testing workflow

* rename helm testing workflow to disable it

---------

Co-authored-by: Richard Kuo <rkuo@rkuo.com>
---
 .github/workflows/pr-helm-chart-testing.yml.disabled.txt    | 6 ++++++
 backend/danswer/background/celery/celery_app.py             | 2 +-
 deployment/docker_compose/docker-compose.gpu-dev.yml        | 1 +
 .../docker_compose/docker-compose.prod-no-letsencrypt.yml   | 1 +
 deployment/docker_compose/docker-compose.prod.yml           | 1 +
 deployment/docker_compose/docker-compose.search-testing.yml | 1 +
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pr-helm-chart-testing.yml.disabled.txt b/.github/workflows/pr-helm-chart-testing.yml.disabled.txt
index eeb1715b1c2..e19c16f4aea 100644
--- a/.github/workflows/pr-helm-chart-testing.yml.disabled.txt
+++ b/.github/workflows/pr-helm-chart-testing.yml.disabled.txt
@@ -38,9 +38,15 @@ jobs:
           backend/requirements/model_server.txt
     - run: |
         python -m pip install --upgrade pip
+<<<<<<< HEAD
         pip install --retries 5 --timeout 30 -r backend/requirements/default.txt
         pip install --retries 5 --timeout 30 -r backend/requirements/dev.txt
         pip install --retries 5 --timeout 30 -r backend/requirements/model_server.txt
+=======
+        pip install -r backend/requirements/default.txt
+        pip install -r backend/requirements/dev.txt
+        pip install -r backend/requirements/model_server.txt
+>>>>>>> 6daea805 (first cut at redis (#2226))
 
     - name: Set up chart-testing
       uses: helm/chart-testing-action@v2.6.1
diff --git a/backend/danswer/background/celery/celery_app.py b/backend/danswer/background/celery/celery_app.py
index cdd9b1d5c44..a96261eb115 100644
--- a/backend/danswer/background/celery/celery_app.py
+++ b/backend/danswer/background/celery/celery_app.py
@@ -1216,4 +1216,4 @@ def on_setup_logging(
             "options": {"priority": DanswerCeleryPriority.HIGH},
         },
     }
-)
+)
\ No newline at end of file
diff --git a/deployment/docker_compose/docker-compose.gpu-dev.yml b/deployment/docker_compose/docker-compose.gpu-dev.yml
index bc8bf10dffc..7702ecf4d2e 100644
--- a/deployment/docker_compose/docker-compose.gpu-dev.yml
+++ b/deployment/docker_compose/docker-compose.gpu-dev.yml
@@ -365,6 +365,7 @@ services:
 
 
 volumes:
+  cache_volume:
   db_volume:
   vespa_volume:
   # Created by the container itself
diff --git a/deployment/docker_compose/docker-compose.prod-no-letsencrypt.yml b/deployment/docker_compose/docker-compose.prod-no-letsencrypt.yml
index 7a56346f074..9ef274bc9d9 100644
--- a/deployment/docker_compose/docker-compose.prod-no-letsencrypt.yml
+++ b/deployment/docker_compose/docker-compose.prod-no-letsencrypt.yml
@@ -219,6 +219,7 @@ services:
 
 
 volumes:
+  cache_volume:
   db_volume:
   vespa_volume:
   # Created by the container itself
diff --git a/deployment/docker_compose/docker-compose.prod.yml b/deployment/docker_compose/docker-compose.prod.yml
index 983881fff7f..342d62935ca 100644
--- a/deployment/docker_compose/docker-compose.prod.yml
+++ b/deployment/docker_compose/docker-compose.prod.yml
@@ -236,6 +236,7 @@ services:
 
 
 volumes:
+  cache_volume:
   db_volume:
   vespa_volume:
   # Created by the container itself
diff --git a/deployment/docker_compose/docker-compose.search-testing.yml b/deployment/docker_compose/docker-compose.search-testing.yml
index a64b30f09d7..06955d62826 100644
--- a/deployment/docker_compose/docker-compose.search-testing.yml
+++ b/deployment/docker_compose/docker-compose.search-testing.yml
@@ -215,6 +215,7 @@ services:
 
 
 volumes:
+  cache_volume:
   db_volume:
     driver: local
     driver_opts: