fix(mm): _collect_image_span_requests produce 3-tuple overlapping (idx,item,span_len)
Merged tree convention (PerImageRequestInfo.overlapping annotation and upstream _assemble_per_image_chunk) is (idx, item, span_len); our span collector still emitted 4-tuples (idx,item,start,end) from the pre-merge version, crashing V4.1 warmup assembly: ValueError too many values to unpack.
This commit is contained in:
@@ -438,7 +438,6 @@ def _collect_image_span_requests(
|
||||
):
|
||||
if end >= chunk_start and start < chunk_end:
|
||||
overlapping.append((idx, item, start, end))
|
||||
req_info.overlapping = overlapping
|
||||
|
||||
for _idx, item, start, end in overlapping:
|
||||
cache_key = (item.hash, end - start + 1)
|
||||
@@ -446,6 +445,9 @@ def _collect_image_span_requests(
|
||||
spans[cache_key][2].append(item)
|
||||
continue
|
||||
spans[cache_key] = (item, start >= chunk_start and end < chunk_end, [])
|
||||
req_info.overlapping = [
|
||||
(idx, item, end - start + 1) for idx, item, start, end in overlapping
|
||||
]
|
||||
return [
|
||||
ImageSpanRequest(
|
||||
hash=item_hash,
|
||||
|
||||
Reference in New Issue
Block a user