From de3e0e7d3cf7366c343fb5881e59e8b59bb8537c Mon Sep 17 00:00:00 2001 From: Grace Guo Date: Tue, 7 Oct 2025 16:11:47 -0700 Subject: [PATCH] clean up, but no longer working with tool calls? --- model/parsers/qwen3vl.go | 12 +++++------- model/renderers/renderer.go | 3 +-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/model/parsers/qwen3vl.go b/model/parsers/qwen3vl.go index 5d36b8326..5d148b0bb 100644 --- a/model/parsers/qwen3vl.go +++ b/model/parsers/qwen3vl.go @@ -20,18 +20,18 @@ func (p *Qwen3VLParser) initialState() qwenParserState { return CollectingContent } -// its because we dont call the Init function +// TODO: call the init function const ( - CollectingThinkingContent qwenParserState = iota - CollectingContent + CollectingContent qwenParserState = iota + CollectingThinkingContent // qwenParserState = iota CollectingToolContent ) const ( - // thinkingOpenTag = "" thinkingCloseTag = "" ) +// TODO(gguo): add a field for isThinking type Qwen3VLParser struct { state qwenParserState buffer strings.Builder @@ -42,6 +42,7 @@ func (p *Qwen3VLParser) HasToolSupport() bool { return true } +// TODO(gguo): changes this to reference an objects param func (p *Qwen3VLParser) HasThinkingSupport() bool { return true } @@ -49,7 +50,6 @@ func (p *Qwen3VLParser) HasThinkingSupport() bool { func (p *Qwen3VLParser) Init(tools []api.Tool, lastMessage *api.Message) []api.Tool { p.tools = tools p.state = p.initialState() - fmt.Println("[qwen3vl parser] initial state", p.state) return tools } @@ -108,7 +108,6 @@ func (p *Qwen3VLParser) parseEvents() []qwenEvent { return all } -// think if a better name func emitContentBeforeTag(p *Qwen3VLParser, events []qwenEvent, tag string) []qwenEvent { split := strings.SplitN(p.buffer.String(), tag, 2) before := split[0] @@ -124,7 +123,6 @@ func emitContentBeforeTag(p *Qwen3VLParser, events []qwenEvent, tag string) []qw func (p *Qwen3VLParser) eat() ([]qwenEvent, bool) { var events []qwenEvent - // fmt.Println("[qwen3vl parser] eat", p.state) switch p.state { case CollectingContent: diff --git a/model/renderers/renderer.go b/model/renderers/renderer.go index 7cedf0421..4f92f7b8e 100644 --- a/model/renderers/renderer.go +++ b/model/renderers/renderer.go @@ -16,14 +16,13 @@ type Renderer interface { Render(messages []api.Message, tools []api.Tool, think *api.ThinkValue) (string, error) } -// func rendererForName(name string) rendererFunc { func RendererForName(name string) Renderer { switch name { case "qwen3-coder": renderer := &Qwen3CoderRenderer{false} // this is not implemented yet return renderer case "qwen3-vl": - renderer := &Qwen3VLRenderer{false} + renderer := &Qwen3VLRenderer{false} // not a thinking model? return renderer default: return nil