mirror of
https://github.com/ollama/ollama.git
synced 2026-10-21 02:51:35 +00:00
* create: add server-side MLX imports and drop GGUF conversion Support safetensors imports through the MLX create pipeline both locally and on the server, including remote upload/staging, draft layer handling, cancellation propagation, transfer limits, and shared manifest/blob writing. Limit GGUF create to wrapping existing GGUF inputs into Ollama manifests. Remove the in-tree safetensors-to-GGUF converter, server quantization path, and converter-only dependencies so GGUF conversion and quantization stay in llama.cpp tooling. Keep the MLX path focused on supported safetensors model creation with validation before MLX work, and expose that flow without the --experimental CLI gate. * address comments * add client side gguf create fast path * address comments * rebase adjustments
138 lines
3.7 KiB
Go
138 lines
3.7 KiB
Go
package server
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"log/slog"
|
|
"os"
|
|
|
|
"github.com/ollama/ollama/api"
|
|
"github.com/ollama/ollama/fs/gguf"
|
|
"github.com/ollama/ollama/manifest"
|
|
"github.com/ollama/ollama/template"
|
|
"github.com/ollama/ollama/types/model"
|
|
)
|
|
|
|
type modelLayer struct {
|
|
manifest.Layer
|
|
GGUF *gguf.Metadata
|
|
parameterCount uint64
|
|
splitFile string
|
|
splitLayers []manifest.Layer
|
|
}
|
|
|
|
func parseFromModel(ctx context.Context, name model.Name, fn func(api.ProgressResponse)) ([]*modelLayer, model.ConfigV2, error) {
|
|
var config model.ConfigV2
|
|
m, err := manifest.ParseNamedManifest(name)
|
|
switch {
|
|
case errors.Is(err, os.ErrNotExist):
|
|
if err := PullModel(ctx, name.String(), ®istryOptions{}, fn); err != nil {
|
|
return nil, config, err
|
|
}
|
|
|
|
m, err = manifest.ParseNamedManifest(name)
|
|
if err != nil {
|
|
return nil, config, err
|
|
}
|
|
case err != nil:
|
|
return nil, config, err
|
|
}
|
|
|
|
if m.Config.Digest == "" {
|
|
return nil, config, fmt.Errorf("model %s is missing its config", name.DisplayShortest())
|
|
}
|
|
configFile, err := m.Config.Open()
|
|
if err != nil {
|
|
return nil, config, fmt.Errorf("open config for %s: %w", name.DisplayShortest(), err)
|
|
}
|
|
if err := json.NewDecoder(configFile).Decode(&config); err != nil {
|
|
configFile.Close()
|
|
return nil, config, fmt.Errorf("decode config for %s: %w", name.DisplayShortest(), err)
|
|
}
|
|
if err := configFile.Close(); err != nil {
|
|
return nil, config, fmt.Errorf("close config for %s: %w", name.DisplayShortest(), err)
|
|
}
|
|
|
|
var layers []*modelLayer
|
|
for _, srcLayer := range m.Layers {
|
|
layer, err := manifest.NewLayerFromLayer(srcLayer.Digest, srcLayer.MediaType, name.DisplayShortest())
|
|
if err != nil {
|
|
return nil, config, err
|
|
}
|
|
layer.Name = srcLayer.Name
|
|
|
|
if layer.MediaType == "application/vnd.ollama.image.adapter" {
|
|
slog.Warn("LoRA adapters are deprecated; the adapter layer is carried over but new adapters cannot be created", "model", name.DisplayShortest(), "digest", layer.Digest)
|
|
}
|
|
switch layer.MediaType {
|
|
case "application/vnd.ollama.image.model",
|
|
"application/vnd.ollama.image.projector",
|
|
"application/vnd.ollama.image.adapter",
|
|
manifest.MediaTypeImageDraft:
|
|
blobpath, err := manifest.BlobsPath(layer.Digest)
|
|
if err != nil {
|
|
return nil, config, err
|
|
}
|
|
|
|
metadata, err := gguf.ReadFileMetadata(blobpath, 1)
|
|
if err != nil {
|
|
return nil, config, err
|
|
}
|
|
|
|
layers = append(layers, &modelLayer{
|
|
Layer: layer,
|
|
GGUF: metadata,
|
|
parameterCount: metadata.ParameterCount(),
|
|
})
|
|
default:
|
|
layers = append(layers, &modelLayer{Layer: layer})
|
|
}
|
|
}
|
|
|
|
layers, err = groupManifestSplitGGUFLayers(layers)
|
|
return layers, config, err
|
|
}
|
|
|
|
func detectChatTemplate(layers []*modelLayer) ([]*modelLayer, error) {
|
|
for _, layer := range layers {
|
|
if layer.GGUF == nil {
|
|
continue
|
|
}
|
|
chatTemplate := layer.GGUF.ChatTemplate()
|
|
if chatTemplate == "" {
|
|
continue
|
|
}
|
|
|
|
t, err := template.Named(chatTemplate)
|
|
if err != nil {
|
|
slog.Debug("template detection", "error", err, "template", chatTemplate)
|
|
return layers, nil
|
|
}
|
|
|
|
templateLayer, err := manifest.NewLayer(t.Reader(), "application/vnd.ollama.image.template")
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
templateLayer.Status = fmt.Sprintf("using autodetected template %s", t.Name)
|
|
layers = append(layers, &modelLayer{Layer: templateLayer})
|
|
|
|
if t.Parameters != nil {
|
|
var b bytes.Buffer
|
|
if err := json.NewEncoder(&b).Encode(t.Parameters); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
paramsLayer, err := manifest.NewLayer(&b, "application/vnd.ollama.image.params")
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
layers = append(layers, &modelLayer{Layer: paramsLayer})
|
|
}
|
|
return layers, nil
|
|
}
|
|
|
|
return layers, nil
|
|
}
|