root
/
ollama
mirror of https://github.com/ollama/ollama.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

clean up, but no longer working with tool calls?

This commit is contained in:
Grace Guo 2025-10-07 16:11:47 -07:00
parent d1f3145a74
commit de3e0e7d3c
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
model/parsers/qwen3vl.go
View File

@ -20,18 +20,18 @@ func (p *Qwen3VLParser) initialState() qwenParserState {
return CollectingContent return CollectingContent
} }
// its because we dont call the Init function // TODO: call the init function
const ( const (
CollectingThinkingContent qwenParserState = iota CollectingContent qwenParserState = iota
CollectingContent CollectingThinkingContent // qwenParserState = iota
CollectingToolContent CollectingToolContent
) )
const ( const (
// thinkingOpenTag = "<think>"
thinkingCloseTag = "</think>" thinkingCloseTag = "</think>"
) )
// TODO(gguo): add a field for isThinking
type Qwen3VLParser struct { type Qwen3VLParser struct {
state qwenParserState state qwenParserState
buffer strings.Builder buffer strings.Builder
@ -42,6 +42,7 @@ func (p *Qwen3VLParser) HasToolSupport() bool {
return true return true
} }
// TODO(gguo): changes this to reference an objects param
func (p *Qwen3VLParser) HasThinkingSupport() bool { func (p *Qwen3VLParser) HasThinkingSupport() bool {
return true return true
} }
@ -49,7 +50,6 @@ func (p *Qwen3VLParser) HasThinkingSupport() bool {
func (p *Qwen3VLParser) Init(tools []api.Tool, lastMessage *api.Message) []api.Tool { func (p *Qwen3VLParser) Init(tools []api.Tool, lastMessage *api.Message) []api.Tool {
p.tools = tools p.tools = tools
p.state = p.initialState() p.state = p.initialState()
fmt.Println("[qwen3vl parser] initial state", p.state)
return tools return tools
} }
@ -108,7 +108,6 @@ func (p *Qwen3VLParser) parseEvents() []qwenEvent {
return all return all
} }
// think if a better name
func emitContentBeforeTag(p *Qwen3VLParser, events []qwenEvent, tag string) []qwenEvent { func emitContentBeforeTag(p *Qwen3VLParser, events []qwenEvent, tag string) []qwenEvent {
split := strings.SplitN(p.buffer.String(), tag, 2) split := strings.SplitN(p.buffer.String(), tag, 2)
before := split[0] before := split[0]
@ -124,7 +123,6 @@ func emitContentBeforeTag(p *Qwen3VLParser, events []qwenEvent, tag string) []qw
func (p *Qwen3VLParser) eat() ([]qwenEvent, bool) { func (p *Qwen3VLParser) eat() ([]qwenEvent, bool) {
var events []qwenEvent var events []qwenEvent
// fmt.Println("[qwen3vl parser] eat", p.state)
switch p.state { switch p.state {
case CollectingContent: case CollectingContent:

3
model/renderers/renderer.go
View File

@ -16,14 +16,13 @@ type Renderer interface {
Render(messages []api.Message, tools []api.Tool, think *api.ThinkValue) (string, error) Render(messages []api.Message, tools []api.Tool, think *api.ThinkValue) (string, error)
} }
// func rendererForName(name string) rendererFunc {
func RendererForName(name string) Renderer { func RendererForName(name string) Renderer {
switch name { switch name {
case "qwen3-coder": case "qwen3-coder":
renderer := &Qwen3CoderRenderer{false} // this is not implemented yet renderer := &Qwen3CoderRenderer{false} // this is not implemented yet
return renderer return renderer
case "qwen3-vl": case "qwen3-vl":
renderer := &Qwen3VLRenderer{false} renderer := &Qwen3VLRenderer{false} // not a thinking model?
return renderer return renderer
default: default:
return nil return nil