mirror of
https://github.com/ollama/ollama.git
synced 2025-11-11 03:57:46 +01:00
e7f56ef3d8
Now that we have a built-in parser abstraction, which was introduced in <https://github.com/ollama/ollama/pull/12248>, we can modify our harmony parser to match this and then get rid of nearly all of the harmony-specific logic in routes.go. We do have a small amount of code that turns the parser on by default if the architecture matches and no other built-in parser was provided. The built-in parser interface was modified in order to handle harmony's prefill and tool name translation requirements.
50 lines
1.4 KiB
Go
50 lines
1.4 KiB
Go
package parsers
|
|
|
|
import (
|
|
"github.com/ollama/ollama/api"
|
|
"github.com/ollama/ollama/harmony"
|
|
)
|
|
|
|
type Parser interface {
|
|
// Init initializes the parser with tools and optional last message for chat prefill
|
|
// Returns processed tools if the parser needs to modify them (e.g., harmony renames them)
|
|
Init(tools []api.Tool, lastMessage *api.Message) []api.Tool
|
|
// Add processes streamed content and returns parsed content, thinking, and tool calls
|
|
// The done flag indicates if this is the last chunk (used for draining accumulators)
|
|
Add(s string, done bool) (content string, thinking string, calls []api.ToolCall, err error)
|
|
HasToolSupport() bool
|
|
HasThinkingSupport() bool
|
|
}
|
|
|
|
func ParserForName(name string) Parser {
|
|
switch name {
|
|
case "qwen3-coder":
|
|
parser := &Qwen3CoderParser{}
|
|
return parser
|
|
case "passthrough":
|
|
return &PassthroughParser{}
|
|
case "harmony":
|
|
return harmony.NewHarmonyMessageHandler()
|
|
default:
|
|
return nil
|
|
}
|
|
}
|
|
|
|
type PassthroughParser struct{}
|
|
|
|
func (p *PassthroughParser) Init(tools []api.Tool, lastMessage *api.Message) []api.Tool {
|
|
return tools // passthrough doesn't modify tools
|
|
}
|
|
|
|
func (p *PassthroughParser) Add(s string, done bool) (content string, thinking string, calls []api.ToolCall, err error) {
|
|
return s, "", nil, nil
|
|
}
|
|
|
|
func (p *PassthroughParser) HasToolSupport() bool {
|
|
return false
|
|
}
|
|
|
|
func (p *PassthroughParser) HasThinkingSupport() bool {
|
|
return false
|
|
}
|