Skip to content

Fix LLM special token issue #895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lvliang-intel merged 6 commits into from
Nov 14, 2024
Merged

Fix LLM special token issue #895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c885c48
Fix LLM special token issue
lvliang-intel Nov 13, 2024
c86cd80
update code
lvliang-intel Nov 13, 2024
d044241
update logic
lvliang-intel Nov 13, 2024
1f867c7
update vllm llm
lvliang-intel Nov 13, 2024
2ebfc97
Merge branch 'main' into fix_model_special_token
ZePan110 Nov 14, 2024
f9d8347
Merge branch 'main' into fix_model_special_token
ZePan110 Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions comps/llms/text-generation/tgi/llm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,12 @@ async def stream_generator():
chat_response = ""
async for text in text_generation:
stream_gen_time.append(time.time() - start)
chat_response += text
chunk_repr = repr(text.encode("utf-8"))
if logflag:
logger.info(f"[ SearchedDoc ] chunk:{chunk_repr}")
yield f"data: {chunk_repr}\n\n"
if text not in ["<|im_end|>", "<|endoftext|>"]:
chat_response += text
chunk_repr = repr(text.encode("utf-8"))
if logflag:
logger.info(f"[ SearchedDoc ] chunk:{chunk_repr}")
yield f"data: {chunk_repr}\n\n"
if logflag:
logger.info(f"[ SearchedDoc ] stream response: {chat_response}")
statistics_dict["opea_service@llm_tgi"].append_latency(stream_gen_time[-1], stream_gen_time[0])
Expand Down Expand Up @@ -162,11 +163,12 @@ async def stream_generator():
chat_response = ""
async for text in text_generation:
stream_gen_time.append(time.time() - start)
chat_response += text
chunk_repr = repr(text.encode("utf-8"))
if logflag:
logger.info(f"[ LLMParamsDoc ] chunk:{chunk_repr}")
yield f"data: {chunk_repr}\n\n"
if text not in ["<|im_end|>", "<|endoftext|>"]:
chat_response += text
chunk_repr = repr(text.encode("utf-8"))
if logflag:
logger.info(f"[ LLMParamsDoc ] chunk:{chunk_repr}")
yield f"data: {chunk_repr}\n\n"
if logflag:
logger.info(f"[ LLMParamsDoc ] stream response: {chat_response}")
statistics_dict["opea_service@llm_tgi"].append_latency(stream_gen_time[-1], stream_gen_time[0])
Expand Down Expand Up @@ -271,7 +273,9 @@ def stream_generator():
for c in chat_completion:
if logflag:
logger.info(c)
yield f"data: {c.model_dump_json()}\n\n"
chunk = c.model_dump_json()
if chunk not in ["<|im_end|>", "<|endoftext|>"]:
yield f"data: {chunk}\n\n"
yield "data: [DONE]\n\n"

return StreamingResponse(stream_generator(), media_type="text/event-stream")
Expand Down
22 changes: 12 additions & 10 deletions comps/llms/text-generation/vllm/langchain/llm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,12 @@ async def llm_generate(input: Union[LLMParamsDoc, ChatCompletionRequest, Searche
async def stream_generator():
chat_response = ""
async for text in llm.astream(new_input.query, **parameters):
chat_response += text
chunk_repr = repr(text.encode("utf-8"))
if logflag:
logger.info(f"[ SearchedDoc ] chunk: {chunk_repr}")
yield f"data: {chunk_repr}\n\n"
if text not in ["<|im_end|>", "<|endoftext|>"]:
chat_response += text
chunk_repr = repr(text.encode("utf-8"))
if logflag:
logger.info(f"[ SearchedDoc ] chunk: {chunk_repr}")
yield f"data: {chunk_repr}\n\n"
if logflag:
logger.info(f"[ SearchedDoc ] stream response: {chat_response}")
yield "data: [DONE]\n\n"
Expand Down Expand Up @@ -175,11 +176,12 @@ async def stream_generator():
async def stream_generator():
chat_response = ""
async for text in llm.astream(prompt, **parameters):
chat_response += text
chunk_repr = repr(text.encode("utf-8"))
if logflag:
logger.info(f"[ LLMParamsDoc ] chunk: {chunk_repr}")
yield f"data: {chunk_repr}\n\n"
if text not in ["<|im_end|>", "<|endoftext|>"]:
chat_response += text
chunk_repr = repr(text.encode("utf-8"))
if logflag:
logger.info(f"[ LLMParamsDoc ] chunk: {chunk_repr}")
yield f"data: {chunk_repr}\n\n"
if logflag:
logger.info(f"[ LLMParamsDoc ] stream response: {chat_response}")
yield "data: [DONE]\n\n"
Expand Down
5 changes: 3 additions & 2 deletions comps/llms/text-generation/vllm/llama_index/llm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ async def llm_generate(input: LLMParamsDoc):

async def stream_generator():
async for text in llm.astream_complete(input.query):
output = text.text
yield f"data: {output}\n\n"
if text.text not in ["<|im_end|>", "<|endoftext|>"]:
output = text.text
yield f"data: {output}\n\n"
if logflag:
logger.info(f"[llm - chat_stream] stream response: {output}")
yield "data: [DONE]\n\n"
Expand Down