[Fix] fix openai adapter (#2685)
This commit is contained in:
@@ -696,14 +696,6 @@ def v1_generate_response(request, ret, tokenizer_manager, to_file=False):
|
||||
|
||||
async def v1_completions(tokenizer_manager, raw_request: Request):
|
||||
request_json = await raw_request.json()
|
||||
if "extra_body" in request_json:
|
||||
extra = request_json["extra_body"]
|
||||
if "ebnf" in extra:
|
||||
request_json["ebnf"] = extra["ebnf"]
|
||||
if "regex" in extra:
|
||||
request_json["regex"] = extra["regex"]
|
||||
# remove extra_body to avoid pydantic conflict
|
||||
del request_json["extra_body"]
|
||||
all_requests = [CompletionRequest(**request_json)]
|
||||
adapted_request, request = v1_generate_request(all_requests)
|
||||
|
||||
@@ -1176,15 +1168,6 @@ def v1_chat_generate_response(request, ret, to_file=False, cache_report=False):
|
||||
|
||||
async def v1_chat_completions(tokenizer_manager, raw_request: Request):
|
||||
request_json = await raw_request.json()
|
||||
if "extra_body" in request_json:
|
||||
extra = request_json["extra_body"]
|
||||
# For example, if 'ebnf' is given:
|
||||
if "ebnf" in extra:
|
||||
request_json["ebnf"] = extra["ebnf"]
|
||||
if "regex" in extra:
|
||||
request_json["regex"] = extra["regex"]
|
||||
# remove extra_body to avoid pydantic conflict
|
||||
del request_json["extra_body"]
|
||||
all_requests = [ChatCompletionRequest(**request_json)]
|
||||
adapted_request, request = v1_chat_generate_request(all_requests, tokenizer_manager)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user