phoenix-oss/llama-stack-mirror
0
0
Fork 1
mirror of https://github.com/meta-llama/llama-stack.git synced 2025-12-03 01:48:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge b99eb2a1d2 into 4237eb4aaa

Browse source
This commit is contained in:
Charlie Doern 2025-12-03 01:04:16 +00:00 • committed by GitHub
commit f2e5b8d7b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 188 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

36
client-sdks/stainless/openapi.yml
View file

@ -4157,6 +4157,16 @@ components:
type: array type: array
- type: 'null' - type: 'null'
nullable: true nullable: true
reasoning_content:
anyOf:
- type: string
- type: 'null'
nullable: true
reasoning:
anyOf:
- type: string
- type: 'null'
nullable: true
title: OpenAIAssistantMessageParam title: OpenAIAssistantMessageParam
type: object type: object
OpenAIChatCompletionContentPartImageParam: OpenAIChatCompletionContentPartImageParam:
@ -4224,6 +4234,11 @@ components:
title: OpenAIChatCompletionToolCallFunction title: OpenAIChatCompletionToolCallFunction
- type: 'null' - type: 'null'
title: OpenAIChatCompletionToolCallFunction title: OpenAIChatCompletionToolCallFunction
extra_content:
anyOf:
- additionalProperties: true
type: object
- type: 'null'
type: object type: object
title: OpenAIChatCompletionToolCall title: OpenAIChatCompletionToolCall
description: Tool call specification for OpenAI-compatible chat completion responses. description: Tool call specification for OpenAI-compatible chat completion responses.
@ -4886,6 +4901,11 @@ components:
- type: string - type: string
- type: 'null' - type: 'null'
nullable: true nullable: true
reasoning:
anyOf:
- type: string
- type: 'null'
nullable: true
title: OpenAIChoiceDelta title: OpenAIChoiceDelta
type: object type: object
OpenAIChunkChoice: OpenAIChunkChoice:
@ -11753,6 +11773,14 @@ components:
$ref: '#/components/schemas/OpenAIChatCompletionToolCall' $ref: '#/components/schemas/OpenAIChatCompletionToolCall'
type: array type: array
- type: 'null' - type: 'null'
reasoning_content:
anyOf:
- type: string
- type: 'null'
reasoning:
anyOf:
- type: string
- type: 'null'
type: object type: object
title: OpenAIAssistantMessageParam title: OpenAIAssistantMessageParam
description: A message containing the model's (assistant) response in an OpenAI-compatible chat completion request. description: A message containing the model's (assistant) response in an OpenAI-compatible chat completion request.
@ -11782,6 +11810,14 @@ components:
$ref: '#/components/schemas/OpenAIChatCompletionToolCall' $ref: '#/components/schemas/OpenAIChatCompletionToolCall'
type: array type: array
- type: 'null' - type: 'null'
reasoning_content:
anyOf:
- type: string
- type: 'null'
reasoning:
anyOf:
- type: string
- type: 'null'
type: object type: object
title: OpenAIAssistantMessageParam title: OpenAIAssistantMessageParam
description: A message containing the model's (assistant) response in an OpenAI-compatible chat completion request. description: A message containing the model's (assistant) response in an OpenAI-compatible chat completion request.

36
docs/static/deprecated-llama-stack-spec.yaml vendored
View file

