mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-10-12 13:57:57 +00:00
feat(api)!: BREAKING CHANGE: support passing extra_body through to providers (#3777)
Some checks failed
SqlStore Integration Tests / test-postgres (3.12) (push) Failing after 0s
SqlStore Integration Tests / test-postgres (3.13) (push) Failing after 0s
Integration Auth Tests / test-matrix (oauth2_token) (push) Failing after 1s
Python Package Build Test / build (3.12) (push) Failing after 1s
Python Package Build Test / build (3.13) (push) Failing after 1s
Integration Tests (Replay) / Integration Tests (, , , client=, ) (push) Failing after 3s
Test External Providers Installed via Module / test-external-providers-from-module (venv) (push) Has been skipped
Vector IO Integration Tests / test-matrix (push) Failing after 5s
API Conformance Tests / check-schema-compatibility (push) Successful in 9s
Test External API and Providers / test-external (venv) (push) Failing after 4s
Unit Tests / unit-tests (3.12) (push) Failing after 4s
Unit Tests / unit-tests (3.13) (push) Failing after 4s
UI Tests / ui-tests (22) (push) Successful in 38s
Pre-commit / pre-commit (push) Successful in 1m27s
Some checks failed
SqlStore Integration Tests / test-postgres (3.12) (push) Failing after 0s
SqlStore Integration Tests / test-postgres (3.13) (push) Failing after 0s
Integration Auth Tests / test-matrix (oauth2_token) (push) Failing after 1s
Python Package Build Test / build (3.12) (push) Failing after 1s
Python Package Build Test / build (3.13) (push) Failing after 1s
Integration Tests (Replay) / Integration Tests (, , , client=, ) (push) Failing after 3s
Test External Providers Installed via Module / test-external-providers-from-module (venv) (push) Has been skipped
Vector IO Integration Tests / test-matrix (push) Failing after 5s
API Conformance Tests / check-schema-compatibility (push) Successful in 9s
Test External API and Providers / test-external (venv) (push) Failing after 4s
Unit Tests / unit-tests (3.12) (push) Failing after 4s
Unit Tests / unit-tests (3.13) (push) Failing after 4s
UI Tests / ui-tests (22) (push) Successful in 38s
Pre-commit / pre-commit (push) Successful in 1m27s
# What does this PR do? Allows passing through extra_body parameters to inference providers. With this, we removed the 2 vllm-specific parameters from completions API into `extra_body`. Before/After <img width="1883" height="324" alt="image" src="https://github.com/user-attachments/assets/acb27c08-c748-46c9-b1da-0de64e9908a1" /> closes #2720 ## Test Plan CI and added new test ``` ❯ uv run pytest -s -v tests/integration/ --stack-config=server:starter --inference-mode=record -k 'not( builtin_tool or safety_with_image or code_interpreter or test_rag ) and test_openai_completion_guided_choice' --setup=vllm --suite=base --color=yes Uninstalled 3 packages in 125ms Installed 3 packages in 19ms INFO 2025-10-10 14:29:54,317 tests.integration.conftest:118 tests: Applying setup 'vllm' for suite base INFO 2025-10-10 14:29:54,331 tests.integration.conftest:47 tests: Test stack config type: server (stack_config=server:starter) ============================================================================================================== test session starts ============================================================================================================== platform darwin -- Python 3.12.11, pytest-8.4.2, pluggy-1.6.0 -- /Users/erichuang/projects/llama-stack-1/.venv/bin/python cachedir: .pytest_cache metadata: {'Python': '3.12.11', 'Platform': 'macOS-15.6.1-arm64-arm-64bit', 'Packages': {'pytest': '8.4.2', 'pluggy': '1.6.0'}, 'Plugins': {'anyio': '4.9.0', 'html': '4.1.1', 'socket': '0.7.0', 'asyncio': '1.1.0', 'json-report': '1.5.0', 'timeout': '2.4.0', 'metadata': '3.1.1', 'cov': '6.2.1', 'nbval': '0.11.0'}} rootdir: /Users/erichuang/projects/llama-stack-1 configfile: pyproject.toml plugins: anyio-4.9.0, html-4.1.1, socket-0.7.0, asyncio-1.1.0, json-report-1.5.0, timeout-2.4.0, metadata-3.1.1, cov-6.2.1, nbval-0.11.0 asyncio: mode=Mode.AUTO, asyncio_default_fixture_loop_scope=None, asyncio_default_test_loop_scope=function collected 285 items / 284 deselected / 1 selected tests/integration/inference/test_openai_completion.py::test_openai_completion_guided_choice[txt=vllm/Qwen/Qwen3-0.6B] instantiating llama_stack_client Starting llama stack server with config 'starter' on port 8321... Waiting for server at http://localhost:8321... (0.0s elapsed) Waiting for server at http://localhost:8321... (0.5s elapsed) Waiting for server at http://localhost:8321... (5.1s elapsed) Waiting for server at http://localhost:8321... (5.6s elapsed) Waiting for server at http://localhost:8321... (10.1s elapsed) Waiting for server at http://localhost:8321... (10.6s elapsed) Server is ready at http://localhost:8321 llama_stack_client instantiated in 11.773s PASSEDTerminating llama stack server process... Terminating process 98444 and its group... Server process and children terminated gracefully ============================================================================================================= slowest 10 durations ============================================================================================================== 11.88s setup tests/integration/inference/test_openai_completion.py::test_openai_completion_guided_choice[txt=vllm/Qwen/Qwen3-0.6B] 3.02s call tests/integration/inference/test_openai_completion.py::test_openai_completion_guided_choice[txt=vllm/Qwen/Qwen3-0.6B] 0.01s teardown tests/integration/inference/test_openai_completion.py::test_openai_completion_guided_choice[txt=vllm/Qwen/Qwen3-0.6B] ================================================================================================ 1 passed, 284 deselected, 3 warnings in 16.21s ================================================================================================= ```
This commit is contained in:
ehhuang
GitHub
parent
80d58ab519
commit
06e4cd8e02
42 changed files with 3147 additions and 202 deletions
23
docs/static/deprecated-llama-stack-spec.html
vendored
23
docs/static/deprecated-llama-stack-spec.html
vendored
|
|
@ -1527,7 +1527,7 @@
|
|||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/OpenAIChatCompletionRequest"
|
||||
"$ref": "#/components/schemas/OpenAIChatCompletionRequestWithExtraBody"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -1617,7 +1617,7 @@
|
|||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/OpenAICompletionRequest"
|
||||
"$ref": "#/components/schemas/OpenAICompletionRequestWithExtraBody"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -7522,7 +7522,7 @@
|
|||
"title": "OpenAIResponseFormatText",
|
||||
"description": "Text response format for OpenAI-compatible chat completion requests."
|
||||
},
|
||||
"OpenAIChatCompletionRequest": {
|
||||
"OpenAIChatCompletionRequestWithExtraBody": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"model": {
|
||||
|
|
@ -7769,7 +7769,7 @@
|
|||
"model",
|
||||
"messages"
|
||||
],
|
||||
"title": "OpenAIChatCompletionRequest",
|
||||
"title": "OpenAIChatCompletionRequestWithExtraBody",
|
||||
"description": "Request parameters for OpenAI-compatible chat completion endpoint."
|
||||
},
|
||||
"OpenAIChatCompletion": {
|
||||
|
|
@ -7966,7 +7966,7 @@
|
|||
],
|
||||
"title": "OpenAICompletionWithInputMessages"
|
||||
},
|
||||
"OpenAICompletionRequest": {
|
||||
"OpenAICompletionRequestWithExtraBody": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"model": {
|
||||
|
|
@ -8097,17 +8097,6 @@
|
|||
"type": "string",
|
||||
"description": "(Optional) The user to use."
|
||||
},
|
||||
"guided_choice": {
|
||||
"type": "array",
|
||||
"items": {
|
||||
"type": "string"
|
||||
},
|
||||
"description": "(Optional) vLLM-specific parameter for guided generation with a list of choices."
|
||||
},
|
||||
"prompt_logprobs": {
|
||||
"type": "integer",
|
||||
"description": "(Optional) vLLM-specific parameter for number of log probabilities to return for prompt tokens."
|
||||
},
|
||||
"suffix": {
|
||||
"type": "string",
|
||||
"description": "(Optional) The suffix that should be appended to the completion."
|
||||
|
|
@ -8118,7 +8107,7 @@
|
|||
"model",
|
||||
"prompt"
|
||||
],
|
||||
"title": "OpenAICompletionRequest",
|
||||
"title": "OpenAICompletionRequestWithExtraBody",
|
||||
"description": "Request parameters for OpenAI-compatible completion endpoint."
|
||||
},
|
||||
"OpenAICompletion": {
|
||||
|
|
|
|||
24
docs/static/deprecated-llama-stack-spec.yaml
vendored
24
docs/static/deprecated-llama-stack-spec.yaml
vendored
|
|
@ -1098,7 +1098,7 @@ paths:
|
|||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/OpenAIChatCompletionRequest'
|
||||
$ref: '#/components/schemas/OpenAIChatCompletionRequestWithExtraBody'
|
||||
required: true
|
||||
deprecated: true
|
||||
/v1/openai/v1/chat/completions/{completion_id}:
|
||||
|
|
@ -1167,7 +1167,7 @@ paths:
|
|||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/OpenAICompletionRequest'
|
||||
$ref: '#/components/schemas/OpenAICompletionRequestWithExtraBody'
|
||||
required: true
|
||||
deprecated: true
|
||||
/v1/openai/v1/embeddings:
|
||||
|
|
@ -5575,7 +5575,7 @@ components:
|
|||
title: OpenAIResponseFormatText
|
||||
description: >-
|
||||
Text response format for OpenAI-compatible chat completion requests.
|
||||
OpenAIChatCompletionRequest:
|
||||
OpenAIChatCompletionRequestWithExtraBody:
|
||||
type: object
|
||||
properties:
|
||||
model:
|
||||
|
|
@ -5717,7 +5717,7 @@ components:
|
|||
required:
|
||||
- model
|
||||
- messages
|
||||
title: OpenAIChatCompletionRequest
|
||||
title: OpenAIChatCompletionRequestWithExtraBody
|
||||
description: >-
|
||||
Request parameters for OpenAI-compatible chat completion endpoint.
|
||||
OpenAIChatCompletion:
|
||||
|
|
@ -5885,7 +5885,7 @@ components:
|
|||
- model
|
||||
- input_messages
|
||||
title: OpenAICompletionWithInputMessages
|
||||
OpenAICompletionRequest:
|
||||
OpenAICompletionRequestWithExtraBody:
|
||||
type: object
|
||||
properties:
|
||||
model:
|
||||
|
|
@ -5973,18 +5973,6 @@ components:
|
|||
user:
|
||||
type: string
|
||||
description: (Optional) The user to use.
|
||||
guided_choice:
|
||||
type: array
|
||||
items:
|
||||
type: string
|
||||
description: >-
|
||||
(Optional) vLLM-specific parameter for guided generation with a list of
|
||||
choices.
|
||||
prompt_logprobs:
|
||||
type: integer
|
||||
description: >-
|
||||
(Optional) vLLM-specific parameter for number of log probabilities to
|
||||
return for prompt tokens.
|
||||
suffix:
|
||||
type: string
|
||||
description: >-
|
||||
|
|
@ -5993,7 +5981,7 @@ components:
|
|||
required:
|
||||
- model
|
||||
- prompt
|
||||
title: OpenAICompletionRequest
|
||||
title: OpenAICompletionRequestWithExtraBody
|
||||
description: >-
|
||||
Request parameters for OpenAI-compatible completion endpoint.
|
||||
OpenAICompletion:
|
||||
|
|
|
|||
23
docs/static/llama-stack-spec.html
vendored
23
docs/static/llama-stack-spec.html
vendored
|
|
@ -153,7 +153,7 @@
|
|||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/OpenAIChatCompletionRequest"
|
||||
"$ref": "#/components/schemas/OpenAIChatCompletionRequestWithExtraBody"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -243,7 +243,7 @@
|
|||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/OpenAICompletionRequest"
|
||||
"$ref": "#/components/schemas/OpenAICompletionRequestWithExtraBody"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -5018,7 +5018,7 @@
|
|||
"title": "OpenAIResponseFormatText",
|
||||
"description": "Text response format for OpenAI-compatible chat completion requests."
|
||||
},
|
||||
"OpenAIChatCompletionRequest": {
|
||||
"OpenAIChatCompletionRequestWithExtraBody": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"model": {
|
||||
|
|
@ -5265,7 +5265,7 @@
|
|||
"model",
|
||||
"messages"
|
||||
],
|
||||
"title": "OpenAIChatCompletionRequest",
|
||||
"title": "OpenAIChatCompletionRequestWithExtraBody",
|
||||
"description": "Request parameters for OpenAI-compatible chat completion endpoint."
|
||||
},
|
||||
"OpenAIChatCompletion": {
|
||||
|
|
@ -5462,7 +5462,7 @@
|
|||
],
|
||||
"title": "OpenAICompletionWithInputMessages"
|
||||
},
|
||||
"OpenAICompletionRequest": {
|
||||
"OpenAICompletionRequestWithExtraBody": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"model": {
|
||||
|
|
@ -5593,17 +5593,6 @@
|
|||
"type": "string",
|
||||
"description": "(Optional) The user to use."
|
||||
},
|
||||
"guided_choice": {
|
||||
"type": "array",
|
||||
"items": {
|
||||
"type": "string"
|
||||
},
|
||||
"description": "(Optional) vLLM-specific parameter for guided generation with a list of choices."
|
||||
},
|
||||
"prompt_logprobs": {
|
||||
"type": "integer",
|
||||
"description": "(Optional) vLLM-specific parameter for number of log probabilities to return for prompt tokens."
|
||||
},
|
||||
"suffix": {
|
||||
"type": "string",
|
||||
"description": "(Optional) The suffix that should be appended to the completion."
|
||||
|
|
@ -5614,7 +5603,7 @@
|
|||
"model",
|
||||
"prompt"
|
||||
],
|
||||
"title": "OpenAICompletionRequest",
|
||||
"title": "OpenAICompletionRequestWithExtraBody",
|
||||
"description": "Request parameters for OpenAI-compatible completion endpoint."
|
||||
},
|
||||
"OpenAICompletion": {
|
||||
|
|
|
|||
24
docs/static/llama-stack-spec.yaml
vendored
24
docs/static/llama-stack-spec.yaml
vendored
|
|
@ -98,7 +98,7 @@ paths:
|
|||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/OpenAIChatCompletionRequest'
|
||||
$ref: '#/components/schemas/OpenAIChatCompletionRequestWithExtraBody'
|
||||
required: true
|
||||
deprecated: false
|
||||
/v1/chat/completions/{completion_id}:
|
||||
|
|
@ -167,7 +167,7 @@ paths:
|
|||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/OpenAICompletionRequest'
|
||||
$ref: '#/components/schemas/OpenAICompletionRequestWithExtraBody'
|
||||
required: true
|
||||
deprecated: false
|
||||
/v1/conversations:
|
||||
|
|
@ -3824,7 +3824,7 @@ components:
|
|||
title: OpenAIResponseFormatText
|
||||
description: >-
|
||||
Text response format for OpenAI-compatible chat completion requests.
|
||||
OpenAIChatCompletionRequest:
|
||||
OpenAIChatCompletionRequestWithExtraBody:
|
||||
type: object
|
||||
properties:
|
||||
model:
|
||||
|
|
@ -3966,7 +3966,7 @@ components:
|
|||
required:
|
||||
- model
|
||||
- messages
|
||||
title: OpenAIChatCompletionRequest
|
||||
title: OpenAIChatCompletionRequestWithExtraBody
|
||||
description: >-
|
||||
Request parameters for OpenAI-compatible chat completion endpoint.
|
||||
OpenAIChatCompletion:
|
||||
|
|
@ -4134,7 +4134,7 @@ components:
|
|||
- model
|
||||
- input_messages
|
||||
title: OpenAICompletionWithInputMessages
|
||||
OpenAICompletionRequest:
|
||||
OpenAICompletionRequestWithExtraBody:
|
||||
type: object
|
||||
properties:
|
||||
model:
|
||||
|
|
@ -4222,18 +4222,6 @@ components:
|
|||
user:
|
||||
type: string
|
||||
description: (Optional) The user to use.
|
||||
guided_choice:
|
||||
type: array
|
||||
items:
|
||||
type: string
|
||||
description: >-
|
||||
(Optional) vLLM-specific parameter for guided generation with a list of
|
||||
choices.
|
||||
prompt_logprobs:
|
||||
type: integer
|
||||
description: >-
|
||||
(Optional) vLLM-specific parameter for number of log probabilities to
|
||||
return for prompt tokens.
|
||||
suffix:
|
||||
type: string
|
||||
description: >-
|
||||
|
|
@ -4242,7 +4230,7 @@ components:
|
|||
required:
|
||||
- model
|
||||
- prompt
|
||||
title: OpenAICompletionRequest
|
||||
title: OpenAICompletionRequestWithExtraBody
|
||||
description: >-
|
||||
Request parameters for OpenAI-compatible completion endpoint.
|
||||
OpenAICompletion:
|
||||
|
|
|
|||
23
docs/static/stainless-llama-stack-spec.html
vendored
23
docs/static/stainless-llama-stack-spec.html
vendored
|
|
@ -153,7 +153,7 @@
|
|||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/OpenAIChatCompletionRequest"
|
||||
"$ref": "#/components/schemas/OpenAIChatCompletionRequestWithExtraBody"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -243,7 +243,7 @@
|
|||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/OpenAICompletionRequest"
|
||||
"$ref": "#/components/schemas/OpenAICompletionRequestWithExtraBody"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -7027,7 +7027,7 @@
|
|||
"title": "OpenAIResponseFormatText",
|
||||
"description": "Text response format for OpenAI-compatible chat completion requests."
|
||||
},
|
||||
"OpenAIChatCompletionRequest": {
|
||||
"OpenAIChatCompletionRequestWithExtraBody": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"model": {
|
||||
|
|
@ -7274,7 +7274,7 @@
|
|||
"model",
|
||||
"messages"
|
||||
],
|
||||
"title": "OpenAIChatCompletionRequest",
|
||||
"title": "OpenAIChatCompletionRequestWithExtraBody",
|
||||
"description": "Request parameters for OpenAI-compatible chat completion endpoint."
|
||||
},
|
||||
"OpenAIChatCompletion": {
|
||||
|
|
@ -7471,7 +7471,7 @@
|
|||
],
|
||||
"title": "OpenAICompletionWithInputMessages"
|
||||
},
|
||||
"OpenAICompletionRequest": {
|
||||
"OpenAICompletionRequestWithExtraBody": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"model": {
|
||||
|
|
@ -7602,17 +7602,6 @@
|
|||
"type": "string",
|
||||
"description": "(Optional) The user to use."
|
||||
},
|
||||
"guided_choice": {
|
||||
"type": "array",
|
||||
"items": {
|
||||
"type": "string"
|
||||
},
|
||||
"description": "(Optional) vLLM-specific parameter for guided generation with a list of choices."
|
||||
},
|
||||
"prompt_logprobs": {
|
||||
"type": "integer",
|
||||
"description": "(Optional) vLLM-specific parameter for number of log probabilities to return for prompt tokens."
|
||||
},
|
||||
"suffix": {
|
||||
"type": "string",
|
||||
"description": "(Optional) The suffix that should be appended to the completion."
|
||||
|
|
@ -7623,7 +7612,7 @@
|
|||
"model",
|
||||
"prompt"
|
||||
],
|
||||
"title": "OpenAICompletionRequest",
|
||||
"title": "OpenAICompletionRequestWithExtraBody",
|
||||
"description": "Request parameters for OpenAI-compatible completion endpoint."
|
||||
},
|
||||
"OpenAICompletion": {
|
||||
|
|
|
|||
24
docs/static/stainless-llama-stack-spec.yaml
vendored
24
docs/static/stainless-llama-stack-spec.yaml
vendored
|
|
@ -101,7 +101,7 @@ paths:
|
|||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/OpenAIChatCompletionRequest'
|
||||
$ref: '#/components/schemas/OpenAIChatCompletionRequestWithExtraBody'
|
||||
required: true
|
||||
deprecated: false
|
||||
/v1/chat/completions/{completion_id}:
|
||||
|
|
@ -170,7 +170,7 @@ paths:
|
|||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/OpenAICompletionRequest'
|
||||
$ref: '#/components/schemas/OpenAICompletionRequestWithExtraBody'
|
||||
required: true
|
||||
deprecated: false
|
||||
/v1/conversations:
|
||||
|
|
@ -5269,7 +5269,7 @@ components:
|
|||
title: OpenAIResponseFormatText
|
||||
description: >-
|
||||
Text response format for OpenAI-compatible chat completion requests.
|
||||
OpenAIChatCompletionRequest:
|
||||
OpenAIChatCompletionRequestWithExtraBody:
|
||||
type: object
|
||||
properties:
|
||||
model:
|
||||
|
|
@ -5411,7 +5411,7 @@ components:
|
|||
required:
|
||||
- model
|
||||
- messages
|
||||
title: OpenAIChatCompletionRequest
|
||||
title: OpenAIChatCompletionRequestWithExtraBody
|
||||
description: >-
|
||||
Request parameters for OpenAI-compatible chat completion endpoint.
|
||||
OpenAIChatCompletion:
|
||||
|
|
@ -5579,7 +5579,7 @@ components:
|
|||
- model
|
||||
- input_messages
|
||||
title: OpenAICompletionWithInputMessages
|
||||
OpenAICompletionRequest:
|
||||
OpenAICompletionRequestWithExtraBody:
|
||||
type: object
|
||||
properties:
|
||||
model:
|
||||
|
|
@ -5667,18 +5667,6 @@ components:
|
|||
user:
|
||||
type: string
|
||||
description: (Optional) The user to use.
|
||||
guided_choice:
|
||||
type: array
|
||||
items:
|
||||
type: string
|
||||
description: >-
|
||||
(Optional) vLLM-specific parameter for guided generation with a list of
|
||||
choices.
|
||||
prompt_logprobs:
|
||||
type: integer
|
||||
description: >-
|
||||
(Optional) vLLM-specific parameter for number of log probabilities to
|
||||
return for prompt tokens.
|
||||
suffix:
|
||||
type: string
|
||||
description: >-
|
||||
|
|
@ -5687,7 +5675,7 @@ components:
|
|||
required:
|
||||
- model
|
||||
- prompt
|
||||
title: OpenAICompletionRequest
|
||||
title: OpenAICompletionRequestWithExtraBody
|
||||
description: >-
|
||||
Request parameters for OpenAI-compatible completion endpoint.
|
||||
OpenAICompletion:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue