Repository navigation
fix: resolve model capabilities from bundled catalog #2150
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
Closed
NarwhalChen
wants to merge
4
commits into
MoonshotAI:main
from
NarwhalChen:refactor/models-dev-capability-fallback
Closed
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
09f9b0d
fix: resolve model capabilities from bundled catalog
NarwhalChen ca917a3
Merge remote-tracking branch 'origin/main' into refactor/models-dev-c…
NarwhalChen bbaac55
fix: separate capability catalog identity
NarwhalChen 38876aa
refactor: use configured model for catalog lookup
NarwhalChen 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "@moonshot-ai/kimi-code": patch | ||
| --- | ||
|
|
||
| Fix capability detection for manually configured models by falling back to the bundled model catalog. |
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
33 changes: 33 additions & 0 deletions
33
packages/agent-core-v2/src/app/kosongConfig/modelsDevCapability.contrib.ts
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 |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /** | ||
| * `app/kosongConfig` domain (L3) — contributes the bundled models.dev | ||
| * snapshot as a capability source without making the L2 provider domain | ||
| * depend on app configuration. The multi-megabyte snapshot is parsed lazily | ||
| * on the first lookup and never refreshed from the network. | ||
| */ | ||
|
|
||
| import { registerModelCapabilityResolver } from '#/kosong/provider/modelCapabilityResolver'; | ||
|
|
||
| import { BUILT_IN_MODELS_DEV_JSON } from './builtInModelsDev'; | ||
| import { | ||
| getModelsDevModelCapability, | ||
| type ModelsDevCatalog, | ||
| } from './modelsDev'; | ||
| import { loadBuiltInModelsDevCatalog } from './modelsDevUpstream'; | ||
|
|
||
| let catalog: ModelsDevCatalog | undefined | null = null; | ||
|
|
||
| registerModelCapabilityResolver(({ protocol, providerType, modelName }) => { | ||
| if (catalog === null) { | ||
| catalog = loadBuiltInModelsDevCatalog(BUILT_IN_MODELS_DEV_JSON); | ||
| } | ||
| const wire = providerType === 'vertexai' ? providerType : protocol; | ||
| const match = getModelsDevModelCapability(catalog, wire, modelName); | ||
| if (match === undefined) return undefined; | ||
| return { | ||
| capability: match.capability, | ||
| source: { | ||
| kind: 'builtin', | ||
| detail: `models.dev built-in snapshot provider '${match.providerId}'`, | ||
| }, | ||
| }; | ||
| }); | ||
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
41 changes: 41 additions & 0 deletions
41
packages/agent-core-v2/src/kosong/provider/modelCapabilityResolver.ts
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 |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /** | ||
| * `kosong/provider` domain (L2) — extension point for capability sources | ||
| * owned by higher layers. Resolvers run after protocol traits but before | ||
| * protocol-base static catalogs. Registration returns a disposable so tests | ||
| * and embedding hosts can restore process-global state. | ||
| */ | ||
|
|
||
| import { toDisposable, type IDisposable } from '#/_base/di/lifecycle'; | ||
| import type { ExplainedCapability, Protocol } from '#/kosong/protocol/protocol'; | ||
|
|
||
| export interface ModelCapabilityQuery { | ||
| readonly protocol: Protocol; | ||
| readonly providerType?: string; | ||
| readonly modelName: string; | ||
| } | ||
|
|
||
| export type ModelCapabilityResolver = ( | ||
| query: ModelCapabilityQuery, | ||
| ) => ExplainedCapability | undefined; | ||
|
|
||
| const resolvers: ModelCapabilityResolver[] = []; | ||
|
|
||
| export function registerModelCapabilityResolver( | ||
| resolver: ModelCapabilityResolver, | ||
| ): IDisposable { | ||
| resolvers.push(resolver); | ||
| return toDisposable(() => { | ||
| const index = resolvers.lastIndexOf(resolver); | ||
| if (index >= 0) resolvers.splice(index, 1); | ||
| }); | ||
| } | ||
|
|
||
| export function explainRegisteredModelCapability( | ||
| query: ModelCapabilityQuery, | ||
| ): ExplainedCapability | undefined { | ||
| for (let index = resolvers.length - 1; index >= 0; index -= 1) { | ||
| const explained = resolvers[index]?.(query); | ||
| if (explained !== undefined) return explained; | ||
| } | ||
| return undefined; | ||
| } |
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.
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.