-
Notifications
You must be signed in to change notification settings - Fork 125
Expand file tree
/
Copy pathbuilder_test.go
More file actions
425 lines (359 loc) · 13.8 KB
/
builder_test.go
File metadata and controls
425 lines (359 loc) · 13.8 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
package builder_test
import (
"context"
"fmt"
"io"
"path/filepath"
"strings"
"testing"
"time"
"github.com/docker/model-runner/pkg/distribution/builder"
"github.com/docker/model-runner/pkg/distribution/internal/testutil"
"github.com/docker/model-runner/pkg/distribution/types"
)
// TestWithCreatedDeterministicDigest verifies that using WithCreated produces
// deterministic digests: the same file + same timestamp should always yield
// the same manifest digest, while different timestamps yield different digests.
func TestWithCreatedDeterministicDigest(t *testing.T) {
ggufPath := filepath.Join("..", "assets", "dummy.gguf")
fixedTime := time.Date(2025, 6, 15, 12, 0, 0, 0, time.UTC)
// Build twice with the same fixed timestamp
b1, err := builder.FromPath(ggufPath, builder.WithCreated(fixedTime))
if err != nil {
t.Fatalf("FromPath (first) failed: %v", err)
}
b2, err := builder.FromPath(ggufPath, builder.WithCreated(fixedTime))
if err != nil {
t.Fatalf("FromPath (second) failed: %v", err)
}
target1 := &fakeTarget{}
target2 := &fakeTarget{}
if err := b1.Build(t.Context(), target1, nil); err != nil {
t.Fatalf("Build (first) failed: %v", err)
}
if err := b2.Build(t.Context(), target2, nil); err != nil {
t.Fatalf("Build (second) failed: %v", err)
}
digest1, err := target1.artifact.Digest()
if err != nil {
t.Fatalf("Digest (first) failed: %v", err)
}
digest2, err := target2.artifact.Digest()
if err != nil {
t.Fatalf("Digest (second) failed: %v", err)
}
if digest1 != digest2 {
t.Errorf("Expected identical digests with same timestamp, got %v and %v", digest1, digest2)
}
// Build with a different timestamp and verify digest differs
differentTime := time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC)
b3, err := builder.FromPath(ggufPath, builder.WithCreated(differentTime))
if err != nil {
t.Fatalf("FromPath (third) failed: %v", err)
}
target3 := &fakeTarget{}
if err := b3.Build(t.Context(), target3, nil); err != nil {
t.Fatalf("Build (third) failed: %v", err)
}
digest3, err := target3.artifact.Digest()
if err != nil {
t.Fatalf("Digest (third) failed: %v", err)
}
if digest1 == digest3 {
t.Errorf("Expected different digests with different timestamps, but both were %v", digest1)
}
}
// TestWithCreatedFromPaths verifies that WithCreated works with FromPaths as well.
func TestWithCreatedFromPaths(t *testing.T) {
ggufPath := filepath.Join("..", "assets", "dummy.gguf")
fixedTime := time.Date(2025, 6, 15, 12, 0, 0, 0, time.UTC)
b1, err := builder.FromPaths([]string{ggufPath}, builder.WithCreated(fixedTime))
if err != nil {
t.Fatalf("FromPaths (first) failed: %v", err)
}
b2, err := builder.FromPaths([]string{ggufPath}, builder.WithCreated(fixedTime))
if err != nil {
t.Fatalf("FromPaths (second) failed: %v", err)
}
target1 := &fakeTarget{}
target2 := &fakeTarget{}
if err := b1.Build(t.Context(), target1, nil); err != nil {
t.Fatalf("Build (first) failed: %v", err)
}
if err := b2.Build(t.Context(), target2, nil); err != nil {
t.Fatalf("Build (second) failed: %v", err)
}
digest1, err := target1.artifact.Digest()
if err != nil {
t.Fatalf("Digest (first) failed: %v", err)
}
digest2, err := target2.artifact.Digest()
if err != nil {
t.Fatalf("Digest (second) failed: %v", err)
}
if digest1 != digest2 {
t.Errorf("Expected identical digests with same timestamp, got %v and %v", digest1, digest2)
}
}
func TestBuilder(t *testing.T) {
// Create a builder from a GGUF file
b, err := builder.FromPath(filepath.Join("..", "assets", "dummy.gguf"))
if err != nil {
t.Fatalf("Failed to create builder from GGUF: %v", err)
}
// Add multimodal projector
b, err = b.WithMultimodalProjector(filepath.Join("..", "assets", "dummy.mmproj"))
if err != nil {
t.Fatalf("Failed to add multimodal projector: %v", err)
}
// Add a chat template file
b, err = b.WithChatTemplateFile(filepath.Join("..", "assets", "template.jinja"))
if err != nil {
t.Fatalf("Failed to add multimodal projector: %v", err)
}
// Build the model
target := &fakeTarget{}
if err := b.Build(t.Context(), target, nil); err != nil {
t.Fatalf("Failed to build model: %v", err)
}
// Verify the model has the expected layers
manifest, err := target.artifact.Manifest()
if err != nil {
t.Fatalf("Failed to get manifest: %v", err)
}
// Should have 3 layers: GGUF + multimodal projector + chat template
if len(manifest.Layers) != 3 {
t.Fatalf("Expected 2 layers, got %d", len(manifest.Layers))
}
// Check that each layer has the expected
if manifest.Layers[0].MediaType != types.MediaTypeGGUF {
t.Fatalf("Expected first layer with media type %s, got %s", types.MediaTypeGGUF, manifest.Layers[0].MediaType)
}
if manifest.Layers[1].MediaType != types.MediaTypeMultimodalProjector {
t.Fatalf("Expected first layer with media type %s, got %s", types.MediaTypeMultimodalProjector, manifest.Layers[1].MediaType)
}
if manifest.Layers[2].MediaType != types.MediaTypeChatTemplate {
t.Fatalf("Expected first layer with media type %s, got %s", types.MediaTypeChatTemplate, manifest.Layers[2].MediaType)
}
}
func TestWithMultimodalProjectorInvalidPath(t *testing.T) {
// Create a builder from a GGUF file
b, err := builder.FromPath(filepath.Join("..", "assets", "dummy.gguf"))
if err != nil {
t.Fatalf("Failed to create builder from GGUF: %v", err)
}
// Try to add multimodal projector with invalid path
_, err = b.WithMultimodalProjector("nonexistent/path/to/mmproj")
if err == nil {
t.Error("Expected error when adding multimodal projector with invalid path")
}
}
func TestWithMultimodalProjectorChaining(t *testing.T) {
// Create a builder from a GGUF file
b, err := builder.FromPath(filepath.Join("..", "assets", "dummy.gguf"))
if err != nil {
t.Fatalf("Failed to create builder from GGUF: %v", err)
}
// Chain multiple operations: license + multimodal projector + context size
b, err = b.WithLicense(filepath.Join("..", "assets", "license.txt"))
if err != nil {
t.Fatalf("Failed to add license: %v", err)
}
b, err = b.WithMultimodalProjector(filepath.Join("..", "assets", "dummy.mmproj"))
if err != nil {
t.Fatalf("Failed to add multimodal projector: %v", err)
}
b = b.WithContextSize(4096)
// Build the model
target := &fakeTarget{}
if err := b.Build(t.Context(), target, nil); err != nil {
t.Fatalf("Failed to build model: %v", err)
}
// Verify the final model has all expected layers and properties
manifest, err := target.artifact.Manifest()
if err != nil {
t.Fatalf("Failed to get manifest: %v", err)
}
// Should have 3 layers: GGUF + license + multimodal projector
if len(manifest.Layers) != 3 {
t.Fatalf("Expected 3 layers, got %d", len(manifest.Layers))
}
// Check media types - using string comparison since we can't use types.MediaType directly
expectedMediaTypes := map[string]bool{
string(types.MediaTypeGGUF): false,
string(types.MediaTypeLicense): false,
string(types.MediaTypeMultimodalProjector): false,
}
for _, layer := range manifest.Layers {
if _, exists := expectedMediaTypes[string(layer.MediaType)]; exists {
expectedMediaTypes[string(layer.MediaType)] = true
}
}
for mediaType, found := range expectedMediaTypes {
if !found {
t.Errorf("Expected to find layer with media type %s", mediaType)
}
}
// Check context size
config, err := target.artifact.Config()
if err != nil {
t.Fatalf("Failed to get config: %v", err)
}
if config.GetContextSize() == nil || *config.GetContextSize() != 4096 {
t.Errorf("Expected context size 4096, got %v", config.GetContextSize())
}
// Note: We can't directly test GGUFPath() and MMPROJPath() on ModelArtifact interface
// but we can verify the layers were added with correct media types above
}
func TestFromModel(t *testing.T) {
// Step 1: Create an initial model from GGUF with context size 2048
initialBuilder, err := builder.FromPath(filepath.Join("..", "assets", "dummy.gguf"))
if err != nil {
t.Fatalf("Failed to create initial builder from GGUF: %v", err)
}
// Add license to the initial model
initialBuilder, err = initialBuilder.WithLicense(filepath.Join("..", "assets", "license.txt"))
if err != nil {
t.Fatalf("Failed to add license: %v", err)
}
// Set initial context size
initialBuilder = initialBuilder.WithContextSize(2048)
// Build the initial model
initialTarget := &fakeTarget{}
if err := initialBuilder.Build(t.Context(), initialTarget, nil); err != nil {
t.Fatalf("Failed to build initial model: %v", err)
}
// Verify initial model properties
initialConfig, err := initialTarget.artifact.Config()
if err != nil {
t.Fatalf("Failed to get initial config: %v", err)
}
if initialConfig.GetContextSize() == nil || *initialConfig.GetContextSize() != 2048 {
t.Fatalf("Expected initial context size 2048, got %v", initialConfig.GetContextSize())
}
// Step 2: Use FromModel() to create a new builder from the existing model
repackagedBuilder, err := builder.FromModel(initialTarget.artifact)
if err != nil {
t.Fatalf("Failed to create builder from model: %v", err)
}
// Step 3: Modify the context size to 4096
repackagedBuilder = repackagedBuilder.WithContextSize(4096)
// Step 4: Build the repackaged model
repackagedTarget := &fakeTarget{}
if err := repackagedBuilder.Build(t.Context(), repackagedTarget, nil); err != nil {
t.Fatalf("Failed to build repackaged model: %v", err)
}
// Step 5: Verify the repackaged model has the new context size
repackagedConfig, err := repackagedTarget.artifact.Config()
if err != nil {
t.Fatalf("Failed to get repackaged config: %v", err)
}
if repackagedConfig.GetContextSize() == nil || *repackagedConfig.GetContextSize() != 4096 {
t.Errorf("Expected repackaged context size 4096, got %v", repackagedConfig.GetContextSize())
}
// Step 6: Verify the original layers are preserved
initialManifest, err := initialTarget.artifact.Manifest()
if err != nil {
t.Fatalf("Failed to get initial manifest: %v", err)
}
repackagedManifest, err := repackagedTarget.artifact.Manifest()
if err != nil {
t.Fatalf("Failed to get repackaged manifest: %v", err)
}
// Should have the same number of layers (GGUF + license)
if len(repackagedManifest.Layers) != len(initialManifest.Layers) {
t.Errorf("Expected %d layers in repackaged model, got %d", len(initialManifest.Layers), len(repackagedManifest.Layers))
}
// Verify layer media types are preserved
for i, initialLayer := range initialManifest.Layers {
if i >= len(repackagedManifest.Layers) {
break
}
if initialLayer.MediaType != repackagedManifest.Layers[i].MediaType {
t.Errorf("Layer %d media type mismatch: expected %s, got %s", i, initialLayer.MediaType, repackagedManifest.Layers[i].MediaType)
}
}
}
func TestFromModelWithAdditionalLayers(t *testing.T) {
// Create an initial model from GGUF
initialBuilder, err := builder.FromPath(filepath.Join("..", "assets", "dummy.gguf"))
if err != nil {
t.Fatalf("Failed to create initial builder from GGUF: %v", err)
}
// Build the initial model
initialTarget := &fakeTarget{}
if err := initialBuilder.Build(t.Context(), initialTarget, nil); err != nil {
t.Fatalf("Failed to build initial model: %v", err)
}
// Use FromModel() and add additional layers
repackagedBuilder, err := builder.FromModel(initialTarget.artifact)
if err != nil {
t.Fatalf("Failed to create builder from model: %v", err)
}
repackagedBuilder, err = repackagedBuilder.WithLicense(filepath.Join("..", "assets", "license.txt"))
if err != nil {
t.Fatalf("Failed to add license to repackaged model: %v", err)
}
repackagedBuilder, err = repackagedBuilder.WithMultimodalProjector(filepath.Join("..", "assets", "dummy.mmproj"))
if err != nil {
t.Fatalf("Failed to add multimodal projector to repackaged model: %v", err)
}
// Build the repackaged model
repackagedTarget := &fakeTarget{}
if err := repackagedBuilder.Build(t.Context(), repackagedTarget, nil); err != nil {
t.Fatalf("Failed to build repackaged model: %v", err)
}
// Verify the repackaged model has all layers
initialManifest, err := initialTarget.artifact.Manifest()
if err != nil {
t.Fatalf("Failed to get initial manifest: %v", err)
}
repackagedManifest, err := repackagedTarget.artifact.Manifest()
if err != nil {
t.Fatalf("Failed to get repackaged manifest: %v", err)
}
// Should have original layers plus license and mmproj (2 additional layers)
expectedLayers := len(initialManifest.Layers) + 2
if len(repackagedManifest.Layers) != expectedLayers {
t.Errorf("Expected %d layers in repackaged model, got %d", expectedLayers, len(repackagedManifest.Layers))
}
// Verify the new layers were added
hasLicense := false
hasMMProj := false
for _, layer := range repackagedManifest.Layers {
if layer.MediaType == types.MediaTypeLicense {
hasLicense = true
}
if layer.MediaType == types.MediaTypeMultimodalProjector {
hasMMProj = true
}
}
if !hasLicense {
t.Error("Expected repackaged model to have license layer")
}
if !hasMMProj {
t.Error("Expected repackaged model to have multimodal projector layer")
}
}
// TestFromModelErrorHandling tests that FromModel properly handles and surfaces errors from mdl.Layers()
func TestFromModelErrorHandling(t *testing.T) {
mockModel := testutil.WithLayersError(testutil.NewGGUFArtifact(t, filepath.Join("..", "assets", "dummy.gguf")), fmt.Errorf("simulated layers error"))
// Attempt to create a builder from the failing model
_, err := builder.FromModel(mockModel)
if err == nil {
t.Fatal("Expected error when model.Layers() fails, got nil")
}
// Verify the error message indicates the issue
expectedErrMsg := "getting model layers"
if !strings.Contains(err.Error(), expectedErrMsg) {
t.Errorf("Expected error message to contain %q, got: %v", expectedErrMsg, err)
}
}
var _ builder.Target = &fakeTarget{}
type fakeTarget struct {
artifact types.ModelArtifact
}
func (ft *fakeTarget) Write(ctx context.Context, artifact types.ModelArtifact, writer io.Writer) error {
ft.artifact = artifact
return nil
}