From 679e610c2f5f5092aa0ae0e8629b8c549dac7b1d Mon Sep 17 00:00:00 2001 From: Chih-Yu Yeh Date: Wed, 31 Jul 2024 16:40:35 +0800 Subject: [PATCH] chore(wren-ai-service): fix entrypoint (#568) * fix entrypoint * add timeout * fix * update * fix --- docker/docker-compose-dev.yaml | 1 + docker/docker-compose.yaml | 1 + wren-ai-service/entrypoint.sh | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/docker/docker-compose-dev.yaml b/docker/docker-compose-dev.yaml index a1e87c1cc..9f8330089 100644 --- a/docker/docker-compose-dev.yaml +++ b/docker/docker-compose-dev.yaml @@ -41,6 +41,7 @@ services: - ${AI_SERVICE_FORWARD_PORT}:${WREN_AI_SERVICE_PORT} environment: WREN_AI_SERVICE_PORT: ${WREN_AI_SERVICE_PORT} + WREN_UI_PORT: ${WREN_UI_PORT} WREN_UI_ENDPOINT: ${WREN_UI_ENDPOINT} LLM_OPENAI_API_KEY: ${LLM_OPENAI_API_KEY} EMBEDDER_OPENAI_API_KEY: ${EMBEDDER_OPENAI_API_KEY} diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index f174644a7..1b7c591c0 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -53,6 +53,7 @@ services: - ${AI_SERVICE_FORWARD_PORT}:${WREN_AI_SERVICE_PORT} environment: WREN_AI_SERVICE_PORT: ${WREN_AI_SERVICE_PORT} + WREN_UI_PORT: ${WREN_UI_PORT} WREN_UI_ENDPOINT: http://wren-ui:${WREN_UI_PORT} LLM_OPENAI_API_KEY: ${LLM_OPENAI_API_KEY} EMBEDDER_OPENAI_API_KEY: ${EMBEDDER_OPENAI_API_KEY} diff --git a/wren-ai-service/entrypoint.sh b/wren-ai-service/entrypoint.sh index 365a6c86e..30ffaa4fb 100644 --- a/wren-ai-service/entrypoint.sh +++ b/wren-ai-service/entrypoint.sh @@ -4,6 +4,12 @@ set -e # Start wren-ai-service in the background uvicorn src.__main__:app --host 0.0.0.0 --port $WREN_AI_SERVICE_PORT --loop uvloop --http httptools & +# Wait for wren-ui to be responsive +echo "Waiting for wren-ui to start..." +while ! nc -z -w 5 wren-ui $WREN_UI_PORT && ! nc -z -w 5 host.docker.internal $WREN_UI_PORT; do + sleep 1 # wait for 1 second before check again +done + # Wait for the server to be responsive echo "Waiting for wren-ai-service to start..." while ! nc -z localhost $WREN_AI_SERVICE_PORT; do