[engine] support async and streaming (#1614)

This commit is contained in:
Byron Hsu
2024-10-11 15:26:25 -07:00
committed by GitHub
parent 00c7e6368b
commit 862cd265e5
7 changed files with 384 additions and 8 deletions

View File

@@ -716,6 +716,58 @@ class Engine:
logprob_start_len: Optional[Union[List[int], int]] = None,
top_logprobs_num: Optional[Union[List[int], int]] = None,
lora_path: Optional[List[Optional[str]]] = None,
stream: bool = False,
):
# TODO (ByronHsu): refactor to reduce the duplicated code
obj = GenerateReqInput(
text=prompt,
sampling_params=sampling_params,
return_logprob=return_logprob,
logprob_start_len=logprob_start_len,
top_logprobs_num=top_logprobs_num,
lora_path=lora_path,
stream=stream,
)
# get the current event loop
loop = asyncio.get_event_loop()
ret = loop.run_until_complete(generate_request(obj, None))
if stream is True:
STREAM_END_SYMBOL = "data: [DONE]"
STREAM_CHUNK_START_SYMBOL = "data:"
def generator_wrapper():
offset = 0
loop = asyncio.get_event_loop()
generator = ret.body_iterator
while True:
chunk = loop.run_until_complete(generator.__anext__())
if chunk.startswith(STREAM_END_SYMBOL):
break
else:
data = json.loads(chunk[len(STREAM_CHUNK_START_SYMBOL) :])
data["text"] = data["text"][offset:]
offset += len(data["text"])
yield data
# we cannot yield in the scope of generate() because python does not allow yield + return in the same function
# however, it allows to wrap the generator as a subfunction and return
return generator_wrapper()
else:
return ret
async def async_generate(
self,
prompt: Union[str, List[str]],
sampling_params: Optional[Dict] = None,
return_logprob: Optional[Union[List[bool], bool]] = False,
logprob_start_len: Optional[Union[List[int], int]] = None,
top_logprobs_num: Optional[Union[List[int], int]] = None,
lora_path: Optional[List[Optional[str]]] = None,
stream: bool = False,
):
obj = GenerateReqInput(
text=prompt,
@@ -724,13 +776,37 @@ class Engine:
logprob_start_len=logprob_start_len,
top_logprobs_num=top_logprobs_num,
lora_path=lora_path,
stream=stream,
)
# get the current event loop
loop = asyncio.get_event_loop()
return loop.run_until_complete(generate_request(obj, None))
ret = await generate_request(obj, None)
if stream is True:
STREAM_END_SYMBOL = "data: [DONE]"
STREAM_CHUNK_START_SYMBOL = "data:"
generator = ret.body_iterator
async def generator_wrapper():
offset = 0
while True:
chunk = await generator.__anext__()
if chunk.startswith(STREAM_END_SYMBOL):
break
else:
data = json.loads(chunk[len(STREAM_CHUNK_START_SYMBOL) :])
data["text"] = data["text"][offset:]
offset += len(data["text"])
yield data
return generator_wrapper()
else:
return ret
def shutdown(self):
kill_child_process(os.getpid(), including_parent=False)
# TODO (ByronHsu): encode and async generate
# TODO (ByronHsu): encode