Skip to content

Commit fd750de

Browse files
committed
chore: more clean up
1 parent 68a080e commit fd750de

13 files changed

+51
-194
lines changed

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

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
import type { ChatRequest } from 'ollama'
2-
3-
interface ModelMeta<TProviderOptions = unknown> {
4-
name: string
5-
providerOptions?: TProviderOptions
6-
supports?: {
7-
input?: Array<'text' | 'image' | 'video'>
8-
output?: Array<'text' | 'image' | 'video'>
9-
capabilities?: Array<'tools' | 'thinking' | 'vision' | 'embedding'>
10-
}
11-
size?: string
12-
context?: number
13-
}
2+
import type { DefaultOllamaModelMeta } from './models-meta'
143

154
const ATHENE_V2_LATEST = {
165
name: 'athene-v2:latest',
@@ -21,7 +10,7 @@ const ATHENE_V2_LATEST = {
2110
},
2211
size: '47gb',
2312
context: 32_000,
24-
} as const satisfies ModelMeta<any>
13+
} as const satisfies DefaultOllamaModelMeta<any>
2514

2615
const ATHENE_V2_72b = {
2716
name: 'athene-v2:72b',
@@ -32,7 +21,7 @@ const ATHENE_V2_72b = {
3221
},
3322
size: '47gb',
3423
context: 32_000,
35-
} as const satisfies ModelMeta<any>
24+
} as const satisfies DefaultOllamaModelMeta<any>
3625

3726
export const ATHENE_MODELS = [
3827
ATHENE_V2_LATEST.name,

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

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
import type { ChatRequest } from 'ollama'
2-
3-
interface ModelMeta<TProviderOptions = unknown> {
4-
name: string
5-
providerOptions?: TProviderOptions
6-
supports?: {
7-
input?: Array<'text' | 'image' | 'video'>
8-
output?: Array<'text' | 'image' | 'video'>
9-
capabilities?: Array<'tools' | 'thinking' | 'vision' | 'embedding'>
10-
}
11-
size?: string
12-
context?: number
13-
}
2+
import type { DefaultOllamaModelMeta } from './models-meta'
143

154
const AYA_LATEST = {
165
name: 'aya:latest',
@@ -21,7 +10,7 @@ const AYA_LATEST = {
2110
},
2211
size: '4.8gb',
2312
context: 8_000,
24-
} as const satisfies ModelMeta<any>
13+
} as const satisfies DefaultOllamaModelMeta<any>
2514

2615
const AYA_8b = {
2716
name: 'aya:8b',
@@ -32,7 +21,7 @@ const AYA_8b = {
3221
},
3322
size: '4.8gb',
3423
context: 8_000,
35-
} as const satisfies ModelMeta<any>
24+
} as const satisfies DefaultOllamaModelMeta<any>
3625

3726
const AYA_35b = {
3827
name: 'aya:35b',
@@ -43,7 +32,7 @@ const AYA_35b = {
4332
},
4433
size: '20gb',
4534
context: 8_000,
46-
} as const satisfies ModelMeta<any>
35+
} as const satisfies DefaultOllamaModelMeta<any>
4736

4837
export const AYA_MODELS = [AYA_LATEST.name, AYA_8b.name, AYA_35b.name] as const
4938

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

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
import type { ChatRequest } from 'ollama'
2-
3-
interface ModelMeta<TProviderOptions = unknown> {
4-
name: string
5-
providerOptions?: TProviderOptions
6-
supports?: {
7-
input?: Array<'text' | 'image' | 'video'>
8-
output?: Array<'text' | 'image' | 'video'>
9-
capabilities?: Array<'tools' | 'thinking' | 'vision' | 'embedding'>
10-
}
11-
size?: string
12-
context?: number
13-
}
2+
import type { DefaultOllamaModelMeta } from './models-meta'
143

