Add io struct for embedding models [unreachable code] - step 2/3 (#987)
This commit is contained in:
@@ -52,6 +52,8 @@ from sglang.srt.openai_api.protocol import (
|
||||
CompletionResponseStreamChoice,
|
||||
CompletionStreamResponse,
|
||||
DeltaMessage,
|
||||
EmbeddingRequest,
|
||||
EmbeddingResponse,
|
||||
ErrorResponse,
|
||||
FileDeleteResponse,
|
||||
FileRequest,
|
||||
@@ -357,7 +359,6 @@ async def v1_retrieve_file_content(file_id: str):
|
||||
|
||||
|
||||
def v1_generate_request(all_requests):
|
||||
|
||||
prompts = []
|
||||
sampling_params_list = []
|
||||
return_logprobs = []
|
||||
@@ -648,7 +649,6 @@ async def v1_completions(tokenizer_manager, raw_request: Request):
|
||||
|
||||
|
||||
def v1_chat_generate_request(all_requests, tokenizer_manager):
|
||||
|
||||
input_ids = []
|
||||
sampling_params_list = []
|
||||
image_data_list = []
|
||||
@@ -961,6 +961,72 @@ async def v1_chat_completions(tokenizer_manager, raw_request: Request):
|
||||
return response
|
||||
|
||||
|
||||
def v1_embedding_request(all_requests, tokenizer_manager):
|
||||
prompts = []
|
||||
sampling_params_list = []
|
||||
first_prompt_type = type(all_requests[0].prompt)
|
||||
|
||||
for request in all_requests:
|
||||
prompt = request.prompt
|
||||
assert (
|
||||
type(prompt) == first_prompt_type
|
||||
), "All prompts must be of the same type in file input settings"
|
||||
prompts.append(prompt)
|
||||
|
||||
if len(all_requests) == 1:
|
||||
prompt = prompts[0]
|
||||
if isinstance(prompt, str) or isinstance(prompt[0], str):
|
||||
prompt_kwargs = {"text": prompt}
|
||||
else:
|
||||
prompt_kwargs = {"input_ids": prompt}
|
||||
else:
|
||||
if isinstance(prompts[0], str) or isinstance(propmt[0][0], str):
|
||||
prompt_kwargs = {"text": prompts}
|
||||
else:
|
||||
prompt_kwargs = {"input_ids": prompts}
|
||||
|
||||
adapted_request = EmbeddingReqInput(
|
||||
**prompt_kwargs,
|
||||
)
|
||||
|
||||
if len(all_requests) == 1:
|
||||
return adapted_request, all_requests[0]
|
||||
return adapted_request, all_requests
|
||||
|
||||
|
||||
def v1_embedding_response(request, ret, to_file=False):
|
||||
response = []
|
||||
for idx, ret_item in enumerate(ret):
|
||||
response.append(
|
||||
EmbeddingResponse(
|
||||
index=idx,
|
||||
embedding=ret[idx],
|
||||
object="embedding",
|
||||
)
|
||||
)
|
||||
return response
|
||||
|
||||
|
||||
async def v1_embeddings(tokenizer_manager, raw_request: Request):
|
||||
request_json = await raw_request.json()
|
||||
all_requests = [EmbeddingRequest(**request_json)]
|
||||
adapted_request, request = v1_embedding_request(all_requests, tokenizer_manager)
|
||||
|
||||
try:
|
||||
ret = await tokenizer_manager.generate_request(
|
||||
adapted_request, raw_request
|
||||
).__anext__()
|
||||
except ValueError as e:
|
||||
return create_error_response(str(e))
|
||||
|
||||
if not isinstance(ret, list):
|
||||
ret = [ret]
|
||||
|
||||
response = v1_embedding_response(request, ret)
|
||||
|
||||
return response
|
||||
|
||||
|
||||
def to_openai_style_logprobs(
|
||||
input_token_logprobs=None,
|
||||
output_token_logprobs=None,
|
||||
|
||||
@@ -294,3 +294,19 @@ class ChatCompletionStreamResponse(BaseModel):
|
||||
created: int = Field(default_factory=lambda: int(time.time()))
|
||||
model: str
|
||||
choices: List[ChatCompletionResponseStreamChoice]
|
||||
|
||||
|
||||
class EmbeddingRequest(BaseModel):
|
||||
# Ordered by official OpenAI API documentation
|
||||
# https://platform.openai.com/docs/api-reference/embeddings/create
|
||||
input: Union[List[int], List[List[int]], str, List[str]]
|
||||
model: str
|
||||
encoding_format: str = "float"
|
||||
dimensions: int = None
|
||||
user: Optional[str] = None
|
||||
|
||||
|
||||
class EmbeddingResponse(BaseModel):
|
||||
index: str
|
||||
embedding: List[float] = None
|
||||
object: str = "embedding"
|
||||
|
||||
Reference in New Issue
Block a user