@ -1151,6 +1151,16 @@ components:
type: array type: array
- type: 'null' - type: 'null'
nullable: true nullable: true
reasoning_content:
anyOf:
- type: string
- type: 'null'
nullable: true
reasoning:
anyOf:
- type: string
- type: 'null'
nullable: true
title: OpenAIAssistantMessageParam title: OpenAIAssistantMessageParam
type: object type: object
OpenAIChatCompletionContentPartImageParam: OpenAIChatCompletionContentPartImageParam:
@ -1218,6 +1228,11 @@ components:
title: OpenAIChatCompletionToolCallFunction title: OpenAIChatCompletionToolCallFunction
- type: 'null' - type: 'null'
title: OpenAIChatCompletionToolCallFunction title: OpenAIChatCompletionToolCallFunction
extra_content:
anyOf:
- additionalProperties: true
type: object
- type: 'null'
type: object type: object
title: OpenAIChatCompletionToolCall title: OpenAIChatCompletionToolCall
description: Tool call specification for OpenAI-compatible chat completion responses. description: Tool call specification for OpenAI-compatible chat completion responses.
@ -1880,6 +1895,11 @@ components:
- type: string - type: string
- type: 'null' - type: 'null'
nullable: true nullable: true
reasoning:
anyOf:
- type: string
- type: 'null'
nullable: true
title: OpenAIChoiceDelta title: OpenAIChoiceDelta
type: object type: object
OpenAIChunkChoice: OpenAIChunkChoice:
@ -8747,6 +8767,14 @@ components:
$ref: '#/components/schemas/OpenAIChatCompletionToolCall' $ref: '#/components/schemas/OpenAIChatCompletionToolCall'
type: array type: array
- type: 'null' - type: 'null'
reasoning_content:
anyOf:
- type: string
- type: 'null'
reasoning:
anyOf:
- type: string
- type: 'null'
type: object type: object
title: OpenAIAssistantMessageParam title: OpenAIAssistantMessageParam
description: A message containing the model's (assistant) response in an OpenAI-compatible chat completion request. description: A message containing the model's (assistant) response in an OpenAI-compatible chat completion request.
@ -8776,6 +8804,14 @@ components:
$ref: '#/components/schemas/OpenAIChatCompletionToolCall' $ref: '#/components/schemas/OpenAIChatCompletionToolCall'
type: array type: array
- type: 'null' - type: 'null'
reasoning_content:
anyOf:
- type: string
- type: 'null'
reasoning:
anyOf:
- type: string
- type: 'null'
type: object type: object
title: OpenAIAssistantMessageParam title: OpenAIAssistantMessageParam
description: A message containing the model's (assistant) response in an OpenAI-compatible chat completion request. description: A message containing the model's (assistant) response in an OpenAI-compatible chat completion request.

36
docs/static/experimental-llama-stack-spec.yaml vendored
View file

@ -859,6 +859,16 @@ components:
type: array type: array
- type: 'null' - type: 'null'
nullable: true nullable: true
reasoning_content:
anyOf:
- type: string
- type: 'null'
nullable: true
reasoning:
anyOf:
- type: string
- type: 'null'
nullable: true
title: OpenAIAssistantMessageParam title: OpenAIAssistantMessageParam
type: object type: object
OpenAIChatCompletionContentPartImageParam: OpenAIChatCompletionContentPartImageParam:
@ -926,6 +936,11 @@ components:
title: OpenAIChatCompletionToolCallFunction title: OpenAIChatCompletionToolCallFunction
- type: 'null' - type: 'null'
title: OpenAIChatCompletionToolCallFunction title: OpenAIChatCompletionToolCallFunction
extra_content:
anyOf:
- additionalProperties: true
type: object
- type: 'null'
type: object type: object
title: OpenAIChatCompletionToolCall title: OpenAIChatCompletionToolCall
description: Tool call specification for OpenAI-compatible chat completion responses. description: Tool call specification for OpenAI-compatible chat completion responses.
@ -1588,6 +1603,11 @@ components:
- type: string - type: string
- type: 'null' - type: 'null'
nullable: true nullable: true
reasoning:
anyOf:
- type: string
- type: 'null'
nullable: true
title: OpenAIChoiceDelta title: OpenAIChoiceDelta
type: object type: object
OpenAIChunkChoice: OpenAIChunkChoice:
@ -7582,6 +7602,14 @@ components:
$ref: '#/components/schemas/OpenAIChatCompletionToolCall' $ref: '#/components/schemas/OpenAIChatCompletionToolCall'
type: array type: array
- type: 'null' - type: 'null'
reasoning_content:
anyOf:
- type: string
- type: 'null'
reasoning:
anyOf:
- type: string
- type: 'null'
type: object type: object
title: OpenAIAssistantMessageParam title: OpenAIAssistantMessageParam
description: A message containing the model's (assistant) response in an OpenAI-compatible chat completion request. description: A message containing the model's (assistant) response in an OpenAI-compatible chat completion request.
@ -7611,6 +7639,14 @@ components:
$ref: '#/components/schemas/OpenAIChatCompletionToolCall' $ref: '#/components/schemas/OpenAIChatCompletionToolCall'
type: array type: array
- type: 'null' - type: 'null'
reasoning_content:
anyOf:
- type: string
- type: 'null'
reasoning:
anyOf:
- type: string
- type: 'null'
type: object type: object
title: OpenAIAssistantMessageParam title: OpenAIAssistantMessageParam
description: A message containing the model's (assistant) response in an OpenAI-compatible chat completion request. description: A message containing the model's (assistant) response in an OpenAI-compatible chat completion request.

