From 8af2a59a9a12667bae2ce138259d432ba81f8e03 Mon Sep 17 00:00:00 2001 From: Grail Finder Date: Wed, 10 Dec 2025 14:07:24 +0300 Subject: Chore: linter complaints --- llm.go | 9 ++++++--- tools.go | 7 ------- tui.go | 6 +++--- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/llm.go b/llm.go index 712fc81..d9900de 100644 --- a/llm.go +++ b/llm.go @@ -3,10 +3,10 @@ package main import ( "bytes" "encoding/json" + "errors" "gf-lt/models" "io" "strings" - "fmt" ) var imageAttachmentPath string // Global variable to track image attachment for next message @@ -98,7 +98,7 @@ func (lcp LCPCompletion) FormMsg(msg, role string, resume bool) (io.Reader, erro multimodalData = append(multimodalData, parts[1]) } else { logger.Error("invalid image data URL format", "url", imageURL) - return nil, fmt.Errorf("invalid image data URL format") + return nil, errors.New("invalid image data URL format") } imageAttachmentPath = "" // Clear the attachment after use } @@ -143,9 +143,12 @@ func (lcp LCPCompletion) FormMsg(msg, role string, resume bool) (io.Reader, erro // This is required by llama.cpp multimodal models so they know where to insert media if len(multimodalData) > 0 { // Add a media marker for each item in the multimodal data + var sb strings.Builder + sb.WriteString(prompt) for range multimodalData { - prompt += " <__media__>" // llama.cpp default multimodal marker + sb.WriteString(" <__media__>") // llama.cpp default multimodal marker } + prompt = sb.String() } logger.Debug("checking prompt for /completion", "tool_use", cfg.ToolUse, diff --git a/tools.go b/tools.go index 93f8ded..d603507 100644 --- a/tools.go +++ b/tools.go @@ -596,13 +596,6 @@ var globalTodoList = TodoList{ Items: []TodoItem{}, } -func getTodoList() TodoList { - return globalTodoList -} - -func setTodoList(todoList TodoList) { - globalTodoList = todoList -} // Todo Management Tools func todoCreate(args map[string]string) []byte { diff --git a/tui.go b/tui.go index 62f9169..b907c5b 100644 --- a/tui.go +++ b/tui.go @@ -37,7 +37,6 @@ var ( agentPage = "agentPage" editMsgPage = "editMsgPage" roleEditPage = "roleEditPage" - indexPage = "indexPage" helpPage = "helpPage" renamePage = "renamePage" RAGPage = "RAGPage" @@ -563,7 +562,8 @@ func init() { SetLabel("Enter new role: "). SetPlaceholder("e.g., user, assistant, system, tool"). SetDoneFunc(func(key tcell.Key) { - if key == tcell.KeyEnter { + switch key { + case tcell.KeyEnter: newRole := roleEditWindow.GetText() if newRole == "" { if err := notifyUser("edit", "no role provided"); err != nil { @@ -578,7 +578,7 @@ func init() { colorText() pages.RemovePage(roleEditPage) } - } else if key == tcell.KeyEscape { + case tcell.KeyEscape: pages.RemovePage(roleEditPage) } }) -- cgit v1.2.3