From a715debcb876908dea93f147d7cdf9a5a5cf88f2 Mon Sep 17 00:00:00 2001 From: Xi Yan Date: Thu, 13 Mar 2025 19:30:47 -0700 Subject: [PATCH] update --- docs/_static/llama-stack-spec.html | 9 +-------- docs/_static/llama-stack-spec.yaml | 4 +--- llama_stack/apis/providers/providers.py | 2 +- llama_stack/distribution/providers.py | 19 ++++++------------- 4 files changed, 9 insertions(+), 25 deletions(-) diff --git a/docs/_static/llama-stack-spec.html b/docs/_static/llama-stack-spec.html index 4a0d7aef4..b5e4097d9 100644 --- a/docs/_static/llama-stack-spec.html +++ b/docs/_static/llama-stack-spec.html @@ -2159,14 +2159,7 @@ "content": { "application/json": { "schema": { - "oneOf": [ - { - "$ref": "#/components/schemas/ProviderInfo" - }, - { - "type": "null" - } - ] + "$ref": "#/components/schemas/ProviderInfo" } } } diff --git a/docs/_static/llama-stack-spec.yaml b/docs/_static/llama-stack-spec.yaml index 73ca34763..bf2343ede 100644 --- a/docs/_static/llama-stack-spec.yaml +++ b/docs/_static/llama-stack-spec.yaml @@ -1452,9 +1452,7 @@ paths: content: application/json: schema: - oneOf: - - $ref: '#/components/schemas/ProviderInfo' - - type: 'null' + $ref: '#/components/schemas/ProviderInfo' '400': $ref: '#/components/responses/BadRequest400' '429': diff --git a/llama_stack/apis/providers/providers.py b/llama_stack/apis/providers/providers.py index de947d4ba..4c4034cd5 100644 --- a/llama_stack/apis/providers/providers.py +++ b/llama_stack/apis/providers/providers.py @@ -33,4 +33,4 @@ class Providers(Protocol): async def list_providers(self) -> ListProvidersResponse: ... @webmethod(route="/providers/{provider_id}", method="GET") - async def inspect_provider(self, provider_id: str) -> Optional[ProviderInfo]: ... + async def inspect_provider(self, provider_id: str) -> ProviderInfo: ... diff --git a/llama_stack/distribution/providers.py b/llama_stack/distribution/providers.py index 8253c421b..ae4c9f7c3 100644 --- a/llama_stack/distribution/providers.py +++ b/llama_stack/distribution/providers.py @@ -51,17 +51,10 @@ class ProviderImpl(Providers): return ListProvidersResponse(data=ret) - async def inspect_provider(self, provider_id: str) -> Optional[ProviderInfo]: - run_config = self.config.run_config - safe_config = StackRunConfig(**redact_sensitive_fields(run_config.model_dump())) - for api, providers in safe_config.providers.items(): - for p in providers: - if p.provider_id == provider_id: - return ProviderInfo( - api=api, - provider_id=p.provider_id, - provider_type=p.provider_type, - config=p.config, - ) + async def inspect_provider(self, provider_id: str) -> ProviderInfo: + all_providers = await self.list_providers() + for p in all_providers.data: + if p.provider_id == provider_id: + return p - return None + raise ValueError(f"Provider {provider_id} not found")