36
docs/static/llama-stack-spec.yaml vendored
View file

@ -2962,6 +2962,16 @@ components:
type: array type: array
- type: 'null' - type: 'null'
nullable: true nullable: true
reasoning_content:
anyOf:
- type: string
- type: 'null'
nullable: true
reasoning:
anyOf:
- type: string
- type: 'null'
nullable: true
title: OpenAIAssistantMessageParam title: OpenAIAssistantMessageParam
type: object type: object
OpenAIChatCompletionContentPartImageParam: OpenAIChatCompletionContentPartImageParam:
@ -3029,6 +3039,11 @@ components:
title: OpenAIChatCompletionToolCallFunction title: OpenAIChatCompletionToolCallFunction
- type: 'null' - type: 'null'
title: OpenAIChatCompletionToolCallFunction title: OpenAIChatCompletionToolCallFunction
extra_content:
anyOf:
- additionalProperties: true
type: object
- type: 'null'
type: object type: object
title: OpenAIChatCompletionToolCall title: OpenAIChatCompletionToolCall
description: Tool call specification for OpenAI-compatible chat completion responses. description: Tool call specification for OpenAI-compatible chat completion responses.
@ -3691,6 +3706,11 @@ components:
- type: string - type: string
- type: 'null' - type: 'null'
nullable: true nullable: true
reasoning:
anyOf:
- type: string
- type: 'null'
nullable: true
title: OpenAIChoiceDelta title: OpenAIChoiceDelta
type: object type: object
OpenAIChunkChoice: OpenAIChunkChoice:
@ -10189,6 +10209,14 @@ components:
$ref: '#/components/schemas/OpenAIChatCompletionToolCall' $ref: '#/components/schemas/OpenAIChatCompletionToolCall'
type: array type: array
- type: 'null' - type: 'null'
reasoning_content:
anyOf:
- type: string
- type: 'null'
reasoning:
anyOf:
- type: string
- type: 'null'
type: object type: object
title: OpenAIAssistantMessageParam title: OpenAIAssistantMessageParam
description: A message containing the model's (assistant) response in an OpenAI-compatible chat completion request. description: A message containing the model's (assistant) response in an OpenAI-compatible chat completion request.
@ -10218,6 +10246,14 @@ components:
$ref: '#/components/schemas/OpenAIChatCompletionToolCall' $ref: '#/components/schemas/OpenAIChatCompletionToolCall'
type: array type: array
- type: 'null' - type: 'null'
reasoning_content:
anyOf:
- type: string
- type: 'null'
reasoning:
anyOf:
- type: string
- type: 'null'
type: object type: object
title: OpenAIAssistantMessageParam title: OpenAIAssistantMessageParam
description: A message containing the model's (assistant) response in an OpenAI-compatible chat completion request. description: A message containing the model's (assistant) response in an OpenAI-compatible chat completion request.

36
docs/static/stainless-llama-stack-spec.yaml vendored
View file