154
const CODEGEMMA_LATEST = {
165
name: 'codegemma:latest',
@@ -21,7 +10,7 @@ const CODEGEMMA_LATEST = {
2110
},
2211
size: '5gb',
2312
context: 8_000,
24-
} as const satisfies ModelMeta<any>
13+
} as const satisfies DefaultOllamaModelMeta<any>
2514

2615
const CODEGEMMA_8b = {
2716
name: 'codegemma:2b',
@@ -32,7 +21,7 @@ const CODEGEMMA_8b = {
3221
},
3322
size: '1.65gb',
3423
context: 8_000,
35-
} as const satisfies ModelMeta<any>
24+
} as const satisfies DefaultOllamaModelMeta<any>
3625

3726
const CODEGEMMA_35b = {
3827
name: 'codegemma:7b',
@@ -43,7 +32,7 @@ const CODEGEMMA_35b = {
4332
},
4433
size: '5gb',
4534
context: 8_000,
46-
} as const satisfies ModelMeta<any>
35+
} as const satisfies DefaultOllamaModelMeta<any>
4736

4837
export const CODEGEMMA_MODELS = [
4938
CODEGEMMA_LATEST.name,

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

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
import type { ChatRequest } from 'ollama'
2-
3-
interface ModelMeta<TProviderOptions = unknown> {
4-
name: string
5-
providerOptions?: TProviderOptions
6-
supports?: {
7-
input?: Array<'text' | 'image' | 'video'>
8-
output?: Array<'text' | 'image' | 'video'>
9-
capabilities?: Array<'tools' | 'thinking' | 'vision' | 'embedding'>
10-
}
11-
size?: string
12-
context?: number
13-
}
2+
import type { DefaultOllamaModelMeta } from './models-meta'
143

154
const CODELLAMA_LATEST = {
165
name: 'codellama:latest',
@@ -21,7 +10,7 @@ const CODELLAMA_LATEST = {
2110
},
2211
size: '3.8gb',
2312
context: 16_000,
24-
} as const satisfies ModelMeta<any>
13+
} as const satisfies DefaultOllamaModelMeta<any>
2514

2615
const CODELLAMA_7b = {
2716
name: 'codellama:7b',
@@ -32,7 +21,7 @@ const CODELLAMA_7b = {
3221
},
3322
size: '3.8gb',
3423
context: 16_000,
35-
} as const satisfies ModelMeta<any>
24+
} as const satisfies DefaultOllamaModelMeta<any>
3625

3726
const CODELLAMA_13b = {
3827
name: 'codellama:13b',
@@ -43,7 +32,7 @@ const CODELLAMA_13b = {
4332
},
4433
size: '7.4gb',
4534
context: 16_000,
46-
} as const satisfies ModelMeta<any>
35+
} as const satisfies DefaultOllamaModelMeta<any>
4736

4837
const CODELLAMA_34b = {
4938
name: 'codellama:34b',
@@ -54,7 +43,7 @@ const CODELLAMA_34b = {
5443
},
5544
size: '19gb',
5645
context: 16_000,
57-
} as const satisfies ModelMeta<any>
46+
} as const satisfies DefaultOllamaModelMeta<any>
5847

5948
const CODELLAMA_70b = {
6049
name: 'codellama:70b',
@@ -65,7 +54,7 @@ const CODELLAMA_70b = {
6554
},
6655
size: '39gb',
6756
context: 2_000,
68-
} as const satisfies ModelMeta<any>
57+
} as const satisfies DefaultOllamaModelMeta<any>
6958

