Skip to content

llm-vllm: unify environment variable LLM_MODEL_ID #1089

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

llm-vllm: unify environment variable LLM_MODEL_ID #1089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion comps/llms/text-generation/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ docker run \
-e no_proxy=${no_proxy} \
-e vLLM_LLM_ENDPOINT=$vLLM_LLM_ENDPOINT \
-e HF_TOKEN=$HF_TOKEN \
-e LLM_MODEL=$LLM_MODEL \
-e LLM_MODEL_ID=$LLM_MODEL \
opea/llm-vllm:latest
```

Expand Down
2 changes: 1 addition & 1 deletion comps/llms/text-generation/vllm/langchain/docker_compose_llm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ services:
https_proxy: ${https_proxy}
vLLM_ENDPOINT: ${vLLM_ENDPOINT}
HF_TOKEN: ${HF_TOKEN}
LLM_MODEL: ${LLM_MODEL}
LLM_MODEL_ID: ${LLM_MODEL}
restart: unless-stopped

networks:
Expand Down
2 changes: 1 addition & 1 deletion comps/llms/text-generation/vllm/langchain/launch_microservice.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ docker run -d --rm \
-e https_proxy=$https_proxy \
-e vLLM_ENDPOINT=$vLLM_ENDPOINT \
-e HUGGINGFACEHUB_API_TOKEN=$HUGGINGFACEHUB_API_TOKEN \
-e LLM_MODEL=$LLM_MODEL \
-e LLM_MODEL_ID=$LLM_MODEL \
-e LOGFLAG=$LOGFLAG \
opea/llm-vllm:latest
2 changes: 1 addition & 1 deletion comps/llms/text-generation/vllm/langchain/llm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ async def llm_generate(input: Union[LLMParamsDoc, ChatCompletionRequest, Searche
headers = {}
if access_token:
headers = {"Authorization": f"Bearer {access_token}"}
model_name = input.model if input.model else os.getenv("LLM_MODEL", "meta-llama/Meta-Llama-3-8B-Instruct")
model_name = input.model if input.model else os.getenv("LLM_MODEL_ID", "meta-llama/Meta-Llama-3-8B-Instruct")
llm_endpoint = get_llm_endpoint(model_name)
llm = VLLMOpenAI(
openai_api_key="EMPTY", openai_api_base=llm_endpoint + "/v1", model_name=model_name, default_headers=headers
Expand Down
2 changes: 1 addition & 1 deletion comps/llms/text-generation/vllm/llama_index/docker_compose_llm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ services:
https_proxy: ${https_proxy}
vLLM_ENDPOINT: ${vLLM_ENDPOINT}
HUGGINGFACEHUB_API_TOKEN: ${HUGGINGFACEHUB_API_TOKEN}
LLM_MODEL: ${LLM_MODEL}
LLM_MODEL_ID: ${LLM_MODEL}
restart: unless-stopped

networks:
Expand Down
2 changes: 1 addition & 1 deletion comps/llms/text-generation/vllm/llama_index/launch_microservice.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ docker run -d --rm \
-e https_proxy=$https_proxy \
-e vLLM_ENDPOINT=$vLLM_ENDPOINT \
-e HUGGINGFACEHUB_API_TOKEN=$HUGGINGFACEHUB_API_TOKEN \
-e LLM_MODEL=$LLM_MODEL \
-e LLM_MODEL_ID=$LLM_MODEL \
-e LOGFLAG=$LOGFLAG \
opea/llm-vllm-llamaindex:latest
2 changes: 1 addition & 1 deletion comps/llms/text-generation/vllm/llama_index/llm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ async def llm_generate(input: LLMParamsDoc):
if logflag:
logger.info(input)
llm_endpoint = os.getenv("vLLM_ENDPOINT", "http://localhost:8008")
model_name = os.getenv("LLM_MODEL", "meta-llama/Meta-Llama-3-8B-Instruct")
model_name = os.getenv("LLM_MODEL_ID", "meta-llama/Meta-Llama-3-8B-Instruct")
llm = OpenAILike(
api_key="fake",
api_base=llm_endpoint + "/v1",
Expand Down
2 changes: 1 addition & 1 deletion tests/llms/test_llms_text-generation_vllm_langchain_on_intel_hpu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function start_service() {
--ipc=host \
-e vLLM_ENDPOINT=$vLLM_ENDPOINT \
-e HUGGINGFACEHUB_API_TOKEN=$HUGGINGFACEHUB_API_TOKEN \
-e LLM_MODEL=$LLM_MODEL \
-e LLM_MODEL_ID=$LLM_MODEL \
opea/llm-vllm:comps

# check whether vllm ray is fully ready
Expand Down
2 changes: 1 addition & 1 deletion tests/llms/test_llms_text-generation_vllm_llamaindex_on_intel_hpu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function start_service() {
--ipc=host \
-e vLLM_ENDPOINT=$vLLM_ENDPOINT \
-e HUGGINGFACEHUB_API_TOKEN=$HUGGINGFACEHUB_API_TOKEN \
-e LLM_MODEL=$LLM_MODEL \
-e LLM_MODEL_ID=$LLM_MODEL \
opea/llm-vllm-llamaindex:comps

# check whether vllm ray is fully ready
Expand Down
Loading