Compare commits
14 Commits
feat/serve
...
c12311da99
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c12311da99 | ||
|
|
7d18a9d77e | ||
|
|
b67ae1be98 | ||
|
|
372e49199b | ||
|
|
d6d4f09f8d | ||
|
|
475936fb1b | ||
|
|
fa846225ee | ||
|
|
7b2fa04391 | ||
|
|
c83779b479 | ||
|
|
43b0fe3739 | ||
|
|
1b36ef938e | ||
|
|
987d5842a4 | ||
|
|
10b665813e | ||
|
|
8c3c2b9b23 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -5,7 +5,6 @@ history/
|
||||
*.db
|
||||
config.toml
|
||||
sysprompts/*
|
||||
!sysprompts/cluedo.json
|
||||
!sysprompts/alice_bob_carl.json
|
||||
history_bak/
|
||||
.aider*
|
||||
|
||||
9
Makefile
9
Makefile
@@ -1,5 +1,4 @@
|
||||
.PHONY: setconfig run lint setup-whisper build-whisper download-whisper-model docker-up docker-down docker-logs noextra-run noextra-server
|
||||
|
||||
.PHONY: setconfig run lint setup-whisper build-whisper download-whisper-model docker-up docker-down docker-logs noextra-run
|
||||
|
||||
run: setconfig
|
||||
go build -tags extra -o gf-lt && ./gf-lt
|
||||
@@ -10,15 +9,9 @@ build-debug:
|
||||
debug: build-debug
|
||||
dlv exec --headless --accept-multiclient --listen=:2345 ./gf-lt
|
||||
|
||||
server: setconfig
|
||||
go build -tags extra -o gf-lt && ./gf-lt -port 3333
|
||||
|
||||
noextra-run: setconfig
|
||||
go build -tags '!extra' -o gf-lt && ./gf-lt
|
||||
|
||||
noextra-server: setconfig
|
||||
go build -tags '!extra' -o gf-lt && ./gf-lt -port 3333
|
||||
|
||||
setconfig:
|
||||
find config.toml &>/dev/null || cp config.example.toml config.toml
|
||||
|
||||
|
||||
46
bot.go
46
bot.go
@@ -17,7 +17,6 @@ import (
|
||||
"net/http"
|
||||
"net/url"
|
||||
"os"
|
||||
"path"
|
||||
"regexp"
|
||||
"slices"
|
||||
"strconv"
|
||||
@@ -343,32 +342,6 @@ func warmUpModel() {
|
||||
}()
|
||||
}
|
||||
|
||||
func fetchLCPModelName() *models.LCPModels {
|
||||
//nolint
|
||||
resp, err := httpClient.Get(cfg.FetchModelNameAPI)
|
||||
if err != nil {
|
||||
chatBody.Model = "disconnected"
|
||||
logger.Warn("failed to get model", "link", cfg.FetchModelNameAPI, "error", err)
|
||||
if err := notifyUser("error", "request failed "+cfg.FetchModelNameAPI); err != nil {
|
||||
logger.Debug("failed to notify user", "error", err, "fn", "fetchLCPModelName")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
llmModel := models.LCPModels{}
|
||||
if err := json.NewDecoder(resp.Body).Decode(&llmModel); err != nil {
|
||||
logger.Warn("failed to decode resp", "link", cfg.FetchModelNameAPI, "error", err)
|
||||
return nil
|
||||
}
|
||||
if resp.StatusCode != 200 {
|
||||
chatBody.Model = "disconnected"
|
||||
return nil
|
||||
}
|
||||
chatBody.Model = path.Base(llmModel.Data[0].ID)
|
||||
cfg.CurrentModel = chatBody.Model
|
||||
return &llmModel
|
||||
}
|
||||
|
||||
// nolint
|
||||
func fetchDSBalance() *models.DSBalance {
|
||||
url := "https://api.deepseek.com/user/balance"
|
||||
@@ -1114,7 +1087,15 @@ func chatToTextSlice(messages []models.RoleMsg, showSys bool) []string {
|
||||
|
||||
func chatToText(messages []models.RoleMsg, showSys bool) string {
|
||||
s := chatToTextSlice(messages, showSys)
|
||||
return strings.Join(s, "\n")
|
||||
text := strings.Join(s, "\n")
|
||||
|
||||
// Collapse thinking blocks if enabled
|
||||
if thinkingCollapsed {
|
||||
placeholder := "[yellow::i][thinking... (press Alt+T to expand)][-:-:-]"
|
||||
text = thinkRE.ReplaceAllString(text, placeholder)
|
||||
}
|
||||
|
||||
return text
|
||||
}
|
||||
|
||||
func removeThinking(chatBody *models.ChatBody) {
|
||||
@@ -1255,6 +1236,15 @@ func init() {
|
||||
os.Exit(1)
|
||||
return
|
||||
}
|
||||
// Set image base directory for path display
|
||||
baseDir := cfg.FilePickerDir
|
||||
if baseDir == "" || baseDir == "." {
|
||||
// Resolve "." to current working directory
|
||||
if wd, err := os.Getwd(); err == nil {
|
||||
baseDir = wd
|
||||
}
|
||||
}
|
||||
models.SetImageBaseDir(baseDir)
|
||||
defaultStarter = []models.RoleMsg{
|
||||
{Role: "system", Content: basicSysMsg},
|
||||
{Role: cfg.AssistantRole, Content: defaultFirstMsg},
|
||||
|
||||
@@ -48,3 +48,4 @@ EnableMouse = false # Enable mouse support in the UI
|
||||
CharSpecificContextEnabled = true
|
||||
CharSpecificContextTag = "@"
|
||||
AutoTurn = true
|
||||
StripThinkingFromAPI = true # Strip <think> blocks from messages before sending to LLM (keeps them in chat history)
|
||||
|
||||
@@ -19,6 +19,7 @@ type Config struct {
|
||||
ToolRole string `toml:"ToolRole"`
|
||||
ToolUse bool `toml:"ToolUse"`
|
||||
ThinkUse bool `toml:"ThinkUse"`
|
||||
StripThinkingFromAPI bool `toml:"StripThinkingFromAPI"`
|
||||
AssistantRole string `toml:"AssistantRole"`
|
||||
SysDir string `toml:"SysDir"`
|
||||
ChunkLimit uint32 `toml:"ChunkLimit"`
|
||||
@@ -30,6 +31,7 @@ type Config struct {
|
||||
DBPATH string `toml:"DBPATH"`
|
||||
FilePickerDir string `toml:"FilePickerDir"`
|
||||
FilePickerExts string `toml:"FilePickerExts"`
|
||||
ImagePreview bool `toml:"ImagePreview"`
|
||||
EnableMouse bool `toml:"EnableMouse"`
|
||||
// embeddings
|
||||
RAGEnabled bool `toml:"RAGEnabled"`
|
||||
|
||||
22
helpfuncs.go
22
helpfuncs.go
@@ -23,6 +23,25 @@ func isASCII(s string) bool {
|
||||
return true
|
||||
}
|
||||
|
||||
// stripThinkingFromMsg removes thinking blocks from assistant messages.
|
||||
// Skips user, tool, and system messages as they may contain thinking examples.
|
||||
func stripThinkingFromMsg(msg *models.RoleMsg) *models.RoleMsg {
|
||||
if !cfg.StripThinkingFromAPI {
|
||||
return msg
|
||||
}
|
||||
// Skip user, tool, and system messages - they might contain thinking examples
|
||||
if msg.Role == cfg.UserRole || msg.Role == cfg.ToolRole || msg.Role == "system" {
|
||||
return msg
|
||||
}
|
||||
// Strip thinking from assistant messages
|
||||
if thinkRE.MatchString(msg.Content) {
|
||||
msg.Content = thinkRE.ReplaceAllString(msg.Content, "")
|
||||
// Clean up any double newlines that might result
|
||||
msg.Content = strings.TrimSpace(msg.Content)
|
||||
}
|
||||
return msg
|
||||
}
|
||||
|
||||
// refreshChatDisplay updates the chat display based on current character view
|
||||
// It filters messages for the character the user is currently "writing as"
|
||||
// and updates the textView with the filtered conversation
|
||||
@@ -35,14 +54,11 @@ func refreshChatDisplay() {
|
||||
// Filter messages for this character
|
||||
filteredMessages := filterMessagesForCharacter(chatBody.Messages, viewingAs)
|
||||
displayText := chatToText(filteredMessages, cfg.ShowSys)
|
||||
// Use QueueUpdate for thread-safe UI updates
|
||||
app.QueueUpdate(func() {
|
||||
textView.SetText(displayText)
|
||||
colorText()
|
||||
if scrollToEndEnabled {
|
||||
textView.ScrollToEnd()
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func stopTTSIfNotForUser(msg *models.RoleMsg) {
|
||||
|
||||
82
llm.go
82
llm.go
@@ -13,28 +13,6 @@ var imageAttachmentPath string // Global variable to track image attachment for
|
||||
var lastImg string // for ctrl+j
|
||||
var RAGMsg = "Retrieved context for user's query:\n"
|
||||
|
||||
// addPersonaSuffixToLastUserMessage adds the persona suffix to the last user message
|
||||
// to indicate to the assistant who it should reply as
|
||||
func addPersonaSuffixToLastUserMessage(messages []models.RoleMsg, persona string) []models.RoleMsg {
|
||||
if len(messages) == 0 {
|
||||
return messages
|
||||
}
|
||||
// // Find the last user message to modify
|
||||
// for i := len(messages) - 1; i >= 0; i-- {
|
||||
// if messages[i].Role == cfg.UserRole || messages[i].Role == "user" {
|
||||
// // Create a copy of the message to avoid modifying the original
|
||||
// modifiedMsg := messages[i]
|
||||
// modifiedMsg.Content = modifiedMsg.Content + "\n" + persona + ":"
|
||||
// messages[i] = modifiedMsg
|
||||
// break
|
||||
// }
|
||||
// }
|
||||
modifiedMsg := messages[len(messages)-1]
|
||||
modifiedMsg.Content = modifiedMsg.Content + "\n" + persona + ":\n"
|
||||
messages[len(messages)-1] = modifiedMsg
|
||||
return messages
|
||||
}
|
||||
|
||||
// containsToolSysMsg checks if the toolSysMsg already exists in the chat body
|
||||
func containsToolSysMsg() bool {
|
||||
for _, msg := range chatBody.Messages {
|
||||
@@ -187,17 +165,9 @@ func (lcp LCPCompletion) FormMsg(msg, role string, resume bool) (io.Reader, erro
|
||||
filteredMessages, botPersona := filterMessagesForCurrentCharacter(chatBody.Messages)
|
||||
messages := make([]string, len(filteredMessages))
|
||||
for i, m := range filteredMessages {
|
||||
messages[i] = m.ToPrompt()
|
||||
messages[i] = stripThinkingFromMsg(&m).ToPrompt()
|
||||
}
|
||||
prompt := strings.Join(messages, "\n")
|
||||
// strings builder?
|
||||
if !resume {
|
||||
botMsgStart := "\n" + botPersona + ":\n"
|
||||
prompt += botMsgStart
|
||||
}
|
||||
if cfg.ThinkUse && !cfg.ToolUse {
|
||||
prompt += "<think>"
|
||||
}
|
||||
// Add multimodal media markers to the prompt text when multimodal data is present
|
||||
// This is required by llama.cpp multimodal models so they know where to insert media
|
||||
if len(multimodalData) > 0 {
|
||||
@@ -209,6 +179,14 @@ func (lcp LCPCompletion) FormMsg(msg, role string, resume bool) (io.Reader, erro
|
||||
}
|
||||
prompt = sb.String()
|
||||
}
|
||||
// needs to be after <__media__> if there are images
|
||||
if !resume {
|
||||
botMsgStart := "\n" + botPersona + ":\n"
|
||||
prompt += botMsgStart
|
||||
}
|
||||
if cfg.ThinkUse && !cfg.ToolUse {
|
||||
prompt += "<think>"
|
||||
}
|
||||
logger.Debug("checking prompt for /completion", "tool_use", cfg.ToolUse,
|
||||
"msg", msg, "resume", resume, "prompt", prompt, "multimodal_data_count", len(multimodalData))
|
||||
payload := models.NewLCPReq(prompt, chatBody.Model, multimodalData,
|
||||
@@ -311,7 +289,7 @@ func (op LCPChat) FormMsg(msg, role string, resume bool) (io.Reader, error) {
|
||||
// If image processing fails, fall back to simple text message
|
||||
newMsg = models.NewRoleMsg(role, msg)
|
||||
} else {
|
||||
newMsg.AddImagePart(imageURL)
|
||||
newMsg.AddImagePart(imageURL, localImageAttachmentPath)
|
||||
}
|
||||
// Only clear the global image attachment after successfully processing it in this API call
|
||||
imageAttachmentPath = "" // Clear the attachment after use
|
||||
@@ -341,23 +319,21 @@ func (op LCPChat) FormMsg(msg, role string, resume bool) (io.Reader, error) {
|
||||
logger.Debug("LCPChat: RAG message added to chat body", "role", ragMsg.Role,
|
||||
"rag_content_len", len(ragMsg.Content), "message_count_after_rag", len(chatBody.Messages))
|
||||
}
|
||||
filteredMessages, botPersona := filterMessagesForCurrentCharacter(chatBody.Messages)
|
||||
filteredMessages, _ := filterMessagesForCurrentCharacter(chatBody.Messages)
|
||||
// openai /v1/chat does not support custom roles; needs to be user, assistant, system
|
||||
// Add persona suffix to the last user message to indicate who the assistant should reply as
|
||||
if cfg.AutoTurn && !resume {
|
||||
filteredMessages = addPersonaSuffixToLastUserMessage(filteredMessages, botPersona)
|
||||
}
|
||||
bodyCopy := &models.ChatBody{
|
||||
Messages: make([]models.RoleMsg, len(filteredMessages)),
|
||||
Model: chatBody.Model,
|
||||
Stream: chatBody.Stream,
|
||||
}
|
||||
for i, msg := range filteredMessages {
|
||||
if msg.Role == cfg.UserRole {
|
||||
bodyCopy.Messages[i] = msg
|
||||
strippedMsg := *stripThinkingFromMsg(&msg)
|
||||
if strippedMsg.Role == cfg.UserRole {
|
||||
bodyCopy.Messages[i] = strippedMsg
|
||||
bodyCopy.Messages[i].Role = "user"
|
||||
} else {
|
||||
bodyCopy.Messages[i] = msg
|
||||
bodyCopy.Messages[i] = strippedMsg
|
||||
}
|
||||
}
|
||||
// Clean null/empty messages to prevent API issues
|
||||
@@ -437,7 +413,7 @@ func (ds DeepSeekerCompletion) FormMsg(msg, role string, resume bool) (io.Reader
|
||||
filteredMessages, botPersona := filterMessagesForCurrentCharacter(chatBody.Messages)
|
||||
messages := make([]string, len(filteredMessages))
|
||||
for i, m := range filteredMessages {
|
||||
messages[i] = m.ToPrompt()
|
||||
messages[i] = stripThinkingFromMsg(&m).ToPrompt()
|
||||
}
|
||||
prompt := strings.Join(messages, "\n")
|
||||
// strings builder?
|
||||
@@ -519,22 +495,20 @@ func (ds DeepSeekerChat) FormMsg(msg, role string, resume bool) (io.Reader, erro
|
||||
logger.Debug("RAG message added to chat body", "message_count", len(chatBody.Messages))
|
||||
}
|
||||
// Create copy of chat body with standardized user role
|
||||
filteredMessages, botPersona := filterMessagesForCurrentCharacter(chatBody.Messages)
|
||||
filteredMessages, _ := filterMessagesForCurrentCharacter(chatBody.Messages)
|
||||
// Add persona suffix to the last user message to indicate who the assistant should reply as
|
||||
if cfg.AutoTurn && !resume {
|
||||
filteredMessages = addPersonaSuffixToLastUserMessage(filteredMessages, botPersona)
|
||||
}
|
||||
bodyCopy := &models.ChatBody{
|
||||
Messages: make([]models.RoleMsg, len(filteredMessages)),
|
||||
Model: chatBody.Model,
|
||||
Stream: chatBody.Stream,
|
||||
}
|
||||
for i, msg := range filteredMessages {
|
||||
if msg.Role == cfg.UserRole || i == 1 {
|
||||
bodyCopy.Messages[i] = msg
|
||||
strippedMsg := *stripThinkingFromMsg(&msg)
|
||||
if strippedMsg.Role == cfg.UserRole || i == 1 {
|
||||
bodyCopy.Messages[i] = strippedMsg
|
||||
bodyCopy.Messages[i].Role = "user"
|
||||
} else {
|
||||
bodyCopy.Messages[i] = msg
|
||||
bodyCopy.Messages[i] = strippedMsg
|
||||
}
|
||||
}
|
||||
// Clean null/empty messages to prevent API issues
|
||||
@@ -605,7 +579,7 @@ func (or OpenRouterCompletion) FormMsg(msg, role string, resume bool) (io.Reader
|
||||
filteredMessages, botPersona := filterMessagesForCurrentCharacter(chatBody.Messages)
|
||||
messages := make([]string, len(filteredMessages))
|
||||
for i, m := range filteredMessages {
|
||||
messages[i] = m.ToPrompt()
|
||||
messages[i] = stripThinkingFromMsg(&m).ToPrompt()
|
||||
}
|
||||
prompt := strings.Join(messages, "\n")
|
||||
// strings builder?
|
||||
@@ -690,7 +664,7 @@ func (or OpenRouterChat) FormMsg(msg, role string, resume bool) (io.Reader, erro
|
||||
// If image processing fails, fall back to simple text message
|
||||
newMsg = models.NewRoleMsg(role, msg)
|
||||
} else {
|
||||
newMsg.AddImagePart(imageURL)
|
||||
newMsg.AddImagePart(imageURL, localImageAttachmentPath)
|
||||
}
|
||||
// Only clear the global image attachment after successfully processing it in this API call
|
||||
imageAttachmentPath = "" // Clear the attachment after use
|
||||
@@ -718,21 +692,19 @@ func (or OpenRouterChat) FormMsg(msg, role string, resume bool) (io.Reader, erro
|
||||
logger.Debug("RAG message added to chat body", "message_count", len(chatBody.Messages))
|
||||
}
|
||||
// Create copy of chat body with standardized user role
|
||||
filteredMessages, botPersona := filterMessagesForCurrentCharacter(chatBody.Messages)
|
||||
filteredMessages, _ := filterMessagesForCurrentCharacter(chatBody.Messages)
|
||||
// Add persona suffix to the last user message to indicate who the assistant should reply as
|
||||
if cfg.AutoTurn && !resume {
|
||||
filteredMessages = addPersonaSuffixToLastUserMessage(filteredMessages, botPersona)
|
||||
}
|
||||
bodyCopy := &models.ChatBody{
|
||||
Messages: make([]models.RoleMsg, len(filteredMessages)),
|
||||
Model: chatBody.Model,
|
||||
Stream: chatBody.Stream,
|
||||
}
|
||||
for i, msg := range filteredMessages {
|
||||
bodyCopy.Messages[i] = msg
|
||||
strippedMsg := *stripThinkingFromMsg(&msg)
|
||||
bodyCopy.Messages[i] = strippedMsg
|
||||
// Standardize role if it's a user role
|
||||
if bodyCopy.Messages[i].Role == cfg.UserRole {
|
||||
bodyCopy.Messages[i] = msg
|
||||
bodyCopy.Messages[i] = strippedMsg
|
||||
bodyCopy.Messages[i].Role = "user"
|
||||
}
|
||||
}
|
||||
|
||||
11
main.go
11
main.go
@@ -1,9 +1,6 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"flag"
|
||||
"strconv"
|
||||
|
||||
"github.com/rivo/tview"
|
||||
)
|
||||
|
||||
@@ -15,18 +12,12 @@ var (
|
||||
injectRole = true
|
||||
selectedIndex = int(-1)
|
||||
shellMode = false
|
||||
thinkingCollapsed = false
|
||||
indexLineCompletion = "F12 to show keys help | llm turn: [%s:-:b]%v[-:-:-] (F6) | chat: [orange:-:b]%s[-:-:-] (F1) | toolUseAdviced: [%s:-:b]%v[-:-:-] (ctrl+k) | model: [orange:-:b]%s[-:-:-] (ctrl+l) | skip LLM resp: [%s:-:b]%v[-:-:-] (F10)\nAPI: [orange:-:b]%s[-:-:-] (ctrl+v) | recording: [%s:-:b]%v[-:-:-] (ctrl+r) | writing as: [orange:-:b]%s[-:-:-] (ctrl+q) | bot will write as [orange:-:b]%s[-:-:-] (ctrl+x) | role injection (alt+7) [%s:-:b]%v[-:-:-]"
|
||||
focusSwitcher = map[tview.Primitive]tview.Primitive{}
|
||||
)
|
||||
|
||||
func main() {
|
||||
apiPort := flag.Int("port", 0, "port to host api")
|
||||
flag.Parse()
|
||||
if apiPort != nil && *apiPort > 3000 {
|
||||
srv := Server{}
|
||||
srv.ListenToRequests(strconv.Itoa(*apiPort))
|
||||
return
|
||||
}
|
||||
pages.AddPage("main", flex, true, true)
|
||||
if err := app.SetRoot(pages,
|
||||
true).EnableMouse(cfg.EnableMouse).EnablePaste(true).Run(); err != nil {
|
||||
|
||||
105
models/models.go
105
models/models.go
@@ -5,9 +5,22 @@ import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
)
|
||||
|
||||
var (
|
||||
// imageBaseDir is the base directory for displaying image paths.
|
||||
// If set, image paths will be shown relative to this directory.
|
||||
imageBaseDir = ""
|
||||
)
|
||||
|
||||
// SetImageBaseDir sets the base directory for displaying image paths.
|
||||
// If dir is empty, full paths will be shown.
|
||||
func SetImageBaseDir(dir string) {
|
||||
imageBaseDir = dir
|
||||
}
|
||||
|
||||
type FuncCall struct {
|
||||
ID string `json:"id,omitempty"`
|
||||
Name string `json:"name"`
|
||||
@@ -82,6 +95,7 @@ type TextContentPart struct {
|
||||
|
||||
type ImageContentPart struct {
|
||||
Type string `json:"type"`
|
||||
Path string `json:"path,omitempty"` // Store original file path
|
||||
ImageURL struct {
|
||||
URL string `json:"url"`
|
||||
} `json:"image_url"`
|
||||
@@ -169,19 +183,49 @@ func (m *RoleMsg) UnmarshalJSON(data []byte) error {
|
||||
func (m *RoleMsg) ToText(i int) string {
|
||||
// Convert content to string representation
|
||||
var contentStr string
|
||||
var imageIndicators []string
|
||||
if !m.hasContentParts {
|
||||
contentStr = m.Content
|
||||
} else {
|
||||
// For structured content, just take the text parts
|
||||
// For structured content, collect text parts and image indicators
|
||||
var textParts []string
|
||||
for _, part := range m.ContentParts {
|
||||
if partMap, ok := part.(map[string]any); ok {
|
||||
if partType, exists := partMap["type"]; exists && partType == "text" {
|
||||
if textVal, textExists := partMap["text"]; textExists {
|
||||
switch p := part.(type) {
|
||||
case TextContentPart:
|
||||
if p.Type == "text" {
|
||||
textParts = append(textParts, p.Text)
|
||||
}
|
||||
case ImageContentPart:
|
||||
// Collect image indicator
|
||||
displayPath := p.Path
|
||||
if displayPath == "" {
|
||||
displayPath = "image"
|
||||
} else {
|
||||
displayPath = extractDisplayPath(displayPath)
|
||||
}
|
||||
imageIndicators = append(imageIndicators, fmt.Sprintf("[orange::i][image: %s][-:-:-]", displayPath))
|
||||
case map[string]any:
|
||||
if partType, exists := p["type"]; exists {
|
||||
switch partType {
|
||||
case "text":
|
||||
if textVal, textExists := p["text"]; textExists {
|
||||
if textStr, isStr := textVal.(string); isStr {
|
||||
textParts = append(textParts, textStr)
|
||||
}
|
||||
}
|
||||
case "image_url":
|
||||
// Handle unmarshaled image content
|
||||
var displayPath string
|
||||
if pathVal, pathExists := p["path"]; pathExists {
|
||||
if pathStr, isStr := pathVal.(string); isStr && pathStr != "" {
|
||||
displayPath = extractDisplayPath(pathStr)
|
||||
}
|
||||
}
|
||||
if displayPath == "" {
|
||||
displayPath = "image"
|
||||
}
|
||||
imageIndicators = append(imageIndicators, fmt.Sprintf("[orange::i][image: %s][-:-:-]", displayPath))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -194,7 +238,17 @@ func (m *RoleMsg) ToText(i int) string {
|
||||
// if !strings.HasPrefix(contentStr, m.Role+":") {
|
||||
icon := fmt.Sprintf("(%d) <%s>: ", i, m.Role)
|
||||
// }
|
||||
textMsg := fmt.Sprintf("[-:-:b]%s[-:-:-]\n%s\n", icon, contentStr)
|
||||
// Build final message with image indicators before text
|
||||
var finalContent strings.Builder
|
||||
if len(imageIndicators) > 0 {
|
||||
// Add each image indicator on its own line
|
||||
for _, indicator := range imageIndicators {
|
||||
finalContent.WriteString(indicator)
|
||||
finalContent.WriteString("\n")
|
||||
}
|
||||
}
|
||||
finalContent.WriteString(contentStr)
|
||||
textMsg := fmt.Sprintf("[-:-:b]%s[-:-:-]\n%s\n", icon, finalContent.String())
|
||||
return strings.ReplaceAll(textMsg, "\n\n", "\n")
|
||||
}
|
||||
|
||||
@@ -206,9 +260,16 @@ func (m *RoleMsg) ToPrompt() string {
|
||||
// For structured content, just take the text parts
|
||||
var textParts []string
|
||||
for _, part := range m.ContentParts {
|
||||
if partMap, ok := part.(map[string]any); ok {
|
||||
if partType, exists := partMap["type"]; exists && partType == "text" {
|
||||
if textVal, textExists := partMap["text"]; textExists {
|
||||
switch p := part.(type) {
|
||||
case TextContentPart:
|
||||
if p.Type == "text" {
|
||||
textParts = append(textParts, p.Text)
|
||||
}
|
||||
case ImageContentPart:
|
||||
// skip images for text display
|
||||
case map[string]any:
|
||||
if partType, exists := p["type"]; exists && partType == "text" {
|
||||
if textVal, textExists := p["text"]; textExists {
|
||||
if textStr, isStr := textVal.(string); isStr {
|
||||
textParts = append(textParts, textStr)
|
||||
}
|
||||
@@ -289,7 +350,7 @@ func (m *RoleMsg) AddTextPart(text string) {
|
||||
}
|
||||
|
||||
// AddImagePart adds an image content part to the message
|
||||
func (m *RoleMsg) AddImagePart(imageURL string) {
|
||||
func (m *RoleMsg) AddImagePart(imageURL, imagePath string) {
|
||||
if !m.hasContentParts {
|
||||
// Convert to content parts format
|
||||
if m.Content != "" {
|
||||
@@ -302,6 +363,7 @@ func (m *RoleMsg) AddImagePart(imageURL string) {
|
||||
|
||||
imagePart := ImageContentPart{
|
||||
Type: "image_url",
|
||||
Path: imagePath, // Store the original file path
|
||||
ImageURL: struct {
|
||||
URL string `json:"url"`
|
||||
}{URL: imageURL},
|
||||
@@ -341,6 +403,31 @@ func CreateImageURLFromPath(imagePath string) (string, error) {
|
||||
return fmt.Sprintf("data:%s;base64,%s", mimeType, encoded), nil
|
||||
}
|
||||
|
||||
// extractDisplayPath returns a path suitable for display, potentially relative to imageBaseDir
|
||||
func extractDisplayPath(p string) string {
|
||||
if p == "" {
|
||||
return ""
|
||||
}
|
||||
|
||||
// If base directory is set, try to make path relative to it
|
||||
if imageBaseDir != "" {
|
||||
if rel, err := filepath.Rel(imageBaseDir, p); err == nil {
|
||||
// Check if relative path doesn't start with ".." (meaning it's within base dir)
|
||||
// If it starts with "..", we might still want to show it as relative
|
||||
// but for now we show full path if it goes outside base dir
|
||||
if !strings.HasPrefix(rel, "..") {
|
||||
p = rel
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Truncate long paths to last 60 characters if needed
|
||||
if len(p) > 60 {
|
||||
return "..." + p[len(p)-60:]
|
||||
}
|
||||
return p
|
||||
}
|
||||
|
||||
type ChatBody struct {
|
||||
Model string `json:"model"`
|
||||
Stream bool `json:"stream"`
|
||||
|
||||
167
models/models_test.go
Normal file
167
models/models_test.go
Normal file
@@ -0,0 +1,167 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestRoleMsgToTextWithImages(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
msg RoleMsg
|
||||
index int
|
||||
expected string // substring to check
|
||||
}{
|
||||
{
|
||||
name: "text and image",
|
||||
index: 0,
|
||||
msg: func() RoleMsg {
|
||||
msg := NewMultimodalMsg("user", []interface{}{})
|
||||
msg.AddTextPart("Look at this picture")
|
||||
msg.AddImagePart("data:image/jpeg;base64,abc123", "/home/user/Pictures/cat.jpg")
|
||||
return msg
|
||||
}(),
|
||||
expected: "[orange::i][image: /home/user/Pictures/cat.jpg][-:-:-]",
|
||||
},
|
||||
{
|
||||
name: "image only",
|
||||
index: 1,
|
||||
msg: func() RoleMsg {
|
||||
msg := NewMultimodalMsg("user", []interface{}{})
|
||||
msg.AddImagePart("data:image/png;base64,xyz789", "/tmp/screenshot_20250217_123456.png")
|
||||
return msg
|
||||
}(),
|
||||
expected: "[orange::i][image: /tmp/screenshot_20250217_123456.png][-:-:-]",
|
||||
},
|
||||
{
|
||||
name: "long filename truncated",
|
||||
index: 2,
|
||||
msg: func() RoleMsg {
|
||||
msg := NewMultimodalMsg("user", []interface{}{})
|
||||
msg.AddTextPart("Check this")
|
||||
msg.AddImagePart("data:image/jpeg;base64,foo", "/very/long/path/to/a/really_long_filename_that_exceeds_forty_characters.jpg")
|
||||
return msg
|
||||
}(),
|
||||
expected: "[orange::i][image: .../to/a/really_long_filename_that_exceeds_forty_characters.jpg][-:-:-]",
|
||||
},
|
||||
{
|
||||
name: "multiple images",
|
||||
index: 3,
|
||||
msg: func() RoleMsg {
|
||||
msg := NewMultimodalMsg("user", []interface{}{})
|
||||
msg.AddTextPart("Multiple images")
|
||||
msg.AddImagePart("data:image/jpeg;base64,a", "/path/img1.jpg")
|
||||
msg.AddImagePart("data:image/png;base64,b", "/path/img2.png")
|
||||
return msg
|
||||
}(),
|
||||
expected: "[orange::i][image: /path/img1.jpg][-:-:-]\n[orange::i][image: /path/img2.png][-:-:-]",
|
||||
},
|
||||
{
|
||||
name: "old format without path",
|
||||
index: 4,
|
||||
msg: RoleMsg{
|
||||
Role: "user",
|
||||
hasContentParts: true,
|
||||
ContentParts: []interface{}{
|
||||
map[string]interface{}{
|
||||
"type": "image_url",
|
||||
"image_url": map[string]interface{}{
|
||||
"url": "data:image/jpeg;base64,old",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
expected: "[orange::i][image: image][-:-:-]",
|
||||
},
|
||||
{
|
||||
name: "old format with path",
|
||||
index: 5,
|
||||
msg: RoleMsg{
|
||||
Role: "user",
|
||||
hasContentParts: true,
|
||||
ContentParts: []interface{}{
|
||||
map[string]interface{}{
|
||||
"type": "image_url",
|
||||
"path": "/old/path/photo.jpg",
|
||||
"image_url": map[string]interface{}{
|
||||
"url": "data:image/jpeg;base64,old",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
expected: "[orange::i][image: /old/path/photo.jpg][-:-:-]",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
result := tt.msg.ToText(tt.index)
|
||||
if !strings.Contains(result, tt.expected) {
|
||||
t.Errorf("ToText() result does not contain expected indicator\ngot: %s\nwant substring: %s", result, tt.expected)
|
||||
}
|
||||
// Ensure the indicator appears before text content
|
||||
if strings.Contains(tt.expected, "cat.jpg") && strings.Contains(result, "Look at this picture") {
|
||||
indicatorPos := strings.Index(result, "[orange::i][image: /home/user/Pictures/cat.jpg][-:-:-]")
|
||||
textPos := strings.Index(result, "Look at this picture")
|
||||
if indicatorPos == -1 || textPos == -1 || indicatorPos >= textPos {
|
||||
t.Errorf("image indicator should appear before text")
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestExtractDisplayPath(t *testing.T) {
|
||||
// Save original base dir
|
||||
originalBaseDir := imageBaseDir
|
||||
defer func() { imageBaseDir = originalBaseDir }()
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
baseDir string
|
||||
path string
|
||||
expected string
|
||||
}{
|
||||
{
|
||||
name: "no base dir shows full path",
|
||||
baseDir: "",
|
||||
path: "/home/user/images/cat.jpg",
|
||||
expected: "/home/user/images/cat.jpg",
|
||||
},
|
||||
{
|
||||
name: "relative path within base dir",
|
||||
baseDir: "/home/user",
|
||||
path: "/home/user/images/cat.jpg",
|
||||
expected: "images/cat.jpg",
|
||||
},
|
||||
{
|
||||
name: "path outside base dir shows full path",
|
||||
baseDir: "/home/user",
|
||||
path: "/tmp/test.jpg",
|
||||
expected: "/tmp/test.jpg",
|
||||
},
|
||||
{
|
||||
name: "same directory",
|
||||
baseDir: "/home/user/images",
|
||||
path: "/home/user/images/cat.jpg",
|
||||
expected: "cat.jpg",
|
||||
},
|
||||
{
|
||||
name: "long path truncated",
|
||||
baseDir: "",
|
||||
path: "/very/long/path/to/a/really_long_filename_that_exceeds_sixty_characters_limit_yes_it_is_very_long.jpg",
|
||||
expected: "..._that_exceeds_sixty_characters_limit_yes_it_is_very_long.jpg",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
imageBaseDir = tt.baseDir
|
||||
result := extractDisplayPath(tt.path)
|
||||
if result != tt.expected {
|
||||
t.Errorf("extractDisplayPath(%q) with baseDir=%q = %q, want %q",
|
||||
tt.path, tt.baseDir, result, tt.expected)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -135,6 +135,9 @@ func makePropsTable(props map[string]float32) *tview.Table {
|
||||
// Reconfigure the app's mouse setting
|
||||
app.EnableMouse(cfg.EnableMouse)
|
||||
})
|
||||
addCheckboxRow("Image Preview (file picker)", cfg.ImagePreview, func(checked bool) {
|
||||
cfg.ImagePreview = checked
|
||||
})
|
||||
addCheckboxRow("Auto turn (for cards with many chars)", cfg.AutoTurn, func(checked bool) {
|
||||
cfg.AutoTurn = checked
|
||||
})
|
||||
|
||||
74
server.go
74
server.go
@@ -1,74 +0,0 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"gf-lt/config"
|
||||
"net/http"
|
||||
"time"
|
||||
)
|
||||
|
||||
type Server struct {
|
||||
// nolint
|
||||
config config.Config
|
||||
}
|
||||
|
||||
func (srv *Server) ListenToRequests(port string) {
|
||||
// h := srv.actions
|
||||
mux := http.NewServeMux()
|
||||
server := &http.Server{
|
||||
Addr: "localhost:" + port,
|
||||
Handler: mux,
|
||||
ReadTimeout: time.Second * 5,
|
||||
WriteTimeout: time.Second * 5,
|
||||
}
|
||||
mux.HandleFunc("GET /ping", pingHandler)
|
||||
mux.HandleFunc("GET /model", modelHandler)
|
||||
mux.HandleFunc("POST /completion", completionHandler)
|
||||
fmt.Println("Listening", "addr", server.Addr)
|
||||
if err := server.ListenAndServe(); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
}
|
||||
|
||||
// create server
|
||||
// listen to the completion endpoint handler
|
||||
func pingHandler(w http.ResponseWriter, req *http.Request) {
|
||||
if _, err := w.Write([]byte("pong")); err != nil {
|
||||
logger.Error("server ping", "error", err)
|
||||
}
|
||||
}
|
||||
|
||||
func completionHandler(w http.ResponseWriter, req *http.Request) {
|
||||
// post request
|
||||
body := req.Body
|
||||
// get body as io.reader
|
||||
// pass it to the /completion
|
||||
go sendMsgToLLM(body)
|
||||
out:
|
||||
for {
|
||||
select {
|
||||
case chunk := <-chunkChan:
|
||||
fmt.Print(chunk)
|
||||
if _, err := w.Write([]byte(chunk)); err != nil {
|
||||
logger.Warn("failed to write chunk", "value", chunk)
|
||||
continue
|
||||
}
|
||||
case <-streamDone:
|
||||
break out
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func modelHandler(w http.ResponseWriter, req *http.Request) {
|
||||
llmModel := fetchLCPModelName()
|
||||
payload, err := json.Marshal(llmModel)
|
||||
if err != nil {
|
||||
logger.Error("model handler", "error", err)
|
||||
// return err
|
||||
return
|
||||
}
|
||||
if _, err := w.Write(payload); err != nil {
|
||||
logger.Error("model handler", "error", err)
|
||||
}
|
||||
}
|
||||
217
tables.go
217
tables.go
@@ -2,6 +2,7 @@ package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"image"
|
||||
"os"
|
||||
"path"
|
||||
"strings"
|
||||
@@ -788,17 +789,18 @@ func makeFilePicker() *tview.Flex {
|
||||
var selectedFile string
|
||||
// Track currently displayed directory (changes as user navigates)
|
||||
currentDisplayDir := startDir
|
||||
// --- NEW: search state ---
|
||||
searching := false
|
||||
searchQuery := ""
|
||||
// Helper function to check if a file has an allowed extension from config
|
||||
hasAllowedExtension := func(filename string) bool {
|
||||
// If no allowed extensions are specified in config, allow all files
|
||||
if cfg.FilePickerExts == "" {
|
||||
return true
|
||||
}
|
||||
// Split the allowed extensions from the config string
|
||||
allowedExts := strings.Split(cfg.FilePickerExts, ",")
|
||||
lowerFilename := strings.ToLower(strings.TrimSpace(filename))
|
||||
for _, ext := range allowedExts {
|
||||
ext = strings.TrimSpace(ext) // Remove any whitespace around the extension
|
||||
ext = strings.TrimSpace(ext)
|
||||
if ext != "" && strings.HasSuffix(lowerFilename, "."+ext) {
|
||||
return true
|
||||
}
|
||||
@@ -823,16 +825,32 @@ func makeFilePicker() *tview.Flex {
|
||||
statusView := tview.NewTextView()
|
||||
statusView.SetBorder(true).SetTitle("Selected File").SetTitleAlign(tview.AlignLeft)
|
||||
statusView.SetTextColor(tcell.ColorYellow)
|
||||
// Layout - only include list view and status view
|
||||
// Image preview pane
|
||||
var imgPreview *tview.Image
|
||||
if cfg.ImagePreview {
|
||||
imgPreview = tview.NewImage()
|
||||
imgPreview.SetBorder(true).SetTitle("Preview").SetTitleAlign(tview.AlignLeft)
|
||||
}
|
||||
// Horizontal flex for list + preview
|
||||
var hFlex *tview.Flex
|
||||
if cfg.ImagePreview && imgPreview != nil {
|
||||
hFlex = tview.NewFlex().SetDirection(tview.FlexColumn).
|
||||
AddItem(listView, 0, 3, true).
|
||||
AddItem(imgPreview, 0, 2, false)
|
||||
} else {
|
||||
hFlex = tview.NewFlex().SetDirection(tview.FlexColumn).
|
||||
AddItem(listView, 0, 1, true)
|
||||
}
|
||||
// Main vertical flex
|
||||
flex := tview.NewFlex().SetDirection(tview.FlexRow)
|
||||
flex.AddItem(listView, 0, 3, true)
|
||||
flex.AddItem(hFlex, 0, 3, true)
|
||||
flex.AddItem(statusView, 3, 0, false)
|
||||
// Refresh the file list
|
||||
var refreshList func(string)
|
||||
refreshList = func(dir string) {
|
||||
// Refresh the file list – now accepts a filter string
|
||||
var refreshList func(string, string)
|
||||
refreshList = func(dir string, filter string) {
|
||||
listView.Clear()
|
||||
// Update the current display directory
|
||||
currentDisplayDir = dir // Update the current display directory
|
||||
currentDisplayDir = dir
|
||||
// Add exit option at the top
|
||||
listView.AddItem("Exit file picker [gray](Close without selecting)[-]", "", 'x', func() {
|
||||
pages.RemovePage(filePickerPage)
|
||||
@@ -840,13 +858,16 @@ func makeFilePicker() *tview.Flex {
|
||||
// Add parent directory (..) if not at root
|
||||
if dir != "/" {
|
||||
parentDir := path.Dir(dir)
|
||||
// Special handling for edge cases - only return if we're truly at a system root
|
||||
// For Unix-like systems, path.Dir("/") returns "/" which would cause parentDir == dir
|
||||
if parentDir == dir && dir == "/" {
|
||||
// We're at the root ("/") and trying to go up, just don't add the parent item
|
||||
} else {
|
||||
// For Unix-like systems, avoid infinite loop when at root
|
||||
if parentDir != dir {
|
||||
listView.AddItem("../ [gray](Parent Directory)[-]", "", 'p', func() {
|
||||
refreshList(parentDir)
|
||||
// Clear search on navigation
|
||||
searching = false
|
||||
searchQuery = ""
|
||||
if cfg.ImagePreview {
|
||||
imgPreview.SetImage(nil)
|
||||
}
|
||||
refreshList(parentDir, "")
|
||||
dirStack = append(dirStack, parentDir)
|
||||
currentStackPos = len(dirStack) - 1
|
||||
})
|
||||
@@ -858,93 +879,183 @@ func makeFilePicker() *tview.Flex {
|
||||
statusView.SetText("Error reading directory: " + err.Error())
|
||||
return
|
||||
}
|
||||
// Add directories and files to the list
|
||||
// Helper to check if an item passes the filter
|
||||
matchesFilter := func(name string) bool {
|
||||
if filter == "" {
|
||||
return true
|
||||
}
|
||||
return strings.Contains(strings.ToLower(name), strings.ToLower(filter))
|
||||
}
|
||||
// Add directories
|
||||
for _, file := range files {
|
||||
name := file.Name()
|
||||
// Skip hidden files and directories (those starting with a dot)
|
||||
if strings.HasPrefix(name, ".") {
|
||||
continue
|
||||
}
|
||||
if file.IsDir() {
|
||||
// Capture the directory name for the closure to avoid loop variable issues
|
||||
if file.IsDir() && matchesFilter(name) {
|
||||
dirName := name
|
||||
listView.AddItem(dirName+"/ [gray](Directory)[-]", "", 0, func() {
|
||||
// Clear search on navigation
|
||||
searching = false
|
||||
searchQuery = ""
|
||||
if cfg.ImagePreview {
|
||||
imgPreview.SetImage(nil)
|
||||
}
|
||||
newDir := path.Join(dir, dirName)
|
||||
refreshList(newDir)
|
||||
refreshList(newDir, "")
|
||||
dirStack = append(dirStack, newDir)
|
||||
currentStackPos = len(dirStack) - 1
|
||||
statusView.SetText("Current: " + newDir)
|
||||
})
|
||||
} else if hasAllowedExtension(name) {
|
||||
// Only show files that have allowed extensions (from config)
|
||||
// Capture the file name for the closure to avoid loop variable issues
|
||||
}
|
||||
}
|
||||
// Add files with allowed extensions
|
||||
for _, file := range files {
|
||||
name := file.Name()
|
||||
if strings.HasPrefix(name, ".") || file.IsDir() {
|
||||
continue
|
||||
}
|
||||
if hasAllowedExtension(name) && matchesFilter(name) {
|
||||
fileName := name
|
||||
fullFilePath := path.Join(dir, fileName)
|
||||
listView.AddItem(fileName+" [gray](File)[-]", "", 0, func() {
|
||||
selectedFile = fullFilePath
|
||||
statusView.SetText("Selected: " + selectedFile)
|
||||
// Check if the file is an image
|
||||
if isImageFile(fileName) {
|
||||
// For image files, offer to attach to the next LLM message
|
||||
statusView.SetText("Selected image: " + selectedFile)
|
||||
} else {
|
||||
// For non-image files, display as before
|
||||
statusView.SetText("Selected: " + selectedFile)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
// Update status line based on search state
|
||||
switch {
|
||||
case searching:
|
||||
statusView.SetText("Search: " + searchQuery + "_")
|
||||
case searchQuery != "":
|
||||
statusView.SetText("Current: " + dir + " (filter: " + searchQuery + ")")
|
||||
default:
|
||||
statusView.SetText("Current: " + dir)
|
||||
}
|
||||
}
|
||||
// Initialize the file list
|
||||
refreshList(startDir)
|
||||
refreshList(startDir, "")
|
||||
// Update image preview when selection changes (unchanged)
|
||||
if cfg.ImagePreview && imgPreview != nil {
|
||||
listView.SetChangedFunc(func(index int, mainText, secondaryText string, rune rune) {
|
||||
itemText, _ := listView.GetItemText(index)
|
||||
if strings.HasPrefix(itemText, "Exit file picker") || strings.HasPrefix(itemText, "../") {
|
||||
imgPreview.SetImage(nil)
|
||||
return
|
||||
}
|
||||
actualItemName := itemText
|
||||
if bracketPos := strings.Index(itemText, " ["); bracketPos != -1 {
|
||||
actualItemName = itemText[:bracketPos]
|
||||
}
|
||||
if strings.HasSuffix(actualItemName, "/") {
|
||||
imgPreview.SetImage(nil)
|
||||
return
|
||||
}
|
||||
if !isImageFile(actualItemName) {
|
||||
imgPreview.SetImage(nil)
|
||||
return
|
||||
}
|
||||
filePath := path.Join(currentDisplayDir, actualItemName)
|
||||
file, err := os.Open(filePath)
|
||||
if err != nil {
|
||||
imgPreview.SetImage(nil)
|
||||
return
|
||||
}
|
||||
defer file.Close()
|
||||
img, _, err := image.Decode(file)
|
||||
if err != nil {
|
||||
imgPreview.SetImage(nil)
|
||||
return
|
||||
}
|
||||
imgPreview.SetImage(img)
|
||||
})
|
||||
}
|
||||
// Set up keyboard navigation
|
||||
flex.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
||||
// --- Handle search mode ---
|
||||
if searching {
|
||||
switch event.Key() {
|
||||
case tcell.KeyEsc:
|
||||
// Exit search, clear filter
|
||||
searching = false
|
||||
searchQuery = ""
|
||||
refreshList(currentDisplayDir, "")
|
||||
return nil
|
||||
case tcell.KeyBackspace, tcell.KeyBackspace2:
|
||||
if len(searchQuery) > 0 {
|
||||
searchQuery = searchQuery[:len(searchQuery)-1]
|
||||
refreshList(currentDisplayDir, searchQuery)
|
||||
}
|
||||
return nil
|
||||
case tcell.KeyRune:
|
||||
r := event.Rune()
|
||||
if r != 0 {
|
||||
searchQuery += string(r)
|
||||
refreshList(currentDisplayDir, searchQuery)
|
||||
}
|
||||
return nil
|
||||
default:
|
||||
// Pass all other keys (arrows, Enter, etc.) to normal processing
|
||||
// This allows selecting items while still in search mode
|
||||
return event
|
||||
}
|
||||
}
|
||||
// --- Not searching ---
|
||||
switch event.Key() {
|
||||
case tcell.KeyEsc:
|
||||
pages.RemovePage(filePickerPage)
|
||||
return nil
|
||||
case tcell.KeyBackspace2: // Backspace to go to parent directory
|
||||
if cfg.ImagePreview && imgPreview != nil {
|
||||
imgPreview.SetImage(nil)
|
||||
}
|
||||
if currentStackPos > 0 {
|
||||
currentStackPos--
|
||||
prevDir := dirStack[currentStackPos]
|
||||
refreshList(prevDir)
|
||||
// Trim the stack to current position to avoid deep history
|
||||
// Clear search when navigating with backspace
|
||||
searching = false
|
||||
searchQuery = ""
|
||||
refreshList(prevDir, "")
|
||||
// Trim the stack to current position
|
||||
dirStack = dirStack[:currentStackPos+1]
|
||||
}
|
||||
return nil
|
||||
case tcell.KeyRune:
|
||||
if event.Rune() == '/' {
|
||||
// Enter search mode
|
||||
searching = true
|
||||
searchQuery = ""
|
||||
refreshList(currentDisplayDir, "")
|
||||
return nil
|
||||
}
|
||||
case tcell.KeyEnter:
|
||||
// Get the currently highlighted item in the list
|
||||
itemIndex := listView.GetCurrentItem()
|
||||
if itemIndex >= 0 && itemIndex < listView.GetItemCount() {
|
||||
// We need to get the text of the currently selected item to determine if it's a directory
|
||||
// Since we can't directly get the item text, we'll keep track of items differently
|
||||
// Let's improve the approach by tracking the currently selected item
|
||||
itemText, _ := listView.GetItemText(itemIndex)
|
||||
logger.Info("choosing dir", "itemText", itemText)
|
||||
// Check for the exit option first (should be the first item)
|
||||
// Check for the exit option first
|
||||
if strings.HasPrefix(itemText, "Exit file picker") {
|
||||
pages.RemovePage(filePickerPage)
|
||||
return nil
|
||||
}
|
||||
// Extract the actual filename/directory name by removing the type info in brackets
|
||||
// Format is "name [gray](type)[-]"
|
||||
// Extract the actual filename/directory name by removing the type info
|
||||
actualItemName := itemText
|
||||
if bracketPos := strings.Index(itemText, " ["); bracketPos != -1 {
|
||||
actualItemName = itemText[:bracketPos]
|
||||
}
|
||||
// Check if it's a directory (ends with /)
|
||||
if strings.HasSuffix(actualItemName, "/") {
|
||||
// This is a directory, we need to get the full path
|
||||
// Since the item text ends with "/" and represents a directory
|
||||
var targetDir string
|
||||
if strings.HasPrefix(actualItemName, "../") {
|
||||
// Parent directory - need to go up from current directory
|
||||
// Parent directory
|
||||
targetDir = path.Dir(currentDisplayDir)
|
||||
// Avoid going above root - if parent is same as current and it's system root
|
||||
if targetDir == currentDisplayDir && currentDisplayDir == "/" {
|
||||
// We're at root, don't navigate
|
||||
logger.Warn("went to root", "dir", targetDir)
|
||||
logger.Warn("at root, cannot go up")
|
||||
return nil
|
||||
}
|
||||
} else {
|
||||
@@ -952,24 +1063,23 @@ func makeFilePicker() *tview.Flex {
|
||||
dirName := strings.TrimSuffix(actualItemName, "/")
|
||||
targetDir = path.Join(currentDisplayDir, dirName)
|
||||
}
|
||||
// Navigate to the selected directory
|
||||
logger.Info("going to the dir", "dir", targetDir)
|
||||
refreshList(targetDir)
|
||||
// Navigate – clear search
|
||||
logger.Info("going to dir", "dir", targetDir)
|
||||
if cfg.ImagePreview && imgPreview != nil {
|
||||
imgPreview.SetImage(nil)
|
||||
}
|
||||
searching = false
|
||||
searchQuery = ""
|
||||
refreshList(targetDir, "")
|
||||
dirStack = append(dirStack, targetDir)
|
||||
currentStackPos = len(dirStack) - 1
|
||||
statusView.SetText("Current: " + targetDir)
|
||||
return nil
|
||||
} else {
|
||||
// It's a file - construct the full path from current directory and the actual item name
|
||||
// We can't rely only on the selectedFile variable since Enter key might be pressed
|
||||
// without having clicked the file first
|
||||
// It's a file
|
||||
filePath := path.Join(currentDisplayDir, actualItemName)
|
||||
// Verify it's actually a file (not just lacking a directory suffix)
|
||||
if info, err := os.Stat(filePath); err == nil && !info.IsDir() {
|
||||
// Check if the file is an image
|
||||
if isImageFile(actualItemName) {
|
||||
// For image files, set it as an attachment for the next LLM message
|
||||
// Use the version without UI updates to avoid hangs in event handlers
|
||||
logger.Info("setting image", "file", actualItemName)
|
||||
SetImageAttachment(filePath)
|
||||
logger.Info("after setting image", "file", actualItemName)
|
||||
@@ -978,7 +1088,6 @@ func makeFilePicker() *tview.Flex {
|
||||
pages.RemovePage(filePickerPage)
|
||||
logger.Info("after update drawn", "file", actualItemName)
|
||||
} else {
|
||||
// For non-image files, update the text area with file path
|
||||
textArea.SetText(filePath, true)
|
||||
app.SetFocus(textArea)
|
||||
pages.RemovePage(filePickerPage)
|
||||
|
||||
23
tui.go
23
tui.go
@@ -96,6 +96,7 @@ var (
|
||||
[yellow]Alt+7[white]: toggle role injection (inject role in messages)
|
||||
[yellow]Alt+8[white]: show char img or last picked img
|
||||
[yellow]Alt+9[white]: warm up (load) selected llama.cpp model
|
||||
[yellow]Alt+t[white]: toggle thinking blocks visibility (collapse/expand <think> blocks)
|
||||
|
||||
=== scrolling chat window (some keys similar to vim) ===
|
||||
[yellow]arrows up/down and j/k[white]: scroll up and down
|
||||
@@ -831,6 +832,20 @@ func init() {
|
||||
injectRole = !injectRole
|
||||
updateStatusLine()
|
||||
}
|
||||
// Handle Alt+T to toggle thinking block visibility
|
||||
if event.Key() == tcell.KeyRune && event.Rune() == 't' && event.Modifiers()&tcell.ModAlt != 0 {
|
||||
thinkingCollapsed = !thinkingCollapsed
|
||||
textView.SetText(chatToText(chatBody.Messages, cfg.ShowSys))
|
||||
colorText()
|
||||
status := "expanded"
|
||||
if thinkingCollapsed {
|
||||
status = "collapsed"
|
||||
}
|
||||
if err := notifyUser("thinking", "Thinking blocks "+status); err != nil {
|
||||
logger.Error("failed to send notification", "error", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
if event.Key() == tcell.KeyF1 {
|
||||
// chatList, err := loadHistoryChats()
|
||||
chatList, err := store.GetChatByChar(cfg.AssistantRole)
|
||||
@@ -858,7 +873,7 @@ func init() {
|
||||
updateStatusLine()
|
||||
return nil
|
||||
}
|
||||
if event.Key() == tcell.KeyF2 {
|
||||
if event.Key() == tcell.KeyF2 && !botRespMode {
|
||||
// regen last msg
|
||||
if len(chatBody.Messages) == 0 {
|
||||
if err := notifyUser("info", "no messages to regenerate"); err != nil {
|
||||
@@ -871,6 +886,9 @@ func init() {
|
||||
// lastRole := chatBody.Messages[len(chatBody.Messages)-1].Role
|
||||
textView.SetText(chatToText(chatBody.Messages, cfg.ShowSys))
|
||||
// go chatRound("", cfg.UserRole, textView, true, false)
|
||||
if cfg.TTS_ENABLED {
|
||||
TTSDoneChan <- true
|
||||
}
|
||||
chatRoundChan <- &models.ChatRoundReq{Role: cfg.UserRole, Regen: true}
|
||||
return nil
|
||||
}
|
||||
@@ -893,6 +911,9 @@ func init() {
|
||||
}
|
||||
chatBody.Messages = chatBody.Messages[:len(chatBody.Messages)-1]
|
||||
textView.SetText(chatToText(chatBody.Messages, cfg.ShowSys))
|
||||
if cfg.TTS_ENABLED {
|
||||
TTSDoneChan <- true
|
||||
}
|
||||
colorText()
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user