[gpt-oss] Small bug fixes for frontend (#22512)
Signed-off-by: Chen Zhang <zhangch99@outlook.com>
This commit is contained in:
@@ -19,8 +19,8 @@ from openai.types.chat.chat_completion_message import (
|
||||
# yapf: enable
|
||||
from openai.types.responses import (ResponseFunctionToolCall,
|
||||
ResponseInputItemParam, ResponseOutputItem,
|
||||
ResponsePrompt, ResponseStatus,
|
||||
ResponseTextConfig)
|
||||
ResponsePrompt, ResponseReasoningItem,
|
||||
ResponseStatus, ResponseTextConfig)
|
||||
from openai.types.responses.response import ToolChoice
|
||||
from openai.types.responses.tool import Tool
|
||||
from openai.types.shared import Metadata, Reasoning
|
||||
@@ -239,6 +239,7 @@ def get_logits_processors(processors: Optional[LogitsProcessors],
|
||||
|
||||
|
||||
ResponseInputOutputItem: TypeAlias = Union[ResponseInputItemParam,
|
||||
ResponseReasoningItem,
|
||||
ResponseFunctionToolCall]
|
||||
|
||||
|
||||
|
||||
@@ -16,8 +16,7 @@ from fastapi import Request
|
||||
from openai import BaseModel
|
||||
# yapf conflicts with isort for this block
|
||||
# yapf: disable
|
||||
from openai.types.responses import (ResponseContentPartDoneEvent,
|
||||
ResponseCreatedEvent,
|
||||
from openai.types.responses import (ResponseCreatedEvent,
|
||||
ResponseFunctionToolCall,
|
||||
ResponseInProgressEvent,
|
||||
ResponseOutputItem,
|
||||
@@ -54,7 +53,7 @@ from vllm.entrypoints.openai.protocol import (ErrorResponse,
|
||||
# yapf: enable
|
||||
from vllm.entrypoints.openai.serving_engine import OpenAIServing
|
||||
from vllm.entrypoints.openai.serving_models import OpenAIServingModels
|
||||
from vllm.entrypoints.tool_server import ToolServer
|
||||
from vllm.entrypoints.tool_server import MCPToolServer, ToolServer
|
||||
from vllm.inputs.data import TokensPrompt as EngineTokensPrompt
|
||||
from vllm.logger import init_logger
|
||||
from vllm.outputs import CompletionOutput
|
||||
@@ -238,6 +237,15 @@ class OpenAIServingResponses(OpenAIServing):
|
||||
if raw_request:
|
||||
raw_request.state.request_metadata = request_metadata
|
||||
|
||||
if self.tool_server is not None and isinstance(
|
||||
self.tool_server, MCPToolServer
|
||||
) and (request.background or request.stream) and request.tools and any(
|
||||
tool.type in ["web_search_preview", "code_interpreter"]
|
||||
for tool in request.tools):
|
||||
return self.create_error_response(
|
||||
"MCP tool server is not supported in background mode and "
|
||||
"streaming mode")
|
||||
|
||||
# Schedule the request and get the result generator.
|
||||
generators: list[AsyncGenerator[ConversationContext, None]] = []
|
||||
|
||||
@@ -844,9 +852,13 @@ class OpenAIServingResponses(OpenAIServing):
|
||||
type="reasoning",
|
||||
content=[
|
||||
ResponseReasoningTextContent(
|
||||
text=previous_item.content[0].text),
|
||||
text=previous_item.content[0].text,
|
||||
type="reasoning_text",
|
||||
),
|
||||
],
|
||||
status="completed",
|
||||
id=current_item_id,
|
||||
summary=[],
|
||||
)
|
||||
yield _send_event(
|
||||
ResponseReasoningTextDoneEvent(
|
||||
@@ -857,15 +869,6 @@ class OpenAIServingResponses(OpenAIServing):
|
||||
content_index=current_content_index,
|
||||
text=previous_item.content[0].text,
|
||||
))
|
||||
yield _send_event(
|
||||
ResponseContentPartDoneEvent(
|
||||
type="response.content_part.done",
|
||||
item_id=current_item_id,
|
||||
sequence_number=-1,
|
||||
output_index=current_output_index,
|
||||
content_index=current_content_index,
|
||||
part=reasoning_item,
|
||||
))
|
||||
yield _send_event(
|
||||
ResponseOutputItemDoneEvent(
|
||||
type="response.output_item.done",
|
||||
|
||||
Reference in New Issue
Block a user