Skip to content

Commit 6a3796a

Browse files
committed
Adapt tests
Signed-off-by: Ettore Di Giacinto <[email protected]>
1 parent 3fcba15 commit 6a3796a

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

pkg/templates/multimodal.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ type MultimodalContent struct {
2222
}
2323

2424
// https://github.com/ggml-org/llama.cpp/blob/be1d4a13db26750fac702ceb3af88ae4f39dc9f4/tools/mtmd/mtmd.h#L42
25-
const DefaultMultiModalTemplate = "{{ range .Audio }}[audio-{{.ID}}]{{end}}{{ range .Images }}<__image__>{{end}}{{ range .Video }}[vid-{{.ID}}]{{end}}{{.Text}}"
25+
// from <__image__> to <__media__> https://github.com/ggml-org/llama.cpp/blob/79c137f77677b3c8ee3c60a7da033721b938399a/tools/mtmd/mtmd.cpp#L83
26+
const DefaultMultiModalTemplate = "{{ range .Audio }}<__media__>{{end}}{{ range .Images }}<__media__>{{end}}{{ range .Video }}[vid-{{.ID}}]{{end}}{{.Text}}"
2627

2728
func TemplateMultiModal(templateString string, opts MultiModalOptions, text string) (string, error) {
2829
if templateString == "" {

pkg/templates/multimodal_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var _ = Describe("EvaluateTemplate", func() {
2020
VideosInMessage: 0,
2121
}, "bar")
2222
Expect(err).NotTo(HaveOccurred())
23-
Expect(result).To(Equal("<__image__>bar"))
23+
Expect(result).To(Equal("<__media__>bar"))
2424
})
2525

2626
It("should handle messages with more images correctly", func() {
@@ -33,7 +33,7 @@ var _ = Describe("EvaluateTemplate", func() {
3333
VideosInMessage: 0,
3434
}, "bar")
3535
Expect(err).NotTo(HaveOccurred())
36-
Expect(result).To(Equal("<__image__><__image__>bar"))
36+
Expect(result).To(Equal("<__media__><__media__>bar"))
3737
})
3838
It("should handle messages with more images correctly", func() {
3939
result, err := TemplateMultiModal("", MultiModalOptions{
@@ -45,7 +45,7 @@ var _ = Describe("EvaluateTemplate", func() {
4545
VideosInMessage: 0,
4646
}, "bar")
4747
Expect(err).NotTo(HaveOccurred())
48-
Expect(result).To(Equal("[audio-0]<__image__><__image__>bar"))
48+
Expect(result).To(Equal("<__media__><__media__><__media__>bar"))
4949
})
5050
It("should handle messages with more images correctly", func() {
5151
result, err := TemplateMultiModal("", MultiModalOptions{
@@ -57,7 +57,7 @@ var _ = Describe("EvaluateTemplate", func() {
5757
VideosInMessage: 0,
5858
}, "bar")
5959
Expect(err).NotTo(HaveOccurred())
60-
Expect(result).To(Equal("[audio-0]<__image__>bar"))
60+
Expect(result).To(Equal("<__media__><__media__>bar"))
6161
})
6262
It("should handle messages with more images correctly", func() {
6363
result, err := TemplateMultiModal("", MultiModalOptions{

0 commit comments

Comments
 (0)