Repository navigation
feat(combos): enroll text-only members in vision sidecar from the UI #4932
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.
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
Draft
x3M3x
wants to merge
4
commits into
lidge-jun:dev
Choose a base branch
from
x3M3x:codex/combo-vision-ui
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
3b19db6
feat(combos): enroll text-only members in vision sidecar from the UI
x3M3x ee990b8
fix(combos): preserve sidecar capability declarations
x3M3x 5e10efb
fix(combos): authoritative vision sidecar consumer flag in model rows
x3M3x c9cda1b
fix(combos): translate vision sidecar hints in Portuguese
x3M3x File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,71 @@ | ||
| import type { ComboTarget } from "./combo-workspace-data"; | ||
| import type { ModelOption } from "./components/combo-workspace-types"; | ||
|
|
||
| /** Whether every selected target advertises image input (incomplete rows fail closed). */ | ||
| type ComboImageMemberKind = "vision" | "sidecar" | "blocked" | "missing"; | ||
|
|
||
| /** | ||
| * One combo member's image story. Classification must survive a reload, so it | ||
| * reads `visionSidecarConsumer` — the runtime predicate's verdict served on the | ||
| * /api/models row — before falling back to the DECLARED modalities | ||
| * (`inputModalitiesDeclared`). A model covered only by legacy `noVisionModels` | ||
| * has no declaration and its advertised modalities are widened to image, so the | ||
| * flag is what keeps it a sidecar member after reload. Rows with no known | ||
| * modalities, or modalities without text, cannot be covered and block the combo. | ||
| */ | ||
| function imageMemberKind(target: ComboTarget, models: ModelOption[]): ComboImageMemberKind { | ||
| const provider = target.provider.trim(); | ||
| const modelId = target.model.trim(); | ||
| if (!provider || !modelId) return "missing"; | ||
| const model = models.find((row) => row.provider === provider && row.id === modelId); | ||
| if (!model) return "missing"; | ||
| if (model.visionSidecarConsumer === true) return "sidecar"; | ||
| const declared = model.inputModalitiesDeclared ?? model.inputModalities; | ||
| if (!declared || declared.length === 0) return "blocked"; | ||
| if (declared.includes("image")) return "vision"; | ||
| return declared.includes("text") ? "sidecar" : "blocked"; | ||
| } | ||
|
|
||
| /** Whether images can be enabled: every target is known and either images natively or can be declared text-only. */ | ||
| export function comboImagesSupported(targets: ComboTarget[], models: ModelOption[]): boolean { | ||
| if (targets.length === 0) return false; | ||
| return targets.every((target) => { | ||
| const provider = target.provider.trim(); | ||
| const modelId = target.model.trim(); | ||
| if (!provider || !modelId) return false; | ||
| const model = models.find((row) => row.provider === provider && row.id === modelId); | ||
| return !!model?.inputModalities?.includes("image"); | ||
| const kind = imageMemberKind(target, models); | ||
| return kind === "vision" || kind === "sidecar"; | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * Exact targets that need a text-only declaration so the Vision Sidecar covers | ||
| * them when the combo accepts images. Deduplicated in submission order. | ||
| */ | ||
| export function comboVisionSidecarTargets( | ||
| targets: ComboTarget[], | ||
| models: ModelOption[], | ||
| ): Array<{ provider: string; model: string }> { | ||
| const seen = new Set<string>(); | ||
| const out: Array<{ provider: string; model: string }> = []; | ||
| for (const target of targets) { | ||
| if (imageMemberKind(target, models) !== "sidecar") continue; | ||
| const provider = target.provider.trim(); | ||
| const model = target.model.trim(); | ||
| const key = `${provider}/${model}`; | ||
| if (seen.has(key)) continue; | ||
| seen.add(key); | ||
| out.push({ provider, model }); | ||
| } | ||
| return out; | ||
| } | ||
|
|
||
| /** | ||
| * Exact targets that cannot be covered by the Vision Sidecar: their row is | ||
| * known but its modalities are unknown or have no text input. Named in the | ||
| * hint so the operator knows which member blocks the image switch. | ||
| */ | ||
| export function comboImageBlockedTargets( | ||
| targets: ComboTarget[], | ||
| models: ModelOption[], | ||
| ): Array<{ provider: string; model: string }> { | ||
| return targets | ||
| .filter((target) => imageMemberKind(target, models) === "blocked") | ||
| .map((target) => ({ provider: target.provider.trim(), model: target.model.trim() })); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.