mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-10-08 13:00:52 +00:00
d23ed26238
# What does this PR do? - implement get_api_key instead of relying on LiteLLMOpenAIMixin.get_api_key - remove use of LiteLLMOpenAIMixin - add default initialize/shutdown methods to OpenAIMixin - remove __init__s to allow proper pydantic construction - remove dead code from vllm adapter and associated / duplicate unit tests - update vllm adapter to use openaimixin for model registration - remove ModelRegistryHelper from fireworks & together adapters - remove Inference from nvidia adapter - complete type hints on embedding_model_metadata - allow extra fields on OpenAIMixin, for model_store, __provider_id__, etc - new recordings for ollama - enhance the list models error handling - update cerebras (remove cerebras-cloud-sdk) and anthropic (custom model listing) inference adapters - parametrized test_inference_client_caching - remove cerebras, databricks, fireworks, together from blanket mypy exclude - removed unnecessary litellm deps ## Test Plan ci
60 lines
2.5 KiB
Python
60 lines
2.5 KiB
Python
# Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
# All rights reserved.
|
|
#
|
|
# This source code is licensed under the terms described in the LICENSE file in
|
|
# the root directory of this source tree.
|
|
|
|
import json
|
|
from unittest.mock import MagicMock
|
|
|
|
import pytest
|
|
|
|
from llama_stack.core.request_headers import request_provider_data_context
|
|
from llama_stack.providers.remote.inference.groq.config import GroqConfig
|
|
from llama_stack.providers.remote.inference.groq.groq import GroqInferenceAdapter
|
|
from llama_stack.providers.remote.inference.llama_openai_compat.config import LlamaCompatConfig
|
|
from llama_stack.providers.remote.inference.llama_openai_compat.llama import LlamaCompatInferenceAdapter
|
|
from llama_stack.providers.remote.inference.openai.config import OpenAIConfig
|
|
from llama_stack.providers.remote.inference.openai.openai import OpenAIInferenceAdapter
|
|
from llama_stack.providers.remote.inference.together.config import TogetherImplConfig
|
|
from llama_stack.providers.remote.inference.together.together import TogetherInferenceAdapter
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"config_cls,adapter_cls,provider_data_validator",
|
|
[
|
|
(
|
|
GroqConfig,
|
|
GroqInferenceAdapter,
|
|
"llama_stack.providers.remote.inference.groq.config.GroqProviderDataValidator",
|
|
),
|
|
(
|
|
OpenAIConfig,
|
|
OpenAIInferenceAdapter,
|
|
"llama_stack.providers.remote.inference.openai.config.OpenAIProviderDataValidator",
|
|
),
|
|
(
|
|
TogetherImplConfig,
|
|
TogetherInferenceAdapter,
|
|
"llama_stack.providers.remote.inference.together.TogetherProviderDataValidator",
|
|
),
|
|
(
|
|
LlamaCompatConfig,
|
|
LlamaCompatInferenceAdapter,
|
|
"llama_stack.providers.remote.inference.llama_openai_compat.config.LlamaProviderDataValidator",
|
|
),
|
|
],
|
|
)
|
|
def test_openai_provider_data_used(config_cls, adapter_cls, provider_data_validator: str):
|
|
"""Ensure the OpenAI provider does not cache api keys across client requests"""
|
|
|
|
inference_adapter = adapter_cls(config=config_cls())
|
|
|
|
inference_adapter.__provider_spec__ = MagicMock()
|
|
inference_adapter.__provider_spec__.provider_data_validator = provider_data_validator
|
|
|
|
for api_key in ["test1", "test2"]:
|
|
with request_provider_data_context(
|
|
{"x-llamastack-provider-data": json.dumps({inference_adapter.provider_data_api_key_field: api_key})}
|
|
):
|
|
assert inference_adapter.client.api_key == api_key
|