@ -4157,6 +4157,16 @@ components:
type: array type: array
- type: 'null' - type: 'null'
nullable: true nullable: true
reasoning_content:
anyOf:
- type: string
- type: 'null'
nullable: true
reasoning:
anyOf:
- type: string
- type: 'null'
nullable: true
title: OpenAIAssistantMessageParam title: OpenAIAssistantMessageParam
type: object type: object
OpenAIChatCompletionContentPartImageParam: OpenAIChatCompletionContentPartImageParam:
@ -4224,6 +4234,11 @@ components:
title: OpenAIChatCompletionToolCallFunction title: OpenAIChatCompletionToolCallFunction
- type: 'null' - type: 'null'
title: OpenAIChatCompletionToolCallFunction title: OpenAIChatCompletionToolCallFunction
extra_content:
anyOf:
- additionalProperties: true
type: object
- type: 'null'
type: object type: object
title: OpenAIChatCompletionToolCall title: OpenAIChatCompletionToolCall
description: Tool call specification for OpenAI-compatible chat completion responses. description: Tool call specification for OpenAI-compatible chat completion responses.
@ -4886,6 +4901,11 @@ components:
- type: string - type: string
- type: 'null' - type: 'null'
nullable: true nullable: true
reasoning:
anyOf:
- type: string
- type: 'null'
nullable: true
title: OpenAIChoiceDelta title: OpenAIChoiceDelta
type: object type: object
OpenAIChunkChoice: OpenAIChunkChoice:
@ -11753,6 +11773,14 @@ components:
$ref: '#/components/schemas/OpenAIChatCompletionToolCall' $ref: '#/components/schemas/OpenAIChatCompletionToolCall'
type: array type: array
- type: 'null' - type: 'null'
reasoning_content:
anyOf:
- type: string
- type: 'null'
reasoning:
anyOf:
- type: string
- type: 'null'
type: object type: object
title: OpenAIAssistantMessageParam title: OpenAIAssistantMessageParam
description: A message containing the model's (assistant) response in an OpenAI-compatible chat completion request. description: A message containing the model's (assistant) response in an OpenAI-compatible chat completion request.
@ -11782,6 +11810,14 @@ components:
$ref: '#/components/schemas/OpenAIChatCompletionToolCall' $ref: '#/components/schemas/OpenAIChatCompletionToolCall'
type: array type: array
- type: 'null' - type: 'null'
reasoning_content:
anyOf:
- type: string
- type: 'null'
reasoning:
anyOf:
- type: string
- type: 'null'
type: object type: object
title: OpenAIAssistantMessageParam title: OpenAIAssistantMessageParam
description: A message containing the model's (assistant) response in an OpenAI-compatible chat completion request. description: A message containing the model's (assistant) response in an OpenAI-compatible chat completion request.

9
src/llama_stack_api/inference.py
View file

@ -438,6 +438,7 @@ class OpenAIChatCompletionToolCall(BaseModel):
id: str | None = None id: str | None = None
type: Literal["function"] = "function" type: Literal["function"] = "function"
function: OpenAIChatCompletionToolCallFunction | None = None function: OpenAIChatCompletionToolCallFunction | None = None
extra_content: dict[str, Any] | None = None
@json_schema_type @json_schema_type
@ -448,12 +449,16 @@ class OpenAIAssistantMessageParam(BaseModel):
:param content: The content of the model's response :param content: The content of the model's response
:param name: (Optional) The name of the assistant message participant. :param name: (Optional) The name of the assistant message participant.
:param tool_calls: List of tool calls. Each tool call is an OpenAIChatCompletionToolCall object. :param tool_calls: List of tool calls. Each tool call is an OpenAIChatCompletionToolCall object.
:param reasoning_content: (Optional) The reasoning content from the model (for vLLM ≤ v0.8.4)
:param reasoning: (Optional) The reasoning content from the model (for vLLM ≥ v0.9.x)
""" """
role: Literal["assistant"] = "assistant" role: Literal["assistant"] = "assistant"
content: OpenAIChatCompletionTextOnlyMessageContent | None = None content: OpenAIChatCompletionTextOnlyMessageContent | None = None
name: str | None = None name: str | None = None
tool_calls: list[OpenAIChatCompletionToolCall] | None = None tool_calls: list[OpenAIChatCompletionToolCall] | None = None
reasoning_content: str | None = None
reasoning: str | None = None
@json_schema_type @json_schema_type
@ -605,7 +610,8 @@ class OpenAIChoiceDelta(BaseModel):
:param refusal: (Optional) The refusal of the delta :param refusal: (Optional) The refusal of the delta
:param role: (Optional) The role of the delta :param role: (Optional) The role of the delta
:param tool_calls: (Optional) The tool calls of the delta :param tool_calls: (Optional) The tool calls of the delta
:param reasoning_content: (Optional) The reasoning content from the model (non-standard, for o1/o3 models) :param reasoning_content: (Optional) The reasoning content from the model (for vLLM ≤ v0.8.4)
:param reasoning: (Optional) The reasoning content from the model (for vLLM ≥ v0.9.x)
""" """
content: str | None = None content: str | None = None
@ -613,6 +619,7 @@ class OpenAIChoiceDelta(BaseModel):
role: str | None = None role: str | None = None
tool_calls: list[OpenAIChatCompletionToolCall] | None = None tool_calls: list[OpenAIChatCompletionToolCall] | None = None
reasoning_content: str | None = None reasoning_content: str | None = None
reasoning: str | None = None
@json_schema_type @json_schema_type