From 20801bbe8c64ac7fbb5035c34ca2b2a62a2560c4 Mon Sep 17 00:00:00 2001
From: Meng Zhang <wsxiaoys.lh@gmail.com>
Date: Wed, 29 Mar 2023 16:33:00 +0800
Subject: [PATCH] Cleanup environment variable (#30)

* Remove EVENTS_LOG_DIR

* Rename supervisord.sh -> tabby.sh
---
 Dockerfile                                      | 4 ++--
 README.md                                       | 1 +
 deployment/docker-compose.yml                   | 6 +++---
 deployment/scripts/{supervisord.sh => tabby.sh} | 1 -
 development/docker-compose.dev.yml              | 2 +-
 tabby/server/events.py                          | 6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename deployment/scripts/{supervisord.sh => tabby.sh} (94%)

diff --git a/Dockerfile b/Dockerfile
index f853303..4f5d50a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -42,7 +42,7 @@ COPY deployment/config/vector.toml /etc/vector/vector.toml
 
 # Supervisord
 RUN --mount=type=cache,target=/root/.cache pip install -i $PYPI_INDEX_URL --extra-index-url https://pypi.org/simple supervisor
-COPY deployment/scripts/supervisord.sh /usr/bin
 
 COPY tabby ./tabby
-CMD ["supervisord.sh"]
+COPY deployment/scripts/tabby.sh /usr/bin
+CMD ["tabby.sh"]
diff --git a/README.md b/README.md
index 1d2b83e..4e1f991 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,7 @@ docker run \
   -v ./data/hf_cache:/root/.cache/huggingface \
   -p 5000:5000 \
   -p 8501:8501 \
+  -p 8080:8080\
   -e MODEL_NAME=TabbyML/J-350M tabbyml/tabby
 ```
 
diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml
index 020854b..87a09db 100644
--- a/deployment/docker-compose.yml
+++ b/deployment/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     environment:
       MODEL_NAME: ${MODEL_NAME}
       MODEL_BACKEND: triton
-      EVENTS_LOG_DIR: /data/logs/tabby-server
+      LOGS_DIR: /data/logs
       DAGU_DAGS: /app/tabby/tasks
     ports:
       - "5000:5000"
@@ -25,10 +25,10 @@ services:
   triton:
     image: tabbyml/fastertransformer_backend
     container_name: tabby-triton
-    command: /scripts/triton.sh
+    command: triton.sh
     shm_size: 1gb
     volumes:
-      - ./scripts:/scripts
+      - ./scripts/triton.sh:/usr/bin/triton.sh:ro
       - ${HF_VOLUME}
     deploy:
       resources:
diff --git a/deployment/scripts/supervisord.sh b/deployment/scripts/tabby.sh
similarity index 94%
rename from deployment/scripts/supervisord.sh
rename to deployment/scripts/tabby.sh
index 227dc07..e16acdb 100755
--- a/deployment/scripts/supervisord.sh
+++ b/deployment/scripts/tabby.sh
@@ -8,7 +8,6 @@ export DB_FILE="${DB_FILE:-/data/logs/duckdb/duck.db}"
 # server
 export MODEL_NAME="${MODEL_NAME:-TabbyML/J-350M}"
 export MODEL_BACKEND="${MODEL_BACKEND:-python}"
-export EVENTS_LOG_DIR="${LOGS_DIR}/tabby-server"
 
 # dagu
 export DAGU_DAGS="tabby/tasks"
diff --git a/development/docker-compose.dev.yml b/development/docker-compose.dev.yml
index afb0e4b..b8da7d2 100644
--- a/development/docker-compose.dev.yml
+++ b/development/docker-compose.dev.yml
@@ -13,4 +13,4 @@ services:
     volumes:
       - ../:/app
       - ../deployment/config/vector.toml:/etc/vector/vector.toml:ro
-      - ../deployment/scripts/supervisord.sh:/usr/bin/supervisord.sh:ro
+      - ../deployment/scripts/tabby.sh:/usr/bin/tabby.sh:ro
diff --git a/tabby/server/events.py b/tabby/server/events.py
index 1e36ee5..9e7cfaa 100644
--- a/tabby/server/events.py
+++ b/tabby/server/events.py
@@ -27,9 +27,9 @@ def setup_logging(logdir):
     )
 
 
-EVENTS_LOG_DIR = os.environ.get("EVENTS_LOG_DIR", None)
-if EVENTS_LOG_DIR is not None:
-    setup_logging(EVENTS_LOG_DIR)
+LOGS_DIR = os.environ.get("LOGS_DIR", None)
+if LOGS_DIR is not None:
+    setup_logging(os.path.join(LOGS_DIR, "tabby-server"))
 
 
 def log_completions(