mirror of
https://github.com/ollama/ollama.git
synced 2026-06-03 05:53:55 -04:00
* broad lint fixes to sidestep CI scope glitch * runner: Remove CGO engines, use llama-server exclusively for GGML models Remove the vendored GGML and llama.cpp backend, CGO runner, Go model implementations, and sample. llama-server (built from upstream llama.cpp via FetchContent) is now the sole inference engine for GGUF-based models. (Safetensor based models continue to run on the new MLX engine.) This allows us to more rapidly pick up new capabilities and fixes from llama.cpp as they come out. On windows this now requires recent AMD driver versions to support ROCm v7 as llama.cpp currently does not support building against v6. * llama/compat: load Ollama-format GGUFs in llama-server Squashed from upstream/jmorganca/llama-compat on 2026-04-29. Source tip:0c33775d37. Original source commits: -25223160dllama/compat: add in-memory shim so llama-server can load Ollama-format GGUFs -7449b539allm,server: route Ollama-format gemma3 blobs through llama/compat -436f2e2b1llama/compat: make patch-apply idempotent -8c2c9d4c8llama/compat: extend gemma3 handler to cover 1B and 270M blobs -021389f7bllama/compat: shrink clip.cpp injection from 18 lines to 1 -61b367ec2llama/compat: shrink patch to pure call-site hooks (34 -> 20 lines) -36049361cllama/compat: simplify shim (gemma3-tested) -8fa664865llama/compat: add qwen35moe text handler -db0c74530llama/compat: add qwen35moe vision (clip) support -2a388da77llama/compat: split shared infra into a util TU -9a69a17dcllama/compat: document non-public API dependencies -d0f38a915llama/compat: add gpt-oss and lfm2 handlers -086071822llama/compat: add mistral3 text handler (vision TODO) -63bde9ff7llama/compat: add mistral3 vision (clip) support -3a57b89d5llama/compat: apply LLaMA RoPE permute to mistral3 vision Q/K -99cb87439llama/compat: add qwen35, gemma4, deepseek-ocr handlers -2c7850dballama/compat: add nemotron_h_moe handler (latent FFN + MTP skip) -9e3b54225llama/compat: add llama4 text + clip handlers -034fee349llama/compat: add gemma4 clip handler (gemma4v projector) -9945c5a93server: remove dhiltgen/* compat redirect table -5d4539101llama/compat: rewrite gemma4 tokenizer model to BPE -7e0765327llama/compat: add glm-ocr text handler + text-loader load-op hook -f1bd1a25allama/compat: add glm-ocr clip handler (glm4v projector) -4b5cf3420llama/compat: collapse text-loader hook back to one new patch line -eb4ecf4fcllama/compat: extend gemma4 clip handler to gemma4a (audio) -a23a5e76fllama/compat: fix gemma4a per-block norm tensor mapping -cd2dcaff4llama/compat: add embeddinggemma handler -1ce8a6b26llama/compat: add qwen3-vl + qwen2.5-vl handlers -fd98ffa1ellama/compat: add gemma3n + glm4moelite handlers -cc7bdf0bcllama/compat: handle null buft in maybe_load_tensor -0c33775d3llama/compat: disable mmap when load_op transforms text-side tensors * refine implementation * ci: fix windows MLX build * ci: fix windows llama-server build * ci: fix windows rocm build * ci: windows mlx tuning Shorten long-tail on build, and get OllamaSetup.exe back under 2g limit * ci: fix windows dependencies * win: fix dependency gathering * disable openmp * win: arm64 cross-compile build also DRY out CI steps * scheduler improvements * ci: improvements from #15982 * win: favor ninja for faster developer builds * win: fix build * win: fix arm64 cross-compile * win: avoid spaces in compiler path * misc discovery fixes, and bos handling * lint fixes * win: fix arm cross-compile build/CI bugs * llama.cpp update * win: handle multiple CRT dirs * vulkan: add windows iGPU detection * fix creation bugs for patched models, other refactoring work * tune batch size for better performance * ci and lint fixes * fix repeat_last_n bug * build: revamp build for better developer UX * amd, sampler, qwen3next fixes * version bump * fix mlx build * revamp GPU discovery Scanning the output of llama-server is turning out to be too error prone across llama.cpp updates, so this switches to a thin dynamic library load against the bundled GGML libraries so more details can be gathered from the API. * version bump * missing file * ci: fix cache miss on rocm build * refine vulkan dep handling * fix ps reporting bug on full GPU load * improve cmake wiring for customized local builds * version bump * docker build arg cleanup * improve windows exit error logs * fix community gemma4 support and ci flakes * fix mlx unit test * tighten up ps logic to avoid double counting fit log lines * version bump * fix ps view for full gpu layer offload * add MTP wiring for llama-server and create with GGUFs * pick best template by capabilities * version bump * ci: harden apt repos * remove unused cpu core discovery * adjust batch default logic to reduce OOMs * support larger tool calls * fix audio support, template show * qwen35 mtp patch support * flesh out dtypes * rocm deps * version bump * lint fix * block broken gfx1150 on windows * fix qwen3.5 moe mtp tensors in patch * mmproj oom fallback and vulkan on by default * qwen MTP compat fix * version bump * ci: fix WoA cross-compile * ci: workaround ui tool in cross-compile * version bump * win: enable OpenMP for CPU builds * build: improve developer UX * ci: windows path workaround for CPU build * win: fix WoA dependencies * win: fix large offset reads for mmproj patched loads * version bump * fix vulkan dup detection * add OLLAMA_IGPU_ENABLE and largely disable iGPUs by default * opt-in MTP, win large offset, integraton fixes * fix unit test scheduler interaction hang * fix multi-gpu filtering * version bump * review comments * fix thinking level * fix linux rocm ordering and granite 3.3 template * version bump * ci fix - non-shallow MLX checkout * bypass linux sysfs unit test on windows --------- Co-authored-by: jmorganca <jmorganca@gmail.com>
1255 lines
28 KiB
Go
1255 lines
28 KiB
Go
package parser
|
|
|
|
import (
|
|
"bytes"
|
|
"crypto/sha256"
|
|
"encoding/binary"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"maps"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
"unicode/utf16"
|
|
|
|
"github.com/google/go-cmp/cmp"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
"golang.org/x/text/encoding"
|
|
"golang.org/x/text/encoding/unicode"
|
|
|
|
"github.com/ollama/ollama/api"
|
|
"github.com/ollama/ollama/convert"
|
|
"github.com/ollama/ollama/fs/ggml"
|
|
)
|
|
|
|
func TestParseFileFile(t *testing.T) {
|
|
input := `
|
|
FROM model1
|
|
ADAPTER adapter1
|
|
LICENSE MIT
|
|
PARAMETER param1 value1
|
|
PARAMETER param2 value2
|
|
TEMPLATE """{{ if .System }}<|start_header_id|>system<|end_header_id|>
|
|
|
|
{{ .System }}<|eot_id|>{{ end }}{{ if .Prompt }}<|start_header_id|>user<|end_header_id|>
|
|
|
|
{{ .Prompt }}<|eot_id|>{{ end }}<|start_header_id|>assistant<|end_header_id|>
|
|
|
|
{{ .Response }}<|eot_id|>"""
|
|
`
|
|
|
|
reader := strings.NewReader(input)
|
|
|
|
modelfile, err := ParseFile(reader)
|
|
require.NoError(t, err)
|
|
|
|
expectedCommands := []Command{
|
|
{Name: "model", Args: "model1"},
|
|
{Name: "adapter", Args: "adapter1"},
|
|
{Name: "license", Args: "MIT"},
|
|
{Name: "param1", Args: "value1"},
|
|
{Name: "param2", Args: "value2"},
|
|
{Name: "template", Args: "{{ if .System }}<|start_header_id|>system<|end_header_id|>\n\n{{ .System }}<|eot_id|>{{ end }}{{ if .Prompt }}<|start_header_id|>user<|end_header_id|>\n\n{{ .Prompt }}<|eot_id|>{{ end }}<|start_header_id|>assistant<|end_header_id|>\n\n{{ .Response }}<|eot_id|>"},
|
|
}
|
|
|
|
assert.Equal(t, expectedCommands, modelfile.Commands)
|
|
}
|
|
|
|
func TestParseFileDraft(t *testing.T) {
|
|
modelfile, err := ParseFile(strings.NewReader(`
|
|
FROM base
|
|
DRAFT ./assistant
|
|
`))
|
|
require.NoError(t, err)
|
|
|
|
expectedCommands := []Command{
|
|
{Name: "model", Args: "base"},
|
|
{Name: "draft", Args: "./assistant"},
|
|
}
|
|
assert.Equal(t, expectedCommands, modelfile.Commands)
|
|
assert.Contains(t, modelfile.String(), "DRAFT ./assistant")
|
|
}
|
|
|
|
func TestCreateRequestDraftFiles(t *testing.T) {
|
|
dir := t.TempDir()
|
|
draft := filepath.Join(dir, "draft.gguf")
|
|
require.NoError(t, os.WriteFile(draft, []byte("draft"), 0o644))
|
|
|
|
modelfile, err := ParseFile(strings.NewReader(`
|
|
FROM base
|
|
DRAFT ./draft.gguf
|
|
`))
|
|
require.NoError(t, err)
|
|
|
|
req, err := modelfile.CreateRequest(dir)
|
|
require.NoError(t, err)
|
|
require.Len(t, req.DraftFiles, 1)
|
|
assert.Contains(t, req.DraftFiles, draft)
|
|
}
|
|
|
|
func TestCreateRequestDraftRejectsSameFile(t *testing.T) {
|
|
dir := t.TempDir()
|
|
model := filepath.Join(dir, "model.gguf")
|
|
require.NoError(t, os.WriteFile(model, []byte("model"), 0o644))
|
|
|
|
modelfile, err := ParseFile(strings.NewReader(`
|
|
FROM ./model.gguf
|
|
DRAFT ./model.gguf
|
|
`))
|
|
require.NoError(t, err)
|
|
|
|
_, err = modelfile.CreateRequest(dir)
|
|
require.ErrorContains(t, err, "DRAFT must not reference the same local path as FROM")
|
|
}
|
|
|
|
func TestCreateRequestDraftRejectsSameDirectory(t *testing.T) {
|
|
dir, err := filepath.EvalSymlinks(t.TempDir())
|
|
require.NoError(t, err)
|
|
require.NoError(t, os.WriteFile(filepath.Join(dir, "model.gguf"), make([]byte, 512), 0o644))
|
|
|
|
modelfile, err := ParseFile(strings.NewReader(`
|
|
FROM .
|
|
DRAFT .
|
|
`))
|
|
require.NoError(t, err)
|
|
|
|
_, err = modelfile.CreateRequest(dir)
|
|
require.ErrorContains(t, err, "DRAFT must not reference the same local path as FROM")
|
|
}
|
|
|
|
func TestParseFileTrimSpace(t *testing.T) {
|
|
input := `
|
|
FROM " model 1"
|
|
ADAPTER adapter3
|
|
LICENSE "MIT "
|
|
PARAMETER param1 value1
|
|
PARAMETER param2 value2
|
|
TEMPLATE """ {{ if .System }}<|start_header_id|>system<|end_header_id|>
|
|
|
|
{{ .System }}<|eot_id|>{{ end }}{{ if .Prompt }}<|start_header_id|>user<|end_header_id|>
|
|
|
|
{{ .Prompt }}<|eot_id|>{{ end }}<|start_header_id|>assistant<|end_header_id|>
|
|
|
|
{{ .Response }}<|eot_id|> """
|
|
`
|
|
|
|
reader := strings.NewReader(input)
|
|
|
|
modelfile, err := ParseFile(reader)
|
|
require.NoError(t, err)
|
|
|
|
expectedCommands := []Command{
|
|
{Name: "model", Args: " model 1"},
|
|
{Name: "adapter", Args: "adapter3"},
|
|
{Name: "license", Args: "MIT "},
|
|
{Name: "param1", Args: "value1"},
|
|
{Name: "param2", Args: "value2"},
|
|
{Name: "template", Args: " {{ if .System }}<|start_header_id|>system<|end_header_id|>\n\n{{ .System }}<|eot_id|>{{ end }}{{ if .Prompt }}<|start_header_id|>user<|end_header_id|>\n\n{{ .Prompt }}<|eot_id|>{{ end }}<|start_header_id|>assistant<|end_header_id|>\n\n{{ .Response }}<|eot_id|> "},
|
|
}
|
|
|
|
assert.Equal(t, expectedCommands, modelfile.Commands)
|
|
}
|
|
|
|
func TestParseFileFrom(t *testing.T) {
|
|
cases := []struct {
|
|
input string
|
|
expected []Command
|
|
err error
|
|
}{
|
|
{
|
|
"FROM \"FOO BAR \"",
|
|
[]Command{{Name: "model", Args: "FOO BAR "}},
|
|
nil,
|
|
},
|
|
{
|
|
"FROM \"FOO BAR\"\nPARAMETER param1 value1",
|
|
[]Command{{Name: "model", Args: "FOO BAR"}, {Name: "param1", Args: "value1"}},
|
|
nil,
|
|
},
|
|
{
|
|
"FROM FOOO BAR ",
|
|
[]Command{{Name: "model", Args: "FOOO BAR"}},
|
|
nil,
|
|
},
|
|
{
|
|
"FROM /what/is/the path ",
|
|
[]Command{{Name: "model", Args: "/what/is/the path"}},
|
|
nil,
|
|
},
|
|
{
|
|
"FROM foo",
|
|
[]Command{{Name: "model", Args: "foo"}},
|
|
nil,
|
|
},
|
|
{
|
|
"FROM /path/to/model",
|
|
[]Command{{Name: "model", Args: "/path/to/model"}},
|
|
nil,
|
|
},
|
|
{
|
|
"FROM /path/to/model/fp16.bin",
|
|
[]Command{{Name: "model", Args: "/path/to/model/fp16.bin"}},
|
|
nil,
|
|
},
|
|
{
|
|
"FROM llama3:latest",
|
|
[]Command{{Name: "model", Args: "llama3:latest"}},
|
|
nil,
|
|
},
|
|
{
|
|
"FROM llama3:7b-instruct-q4_K_M",
|
|
[]Command{{Name: "model", Args: "llama3:7b-instruct-q4_K_M"}},
|
|
nil,
|
|
},
|
|
{
|
|
"", nil, errMissingFrom,
|
|
},
|
|
{
|
|
"PARAMETER param1 value1",
|
|
nil,
|
|
errMissingFrom,
|
|
},
|
|
{
|
|
"PARAMETER param1 value1\nFROM foo",
|
|
[]Command{{Name: "param1", Args: "value1"}, {Name: "model", Args: "foo"}},
|
|
nil,
|
|
},
|
|
{
|
|
"PARAMETER what the \nFROM lemons make lemonade ",
|
|
[]Command{{Name: "what", Args: "the"}, {Name: "model", Args: "lemons make lemonade"}},
|
|
nil,
|
|
},
|
|
}
|
|
|
|
for _, c := range cases {
|
|
t.Run("", func(t *testing.T) {
|
|
modelfile, err := ParseFile(strings.NewReader(c.input))
|
|
require.ErrorIs(t, err, c.err)
|
|
if modelfile != nil {
|
|
assert.Equal(t, c.expected, modelfile.Commands)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestParseFileParametersMissingValue(t *testing.T) {
|
|
input := `
|
|
FROM foo
|
|
PARAMETER param1
|
|
`
|
|
|
|
reader := strings.NewReader(input)
|
|
|
|
_, err := ParseFile(reader)
|
|
require.ErrorIs(t, err, io.ErrUnexpectedEOF)
|
|
}
|
|
|
|
func TestParseFileBadCommand(t *testing.T) {
|
|
input := `
|
|
FROM foo
|
|
BADCOMMAND param1 value1
|
|
`
|
|
parserError := &ParserError{
|
|
LineNumber: 3,
|
|
Msg: errInvalidCommand.Error(),
|
|
}
|
|
|
|
_, err := ParseFile(strings.NewReader(input))
|
|
if !errors.As(err, &parserError) {
|
|
t.Errorf("unexpected error: expected: %s, actual: %s", parserError.Error(), err.Error())
|
|
}
|
|
}
|
|
|
|
func TestParseFileRenderer(t *testing.T) {
|
|
input := `
|
|
FROM foo
|
|
RENDERER renderer1
|
|
`
|
|
|
|
reader := strings.NewReader(input)
|
|
|
|
modelfile, err := ParseFile(reader)
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, []Command{{Name: "model", Args: "foo"}, {Name: "renderer", Args: "renderer1"}}, modelfile.Commands)
|
|
}
|
|
|
|
func TestParseFileParser(t *testing.T) {
|
|
input := `
|
|
FROM foo
|
|
PARSER parser1
|
|
`
|
|
|
|
reader := strings.NewReader(input)
|
|
|
|
modelfile, err := ParseFile(reader)
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, []Command{{Name: "model", Args: "foo"}, {Name: "parser", Args: "parser1"}}, modelfile.Commands)
|
|
}
|
|
|
|
func TestParseFileMessages(t *testing.T) {
|
|
cases := []struct {
|
|
input string
|
|
expected []Command
|
|
err error
|
|
}{
|
|
{
|
|
`
|
|
FROM foo
|
|
MESSAGE system You are a file parser. Always parse things.
|
|
`,
|
|
[]Command{
|
|
{Name: "model", Args: "foo"},
|
|
{Name: "message", Args: "system: You are a file parser. Always parse things."},
|
|
},
|
|
nil,
|
|
},
|
|
{
|
|
`
|
|
FROM foo
|
|
MESSAGE system You are a file parser. Always parse things.`,
|
|
[]Command{
|
|
{Name: "model", Args: "foo"},
|
|
{Name: "message", Args: "system: You are a file parser. Always parse things."},
|
|
},
|
|
nil,
|
|
},
|
|
{
|
|
`
|
|
FROM foo
|
|
MESSAGE system You are a file parser. Always parse things.
|
|
MESSAGE user Hey there!
|
|
MESSAGE assistant Hello, I want to parse all the things!
|
|
`,
|
|
[]Command{
|
|
{Name: "model", Args: "foo"},
|
|
{Name: "message", Args: "system: You are a file parser. Always parse things."},
|
|
{Name: "message", Args: "user: Hey there!"},
|
|
{Name: "message", Args: "assistant: Hello, I want to parse all the things!"},
|
|
},
|
|
nil,
|
|
},
|
|
{
|
|
`
|
|
FROM foo
|
|
MESSAGE system """
|
|
You are a multiline file parser. Always parse things.
|
|
"""
|
|
`,
|
|
[]Command{
|
|
{Name: "model", Args: "foo"},
|
|
{Name: "message", Args: "system: \nYou are a multiline file parser. Always parse things.\n"},
|
|
},
|
|
nil,
|
|
},
|
|
{
|
|
`
|
|
FROM foo
|
|
MESSAGE badguy I'm a bad guy!
|
|
`,
|
|
nil,
|
|
&ParserError{
|
|
LineNumber: 3,
|
|
Msg: errInvalidMessageRole.Error(),
|
|
},
|
|
},
|
|
{
|
|
`
|
|
FROM foo
|
|
MESSAGE system
|
|
`,
|
|
nil,
|
|
io.ErrUnexpectedEOF,
|
|
},
|
|
{
|
|
`
|
|
FROM foo
|
|
MESSAGE system`,
|
|
nil,
|
|
io.ErrUnexpectedEOF,
|
|
},
|
|
}
|
|
|
|
for _, tt := range cases {
|
|
t.Run("", func(t *testing.T) {
|
|
modelfile, err := ParseFile(strings.NewReader(tt.input))
|
|
|
|
if modelfile != nil {
|
|
assert.Equal(t, tt.expected, modelfile.Commands)
|
|
}
|
|
|
|
if tt.err == nil {
|
|
if err != nil {
|
|
t.Fatalf("expected no error, but got %v", err)
|
|
}
|
|
return
|
|
}
|
|
|
|
switch tt.err.(type) {
|
|
case *ParserError:
|
|
var pErr *ParserError
|
|
if errors.As(err, &pErr) {
|
|
// got the correct type of error
|
|
return
|
|
}
|
|
}
|
|
|
|
if errors.Is(err, tt.err) {
|
|
return
|
|
}
|
|
|
|
t.Fatalf("unexpected error: expected: %v, actual: %v", tt.err, err)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestParseFileQuoted(t *testing.T) {
|
|
cases := []struct {
|
|
multiline string
|
|
expected []Command
|
|
err error
|
|
}{
|
|
{
|
|
`
|
|
FROM foo
|
|
SYSTEM """
|
|
This is a
|
|
multiline system.
|
|
"""
|
|
`,
|
|
[]Command{
|
|
{Name: "model", Args: "foo"},
|
|
{Name: "system", Args: "\nThis is a\nmultiline system.\n"},
|
|
},
|
|
nil,
|
|
},
|
|
{
|
|
`
|
|
FROM foo
|
|
SYSTEM """
|
|
This is a
|
|
multiline system."""
|
|
`,
|
|
[]Command{
|
|
{Name: "model", Args: "foo"},
|
|
{Name: "system", Args: "\nThis is a\nmultiline system."},
|
|
},
|
|
nil,
|
|
},
|
|
{
|
|
`
|
|
FROM foo
|
|
SYSTEM """This is a
|
|
multiline system."""
|
|
`,
|
|
[]Command{
|
|
{Name: "model", Args: "foo"},
|
|
{Name: "system", Args: "This is a\nmultiline system."},
|
|
},
|
|
nil,
|
|
},
|
|
{
|
|
`
|
|
FROM foo
|
|
SYSTEM """This is a multiline system."""
|
|
`,
|
|
[]Command{
|
|
{Name: "model", Args: "foo"},
|
|
{Name: "system", Args: "This is a multiline system."},
|
|
},
|
|
nil,
|
|
},
|
|
{
|
|
`
|
|
FROM foo
|
|
SYSTEM """This is a multiline system.""
|
|
`,
|
|
nil,
|
|
io.ErrUnexpectedEOF,
|
|
},
|
|
{
|
|
`
|
|
FROM foo
|
|
SYSTEM "
|
|
`,
|
|
nil,
|
|
io.ErrUnexpectedEOF,
|
|
},
|
|
{
|
|
`
|
|
FROM foo
|
|
SYSTEM """
|
|
This is a multiline system with "quotes".
|
|
"""
|
|
`,
|
|
[]Command{
|
|
{Name: "model", Args: "foo"},
|
|
{Name: "system", Args: "\nThis is a multiline system with \"quotes\".\n"},
|
|
},
|
|
nil,
|
|
},
|
|
{
|
|
`
|
|
FROM foo
|
|
SYSTEM """"""
|
|
`,
|
|
[]Command{
|
|
{Name: "model", Args: "foo"},
|
|
{Name: "system", Args: ""},
|
|
},
|
|
nil,
|
|
},
|
|
{
|
|
`
|
|
FROM foo
|
|
SYSTEM ""
|
|
`,
|
|
[]Command{
|
|
{Name: "model", Args: "foo"},
|
|
{Name: "system", Args: ""},
|
|
},
|
|
nil,
|
|
},
|
|
{
|
|
`
|
|
FROM foo
|
|
SYSTEM "'"
|
|
`,
|
|
[]Command{
|
|
{Name: "model", Args: "foo"},
|
|
{Name: "system", Args: "'"},
|
|
},
|
|
nil,
|
|
},
|
|
{
|
|
`
|
|
FROM foo
|
|
SYSTEM """''"'""'""'"'''''""'""'"""
|
|
`,
|
|
[]Command{
|
|
{Name: "model", Args: "foo"},
|
|
{Name: "system", Args: `''"'""'""'"'''''""'""'`},
|
|
},
|
|
nil,
|
|
},
|
|
{
|
|
`
|
|
FROM foo
|
|
TEMPLATE """
|
|
{{ .Prompt }}
|
|
"""`,
|
|
[]Command{
|
|
{Name: "model", Args: "foo"},
|
|
{Name: "template", Args: "\n{{ .Prompt }}\n"},
|
|
},
|
|
nil,
|
|
},
|
|
}
|
|
|
|
for _, c := range cases {
|
|
t.Run("", func(t *testing.T) {
|
|
modelfile, err := ParseFile(strings.NewReader(c.multiline))
|
|
require.ErrorIs(t, err, c.err)
|
|
if modelfile != nil {
|
|
assert.Equal(t, c.expected, modelfile.Commands)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestParseFileParameters(t *testing.T) {
|
|
cases := map[string]struct {
|
|
name, value string
|
|
}{
|
|
"numa true": {"numa", "true"},
|
|
"num_ctx 1": {"num_ctx", "1"},
|
|
"num_batch 1": {"num_batch", "1"},
|
|
"num_gqa 1": {"num_gqa", "1"},
|
|
"num_gpu 1": {"num_gpu", "1"},
|
|
"main_gpu 1": {"main_gpu", "1"},
|
|
"use_mmap true": {"use_mmap", "true"},
|
|
"num_thread 1": {"num_thread", "1"},
|
|
"num_keep 1": {"num_keep", "1"},
|
|
"seed 1": {"seed", "1"},
|
|
"num_predict 1": {"num_predict", "1"},
|
|
"top_k 1": {"top_k", "1"},
|
|
"top_p 1.0": {"top_p", "1.0"},
|
|
"min_p 0.05": {"min_p", "0.05"},
|
|
"typical_p 1.0": {"typical_p", "1.0"},
|
|
"repeat_last_n 1": {"repeat_last_n", "1"},
|
|
"temperature 1.0": {"temperature", "1.0"},
|
|
"repeat_penalty 1.0": {"repeat_penalty", "1.0"},
|
|
"presence_penalty 1.0": {"presence_penalty", "1.0"},
|
|
"frequency_penalty 1.0": {"frequency_penalty", "1.0"},
|
|
"penalize_newline true": {"penalize_newline", "true"},
|
|
"stop ### User:": {"stop", "### User:"},
|
|
"stop ### User: ": {"stop", "### User:"},
|
|
"stop \"### User:\"": {"stop", "### User:"},
|
|
"stop \"### User: \"": {"stop", "### User: "},
|
|
"stop \"\"\"### User:\"\"\"": {"stop", "### User:"},
|
|
"stop \"\"\"### User:\n\"\"\"": {"stop", "### User:\n"},
|
|
"stop <|endoftext|>": {"stop", "<|endoftext|>"},
|
|
"stop <|eot_id|>": {"stop", "<|eot_id|>"},
|
|
"stop </s>": {"stop", "</s>"},
|
|
}
|
|
|
|
for k, v := range cases {
|
|
t.Run(k, func(t *testing.T) {
|
|
var b bytes.Buffer
|
|
fmt.Fprintln(&b, "FROM foo")
|
|
fmt.Fprintln(&b, "PARAMETER", k)
|
|
modelfile, err := ParseFile(&b)
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, []Command{
|
|
{Name: "model", Args: "foo"},
|
|
{Name: v.name, Args: v.value},
|
|
}, modelfile.Commands)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestParseFileComments(t *testing.T) {
|
|
cases := []struct {
|
|
input string
|
|
expected []Command
|
|
}{
|
|
{
|
|
`
|
|
# comment
|
|
FROM foo
|
|
`,
|
|
[]Command{
|
|
{Name: "model", Args: "foo"},
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, c := range cases {
|
|
t.Run("", func(t *testing.T) {
|
|
modelfile, err := ParseFile(strings.NewReader(c.input))
|
|
require.NoError(t, err)
|
|
assert.Equal(t, c.expected, modelfile.Commands)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestParseFileFormatParseFile(t *testing.T) {
|
|
cases := []string{
|
|
`
|
|
FROM foo
|
|
ADAPTER adapter1
|
|
LICENSE MIT
|
|
PARAMETER param1 value1
|
|
PARAMETER param2 value2
|
|
TEMPLATE template1
|
|
MESSAGE system You are a file parser. Always parse things.
|
|
MESSAGE user Hey there!
|
|
MESSAGE assistant Hello, I want to parse all the things!
|
|
`,
|
|
`
|
|
FROM foo
|
|
ADAPTER adapter1
|
|
LICENSE MIT
|
|
PARAMETER param1 value1
|
|
PARAMETER param2 value2
|
|
TEMPLATE template1
|
|
MESSAGE system """
|
|
You are a store greeter. Always respond with "Hello!".
|
|
"""
|
|
MESSAGE user Hey there!
|
|
MESSAGE assistant Hello, I want to parse all the things!
|
|
`,
|
|
`
|
|
FROM foo
|
|
ADAPTER adapter1
|
|
LICENSE """
|
|
Very long and boring legal text.
|
|
Blah blah blah.
|
|
"Oh look, a quote!"
|
|
"""
|
|
|
|
PARAMETER param1 value1
|
|
PARAMETER param2 value2
|
|
TEMPLATE template1
|
|
MESSAGE system """
|
|
You are a store greeter. Always respond with "Hello!".
|
|
"""
|
|
MESSAGE user Hey there!
|
|
MESSAGE assistant Hello, I want to parse all the things!
|
|
`,
|
|
`
|
|
FROM foo
|
|
SYSTEM ""
|
|
`,
|
|
}
|
|
|
|
for _, c := range cases {
|
|
t.Run("", func(t *testing.T) {
|
|
modelfile, err := ParseFile(strings.NewReader(c))
|
|
require.NoError(t, err)
|
|
|
|
modelfile2, err := ParseFile(strings.NewReader(modelfile.String()))
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, modelfile, modelfile2)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestParseFileUTF16ParseFile(t *testing.T) {
|
|
data := `FROM bob
|
|
PARAMETER param1 1
|
|
PARAMETER param2 4096
|
|
SYSTEM You are a utf16 file.
|
|
`
|
|
|
|
expected := []Command{
|
|
{Name: "model", Args: "bob"},
|
|
{Name: "param1", Args: "1"},
|
|
{Name: "param2", Args: "4096"},
|
|
{Name: "system", Args: "You are a utf16 file."},
|
|
}
|
|
|
|
t.Run("le", func(t *testing.T) {
|
|
var b bytes.Buffer
|
|
require.NoError(t, binary.Write(&b, binary.LittleEndian, []byte{0xff, 0xfe}))
|
|
require.NoError(t, binary.Write(&b, binary.LittleEndian, utf16.Encode([]rune(data))))
|
|
|
|
actual, err := ParseFile(&b)
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, expected, actual.Commands)
|
|
})
|
|
|
|
t.Run("be", func(t *testing.T) {
|
|
var b bytes.Buffer
|
|
require.NoError(t, binary.Write(&b, binary.BigEndian, []byte{0xfe, 0xff}))
|
|
require.NoError(t, binary.Write(&b, binary.BigEndian, utf16.Encode([]rune(data))))
|
|
|
|
actual, err := ParseFile(&b)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, expected, actual.Commands)
|
|
})
|
|
}
|
|
|
|
func TestParseMultiByte(t *testing.T) {
|
|
input := `FROM test
|
|
SYSTEM 你好👋`
|
|
|
|
expect := []Command{
|
|
{Name: "model", Args: "test"},
|
|
{Name: "system", Args: "你好👋"},
|
|
}
|
|
|
|
encodings := []encoding.Encoding{
|
|
unicode.UTF8,
|
|
unicode.UTF16(unicode.LittleEndian, unicode.UseBOM),
|
|
unicode.UTF16(unicode.BigEndian, unicode.UseBOM),
|
|
}
|
|
|
|
for _, encoding := range encodings {
|
|
t.Run(fmt.Sprintf("%s", encoding), func(t *testing.T) {
|
|
s, err := encoding.NewEncoder().String(input)
|
|
require.NoError(t, err)
|
|
|
|
actual, err := ParseFile(strings.NewReader(s))
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, expect, actual.Commands)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestCreateRequest(t *testing.T) {
|
|
cases := []struct {
|
|
input string
|
|
expected *api.CreateRequest
|
|
}{
|
|
{
|
|
`FROM test`,
|
|
&api.CreateRequest{From: "test"},
|
|
},
|
|
{
|
|
`FROM test
|
|
TEMPLATE some template
|
|
`,
|
|
&api.CreateRequest{
|
|
From: "test",
|
|
Template: "some template",
|
|
},
|
|
},
|
|
{
|
|
`FROM test
|
|
LICENSE single license
|
|
PARAMETER temperature 0.5
|
|
MESSAGE user Hello
|
|
`,
|
|
&api.CreateRequest{
|
|
From: "test",
|
|
License: []string{"single license"},
|
|
Parameters: map[string]any{"temperature": float32(0.5)},
|
|
Messages: []api.Message{
|
|
{Role: "user", Content: "Hello"},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
`FROM test
|
|
PARAMETER temperature 0.5
|
|
PARAMETER top_k 1
|
|
SYSTEM You are a bot.
|
|
LICENSE license1
|
|
LICENSE license2
|
|
MESSAGE user Hello there!
|
|
MESSAGE assistant Hi! How are you?
|
|
`,
|
|
&api.CreateRequest{
|
|
From: "test",
|
|
License: []string{"license1", "license2"},
|
|
System: "You are a bot.",
|
|
Parameters: map[string]any{"temperature": float32(0.5), "top_k": int64(1)},
|
|
Messages: []api.Message{
|
|
{Role: "user", Content: "Hello there!"},
|
|
{Role: "assistant", Content: "Hi! How are you?"},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, c := range cases {
|
|
s, err := unicode.UTF8.NewEncoder().String(c.input)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
p, err := ParseFile(strings.NewReader(s))
|
|
if err != nil {
|
|
t.Error(err)
|
|
}
|
|
|
|
actual, err := p.CreateRequest("")
|
|
if err != nil {
|
|
t.Error(err)
|
|
}
|
|
|
|
if diff := cmp.Diff(actual, c.expected); diff != "" {
|
|
t.Errorf("mismatch (-got +want):\n%s", diff)
|
|
}
|
|
}
|
|
}
|
|
|
|
func getSHA256Digest(t *testing.T, r io.Reader) (string, int64) {
|
|
t.Helper()
|
|
|
|
h := sha256.New()
|
|
n, err := io.Copy(h, r)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
return fmt.Sprintf("sha256:%x", h.Sum(nil)), n
|
|
}
|
|
|
|
func createBinFile(t *testing.T, kv map[string]any, ti []*ggml.Tensor) (string, string) {
|
|
t.Helper()
|
|
|
|
f, err := os.CreateTemp(t.TempDir(), "testbin.*.gguf")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer f.Close()
|
|
|
|
var base convert.KV = map[string]any{"general.architecture": "test"}
|
|
maps.Copy(base, kv)
|
|
|
|
if err := ggml.WriteGGUF(f, base, ti); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
// Calculate sha256 of file
|
|
if _, err := f.Seek(0, 0); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
digest, _ := getSHA256Digest(t, f)
|
|
|
|
return f.Name(), digest
|
|
}
|
|
|
|
func TestCreateRequestFiles(t *testing.T) {
|
|
n1, d1 := createBinFile(t, nil, nil)
|
|
n2, d2 := createBinFile(t, map[string]any{"foo": "bar"}, nil)
|
|
|
|
cases := []struct {
|
|
input string
|
|
expected *api.CreateRequest
|
|
}{
|
|
{
|
|
fmt.Sprintf("FROM %s", n1),
|
|
&api.CreateRequest{Files: map[string]string{n1: d1}},
|
|
},
|
|
{
|
|
fmt.Sprintf("FROM %s\nFROM %s", n1, n2),
|
|
&api.CreateRequest{Files: map[string]string{n1: d1, n2: d2}},
|
|
},
|
|
}
|
|
|
|
for _, c := range cases {
|
|
s, err := unicode.UTF8.NewEncoder().String(c.input)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
p, err := ParseFile(strings.NewReader(s))
|
|
if err != nil {
|
|
t.Error(err)
|
|
}
|
|
|
|
actual, err := p.CreateRequest("")
|
|
if err != nil {
|
|
t.Error(err)
|
|
}
|
|
|
|
if diff := cmp.Diff(actual, c.expected); diff != "" {
|
|
t.Errorf("mismatch (-got +want):\n%s", diff)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestFilesForModel(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
setup func(string) error
|
|
wantFiles []string
|
|
wantErr bool
|
|
expectErrType error
|
|
}{
|
|
{
|
|
name: "safetensors model files",
|
|
setup: func(dir string) error {
|
|
files := []string{
|
|
"model-00001-of-00002.safetensors",
|
|
"model-00002-of-00002.safetensors",
|
|
"config.json",
|
|
"tokenizer.json",
|
|
}
|
|
for _, file := range files {
|
|
if err := os.WriteFile(filepath.Join(dir, file), []byte("test content"), 0o644); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
},
|
|
wantFiles: []string{
|
|
"model-00001-of-00002.safetensors",
|
|
"model-00002-of-00002.safetensors",
|
|
"config.json",
|
|
"tokenizer.json",
|
|
},
|
|
},
|
|
{
|
|
name: "safetensors with both tokenizer.json and tokenizer.model",
|
|
setup: func(dir string) error {
|
|
// Create binary content for tokenizer.model (application/octet-stream)
|
|
binaryContent := make([]byte, 512)
|
|
for i := range binaryContent {
|
|
binaryContent[i] = byte(i % 256)
|
|
}
|
|
files := []string{
|
|
"model-00001-of-00001.safetensors",
|
|
"config.json",
|
|
"tokenizer.json",
|
|
}
|
|
for _, file := range files {
|
|
if err := os.WriteFile(filepath.Join(dir, file), []byte("test content"), 0o644); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
// Write tokenizer.model as binary
|
|
if err := os.WriteFile(filepath.Join(dir, "tokenizer.model"), binaryContent, 0o644); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
},
|
|
wantFiles: []string{
|
|
"model-00001-of-00001.safetensors",
|
|
"config.json",
|
|
"tokenizer.json",
|
|
"tokenizer.model",
|
|
},
|
|
},
|
|
{
|
|
name: "safetensors sentence transformers module weights",
|
|
setup: func(dir string) error {
|
|
files := []string{
|
|
"model.safetensors",
|
|
"config.json",
|
|
"modules.json",
|
|
filepath.Join("2_Dense", "config.json"),
|
|
filepath.Join("2_Dense", "model.safetensors"),
|
|
filepath.Join("3_Dense", "config.json"),
|
|
filepath.Join("3_Dense", "model.safetensors"),
|
|
}
|
|
for _, file := range files {
|
|
if err := os.MkdirAll(filepath.Dir(filepath.Join(dir, file)), 0o755); err != nil {
|
|
return err
|
|
}
|
|
if err := os.WriteFile(filepath.Join(dir, file), []byte("test content"), 0o644); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
},
|
|
wantFiles: []string{
|
|
"model.safetensors",
|
|
"config.json",
|
|
"modules.json",
|
|
filepath.Join("2_Dense", "config.json"),
|
|
filepath.Join("2_Dense", "model.safetensors"),
|
|
filepath.Join("3_Dense", "config.json"),
|
|
filepath.Join("3_Dense", "model.safetensors"),
|
|
},
|
|
},
|
|
{
|
|
name: "safetensors with consolidated files - prefers model files",
|
|
setup: func(dir string) error {
|
|
files := []string{
|
|
"model-00001-of-00001.safetensors",
|
|
"consolidated.safetensors",
|
|
"config.json",
|
|
}
|
|
for _, file := range files {
|
|
if err := os.WriteFile(filepath.Join(dir, file), []byte("test content"), 0o644); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
},
|
|
wantFiles: []string{
|
|
"model-00001-of-00001.safetensors", // consolidated files should be excluded
|
|
"config.json",
|
|
},
|
|
},
|
|
{
|
|
name: "safetensors without model-.safetensors files - uses consolidated",
|
|
setup: func(dir string) error {
|
|
files := []string{
|
|
"consolidated.safetensors",
|
|
"config.json",
|
|
}
|
|
for _, file := range files {
|
|
if err := os.WriteFile(filepath.Join(dir, file), []byte("test content"), 0o644); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
},
|
|
wantFiles: []string{
|
|
"consolidated.safetensors",
|
|
"config.json",
|
|
},
|
|
},
|
|
{
|
|
name: "pytorch model files",
|
|
setup: func(dir string) error {
|
|
// Create a file that will be detected as application/zip
|
|
zipHeader := []byte{0x50, 0x4B, 0x03, 0x04} // PK zip header
|
|
files := []string{
|
|
"pytorch_model-00001-of-00002.bin",
|
|
"pytorch_model-00002-of-00002.bin",
|
|
"config.json",
|
|
}
|
|
for _, file := range files {
|
|
content := zipHeader
|
|
if file == "config.json" {
|
|
content = []byte(`{"config": true}`)
|
|
}
|
|
if err := os.WriteFile(filepath.Join(dir, file), content, 0o644); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
},
|
|
wantFiles: []string{
|
|
"pytorch_model-00001-of-00002.bin",
|
|
"pytorch_model-00002-of-00002.bin",
|
|
"config.json",
|
|
},
|
|
},
|
|
{
|
|
name: "consolidated pth files",
|
|
setup: func(dir string) error {
|
|
zipHeader := []byte{0x50, 0x4B, 0x03, 0x04}
|
|
files := []string{
|
|
"consolidated.00.pth",
|
|
"consolidated.01.pth",
|
|
"config.json",
|
|
}
|
|
for _, file := range files {
|
|
content := zipHeader
|
|
if file == "config.json" {
|
|
content = []byte(`{"config": true}`)
|
|
}
|
|
if err := os.WriteFile(filepath.Join(dir, file), content, 0o644); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
},
|
|
wantFiles: []string{
|
|
"consolidated.00.pth",
|
|
"consolidated.01.pth",
|
|
"config.json",
|
|
},
|
|
},
|
|
{
|
|
name: "gguf files",
|
|
setup: func(dir string) error {
|
|
// Create binary content that will be detected as application/octet-stream
|
|
binaryContent := make([]byte, 512)
|
|
for i := range binaryContent {
|
|
binaryContent[i] = byte(i % 256)
|
|
}
|
|
files := []string{
|
|
"model.gguf",
|
|
"config.json",
|
|
}
|
|
for _, file := range files {
|
|
content := binaryContent
|
|
if file == "config.json" {
|
|
content = []byte(`{"config": true}`)
|
|
}
|
|
if err := os.WriteFile(filepath.Join(dir, file), content, 0o644); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
},
|
|
wantFiles: []string{
|
|
"model.gguf",
|
|
"config.json",
|
|
},
|
|
},
|
|
{
|
|
name: "bin files as gguf",
|
|
setup: func(dir string) error {
|
|
binaryContent := make([]byte, 512)
|
|
for i := range binaryContent {
|
|
binaryContent[i] = byte(i % 256)
|
|
}
|
|
files := []string{
|
|
"model.bin",
|
|
"config.json",
|
|
}
|
|
for _, file := range files {
|
|
content := binaryContent
|
|
if file == "config.json" {
|
|
content = []byte(`{"config": true}`)
|
|
}
|
|
if err := os.WriteFile(filepath.Join(dir, file), content, 0o644); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
},
|
|
wantFiles: []string{
|
|
"model.bin",
|
|
"config.json",
|
|
},
|
|
},
|
|
{
|
|
name: "no model files found",
|
|
setup: func(dir string) error {
|
|
// Only create non-model files
|
|
files := []string{"README.md", "config.json"}
|
|
for _, file := range files {
|
|
if err := os.WriteFile(filepath.Join(dir, file), []byte("content"), 0o644); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
},
|
|
wantErr: true,
|
|
expectErrType: ErrModelNotFound,
|
|
},
|
|
{
|
|
name: "invalid content type for pytorch model",
|
|
setup: func(dir string) error {
|
|
// Create pytorch model file with wrong content type (text instead of zip)
|
|
files := []string{
|
|
"pytorch_model.bin",
|
|
"config.json",
|
|
}
|
|
for _, file := range files {
|
|
content := []byte("plain text content")
|
|
if err := os.WriteFile(filepath.Join(dir, file), content, 0o644); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
},
|
|
wantErr: true,
|
|
},
|
|
}
|
|
|
|
tmpDir := t.TempDir()
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
testDir := filepath.Join(tmpDir, tt.name)
|
|
if err := os.MkdirAll(testDir, 0o755); err != nil {
|
|
t.Fatalf("Failed to create test directory: %v", err)
|
|
}
|
|
|
|
if err := tt.setup(testDir); err != nil {
|
|
t.Fatalf("Setup failed: %v", err)
|
|
}
|
|
|
|
files, err := filesForModel(testDir)
|
|
|
|
if tt.wantErr {
|
|
if err == nil {
|
|
t.Error("Expected error, but got none")
|
|
}
|
|
if tt.expectErrType != nil && err != tt.expectErrType {
|
|
t.Errorf("Expected error type %v, got %v", tt.expectErrType, err)
|
|
}
|
|
return
|
|
}
|
|
|
|
if err != nil {
|
|
t.Errorf("Unexpected error: %v", err)
|
|
return
|
|
}
|
|
|
|
var relativeFiles []string
|
|
for _, file := range files {
|
|
rel, err := filepath.Rel(testDir, file)
|
|
if err != nil {
|
|
t.Fatalf("Failed to get relative path: %v", err)
|
|
}
|
|
relativeFiles = append(relativeFiles, rel)
|
|
}
|
|
|
|
if len(relativeFiles) != len(tt.wantFiles) {
|
|
t.Errorf("Expected %d files, got %d: %v", len(tt.wantFiles), len(relativeFiles), relativeFiles)
|
|
}
|
|
|
|
fileSet := make(map[string]bool)
|
|
for _, file := range relativeFiles {
|
|
fileSet[file] = true
|
|
}
|
|
|
|
for _, wantFile := range tt.wantFiles {
|
|
if !fileSet[wantFile] {
|
|
t.Errorf("Missing expected file: %s", wantFile)
|
|
}
|
|
}
|
|
})
|
|
}
|
|
}
|