mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-06-28 02:53:30 +00:00
chore: allow to pass CA cert to remote vllm (#2266)
Some checks failed
Integration Auth Tests / test-matrix (oauth2_token) (push) Failing after 14s
Integration Tests / test-matrix (http, inference) (push) Failing after 22s
Integration Tests / test-matrix (http, datasets) (push) Failing after 28s
Integration Tests / test-matrix (http, inspect) (push) Failing after 29s
Integration Tests / test-matrix (http, scoring) (push) Failing after 30s
Integration Tests / test-matrix (library, datasets) (push) Failing after 18s
Integration Tests / test-matrix (library, agents) (push) Failing after 28s
Integration Tests / test-matrix (library, inference) (push) Failing after 9s
Integration Tests / test-matrix (http, post_training) (push) Failing after 35s
Integration Tests / test-matrix (http, agents) (push) Failing after 37s
Integration Tests / test-matrix (http, tool_runtime) (push) Failing after 34s
Integration Tests / test-matrix (http, providers) (push) Failing after 35s
Integration Tests / test-matrix (library, inspect) (push) Failing after 9s
Integration Tests / test-matrix (library, providers) (push) Failing after 10s
Integration Tests / test-matrix (library, scoring) (push) Failing after 8s
Test External Providers / test-external-providers (venv) (push) Failing after 7s
Integration Tests / test-matrix (library, post_training) (push) Failing after 10s
Integration Tests / test-matrix (library, tool_runtime) (push) Failing after 11s
Unit Tests / unit-tests (3.11) (push) Failing after 10s
Unit Tests / unit-tests (3.12) (push) Failing after 9s
Unit Tests / unit-tests (3.13) (push) Failing after 8s
Unit Tests / unit-tests (3.10) (push) Failing after 1m18s
Pre-commit / pre-commit (push) Successful in 3m12s
Some checks failed
Integration Auth Tests / test-matrix (oauth2_token) (push) Failing after 14s
Integration Tests / test-matrix (http, inference) (push) Failing after 22s
Integration Tests / test-matrix (http, datasets) (push) Failing after 28s
Integration Tests / test-matrix (http, inspect) (push) Failing after 29s
Integration Tests / test-matrix (http, scoring) (push) Failing after 30s
Integration Tests / test-matrix (library, datasets) (push) Failing after 18s
Integration Tests / test-matrix (library, agents) (push) Failing after 28s
Integration Tests / test-matrix (library, inference) (push) Failing after 9s
Integration Tests / test-matrix (http, post_training) (push) Failing after 35s
Integration Tests / test-matrix (http, agents) (push) Failing after 37s
Integration Tests / test-matrix (http, tool_runtime) (push) Failing after 34s
Integration Tests / test-matrix (http, providers) (push) Failing after 35s
Integration Tests / test-matrix (library, inspect) (push) Failing after 9s
Integration Tests / test-matrix (library, providers) (push) Failing after 10s
Integration Tests / test-matrix (library, scoring) (push) Failing after 8s
Test External Providers / test-external-providers (venv) (push) Failing after 7s
Integration Tests / test-matrix (library, post_training) (push) Failing after 10s
Integration Tests / test-matrix (library, tool_runtime) (push) Failing after 11s
Unit Tests / unit-tests (3.11) (push) Failing after 10s
Unit Tests / unit-tests (3.12) (push) Failing after 9s
Unit Tests / unit-tests (3.13) (push) Failing after 8s
Unit Tests / unit-tests (3.10) (push) Failing after 1m18s
Pre-commit / pre-commit (push) Successful in 3m12s
# What does this PR do? The `tls_verify` can now receive a path to a certificate file if the endpoint requires it. Signed-off-by: Sébastien Han <seb@redhat.com>
This commit is contained in:
parent
7710b2f43b
commit
39b33a3b01
2 changed files with 16 additions and 4 deletions
|
@ -4,8 +4,9 @@
|
||||||
# This source code is licensed under the terms described in the LICENSE file in
|
# This source code is licensed under the terms described in the LICENSE file in
|
||||||
# the root directory of this source tree.
|
# the root directory of this source tree.
|
||||||
|
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
from pydantic import BaseModel, Field
|
from pydantic import BaseModel, Field, field_validator
|
||||||
|
|
||||||
from llama_stack.schema_utils import json_schema_type
|
from llama_stack.schema_utils import json_schema_type
|
||||||
|
|
||||||
|
@ -24,11 +25,22 @@ class VLLMInferenceAdapterConfig(BaseModel):
|
||||||
default="fake",
|
default="fake",
|
||||||
description="The API token",
|
description="The API token",
|
||||||
)
|
)
|
||||||
tls_verify: bool = Field(
|
tls_verify: bool | str = Field(
|
||||||
default=True,
|
default=True,
|
||||||
description="Whether to verify TLS certificates",
|
description="Whether to verify TLS certificates. Can be a boolean or a path to a CA certificate file.",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@field_validator("tls_verify")
|
||||||
|
@classmethod
|
||||||
|
def validate_tls_verify(cls, v):
|
||||||
|
if isinstance(v, str):
|
||||||
|
cert_path = Path(v)
|
||||||
|
if not cert_path.exists():
|
||||||
|
raise ValueError(f"TLS certificate file does not exist: {v}")
|
||||||
|
if not cert_path.is_file():
|
||||||
|
raise ValueError(f"TLS certificate path is not a file: {v}")
|
||||||
|
return v
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def sample_run_config(
|
def sample_run_config(
|
||||||
cls,
|
cls,
|
||||||
|
|
|
@ -313,7 +313,7 @@ class VLLMInferenceAdapter(Inference, ModelsProtocolPrivate):
|
||||||
return AsyncOpenAI(
|
return AsyncOpenAI(
|
||||||
base_url=self.config.url,
|
base_url=self.config.url,
|
||||||
api_key=self.config.api_token,
|
api_key=self.config.api_token,
|
||||||
http_client=None if self.config.tls_verify else httpx.AsyncClient(verify=False),
|
http_client=httpx.AsyncClient(verify=self.config.tls_verify),
|
||||||
)
|
)
|
||||||
|
|
||||||
async def completion(
|
async def completion(
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue