Skip to content

Commit 7cf11b1

Browse files
harry-whorlowharry-whorlow
committed
chore: pr comments
1 parent 0daf4ab commit 7cf11b1

10 files changed

Lines changed: 48 additions & 39 deletions

‎packages/typescript/ai-ollama/src/meta/model-meta-deepseek-coder-v2.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ const DEEPSEEK_CODER_V2_LATEST = {
1111
output: ['text'],
1212
capabilities: [],
1313
},
14-
size: '4.8gb',
15-
context: 160_900,
14+
size: '8.9gb',
15+
context: 160_000,
1616
} as const satisfies OllamaModelMeta<
1717
OllamaChatRequest & OllamaChatRequestMessages
1818
>

‎packages/typescript/ai-ollama/src/meta/model-meta-gpt-oss.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const OPT_OSS_20b = {
2929
supports: {
3030
input: ['text'],
3131
output: ['text'],
32-
capabilities: ['tools'],
32+
capabilities: ['tools', 'thinking'],
3333
},
3434
size: '14gb',
3535
context: 128_000,
@@ -45,7 +45,7 @@ const OPT_OSS_120b = {
4545
supports: {
4646
input: ['text'],
4747
output: ['text'],
48-
capabilities: ['tools'],
48+
capabilities: ['tools', 'thinking'],
4949
},
5050
size: '65gb',
5151
context: 128_000,

‎packages/typescript/ai-ollama/src/meta/model-meta-llama-guard3.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ import type {
55
} from './models-meta'
66

77
const LLAMA_GUARD3_LATEST = {
8-
name: 'llama3:latest',
8+
name: 'llama-guard3:latest',
99
supports: {
1010
input: ['text'],
1111
output: ['text'],
1212
capabilities: [],
1313
},
14-
size: '4.9b',
14+
size: '4.9gb',
1515
context: 128_000,
1616
} as const satisfies OllamaModelMeta<
1717
OllamaChatRequest & OllamaChatRequestMessages
1818
>
1919

2020
const LLAMA_GUARD3_1b = {
21-
name: 'llama3:7b',
21+
name: 'llama-guard3:1b',
2222
supports: {
2323
input: ['text'],
2424
output: ['text'],
@@ -31,7 +31,7 @@ const LLAMA_GUARD3_1b = {
3131
>
3232

3333
const LLAMA_GUARD3_8b = {
34-
name: 'llama3:70b',
34+
name: 'llama-guard3:8b',
3535
supports: {
3636
input: ['text'],
3737
output: ['text'],

‎packages/typescript/ai-ollama/src/meta/model-meta-llama3-gradient.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ const LLAMA3_GRADIENT_70b = {
3939
},
4040
size: '40gb',
4141
context: 1_000_000,
42-
} as const satisfies OllamaModelMeta<any>
42+
} as const satisfies OllamaModelMeta<
43+
OllamaChatRequest & OllamaChatRequestMessages
44+
>
4345

4446
export const LLAMA3_GRADIENT_MODELS = [
4547
LLAMA3_GRADIENT_LATEST.name,

‎packages/typescript/ai-ollama/src/meta/model-meta-llama3.1.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const LLAMA3_1_LATEST = {
1313
output: ['text'],
1414
capabilities: ['tools'],
1515
},
16-
size: '4.9b',
16+
size: '4.9gb',
1717
context: 128_000,
1818
} as const satisfies OllamaModelMeta<
1919
OllamaChatRequest &
@@ -52,7 +52,7 @@ const LLAMA3_1_70b = {
5252
>
5353

5454
const LLAMA3_1_405b = {
55-
name: 'llama3.1:70b',
55+
name: 'llama3.1:405b',
5656
supports: {
5757
input: ['text'],
5858
output: ['text'],

‎packages/typescript/ai-ollama/src/meta/model-meta-llava.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import type {
88
const LLAVA_LATEST = {
99
name: 'llava:latest',
1010
supports: {
11-
input: ['text'],
11+
input: ['text', 'image'],
1212
output: ['text'],
13-
capabilities: [],
13+
capabilities: ['vision'],
1414
},
1515
size: '4.7b',
1616
context: 32_000,
@@ -72,10 +72,10 @@ export const LLAVA_MODELS = [
7272

7373
// const LLAVA_VIDEO_MODELS = [] as const
7474

75-
// export type llavaChatModels = (typeof LLAVA_MODELS)[number]
75+
// export type LlavaChatModels = (typeof LLAVA_MODELS)[number]
7676

7777
// Manual type map for per-model provider options
78-
export type llavaChatModelProviderOptionsByName = {
78+
export type LlavaChatModelProviderOptionsByName = {
7979
// Models with thinking and structured output support
8080
[LLAVA_LATEST.name]: OllamaChatRequest &
8181
OllamaChatRequestMessages<OllamaMessageImages>
@@ -90,7 +90,7 @@ export type llavaChatModelProviderOptionsByName = {
9090
OllamaChatRequestMessages<OllamaMessageImages>
9191
}
9292

93-
export type llavaModelInputModalitiesByName = {
93+
export type LlavaModelInputModalitiesByName = {
9494
// Models with text, image, audio, video (no document)
9595
[LLAVA_LATEST.name]: typeof LLAVA_LATEST.supports.input
9696
[LLAVA_7b.name]: typeof LLAVA_7b.supports.input

‎packages/typescript/ai-ollama/src/meta/model-meta-mistral-small.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,28 @@ const MISTRAL_SMALL_LATEST = {
2222
>
2323

2424
const MISTRAL_SMALL_22b = {
25-
name: 'mistral-small:12b',
25+
name: 'mistral-small:22b',
2626
supports: {
2727
input: ['text'],
2828
output: ['text'],
2929
capabilities: ['tools'],
3030
},
3131
size: '13gb',
32-
context: 32_000,
32+
context: 128_000,
3333
} as const satisfies OllamaModelMeta<
3434
OllamaChatRequest &
3535
OllamaChatRequestMessages<OllamaMessageTools> &
3636
OllamaChatRequestTools
3737
>
3838

3939
const MISTRAL_SMALL_24b = {
40-
name: 'mistral-small:12b',
40+
name: 'mistral-small:24b',
4141
supports: {
4242
input: ['text'],
4343
output: ['text'],
4444
capabilities: ['tools'],
4545
},
46-
size: '13gb',
46+
size: '14gb',
4747
context: 32_000,
4848
} as const satisfies OllamaModelMeta<
4949
OllamaChatRequest &

‎packages/typescript/ai-ollama/src/meta/model-meta-mistral.ts‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,39 @@
11
import type {
22
OllamaChatRequest,
33
OllamaChatRequestMessages,
4-
OllamaMessageImages,
4+
OllamaChatRequestTools,
5+
OllamaMessageTools,
56
OllamaModelMeta,
67
} from './models-meta'
78

89
const MISTRAL_LATEST = {
910
name: 'mistral:latest',
1011
supports: {
11-
input: ['text', 'image'],
12+
input: ['text'],
1213
output: ['text'],
13-
capabilities: ['vision'],
14+
capabilities: ['tools'],
1415
},
15-
size: '2.9gb',
16-
context: 4_000,
16+
size: '4.4gb',
17+
context: 32_000,
1718
} as const satisfies OllamaModelMeta<
18-
OllamaChatRequest & OllamaChatRequestMessages<OllamaMessageImages>
19+
OllamaChatRequest &
20+
OllamaChatRequestMessages<OllamaMessageTools> &
21+
OllamaChatRequestTools
1922
>
2023

2124
const MISTRAL_7b = {
22-
name: 'mistral:87',
25+
name: 'mistral:7b',
2326
supports: {
24-
input: ['text', 'image'],
27+
input: ['text'],
2528
output: ['text'],
26-
capabilities: ['vision'],
29+
capabilities: ['tools'],
2730
},
28-
size: '2.9gb',
29-
context: 4_000,
31+
size: '4.4gb',
32+
context: 32_000,
3033
} as const satisfies OllamaModelMeta<
31-
OllamaChatRequest & OllamaChatRequestMessages<OllamaMessageImages>
34+
OllamaChatRequest &
35+
OllamaChatRequestMessages<OllamaMessageTools> &
36+
OllamaChatRequestTools
3237
>
3338

3439
export const MISTRAL_MODELS = [MISTRAL_LATEST.name, MISTRAL_7b.name] as const
@@ -47,10 +52,12 @@ export const MISTRAL_MODELS = [MISTRAL_LATEST.name, MISTRAL_7b.name] as const
4752
export type MistralChatModelProviderOptionsByName = {
4853
// Models with thinking and structured output support
4954
[MISTRAL_LATEST.name]: OllamaChatRequest &
50-
OllamaChatRequestMessages<OllamaMessageImages>
55+
OllamaChatRequestMessages<OllamaMessageTools> &
56+
OllamaChatRequestTools
5157

5258
[MISTRAL_7b.name]: OllamaChatRequest &
53-
OllamaChatRequestMessages<OllamaMessageImages>
59+
OllamaChatRequestMessages<OllamaMessageTools> &
60+
OllamaChatRequestTools
5461
}
5562

5663
export type MistralModelInputModalitiesByName = {

‎packages/typescript/ai-ollama/src/meta/model-meta-qwen2.5-coder.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ export const QWEN2_5_CODER_MODELS = [
115115
QWEN2_5_CODER_LATEST.name,
116116
QWEN2_5_CODER_0_5b.name,
117117
QWEN2_5_CODER_1_5b.name,
118+
QWEN2_5_CODER_3b.name,
118119
QWEN2_5_CODER_7b.name,
119120
QWEN2_5_CODER_14b.name,
120121
QWEN2_5_CODER_32b.name,

‎packages/typescript/ai-ollama/src/model-meta.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ import type {
211211
Llama3_4ModelInputModalitiesByName,
212212
} from './meta/model-meta-llama4'
213213
import type {
214-
llavaChatModelProviderOptionsByName,
215-
llavaModelInputModalitiesByName,
214+
LlavaChatModelProviderOptionsByName,
215+
LlavaModelInputModalitiesByName,
216216
} from './meta/model-meta-llava'
217217
import type {
218218
LlavaLlamaChatModelProviderOptionsByName,
@@ -361,7 +361,6 @@ export const OLLAMA_TEXT_MODELS = [
361361
...LLAMA3_1_MODELS,
362362
...LLAMA3_2_MODELS,
363363
...LLAMA3_2_VISION_MODELS,
364-
...LLAMA3_2_MODELS,
365364
...LLAMA3_3_MODELS,
366365
...LLAMA3_MODELS,
367366
...LLAMA4_MODELS,
@@ -435,7 +434,7 @@ export type OllamaChatModelProviderOptionsByName =
435434
Llama3_4ChatModelProviderOptionsByName &
436435
LlavaLlamaChatModelProviderOptionsByName &
437436
LlavaPhi3ChatModelProviderOptionsByName &
438-
llavaChatModelProviderOptionsByName &
437+
LlavaChatModelProviderOptionsByName &
439438
MarcoO1ChatModelProviderOptionsByName &
440439
MistralLargeChatModelProviderOptionsByName &
441440
MistralNemoChatModelProviderOptionsByName &
@@ -502,7 +501,7 @@ export type OllamaModelInputModalitiesByName =
502501
Llama3_4ModelInputModalitiesByName &
503502
LlavaLlamaModelInputModalitiesByName &
504503
LlavaPhi3ModelInputModalitiesByName &
505-
llavaModelInputModalitiesByName &
504+
LlavaModelInputModalitiesByName &
506505
MarcoO1ModelInputModalitiesByName &
507506
MistralLargeModelInputModalitiesByName &
508507
MistralNemoModelInputModalitiesByName &

0 commit comments

Comments
 (0)