Improve secret handling further (#25)

Get rid of the runtime_env
ray-project · Aug 24, 2023 · 9d13151 · 9d13151
1 parent 5fa005c
commit 9d13151
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/app/serve.py b/app/serve.py
@@ -12,13 +12,8 @@
 from slack_bolt import App
 from slack_bolt.adapter.socket_mode import SocketModeHandler
 
+import app
 from app import query
-from app.config import (
-    DB_CONNECTION_STRING,
-    OPENAI_API_KEY,
-    SLACK_APP_TOKEN,
-    SLACK_BOT_TOKEN,
-)
 
 
 def get_secret(secret_name):
@@ -59,17 +54,6 @@ def run(self):
         SocketModeHandler(self.slack_app, get_secret("SLACK_APP_TOKEN")).start()
 
 
-ray.init(
-    runtime_env={
-        "env_vars": {
-            "DB_CONNECTION_STRING": get_secret("DB_CONNECTION_STRING"),
-            "OPENAI_API_KEY": OPENAI_API_KEY,
-        }
-    },
-    ignore_reinit_error=True,
-)
-
-
 class Query(BaseModel):
     query: str
 
@@ -84,6 +68,7 @@ class Answer(BaseModel):
 @serve.ingress(app)
 class RayAssistantDeployment:
     def __init__(self):
+        app.config.DB_CONNECTION_STRING = get_secret("DB_CONNECTION_STRING")
         self.agent = query.QueryAgent(
             llm="meta-llama/Llama-2-70b-chat-hf",
             max_context_length=4096,

diff --git a/app/service.yaml b/app/service.yaml
@@ -3,7 +3,7 @@ cluster_env: ray-assistant:2
 ray_serve_config:
   import_path: app.serve:deployment
   runtime_env:
-    working_dir: "https://github.com/ray-project/llm-applications/archive/refs/tags/v0.0.3.zip"
+    working_dir: "https://github.com/ray-project/llm-applications/archive/refs/tags/v0.0.4.zip"
     env_vars: {
       RAY_ASSISTANT_AWS_SECRET_ID: "ray-assistant",
       RAY_ASSISTANT_AWS_REGION: "us-west-2"