7059
export const CODELLAMA_MODELS = [
7160
CODELLAMA_LATEST.name,

packages/typescript/ai-ollama/src/meta/model-meta-command-r-plus.ts

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
import type { ChatRequest } from 'ollama'
2-
3-
interface ModelMeta<TProviderOptions = unknown> {
4-
name: string
5-
providerOptions?: TProviderOptions
6-
supports?: {
7-
input?: Array<'text' | 'image' | 'video'>
8-
output?: Array<'text' | 'image' | 'video'>
9-
capabilities?: Array<'tools' | 'thinking' | 'vision' | 'embedding'>
10-
}
11-
size?: string
12-
context?: number
13-
}
2+
import type { DefaultOllamaModelMeta } from './models-meta'
143

154
const COMMAND_R_PLUS_LATEST = {
165
name: 'command-r-plus:latest',
@@ -21,7 +10,7 @@ const COMMAND_R_PLUS_LATEST = {
2110
},
2211
size: '59gb',
2312
context: 128_000,
24-
} as const satisfies ModelMeta<any>
13+
} as const satisfies DefaultOllamaModelMeta<any>
2514

2615
const COMMAND_R_PLUS_104b = {
2716
name: 'command-r-plus:104b',
@@ -32,7 +21,7 @@ const COMMAND_R_PLUS_104b = {
3221
},
3322
size: '59gb',
3423
context: 128_000,
35-
} as const satisfies ModelMeta<any>
24+
} as const satisfies DefaultOllamaModelMeta<any>
3625

3726
export const COMMAND_R_PLUS_MODELS = [
3827
COMMAND_R_PLUS_LATEST.name,

packages/typescript/ai-ollama/src/meta/model-meta-command-r.ts

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
import type { ChatRequest } from 'ollama'
2-
3-
interface ModelMeta<TProviderOptions = unknown> {
4-
name: string
5-
providerOptions?: TProviderOptions
6-
supports?: {
7-
input?: Array<'text' | 'image' | 'video'>
8-
output?: Array<'text' | 'image' | 'video'>
9-
capabilities?: Array<'tools' | 'thinking' | 'vision' | 'embedding'>
10-
}
11-
size?: string
12-
context?: number
13-
}
2+
import type { DefaultOllamaModelMeta } from './models-meta'
143

154
const COMMAND_R_LATEST = {
165
name: 'command-r:latest',
@@ -21,7 +10,7 @@ const COMMAND_R_LATEST = {
2110
},
2211
size: '19gb',
2312
context: 128_000,
24-
} as const satisfies ModelMeta<any>
13+
} as const satisfies DefaultOllamaModelMeta<any>
2514

2615
const COMMAND_R_35b = {
2716
name: 'command-r:35b',
@@ -32,7 +21,7 @@ const COMMAND_R_35b = {
3221
},
3322
size: '19gb',
3423
context: 128_000,
35-
} as const satisfies ModelMeta<any>
24+
} as const satisfies DefaultOllamaModelMeta<any>
3625

3726
export const COMMAND_R_MODELS = [
3827
COMMAND_R_LATEST.name,

packages/typescript/ai-ollama/src/meta/model-meta-command-r7b.ts

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
import type { ChatRequest } from 'ollama'
2-
3-
interface ModelMeta<TProviderOptions = unknown> {
4-
name: string
5-
providerOptions?: TProviderOptions
6-
supports?: {
7-
input?: Array<'text' | 'image' | 'video'>
8-
output?: Array<'text' | 'image' | 'video'>
9-
capabilities?: Array<'tools' | 'thinking' | 'vision' | 'embedding'>
10-
}
11-
size?: string
12-
context?: number
13-
}
2+
import type { DefaultOllamaModelMeta } from './models-meta'
143

154
const COMMAND_R_7b_LATEST = {
165
name: 'command-r7b:latest',
@@ -21,7 +10,7 @@ const COMMAND_R_7b_LATEST = {
2110
},
2211
size: '5.1gb',
2312
context: 8_000,
24-
} as const satisfies ModelMeta<any>
13+
} as const satisfies DefaultOllamaModelMeta<any>
2514

