Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 30 additions & 14 deletions src/engine/ov_genai/llm.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,21 @@ async def generate_text(self, gen_config: OVGenAI_GenConfig) -> AsyncIterator[Un
Async non-streaming text generation.
Yields in order: metrics (dict), new_text (str).
"""
generation_kwargs = GenerationConfig(
max_new_tokens=gen_config.max_tokens,
temperature=gen_config.temperature,
top_k=gen_config.top_k,
top_p=gen_config.top_p,
repetition_penalty=gen_config.repetition_penalty,
)
if isinstance(self.model, LLMPipeline):
generation_kwargs = self.model.get_generation_config()
generation_kwargs.max_new_tokens = gen_config.max_tokens
generation_kwargs.temperature = gen_config.temperature
generation_kwargs.top_k = gen_config.top_k
generation_kwargs.top_p = gen_config.top_p
generation_kwargs.repetition_penalty = gen_config.repetition_penalty
else:
generation_kwargs = GenerationConfig(
max_new_tokens=gen_config.max_tokens,
temperature=gen_config.temperature,
top_k=gen_config.top_k,
top_p=gen_config.top_p,
repetition_penalty=gen_config.repetition_penalty,
)

# Add speculative decoding parameters (mutually exclusive per OpenVINO docs)
import os
Expand Down Expand Up @@ -130,13 +138,21 @@ async def generate_stream(self, gen_config: OVGenAI_GenConfig) -> AsyncIterator[
Async streaming text generation.
Yields token chunks (str) as they arrive, then metrics (dict), then final new_text (str).
"""
generation_kwargs = GenerationConfig(
max_new_tokens=gen_config.max_tokens,
temperature=gen_config.temperature,
top_k=gen_config.top_k,
top_p=gen_config.top_p,
repetition_penalty=gen_config.repetition_penalty
)
if isinstance(self.model, LLMPipeline):
generation_kwargs = self.model.get_generation_config()
generation_kwargs.max_new_tokens = gen_config.max_tokens
generation_kwargs.temperature = gen_config.temperature
generation_kwargs.top_k = gen_config.top_k
generation_kwargs.top_p = gen_config.top_p
generation_kwargs.repetition_penalty = gen_config.repetition_penalty
else:
generation_kwargs = GenerationConfig(
max_new_tokens=gen_config.max_tokens,
temperature=gen_config.temperature,
top_k=gen_config.top_k,
top_p=gen_config.top_p,
repetition_penalty=gen_config.repetition_penalty,
)

# Add speculative decoding parameters (mutually exclusive per OpenVINO docs)
import os
Expand Down
44 changes: 30 additions & 14 deletions src/engine/ov_genai/vlm.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,21 @@ async def generate_text(self, gen_config: OVGenAI_GenConfig) -> AsyncIterator[Un
Yields in order: metrics (dict), new_text (str).
"""
try:
generation_kwargs = GenerationConfig(
max_new_tokens=gen_config.max_tokens,
temperature=gen_config.temperature,
top_k=gen_config.top_k,
top_p=gen_config.top_p,
repetition_penalty=gen_config.repetition_penalty,
)
if isinstance(self.model_path, VLMPipeline):
generation_kwargs = self.model_path.get_generation_config()
generation_kwargs.max_new_tokens = gen_config.max_tokens
generation_kwargs.temperature = gen_config.temperature
generation_kwargs.top_k = gen_config.top_k
generation_kwargs.top_p = gen_config.top_p
generation_kwargs.repetition_penalty = gen_config.repetition_penalty
else:
generation_kwargs = GenerationConfig(
max_new_tokens=gen_config.max_tokens,
temperature=gen_config.temperature,
top_k=gen_config.top_k,
top_p=gen_config.top_p,
repetition_penalty=gen_config.repetition_penalty,
)

prompt, ov_images = self.prepare_inputs(gen_config.messages, gen_config.tools)

Expand Down Expand Up @@ -176,13 +184,21 @@ async def generate_stream(self,
Async streaming generation for VLM.
Yields token chunks (str) as they arrive, then metrics (dict).
"""
generation_kwargs = GenerationConfig(
max_new_tokens=gen_config.max_tokens,
temperature=gen_config.temperature,
top_k=gen_config.top_k,
top_p=gen_config.top_p,
repetition_penalty=gen_config.repetition_penalty,
)
if isinstance(self.model_path, VLMPipeline):
generation_kwargs = self.model_path.get_generation_config()
generation_kwargs.max_new_tokens = gen_config.max_tokens
generation_kwargs.temperature = gen_config.temperature
generation_kwargs.top_k = gen_config.top_k
generation_kwargs.top_p = gen_config.top_p
generation_kwargs.repetition_penalty = gen_config.repetition_penalty
else:
generation_kwargs = GenerationConfig(
max_new_tokens=gen_config.max_tokens,
temperature=gen_config.temperature,
top_k=gen_config.top_k,
top_p=gen_config.top_p,
repetition_penalty=gen_config.repetition_penalty,
)

decoder_tokenizer = self.model_path.get_tokenizer()
streamer = ChunkStreamer(decoder_tokenizer, gen_config)
Expand Down