mirror of
https://git.datalinker.icu/vllm-project/vllm.git
synced 2025-12-14 13:14:59 +08:00
[gpt-oss][bugfix] remove logic to require resp_ in ResponseAPI (#25428)
Signed-off-by: Andrew Xia <axia@meta.com>
This commit is contained in:
parent
4f2954f724
commit
95bc60e4cb
@ -523,6 +523,7 @@ async def test_function_calling(client: OpenAI, model_name: str):
|
|||||||
input="What's the weather like in Paris today?",
|
input="What's the weather like in Paris today?",
|
||||||
tools=tools,
|
tools=tools,
|
||||||
temperature=0.0,
|
temperature=0.0,
|
||||||
|
extra_body={"request_id": "test_function_calling_non_resp"},
|
||||||
)
|
)
|
||||||
assert response is not None
|
assert response is not None
|
||||||
assert response.status == "completed"
|
assert response.status == "completed"
|
||||||
|
|||||||
@ -235,8 +235,6 @@ class OpenAIServingResponses(OpenAIServing):
|
|||||||
# Handle the previous response ID.
|
# Handle the previous response ID.
|
||||||
prev_response_id = request.previous_response_id
|
prev_response_id = request.previous_response_id
|
||||||
if prev_response_id is not None:
|
if prev_response_id is not None:
|
||||||
if not prev_response_id.startswith("resp_"):
|
|
||||||
return self._make_invalid_id_error(prev_response_id)
|
|
||||||
async with self.response_store_lock:
|
async with self.response_store_lock:
|
||||||
prev_response = self.response_store.get(prev_response_id)
|
prev_response = self.response_store.get(prev_response_id)
|
||||||
if prev_response is None:
|
if prev_response is None:
|
||||||
@ -924,9 +922,6 @@ class OpenAIServingResponses(OpenAIServing):
|
|||||||
stream: Optional[bool],
|
stream: Optional[bool],
|
||||||
) -> Union[ErrorResponse, ResponsesResponse, AsyncGenerator[
|
) -> Union[ErrorResponse, ResponsesResponse, AsyncGenerator[
|
||||||
StreamingResponsesResponse, None]]:
|
StreamingResponsesResponse, None]]:
|
||||||
if not response_id.startswith("resp_"):
|
|
||||||
return self._make_invalid_id_error(response_id)
|
|
||||||
|
|
||||||
async with self.response_store_lock:
|
async with self.response_store_lock:
|
||||||
response = self.response_store.get(response_id)
|
response = self.response_store.get(response_id)
|
||||||
|
|
||||||
@ -944,9 +939,6 @@ class OpenAIServingResponses(OpenAIServing):
|
|||||||
self,
|
self,
|
||||||
response_id: str,
|
response_id: str,
|
||||||
) -> Union[ErrorResponse, ResponsesResponse]:
|
) -> Union[ErrorResponse, ResponsesResponse]:
|
||||||
if not response_id.startswith("resp_"):
|
|
||||||
return self._make_invalid_id_error(response_id)
|
|
||||||
|
|
||||||
async with self.response_store_lock:
|
async with self.response_store_lock:
|
||||||
response = self.response_store.get(response_id)
|
response = self.response_store.get(response_id)
|
||||||
if response is None:
|
if response is None:
|
||||||
@ -972,13 +964,6 @@ class OpenAIServingResponses(OpenAIServing):
|
|||||||
response_id)
|
response_id)
|
||||||
return response
|
return response
|
||||||
|
|
||||||
def _make_invalid_id_error(self, response_id: str) -> ErrorResponse:
|
|
||||||
return self.create_error_response(
|
|
||||||
err_type="invalid_request_error",
|
|
||||||
message=(f"Invalid 'response_id': '{response_id}'. "
|
|
||||||
"Expected an ID that begins with 'resp'."),
|
|
||||||
)
|
|
||||||
|
|
||||||
def _make_not_found_error(self, response_id: str) -> ErrorResponse:
|
def _make_not_found_error(self, response_id: str) -> ErrorResponse:
|
||||||
return self.create_error_response(
|
return self.create_error_response(
|
||||||
err_type="invalid_request_error",
|
err_type="invalid_request_error",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user