root
/
tabby
mirror of https://gitee.com/zhang_1334717033/tabby.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup environment variable (#30) 

* Remove EVENTS_LOG_DIR

* Rename supervisord.sh -> tabby.sh
add-more-languages
Meng Zhang 2023-03-29 16:33:00 +08:00 committed by GitHub
parent 44ac6cd510
commit 20801bbe8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -42,7 +42,7 @@ COPY deployment/config/vector.toml /etc/vector/vector.toml
# Supervisord # Supervisord
RUN --mount=type=cache,target=/root/.cache pip install -i $PYPI_INDEX_URL --extra-index-url https://pypi.org/simple supervisor 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 COPY tabby ./tabby
CMD ["supervisord.sh"] COPY deployment/scripts/tabby.sh /usr/bin
CMD ["tabby.sh"]

1
README.md
View File

@ -34,6 +34,7 @@ docker run \
-v ./data/hf_cache:/root/.cache/huggingface \ -v ./data/hf_cache:/root/.cache/huggingface \
-p 5000:5000 \ -p 5000:5000 \
-p 8501:8501 \ -p 8501:8501 \
-p 8080:8080\
-e MODEL_NAME=TabbyML/J-350M tabbyml/tabby -e MODEL_NAME=TabbyML/J-350M tabbyml/tabby
``` ```

6
deployment/docker-compose.yml
View File

@ -7,7 +7,7 @@ services:
environment: environment:
MODEL_NAME: ${MODEL_NAME} MODEL_NAME: ${MODEL_NAME}
MODEL_BACKEND: triton MODEL_BACKEND: triton
EVENTS_LOG_DIR: /data/logs/tabby-server LOGS_DIR: /data/logs
DAGU_DAGS: /app/tabby/tasks DAGU_DAGS: /app/tabby/tasks
ports: ports:
- "5000:5000" - "5000:5000"
@ -25,10 +25,10 @@ services:
triton: triton:
image: tabbyml/fastertransformer_backend image: tabbyml/fastertransformer_backend
container_name: tabby-triton container_name: tabby-triton
command: /scripts/triton.sh command: triton.sh
shm_size: 1gb shm_size: 1gb
volumes: volumes:
- ./scripts:/scripts - ./scripts/triton.sh:/usr/bin/triton.sh:ro
- ${HF_VOLUME} - ${HF_VOLUME}
deploy: deploy:
resources: resources:

1
deployment/scripts/supervisord.sh → deployment/scripts/tabby.sh
View File

@ -8,7 +8,6 @@ export DB_FILE="${DB_FILE:-/data/logs/duckdb/duck.db}"
# server # server
export MODEL_NAME="${MODEL_NAME:-TabbyML/J-350M}" export MODEL_NAME="${MODEL_NAME:-TabbyML/J-350M}"
export MODEL_BACKEND="${MODEL_BACKEND:-python}" export MODEL_BACKEND="${MODEL_BACKEND:-python}"
export EVENTS_LOG_DIR="${LOGS_DIR}/tabby-server"
# dagu # dagu
export DAGU_DAGS="tabby/tasks" export DAGU_DAGS="tabby/tasks"

2
development/docker-compose.dev.yml
View File

@ -13,4 +13,4 @@ services:
volumes: volumes:
- ../:/app - ../:/app
- ../deployment/config/vector.toml:/etc/vector/vector.toml:ro - ../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

6
tabby/server/events.py
View File

@ -27,9 +27,9 @@ def setup_logging(logdir):
) )
EVENTS_LOG_DIR = os.environ.get("EVENTS_LOG_DIR", None) LOGS_DIR = os.environ.get("LOGS_DIR", None)
if EVENTS_LOG_DIR is not None: if LOGS_DIR is not None:
setup_logging(EVENTS_LOG_DIR) setup_logging(os.path.join(LOGS_DIR, "tabby-server"))
def log_completions( def log_completions(