[WIP][Bugfix][MiniCPM-o] Fix Full duplex bugs for minicpm-challenge (#5496)
Signed-off-by: Sy03 <1370724210@qq.com>
This commit is contained in:
60 files changed
+3696
-634
No files matched your search
@@ -231,18 +231,18 @@ def construct_next_stage_streaming_input_prompt(payload_data: dict[str, Any], re
|
||||
ids = payload_data.get("ids", {})
|
||||
meta = payload_data.get("meta", {})
|
||||
replace_prompt = isinstance(meta, dict) and meta.get("replace_streaming_prompt") is True
|
||||
condition_len = meta.get("next_stage_prompt_len") if replace_prompt else None
|
||||
if isinstance(condition_len, int) and condition_len > 0:
|
||||
next_stage_prompt_len = meta.get("next_stage_prompt_len") if isinstance(meta, dict) else None
|
||||
if replace_prompt and isinstance(next_stage_prompt_len, int) and next_stage_prompt_len > 0:
|
||||
# Some downstream stages consume complete, independently conditioned
|
||||
# segments instead of extending an existing KV prefix. The producer
|
||||
# declares that transport behavior explicitly in payload metadata.
|
||||
new_prompt = [0] * condition_len
|
||||
new_prompt = [0] * next_stage_prompt_len
|
||||
request._output_token_ids.clear()
|
||||
request._all_token_ids.clear()
|
||||
request._all_token_ids.extend(new_prompt)
|
||||
request.prompt_token_ids = new_prompt
|
||||
request.num_computed_tokens = 0
|
||||
request.num_prompt_tokens = condition_len
|
||||
request.num_prompt_tokens = next_stage_prompt_len
|
||||
request.update_block_hashes()
|
||||
return
|
||||
prompt_token_ids = ids.get("prompt", None)
|
||||
@@ -255,7 +255,10 @@ def construct_next_stage_streaming_input_prompt(payload_data: dict[str, Any], re
|
||||
assert request.prompt_token_ids is not None
|
||||
# Extend prompt with kept output tokens.
|
||||
request.prompt_token_ids.extend(kept_output_tokens)
|
||||
next_prompt_len = max(1, compute_talker_prompt_ids_length(prompt_token_ids))
|
||||
if isinstance(next_stage_prompt_len, int) and next_stage_prompt_len > 0:
|
||||
next_prompt_len = next_stage_prompt_len
|
||||
else:
|
||||
next_prompt_len = max(1, compute_talker_prompt_ids_length(prompt_token_ids))
|
||||
new_prompt = [0] * next_prompt_len
|
||||
request._all_token_ids.extend(new_prompt or ())
|
||||
request.prompt_token_ids.extend(new_prompt or ())
|
||||
|
||||
@@ -283,7 +283,11 @@ class OmniChunkTransferAdapter(OmniTransferAdapterBase):
|
||||
|
||||
# Empty chunk with more data expected: keep polling.
|
||||
has_new_ids = bool(new_ids.numel()) if use_tensor_codes else bool(new_ids)
|
||||
if not has_new_ids and not payload_finished:
|
||||
if not has_new_ids and payload_segment_finished:
|
||||
# Preserve an explicit scheduler boundary even when it
|
||||
# contains no new codec frames.
|
||||
request.prompt_token_ids = [0]
|
||||
if not has_new_ids and not payload_finished and not payload_segment_finished:
|
||||
# The base recv loop treats False as "not ready yet" and
|
||||
# requeues the request. Do not mark an empty non-terminal
|
||||
# chunk as ready, otherwise Stage1 can consume before the
|
||||
@@ -317,7 +321,13 @@ class OmniChunkTransferAdapter(OmniTransferAdapterBase):
|
||||
multimodal_output=multimodal_output,
|
||||
request=request,
|
||||
# Existing processors use is_finished as a flush signal.
|
||||
is_finished=is_segment_finished,
|
||||
# Terminal stops no longer count as segment boundaries
|
||||
# (is_segment_finished is False when the request finishes,
|
||||
# see #5383), but the processor must still flush its
|
||||
# accumulated tail on the terminal chunk — otherwise the
|
||||
# downstream stage receives the finished marker without
|
||||
# the final payload (#5413).
|
||||
is_finished=is_segment_finished or is_finished,
|
||||
)
|
||||
|
||||
except Exception as e:
|
||||
@@ -332,7 +342,8 @@ class OmniChunkTransferAdapter(OmniTransferAdapterBase):
|
||||
if payload_data.meta is None:
|
||||
payload_data.meta = MetaStruct()
|
||||
payload_data.meta.finished = torch.tensor(is_finished, dtype=torch.bool)
|
||||
payload_data.meta.is_segment_finished = torch.tensor(is_segment_finished, dtype=torch.bool)
|
||||
if payload_data.meta.is_segment_finished is None:
|
||||
payload_data.meta.is_segment_finished = torch.tensor(is_segment_finished, dtype=torch.bool)
|
||||
|
||||
success, size, metadata = self.connector.put(
|
||||
from_stage=str(stage_id),
|
||||
@@ -725,6 +736,14 @@ class OmniChunkTransferAdapter(OmniTransferAdapterBase):
|
||||
queue_snapshot = list(queue)
|
||||
for request in queue_snapshot:
|
||||
if not self._ensure_active_stream(request):
|
||||
if target_status == RequestStatus.WAITING:
|
||||
# A non-active placeholder must not remain visible to the
|
||||
# scheduler: it has no connector payload yet, so running
|
||||
# it would execute the downstream model with empty
|
||||
# additional_information. Park it until restore_queues()
|
||||
# and retry admission on the next scheduler tick.
|
||||
queue.remove(request)
|
||||
waiting_for_chunk_list.append(request)
|
||||
continue
|
||||
if request.status != RequestStatus.WAITING_FOR_CHUNK:
|
||||
if request.request_id in self.requests_with_ready_chunks:
|
||||
|
||||
Reference in new issue
Block a user