Inline raw image refs for multimodal rendering - #110
Conversation
Drop the cache-only None path. Every image (current and prior turns) carries its raw descriptor ref; _descriptor_only_mm_data no longer strips the pointer, so refs carry forward without a rebuild. Removes the now-orphaned materialize_image_refs / materialize_kimi_image_refs and the materialize_all_image_refs flag. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…tale comments - Drop the render-time processor constructor arg from Qwen3VL/Qwen35/Kimi renderers: geometry is computed deterministically from config; no renderer runs the HF image processor at render. Remove Kimi dead _get_processor/_process_image/self._processor/_image_cache. - mm_store: remove all backcompat aliases (MMRAW_PREFIX, MM_RAW_PAYLOAD_KEY/VALUE, mmraw_ref, split_mmraw_ref, image_asset_dir) -- no consumers. - client.py: fix stale generate() docstring + comment that referenced the removed None/cache path. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
It only sized Kimi per-renderer image cache, which was deleted with the render-time processor path. No consumers. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…s-renderers # Conflicts: # renderers/configs.py # renderers/qwen3_vl.py
- Fix bridge merge mutating the caller's previous sidecar in place: shared merge_multi_modal_data helper copies inner lists, replacing the three per-renderer merge blocks; bridge test asserts no mutation. - Import Qwen's smart_resize from transformers (torch-free PIL-backend module) instead of maintaining a port. - Resolve and read each raw image asset once per layout describe. - mm_store: full sha256 content-addressed filenames; raise on undecodable base64 instead of silently passing the data URL through. - Drop the dead features/mm_data tuple plumbing in client.generate. - Add layout-math parity test against the real Qwen3-VL and Kimi-K2.5 image processors at rounding-boundary dimensions. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
…s-renderers Weaves main's independent bridge-mutation fix and thinking-deviation skip guard into this branch's raw/processed offload restructuring: - kimi_k25.py/qwen35.py/qwen3_vl.py: kept our shared merge_multi_modal_data() helper over main's three duplicated inline fixes for the same bug (identical behavior, single implementation). - test_multimodal.py: re-injected main's _skip_for_disabled_thinking_deviation guard into this branch's parallel renderer_cases/processor_cases structure at all 4 call sites; took main's tuple-based prior_mm/prior_counts assertion over our redundant duplicate. - test_client.py: kept both additions (non-overlapping). Full suite: 2578 passed, 153 skipped, 1 xfailed.
Intermediate storage mode: the image processor stays out of the render path (raw geometry math + descriptors), but images travel inline as data:image/...;base64 URLs instead of offloaded file:// run assets. - mm_store: the mmraw ref envelope carries raw_image_data (the inline data URL) instead of raw_image_uri; offload_image_to_run_assets, run_image_dir, and VF_RENDERER_IMAGE_OFFLOAD_DIR are gone. New decode_data_image_url() is the one supported source decode. - qwen3_vl/qwen35/kimi_k25: raw layout describes decode the inline source once for dimensions + sha256 hash; descriptors embed it. - client: _build_vllm_mm_features serializes the inline source into every image slot's ref. Suite: 2153 passed, 121 skipped, 1 xfailed (parity deselection as usual).
The ref rides as a string inside a JSON request body, so serializing the payload as compact JSON costs only the escaping of its own quotes (~200 bytes). The base64 wrapper instead inflated the entire payload by a third — with an inline image source that was ~32 KiB per image, on every image slot of every request. Verified: a 75 KiB JPEG's ref goes 130.3 KiB -> 97.9 KiB on the wire (the 97.7 KiB data URL plus ~200 bytes), a 25% cut. The payload contains colons now, so refs parse with a single partition; the base64-alphabet guard on the segment is gone with the wrapper.
ApprovabilityVerdict: Needs human review This PR introduces a new multimodal architecture that changes how images are processed and transmitted to inference endpoints, defaulting to raw refs instead of processed tensors. The scope spans multiple renderers with substantial new logic. An unresolved comment identifies a potential bug in hub config loading that could affect network-free CI environments. You can customize Macroscope's approvability policy. Learn more. |
Delete the baked QWEN_VL_IMAGE_LAYOUT / KIMI_K25_IMAGE_LAYOUT constants. The layout spec dataclass is now the canonical knob list: renderers fill it from the checkpoint's preprocessor_config.json (raw JSON read, no processor instantiation) via qwen_layout_from / kimi_layout_from, and fingerprint() hashes exactly its fields. Layout parity tests additionally assert our grid math against HF's metadata-only oracle get_number_of_image_patches. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
One conflict, in client.py: main's #115 vLLM import fix lands inside the processed-tensor encoder this branch deletes by design. Kept the raw-ref _build_vllm_mm_features; main's fix applies to code that no longer exists here (same resolution as the offload branch). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
…derer Materialize-side fingerprint enforcement is gone (prime-rl trusts the train-time same-checkpoint contract and keeps grid asserts), so the fingerprint machinery goes with it: no fingerprint()/image_layout_fingerprint, no fingerprint field in mmraw refs or descriptors, and the extractors are Mapping-only (config JSON is the single source; no live-processor or SizeDict handling). Config resolution is one cache-aware hf_hub_download, resolved lazily once per renderer and stashed as the layout spec; describe/item helpers take the spec directly. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 1 potential issue.
❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.
Reviewed by Cursor Bugbot for commit ce7078a. Configure here.
|
|
||
| from huggingface_hub import hf_hub_download | ||
|
|
||
| path = hf_hub_download(model_name, "preprocessor_config.json", revision=revision) |
There was a problem hiding this comment.
Cache-first hub config load removed
Medium Severity
hub_image_processor_config no longer tries local_files_only=True before a normal hub fetch. For unpinned models this forces an etag network check even when the file is already cached, which breaks network-free CI and can pull a newer preprocessor_config.json than the rest of the local checkpoint — drifting from the knobs the docstring says must stay checkpoint-aligned.
Reviewed by Cursor Bugbot for commit ce7078a. Configure here.
Prune the leftovers of the fingerprint era down to what the geometry math and the wire actually use: - Kimi spec drops image_mean/image_std (fingerprint inputs, not geometry) and the float_triple extraction; Qwen spec drops temporal_patch_size (grid_t is 1 for images). - Kimi's ref payload drops num_media_tokens — no consumer; adapters read grid_thws only. The descriptor field stays: the parity test asserts it against the processor's media_tokens_calculator. - The descriptor envelope drops its modality key: an item's modality is its key in MultiModalData.mm_items; only the standalone mmraw: ref carries its own (consumed by the vLLM-front routing check). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>