2615
const COMMAND_R_7b_7b = {
2716
name: 'command-r7b:7b',
@@ -32,7 +21,7 @@ const COMMAND_R_7b_7b = {
3221
},
3322
size: '5.1gb',
3423
context: 8_000,
35-
} as const satisfies ModelMeta<any>
24+
} as const satisfies DefaultOllamaModelMeta<any>
3625

3726
export const COMMAND_R_7b_MODELS = [
3827
COMMAND_R_7b_LATEST.name,

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

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
import type { ChatRequest } from 'ollama'
2-
3-
interface ModelMeta<TProviderOptions = unknown> {
4-
name: string
5-
providerOptions?: TProviderOptions
6-
supports?: {
7-
input?: Array<'text' | 'image' | 'video'>
8-
output?: Array<'text' | 'image' | 'video'>
9-
capabilities?: Array<'tools' | 'thinking' | 'vision' | 'embedding'>
10-
}
11-
size?: string
12-
context?: number
13-
}
2+
import type { DefaultOllamaModelMeta } from './models-meta'
143

154
const DEEPSEEK_CODER_V2_LATEST = {
165
name: 'deepseek-coder-v2:latest',
@@ -21,7 +10,7 @@ const DEEPSEEK_CODER_V2_LATEST = {
2110
},
2211
size: '4.8gb',
2312
context: 160_900,
24-
} as const satisfies ModelMeta<any>
13+
} as const satisfies DefaultOllamaModelMeta<any>
2514

2615
const DEEPSEEK_CODER_V2_16b = {
2716
name: 'deepseek-coder-v2:16b',
@@ -32,7 +21,7 @@ const DEEPSEEK_CODER_V2_16b = {
3221
},
3322
size: '8.9gb',
3423
context: 160_000,
35-
} as const satisfies ModelMeta<any>
24+
} as const satisfies DefaultOllamaModelMeta<any>
3625

3726
const DEEPSEEK_CODER_V2_236b = {
3827
name: 'deepseek-coder-v2:236b',
@@ -43,7 +32,7 @@ const DEEPSEEK_CODER_V2_236b = {
4332
},
4433
size: '133gb',
4534
context: 4_000,
46-
} as const satisfies ModelMeta<any>
35+
} as const satisfies DefaultOllamaModelMeta<any>
4736

4837
export const DEEPSEEK_CODER_V2_MODELS = [
4938
DEEPSEEK_CODER_V2_LATEST.name,

packages/typescript/ai-ollama/src/meta/model-meta-deepseek-ocr.ts

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
import type { ChatRequest } from 'ollama'
2-
3-
interface ModelMeta<TProviderOptions = unknown> {
4-
name: string
5-
providerOptions?: TProviderOptions
6-
supports?: {
7-
input?: Array<'text' | 'image' | 'video'>
8-
output?: Array<'text' | 'image' | 'video'>
9-
capabilities?: Array<'tools' | 'thinking' | 'vision' | 'embedding'>
10-
}
11-
size?: string
12-
context?: number
13-
}
2+
import type { DefaultOllamaModelMeta } from './models-meta'
143

154
const DEEPSEEK_OCR_LATEST = {
165
name: 'deepseek-ocr:latest',
@@ -21,7 +10,7 @@ const DEEPSEEK_OCR_LATEST = {
2110
},
2211
size: '6.7gb',
2312
context: 8_000,
24-
} as const satisfies ModelMeta<any>
13+
} as const satisfies DefaultOllamaModelMeta<any>
2514

2615
const DEEPSEEK_OCR_3b = {
2716
name: 'deepseek-ocr:3b',
@@ -33,7 +22,7 @@ const DEEPSEEK_OCR_3b = {
3322

3423
size: '6.7gb',
3524
context: 8_000,
36-
} as const satisfies ModelMeta<any>
25+
} as const satisfies DefaultOllamaModelMeta<any>
3726

3827
export const DEEPSEEK_OCR_MODELS = [
3928
DEEPSEEK_OCR_LATEST.name,

0 commit comments

Comments
 (0)