Merge remote-tracking branch 'upstream/main' into add-mcp-authentication-param

This commit is contained in:
Omar Abdelwahab 2025-11-13 12:04:44 -08:00
commit e6c6c36b70
359 changed files with 2344 additions and 1431 deletions

View file

@ -15,14 +15,14 @@ that enables routing based on provider_data alone.
from unittest.mock import AsyncMock, patch
import pytest
from llama_stack.apis.datatypes import Api
from llama_stack.apis.inference.inference import (
from llama_stack_api import (
Api,
OpenAIAssistantMessageParam,
OpenAIChatCompletion,
OpenAIChatCompletionUsage,
OpenAIChoice,
)
from llama_stack.core.library_client import LlamaStackAsLibraryClient
from llama_stack.core.telemetry.telemetry import MetricEvent