Compare commits
6 Commits
feat/serve
...
c83779b479
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c83779b479 | ||
|
|
43b0fe3739 | ||
|
|
1b36ef938e | ||
|
|
987d5842a4 | ||
|
|
10b665813e | ||
|
|
8c3c2b9b23 |
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
|
||||
|
||||
|
||||
27
bot.go
27
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"
|
||||
|
||||
@@ -30,6 +30,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"`
|
||||
|
||||
66
docs/filepicker-search.md
Normal file
66
docs/filepicker-search.md
Normal file
@@ -0,0 +1,66 @@
|
||||
# Filepicker Search Implementation - Notes
|
||||
|
||||
## Goal
|
||||
Add `/` key functionality in filepicker (Ctrl+O) to filter/search files by name, similar to how `/` works in the main TUI textview.
|
||||
|
||||
## Requirements
|
||||
- Press `/` to activate search mode
|
||||
- Live case-insensitive filtering
|
||||
- `../` (parent directory) always visible
|
||||
- Show "No matching files" when nothing matches
|
||||
- Esc to cancel (return to main app for sending messages)
|
||||
- Enter to confirm search and close search input
|
||||
|
||||
## Approaches Tried
|
||||
|
||||
### Approach 1: Modify Flex Layout In-Place
|
||||
Add search input to the existing flex container by replacing listView with searchInput.
|
||||
|
||||
**Issues:**
|
||||
- tview's `RemoveItem`/`AddItem` causes UI freezes/hangs
|
||||
- Using `app.QueueUpdate` or `app.Draw` didn't help
|
||||
- Layout changes don't render properly
|
||||
|
||||
### Approach 2: Add Input Capture to ListView
|
||||
Handle `/` key in listView's SetInputCapture.
|
||||
|
||||
**Issues:**
|
||||
- Key events don't reach listView when filepicker is open
|
||||
- Global app input capture handles `/` for main textview search first
|
||||
- Even when checking `pages.GetFrontPage()`, the key isn't captured
|
||||
|
||||
### Approach 3: Global Handler with Page Replacement
|
||||
Handle `/` in global app input capture when filepicker page is frontmost.
|
||||
|
||||
**Issues:**
|
||||
- Search input appears but text is invisible (color issues)
|
||||
- Enter/Esc not handled - main TUI captures them
|
||||
- Creating new pages adds on top instead of replacing, causing split-screen effect
|
||||
- Enter on file item opens new filepicker (page stacking issue)
|
||||
|
||||
### Approach 4: Overlay Page (Modal-style)
|
||||
Create a new flex with search input on top and filepicker below, replace the page.
|
||||
|
||||
**Issues:**
|
||||
- Page replacement causes split-screen between main app and filepicker
|
||||
- Search input renders but invisible text
|
||||
- Enter/Esc handled by main TUI, not search input
|
||||
- State lost when recreating filepicker
|
||||
|
||||
## Root Causes
|
||||
|
||||
1. **tview UI update issues**: Direct manipulation of flex items causes freezes or doesn't render
|
||||
2. **Input capture priority**: Even with page overlay, main TUI's global input capture processes keys first
|
||||
3. **Esc key conflict**: Esc is used for sending messages in main TUI, and it's hard to distinguish when filepicker is open
|
||||
4. **Focus management**: tview's focus system doesn't work as expected with dynamic layouts
|
||||
|
||||
## Possible Solutions (Not Tried)
|
||||
|
||||
1. **Use tview's built-in Filter method**: ListView has a SetFilterFunc that might work
|
||||
2. **Create separate search primitive**: Instead of replacing list, use a separate text input overlay
|
||||
3. **Different key for search**: Use a key that isn't already mapped in main TUI
|
||||
4. **Fork/extend tview**: May need to modify tview itself for better dynamic UI updates
|
||||
5. **Use form with text input**: tview.Forms might handle input better
|
||||
|
||||
## Current State
|
||||
All search-related changes rolled back. Filepicker works as before without search functionality.
|
||||
10
main.go
10
main.go
@@ -1,9 +1,6 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"flag"
|
||||
"strconv"
|
||||
|
||||
"github.com/rivo/tview"
|
||||
)
|
||||
|
||||
@@ -20,13 +17,6 @@ var (
|
||||
)
|
||||
|
||||
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 {
|
||||
|
||||
@@ -175,9 +175,16 @@ func (m *RoleMsg) ToText(i int) 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)
|
||||
}
|
||||
@@ -206,9 +213,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)
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
66
tables.go
66
tables.go
@@ -2,6 +2,7 @@ package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"image"
|
||||
"os"
|
||||
"path"
|
||||
"strings"
|
||||
@@ -823,9 +824,25 @@ 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)
|
||||
@@ -846,6 +863,7 @@ func makeFilePicker() *tview.Flex {
|
||||
// We're at the root ("/") and trying to go up, just don't add the parent item
|
||||
} else {
|
||||
listView.AddItem("../ [gray](Parent Directory)[-]", "", 'p', func() {
|
||||
imgPreview.SetImage(nil)
|
||||
refreshList(parentDir)
|
||||
dirStack = append(dirStack, parentDir)
|
||||
currentStackPos = len(dirStack) - 1
|
||||
@@ -869,6 +887,7 @@ func makeFilePicker() *tview.Flex {
|
||||
// Capture the directory name for the closure to avoid loop variable issues
|
||||
dirName := name
|
||||
listView.AddItem(dirName+"/ [gray](Directory)[-]", "", 0, func() {
|
||||
imgPreview.SetImage(nil)
|
||||
newDir := path.Join(dir, dirName)
|
||||
refreshList(newDir)
|
||||
dirStack = append(dirStack, newDir)
|
||||
@@ -898,6 +917,43 @@ func makeFilePicker() *tview.Flex {
|
||||
}
|
||||
// Initialize the file list
|
||||
refreshList(startDir)
|
||||
// Update image preview when selection changes
|
||||
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)
|
||||
go func() {
|
||||
file, err := os.Open(filePath)
|
||||
if err != nil {
|
||||
app.QueueUpdate(func() { imgPreview.SetImage(nil) })
|
||||
return
|
||||
}
|
||||
defer file.Close()
|
||||
img, _, err := image.Decode(file)
|
||||
if err != nil {
|
||||
app.QueueUpdate(func() { imgPreview.SetImage(nil) })
|
||||
return
|
||||
}
|
||||
app.QueueUpdate(func() { imgPreview.SetImage(img) })
|
||||
}()
|
||||
})
|
||||
}
|
||||
// Set up keyboard navigation
|
||||
flex.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
||||
switch event.Key() {
|
||||
@@ -905,6 +961,9 @@ func makeFilePicker() *tview.Flex {
|
||||
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]
|
||||
@@ -954,6 +1013,9 @@ func makeFilePicker() *tview.Flex {
|
||||
}
|
||||
// Navigate to the selected directory
|
||||
logger.Info("going to the dir", "dir", targetDir)
|
||||
if cfg.ImagePreview && imgPreview != nil {
|
||||
imgPreview.SetImage(nil)
|
||||
}
|
||||
refreshList(targetDir)
|
||||
dirStack = append(dirStack, targetDir)
|
||||
currentStackPos = len(dirStack) - 1
|
||||
|
||||
8
tui.go
8
tui.go
@@ -858,7 +858,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 +871,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 +896,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