Summary
Intermediate multimodal storage mode — the inline bundle. Keeps this repo's raw multimodal contract (renderer computes token layout via pure geometry math, no image processor at render time; refs + descriptors instead of processed tensors) but images travel inline as
data:image/...;base64URLs instead of offloadedfile://run assets.mm_store: themmrawref envelope carriesraw_image_data(the inline data URL) instead ofraw_image_uri.offload_image_to_run_assets,run_image_dir, andVF_RENDERER_IMAGE_OFFLOAD_DIRare gone. Newdecode_data_image_url()is the single supported source decode.client.generate()serializes the inline source into every image slot's ref — every request to/inference/v1/generatecarries the full inline payload for every image in the prompt (current and prior turns), and the prime-rl serving layer dedups processor work by content hash.Relationship to the offload bundle
This PR is cut from the offload branch (#89) and is the storage-layer intermediate: same processor-ownership architecture, no shared image directory. The offload bundle (renderers #89 / verifiers #1746 / prime-rl #2836) layers content-addressed
file://offload on top of this contract.Companion inline PRs: verifiers
feat/v1-inline-raw-images, prime-rlfeat/v1-inline-mm.Validation
2153 passed, 121 skipped, 1 xfailed(processor-parity tests included, run against the real Qwen3-VL-4B and pinned Kimi-K2.5 processors).Note
Inline raw image refs as default multimodal output for Qwen and Kimi renderers
multimodal_outputfor all multimodal renderers from processed pixel-value tensors to raw image references with layout metadata (grid shape, token count, content hash); processed payloads are still available viaconfig.multimodal_output="processed".raw_mm_item,raw_mm_ref,split_raw_mm_ref).describe_qwen_image_layout,describe_kimi_image_layout) that compute token counts and grid dimensions from raw image bytes without running an HF image processor._build_vllm_mm_featuresin client.py is rewritten to be renderer-agnostic, expecting rawmm_itemdescriptors; Qwen-specific tensor paths are removed.image_cache_maxfrom all renderer configs; processor loading is now lazy and internal cache size is fixed.visionoptional-dependency group (pillow,torch,torchvision) to pyproject.toml.processorkeyword argument; any caller passingprocessor=will get aTypeErrorat runtime.Macroscope summarized 20b3f2d.
Update: unwrapped the ref payload (
603118b)raw_mm_refserializes its payload as compact JSON instead of base64-wrapping it. The ref travels as a string inside a JSON request body, so the only encoding cost is escaping the payload's own quotes (~200 bytes) — while the base64 wrapper inflated the entire payload, image included, by a third.Measured on a 75 KiB JPEG: 130.3 KiB → 97.9 KiB per image slot (the 97.7 KiB data URL plus ~200 bytes), a 25% cut on every image slot of every request. Refs parse with a single
partition(":")now that the payload contains colons; the base64-alphabet guard retired with the wrapper.Update: layout knobs sourced from the checkpoint config (
9208b40)Deleted the baked
QWEN_VL_IMAGE_LAYOUT/KIMI_K25_IMAGE_LAYOUTconstants. The layout spec dataclass is now the canonical knob list per family:preprocessor_config.json— a cached raw JSON read (hub_image_processor_config), never a processor instantiation, so render hosts still avoid torch and (for Kimi) trust-remote-code execution. No baked fallback: a missing knob fails loudly.qwen_layout_from/kimi_layout_from) fills the spec from either the config dict or a live image processor object (prime-rl's adapters use the latter, deleting their hand-duplicated knob lists). Qwen honors both config shapes (top-levelmin_pixels/max_pixels, or nestedsize.shortest_edge/longest_edge) and live-processorSizeDictattributes.fingerprint()on the spec hashes exactly its own fields, so the knob list and the hash can't drift. Fingerprint values are byte-identical to before.get_number_of_image_patches(Qwen), and asserts config-sourced spec == live-processor spec for both families (this caught aSizeDictextraction bug in review).New runtime requirement: the tokenizer must carry
name_or_pathand the checkpoint'spreprocessor_config.jsonmust be resolvable (local path, HF cache, or hub); failures surface at first image render.Full suite: 2153 passed, 121 skipped, 1 xfailed.
Update: synced with main (
27fe3c6)Merged renderers main (5 commits: vLLM token-serving import fix #115, GLM tool-name validation #114, setuptools bump, ruff pins). One conflict, in
client.py: main's #115 updated imports inside the processed-tensor encoder this branch deletes by design — kept the raw-ref_build_vllm_mm_features(same resolution as the offload branch #89). Full suite: 2169 passed, 121 skipped, 1 xfailed.Update: fingerprints deleted; layout resolved once per renderer (
ce7078a)Companion to prime-rl's "trust the train-time checkpoint contract" change: materialize no longer re-checks layout knobs (it keeps output-level grid asserts, which need no knob extraction), so the fingerprint machinery is deleted end to end — no
image_layout_fingerprint, nofingerprint()on the layout specs, nofingerprint/layout_fingerprintfields inmmraw:refs or descriptor envelopes (a ref format change; nothing is merged, both bundles move together).Render-side resolution is also simplified to the cleanest shape:
hub_image_processor_configis a local-path check plus one cache-awarehf_hub_download(the previouslocal_files_onlytwo-step re-implemented hub internals).qwen_layout_from/kimi_layout_from) are Mapping-only — config JSON is the single knob source; the live-processor/SizeDictduck-typing is gone with its only caller._raw_image_layout), mirroring the existing lazy_get_processoridiom;describe_*_layout/*_image_item_for_rendertake the spec directly instead of a model name.Full suite: 2169 passed, 121 skipped, 1 xfailed.
Update: pruned unread layout knobs and envelope fields (
20b3f2d)Review follow-up to the fingerprint deletion — removed everything only fingerprints consumed:
image_mean/image_std(+ thefloat_triplevalidator); Qwen spec dropstemporal_patch_size(grid_tis 1 for images). Specs now carry exactly what the geometry math reads.num_media_tokens(no consumer; adapters readgrid_thwsonly). The descriptor field stays — the parity test asserts it against the processor'smedia_tokens_calculator.modalitykey: an item's modality is its key inMultiModalData.mm_items; only the standalonemmraw:ref carries its own (consumed by the vLLM-front routing check).Full suite: 2169 passed, 121 skipped, 1 xfailed.
Note
High Risk
Changes the multimodal wire contract and vLLM feature serialization; breaks callers that passed
processor=to VL renderers or expected processed tensors by default. Raw mode requires inline data URLs and resolvable checkpoint preprocessor configs at first image render.Overview
Multimodal sidecars default to lightweight raw descriptors instead of shipping
pixel_valuesfrom the render host. Qwen3-VL, Qwen3.5, and Kimi K2.5 compute placeholder counts from checkpointpreprocessor_config.json(via newmm_storehelpers) and embed inlinedata:image/...;base64sources inprime_raw_mm_itemenvelopes;multimodal_output="processed"keeps the old processor/tensor path for SFT.Inference client wiring changes:
generate()builds vLLMfeaturesfrom genericmmraw:refs (no vLLM/torch tensor encoding), carries prior-turn images in every slot, and falls back toprompt_attribution.multi_modal_datawhen only prebuiltprompt_idsare passed. Bridge turns use sharedmerge_multi_modal_data.Config / API:
BaseRendererConfig.multimodal_output(raw|processed) flows throughAutoRendererConfig; per-rendererimage_cache_maxand constructorprocessor=injection are removed. Optionalrenderers[vision]extra added for processed-mode deps.Reviewed by Cursor Bugbot for commit 20b3f2d. Bugbot is set up for automated code reviews on this repo. Configure here.