mirror of
https://github.com/likelovewant/ollama-for-amd.git
synced 2025-12-21 22:33:56 +00:00
add registries for parsers/renderers
This commit is contained in:
@@ -1,12 +1,46 @@
|
||||
package renderers
|
||||
|
||||
import "github.com/ollama/ollama/api"
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/ollama/ollama/api"
|
||||
)
|
||||
|
||||
type Renderer interface {
|
||||
Render(messages []api.Message, tools []api.Tool, think *api.ThinkValue) (string, error)
|
||||
}
|
||||
|
||||
func RendererForName(name string) Renderer {
|
||||
type (
|
||||
RendererConstructor func() Renderer
|
||||
RendererRegistry struct {
|
||||
renderers map[string]RendererConstructor
|
||||
}
|
||||
)
|
||||
|
||||
func (r *RendererRegistry) Register(name string, renderer RendererConstructor) {
|
||||
r.renderers[name] = renderer
|
||||
}
|
||||
|
||||
var registry = RendererRegistry{
|
||||
renderers: make(map[string]RendererConstructor),
|
||||
}
|
||||
|
||||
func Register(name string, renderer RendererConstructor) {
|
||||
registry.Register(name, renderer)
|
||||
}
|
||||
|
||||
func RenderWithRenderer(name string, msgs []api.Message, tools []api.Tool, think *api.ThinkValue) (string, error) {
|
||||
renderer := rendererForName(name)
|
||||
if renderer == nil {
|
||||
return "", fmt.Errorf("unknown renderer %q", name)
|
||||
}
|
||||
return renderer.Render(msgs, tools, think)
|
||||
}
|
||||
|
||||
func rendererForName(name string) Renderer {
|
||||
if constructor, ok := registry.renderers[name]; ok {
|
||||
return constructor()
|
||||
}
|
||||
switch name {
|
||||
case "qwen3-coder":
|
||||
renderer := &Qwen3CoderRenderer{}
|
||||
|
||||
67
model/renderers/renderer_test.go
Normal file
67
model/renderers/renderer_test.go
Normal file
@@ -0,0 +1,67 @@
|
||||
package renderers
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/ollama/ollama/api"
|
||||
)
|
||||
|
||||
type mockRenderer struct{}
|
||||
|
||||
func (m *mockRenderer) Render(msgs []api.Message, tools []api.Tool, think *api.ThinkValue) (string, error) {
|
||||
return "mock-output", nil
|
||||
}
|
||||
|
||||
func TestRegisterCustomRenderer(t *testing.T) {
|
||||
// Register a custom renderer
|
||||
Register("custom-renderer", func() Renderer {
|
||||
return &mockRenderer{}
|
||||
})
|
||||
|
||||
// Retrieve and use it
|
||||
result, err := RenderWithRenderer("custom-renderer", nil, nil, nil)
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
if result != "mock-output" {
|
||||
t.Errorf("expected 'mock-output', got %q", result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestBuiltInRendererStillWorks(t *testing.T) {
|
||||
// Test that qwen3-coder still works
|
||||
messages := []api.Message{
|
||||
{Role: "user", Content: "Hello"},
|
||||
}
|
||||
|
||||
result, err := RenderWithRenderer("qwen3-coder", messages, nil, nil)
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
if result == "" {
|
||||
t.Error("expected non-empty result from qwen3-coder renderer")
|
||||
}
|
||||
}
|
||||
|
||||
func TestOverrideBuiltInRenderer(t *testing.T) {
|
||||
// Override the built-in renderer
|
||||
Register("qwen3-coder", func() Renderer {
|
||||
return &mockRenderer{}
|
||||
})
|
||||
|
||||
// Should get the override
|
||||
result, err := RenderWithRenderer("qwen3-coder", nil, nil, nil)
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
if result != "mock-output" {
|
||||
t.Errorf("expected 'mock-output' from override, got %q", result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestUnknownRendererReturnsError(t *testing.T) {
|
||||
_, err := RenderWithRenderer("nonexistent-renderer", nil, nil, nil)
|
||||
if err == nil {
|
||||
t.Error("expected error for unknown renderer")
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user