Skip to content

Commit ed875f4

Browse files
harry-whorlowharry-whorlow
committed
fix: build stuff and type cleanup
1 parent 4b5ebe5 commit ed875f4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+223
-784
lines changed

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

Lines changed: 5 additions & 16 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 EXAONE3_5_LATEST = {
165
name: 'exaone3.5:latest',
@@ -21,7 +10,7 @@ const EXAONE3_5_LATEST = {
2110
},
2211
size: '4.8gb',
2312
context: 32_000,
24-
} as const satisfies ModelMeta<any>
13+
} as const satisfies DefaultOllamaModelMeta<any>
2514

2615
const EXAONE3_5_2_4b = {
2716
name: 'exaone3.5:2.4b',
@@ -32,7 +21,7 @@ const EXAONE3_5_2_4b = {
3221
},
3322
size: '1.6gb',
3423
context: 32_000,
35-
} as const satisfies ModelMeta<any>
24+
} as const satisfies DefaultOllamaModelMeta<any>
3625

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

4837
const EXAONE3_5_32b = {
4938
name: 'exaone3.5:32b',
@@ -54,7 +43,7 @@ const EXAONE3_5_32b = {
5443
},
5544
size: '19gb',
5645
context: 32_000,
57-
} as const satisfies ModelMeta<any>
46+
} as const satisfies DefaultOllamaModelMeta<any>
5847

5948
export const EXAONE3_5MODELS = [
6049
EXAONE3_5_LATEST.name,

‎packages/typescript/ai-ollama/src/meta/model-meta-falcon2.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 FALCON2_LATEST = {
165
name: 'falcon2:latest',
@@ -21,7 +10,7 @@ const FALCON2_LATEST = {
2110
},
2211
size: '6.4gb',
2312
context: 2_000,
24-
} as const satisfies ModelMeta<any>
13+
} as const satisfies DefaultOllamaModelMeta<any>
2514

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

3726
export const FALCON2_MODELS = [FALCON2_LATEST.name, FALCON2_11b.name] as const
3827

‎packages/typescript/ai-ollama/src/meta/model-meta-falcon3.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 FALCON3_LATEST = {
165
name: 'falcon3:latest',
@@ -21,7 +10,7 @@ const FALCON3_LATEST = {
2110
},
2211
size: '4.6gb',
2312
context: 32_000,
24-
} as const satisfies ModelMeta<any>
13+
} as const satisfies DefaultOllamaModelMeta<any>
2514

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

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

4837
const FALCON3_7b = {
4938
name: 'falcon3:7b',
@@ -54,7 +43,7 @@ const FALCON3_7b = {
5443
},
5544
size: '4.6gb',
5645
context: 32_000,
57-
} as const satisfies ModelMeta<any>
46+
} as const satisfies DefaultOllamaModelMeta<any>
5847

5948
const FALCON3_10b = {
6049
name: 'falcon3:10b',
@@ -65,7 +54,7 @@ const FALCON3_10b = {
6554
},
6655
size: '6.3gb',
6756
context: 32_000,
68-
} as const satisfies ModelMeta<any>
57+
} as const satisfies DefaultOllamaModelMeta<any>
6958

7059
export const FALCON3_MODELS = [
7160
FALCON3_LATEST.name,

‎packages/typescript/ai-ollama/src/meta/model-meta-firefunction-v2.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 FIREFUNCTION_V2_LATEST = {
165
name: 'firefunction-v2:latest',
@@ -21,7 +10,7 @@ const FIREFUNCTION_V2_LATEST = {
2110
},
2211
size: '40gb',
2312
context: 8_000,
24-
} as const satisfies ModelMeta<any>
13+
} as const satisfies DefaultOllamaModelMeta<any>
2514

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

3726
export const FIREFUNCTION_V2_MODELS = [
3827
FIREFUNCTION_V2_LATEST.name,

‎packages/typescript/ai-ollama/src/meta/model-meta-gemma.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 GEMMA_LATEST = {
165
name: 'gemma:latest',
@@ -21,7 +10,7 @@ const GEMMA_LATEST = {
2110
},
2211
size: '5gb',
2312
context: 8_000,
24-
} as const satisfies ModelMeta<any>
13+
} as const satisfies DefaultOllamaModelMeta<any>
2514

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

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

4837
export const GEMMA_MODELS = [
4938
GEMMA_LATEST.name,

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

Lines changed: 5 additions & 16 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 GEMMA2_LATEST = {
165
name: 'gemma2:latest',
@@ -21,7 +10,7 @@ const GEMMA2_LATEST = {
2110
},
2211
size: '5.4gb',
2312
context: 8_000,
24-
} as const satisfies ModelMeta<any>
13+
} as const satisfies DefaultOllamaModelMeta<any>
2514

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

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

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

5948
export const GEMMA2_MODELS = [
6049
GEMMA2_LATEST.name,

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

Lines changed: 7 additions & 18 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 GEMMA3_LATEST = {
165
name: 'gemma3:latest',
@@ -21,7 +10,7 @@ const GEMMA3_LATEST = {
2110
},
2211
size: '3.3gb',
2312
context: 128_000,
24-
} as const satisfies ModelMeta<any>
13+
} as const satisfies DefaultOllamaModelMeta<any>
2514

2615
const GEMMA3_270m = {
2716
name: 'gemma3:270m',
@@ -32,7 +21,7 @@ const GEMMA3_270m = {
3221
},
3322
size: '298mb',
3423
context: 32_000,
35-
} as const satisfies ModelMeta<any>
24+
} as const satisfies DefaultOllamaModelMeta<any>
3625

3726
const GEMMA3_1b = {
3827
name: 'gemma3:1b',
@@ -43,7 +32,7 @@ const GEMMA3_1b = {
4332
},
4433
size: '815mb',
4534
context: 32_000,
46-
} as const satisfies ModelMeta<any>
35+
} as const satisfies DefaultOllamaModelMeta<any>
4736

4837
const GEMMA3_4b = {
4938
name: 'gemma3:4b',
@@ -54,7 +43,7 @@ const GEMMA3_4b = {
5443
},
5544
size: '3.3gb',
5645
context: 128_000,
57-
} as const satisfies ModelMeta<any>
46+
} as const satisfies DefaultOllamaModelMeta<any>
5847

5948
const GEMMA3_12b = {
6049
name: 'gemma3:12b',
@@ -65,7 +54,7 @@ const GEMMA3_12b = {
6554
},
6655
size: '8.1gb',
6756
context: 128_000,
68-
} as const satisfies ModelMeta<any>
57+
} as const satisfies DefaultOllamaModelMeta<any>
6958

7059
const GEMMA3_27b = {
7160
name: 'gemma3:27b',
@@ -76,7 +65,7 @@ const GEMMA3_27b = {
7665
},
7766
size: '17gb',
7867
context: 128_000,
79-
} as const satisfies ModelMeta<any>
68+
} as const satisfies DefaultOllamaModelMeta<any>
8069

8170
export const GEMMA3_MODELS = [
8271
GEMMA3_LATEST.name,

0 commit comments

Comments
 (0)