fix(llm): add SENTINEL_PORT env var

helm-chart/sefaria-project/templates/configmap/local-settings-file.yaml

@@ -214,16 +214,17 @@ data:
     }
     
     # Celery
+    # Either define SENTINEL_HEADLESS_URL if using sentinel or REDIS_URL for a simple redis instance
+    REDIS_URL = os.getenv("REDIS_URL")
     REDIS_PORT = os.getenv("REDIS_PORT")
     REDIS_PASSWORD = os.getenv("REDIS_PASSWORD")
     CELERY_REDIS_BROKER_DB_NUM = os.getenv("CELERY_REDIS_BROKER_DB_NUM")
     CELERY_REDIS_RESULT_BACKEND_DB_NUM = os.getenv("CELERY_REDIS_RESULT_BACKEND_DB_NUM")
     CELERY_QUEUES = json.loads(os.getenv("CELERY_QUEUES", "{}"))
-    # Either define SENTINEL_HEADLESS_URL if using sentinel or REDIS_URL for a simple redis instance
     SENTINEL_HEADLESS_URL = os.getenv("SENTINEL_HEADLESS_URL") 
+    SENTINEL_PORT = os.getenv("SENTINEL_PORT")
     SENTINEL_TRANSPORT_OPTS = json.loads(os.getenv("SENTINEL_TRANSPORT_OPTS", "{}"))
     SENTINEL_PASSWORD = os.getenv("SENTINEL_PASSWORD")
-    REDIS_URL = os.getenv("REDIS_URL")
 
     MOBILE_APP_KEY = os.getenv("MOBILE_APP_KEY")
 

helm-chart/sefaria-project/values.yaml

@@ -385,6 +385,7 @@ secrets:
     #   CELERY_REDIS_RESULT_BACKEND_DB_NUM
     #   CELERY_QUEUES
     #   SENTINEL_HEADLESS_URL
+    #   SENTINEL_PORT
     #   SENTINEL_TRANSPORT_OPTS
     #   SENTINEL_PASSWORD
     #   REDIS_URL

sefaria/celery_setup/config.py

@@ -1,13 +1,13 @@
 from sefaria.settings import (REDIS_URL, REDIS_PASSWORD, REDIS_PORT, CELERY_REDIS_BROKER_DB_NUM,
                              CELERY_REDIS_RESULT_BACKEND_DB_NUM, SENTINEL_HEADLESS_URL, SENTINEL_PASSWORD,
-                             SENTINEL_TRANSPORT_OPTS)
+                             SENTINEL_TRANSPORT_OPTS, SENTINEL_PORT)
 from sefaria.celery_setup.generate_config import generate_config, SentinelConfig, RedisConfig
 
 
 def generate_config_from_env():
     return generate_config(
         RedisConfig(REDIS_URL, REDIS_PASSWORD, REDIS_PORT, CELERY_REDIS_BROKER_DB_NUM, CELERY_REDIS_RESULT_BACKEND_DB_NUM),
-        SentinelConfig(SENTINEL_HEADLESS_URL, SENTINEL_PASSWORD, REDIS_PORT, SENTINEL_TRANSPORT_OPTS)
+        SentinelConfig(SENTINEL_HEADLESS_URL, SENTINEL_PASSWORD, SENTINEL_PORT, SENTINEL_TRANSPORT_OPTS)
     )
 
 

sefaria/local_settings_ci.py

@@ -155,6 +155,7 @@
 CELERY_QUEUES = {}
 # Either define SENTINEL_HEADLESS_URL if using sentinel or REDIS_URL for a simple redis instance
 SENTINEL_HEADLESS_URL = None
+SENTINEL_PORT = 26379
 SENTINEL_TRANSPORT_OPTS = {}
 SENTINEL_PASSWORD = None
 REDIS_URL = "redis://127.0.0.1"

sefaria/local_settings_example.py

@@ -263,6 +263,7 @@
 CELERY_QUEUES = {}
 # Either define SENTINEL_HEADLESS_URL if using sentinel or REDIS_URL for a simple redis instance
 SENTINEL_HEADLESS_URL = None
+SENTINEL_PORT = 26379
 SENTINEL_TRANSPORT_OPTS = {}
 SENTINEL_PASSWORD = None
 REDIS_URL = "redis://127.0.0.1"