From 5eb0abd604991b72a8607ed4ce994b912188a559 Mon Sep 17 00:00:00 2001
From: cotran <cotran2@utexas.edu>
Date: Tue, 1 Oct 2024 11:19:32 -0700
Subject: [PATCH] fix bug merge

---
 demos/function_calling/docker-compose.yaml    | 24 +++++++++----------
 model_server/app/arch_fc/arch_fc.py           |  2 +-
 model_server/app/main.py                      |  4 +++-
 .../{app/arch_fc => }/openai_params.yaml      |  0
 4 files changed, 16 insertions(+), 14 deletions(-)
 rename model_server/{app/arch_fc => }/openai_params.yaml (100%)

diff --git a/demos/function_calling/docker-compose.yaml b/demos/function_calling/docker-compose.yaml
index a32127c0..177a28a2 100644
--- a/demos/function_calling/docker-compose.yaml
+++ b/demos/function_calling/docker-compose.yaml
@@ -4,14 +4,14 @@ x-variables: &common-vars
 
 services:
 
-  config_generator:
-    build:
-      context: ../../
-      dockerfile: config_generator/Dockerfile
-    volumes:
-      - ../../arch/envoy.template.yaml:/usr/src/app/envoy.template.yaml
-      - ./arch_config.yaml:/usr/src/app/arch_config.yaml
-      - ./generated:/usr/src/app/out
+  # config_generator:
+  #   build:
+  #     context: ../../
+  #     dockerfile: config_generator/Dockerfile
+  #   volumes:
+  #     - ../../arch/envoy.template.yaml:/usr/src/app/envoy.template.yaml
+  #     - ./arch_config.yaml:/usr/src/app/arch_config.yaml
+  #     - ./generated:/usr/src/app/out
 
   arch:
     build:
@@ -25,9 +25,9 @@ services:
       - /etc/ssl/cert.pem:/etc/ssl/cert.pem
       - ./arch_log:/var/log/
     depends_on:
-      config_generator:
-        condition: service_completed_successfully
-      model_server:
+      # config_generator:
+      #   condition: service_completed_successfully
+      archgw_model_server:
         condition: service_healthy
     environment:
       - LOG_LEVEL=debug
@@ -48,7 +48,7 @@ services:
     <<: *common-vars
     environment:
       - OLLAMA_ENDPOINT=${OLLAMA_ENDPOINT:-host.docker.internal}
-      - FC_URL=${FC_URL:}
+      - FC_URL=${FC_URL:-empty}
       - OLLAMA_MODEL=Arch-Function-Calling-3B-Q4_K_M
       - MODE=${MODE:-cloud}
       # uncomment following line to use ollama endpoint that is hosted by docker
diff --git a/model_server/app/arch_fc/arch_fc.py b/model_server/app/arch_fc/arch_fc.py
index 75b737d7..2039ba8a 100644
--- a/model_server/app/arch_fc/arch_fc.py
+++ b/model_server/app/arch_fc/arch_fc.py
@@ -34,7 +34,7 @@
 if mode == "cloud":
     client = OpenAI(
         base_url=fc_url,
-        api_key=arch_api_key,
+        api_key="EMPTY",
     )
     models = client.models.list()
     model = models.data[0].id
diff --git a/model_server/app/main.py b/model_server/app/main.py
index ab74d5c7..b9dda9d8 100644
--- a/model_server/app/main.py
+++ b/model_server/app/main.py
@@ -26,6 +26,8 @@
 
 with open("guard_model_config.yaml") as f:
     guard_model_config = yaml.safe_load(f)
+with open('/root/arch_config.yaml') as f:
+    config = yaml.safe_load(f)
 mode = os.getenv("MODE", "cloud")
 logger.info(f"Serving model mode: {mode}")
 if mode not in ['cloud', 'local-gpu', 'local-cpu']:
@@ -44,7 +46,7 @@
     )
     toxic_model = None
 
-guard_handler = GuardHandler(toxic_model=None, jailbreak_model=jailbreak_model)
+    guard_handler = GuardHandler(toxic_model=toxic_model, jailbreak_model=jailbreak_model)
 
 app = FastAPI()
 
diff --git a/model_server/app/arch_fc/openai_params.yaml b/model_server/openai_params.yaml
similarity index 100%
rename from model_server/app/arch_fc/openai_params.yaml
rename to model_server/openai_params.yaml