Compare commits
117 Commits
feat/resp-
...
enha/rag-e
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a1b5f9cdc5 | ||
|
|
e74ff8c03f | ||
|
|
b6e802c12e | ||
|
|
c0d5db29a5 | ||
|
|
6ed96c9bd3 | ||
|
|
b5f0eabeea | ||
|
|
e0201886f8 | ||
|
|
5b175c12a6 | ||
|
|
c200c9328c | ||
|
|
23cb8f2578 | ||
|
|
4f0bce50c5 | ||
|
|
bf655a1087 | ||
|
|
c8f00198d6 | ||
|
|
c5a24b2a3f | ||
|
|
0f0c43f327 | ||
|
|
0e55e44f62 | ||
|
|
014e297ae3 | ||
|
|
5f273681df | ||
|
|
17b68bc21f | ||
|
|
edfd43c52a | ||
|
|
62ec55505c | ||
|
|
f9866bcf5a | ||
|
|
822cc48834 | ||
|
|
4ef0a21511 | ||
|
|
d2caebdb4f | ||
|
|
e1f2a8cd7b | ||
|
|
efc92d884c | ||
|
|
ac8c8bb055 | ||
|
|
c2c107c786 | ||
|
|
c2757653a3 | ||
|
|
4bd6883966 | ||
|
|
7c56e27dbe | ||
|
|
fbc955ca37 | ||
|
|
c65c11bcfb | ||
|
|
04f1fd464b | ||
|
|
6e9c453ee0 | ||
|
|
645b7351a8 | ||
|
|
57088565bd | ||
|
|
4b6769e531 | ||
|
|
d144ee76d9 | ||
|
|
abcaad6609 | ||
|
|
50ce0200af | ||
|
|
58ccd63f4a | ||
|
|
3611d7eb59 | ||
|
|
8974d2f52c | ||
|
|
6b0d03f2d6 | ||
|
|
fb4deb1161 | ||
|
|
0e5d37666f | ||
|
|
093103bdd7 | ||
|
|
6c9a1ba56b | ||
|
|
93ecfc8a34 | ||
|
|
0c9c590d8f | ||
|
|
d130254e88 | ||
|
|
6e7a063300 | ||
|
|
c05b93299c | ||
|
|
cad1bd46c1 | ||
|
|
4bddce3700 | ||
|
|
fcc71987bf | ||
|
|
8458edf5a8 | ||
|
|
07b06bb0d3 | ||
|
|
3389b1d83b | ||
|
|
4f6000a43a | ||
|
|
9ba46b40cc | ||
|
|
5bb456272e | ||
|
|
8999f48fb9 | ||
|
|
b2f280a7f1 | ||
|
|
65cbd5d6a6 | ||
|
|
caac1d397a | ||
|
|
742f1ca838 | ||
|
|
e36bade353 | ||
|
|
01d8bcdbf5 | ||
|
|
f6a395bce9 | ||
|
|
dc34c63256 | ||
|
|
cdfccf9a24 | ||
|
|
1f112259d2 | ||
|
|
a505ffaaa9 | ||
|
|
32be271aa3 | ||
|
|
133ec27938 | ||
|
|
d79760a289 | ||
|
|
2580360f91 | ||
|
|
fe4dd0c982 | ||
|
|
83f99d3577 | ||
|
|
e521434073 | ||
|
|
916c5d3904 | ||
|
|
5b1cbb46fa | ||
|
|
1fcab8365e | ||
|
|
c855c30ae2 | ||
|
|
915b029d2c | ||
|
|
b599e1ab38 | ||
|
|
0d94734090 | ||
|
|
a0ff384b81 | ||
|
|
09b5e0d08f | ||
|
|
7d51c5d0f3 | ||
|
|
b97cd67d72 | ||
|
|
888c9fec65 | ||
|
|
4f07994bdc | ||
|
|
776fd7a2c4 | ||
|
|
9c6b0dc1fa | ||
|
|
9f51bd3853 | ||
|
|
b386c1181f | ||
|
|
b8e7649e69 | ||
|
|
6664c1a0fc | ||
|
|
e0c3fe554f | ||
|
|
40943ff4d3 | ||
|
|
6c03a1a277 | ||
|
|
27288e2aaa | ||
|
|
1c728ec7a7 | ||
|
|
78059083c2 | ||
|
|
34cd4ac141 | ||
|
|
343366b12d | ||
|
|
978369eeaa | ||
|
|
c39e1c267d | ||
|
|
9af21895c6 | ||
|
|
e3bd6f219f | ||
|
|
ae62c2c8d8 | ||
|
|
04db7c2f01 | ||
|
|
3d889e70b5 |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -3,6 +3,8 @@
|
|||||||
testlog
|
testlog
|
||||||
history/
|
history/
|
||||||
*.db
|
*.db
|
||||||
|
*.db-shm
|
||||||
|
*.db-wal
|
||||||
config.toml
|
config.toml
|
||||||
sysprompts/*
|
sysprompts/*
|
||||||
!sysprompts/alice_bob_carl.json
|
!sysprompts/alice_bob_carl.json
|
||||||
@@ -15,3 +17,4 @@ gflt
|
|||||||
chat_exports/*.json
|
chat_exports/*.json
|
||||||
ragimport
|
ragimport
|
||||||
.env
|
.env
|
||||||
|
onnx/
|
||||||
|
|||||||
120
Makefile
120
Makefile
@@ -1,4 +1,4 @@
|
|||||||
.PHONY: setconfig run lint setup-whisper build-whisper download-whisper-model docker-up docker-down docker-logs noextra-run
|
.PHONY: setconfig run lint lintall install-linters setup-whisper build-whisper download-whisper-model docker-up docker-down docker-logs noextra-run installdelve checkdelve fetch-onnx install-onnx-deps
|
||||||
|
|
||||||
run: setconfig
|
run: setconfig
|
||||||
go build -tags extra -o gf-lt && ./gf-lt
|
go build -tags extra -o gf-lt && ./gf-lt
|
||||||
@@ -15,9 +15,120 @@ noextra-run: setconfig
|
|||||||
setconfig:
|
setconfig:
|
||||||
find config.toml &>/dev/null || cp config.example.toml config.toml
|
find config.toml &>/dev/null || cp config.example.toml config.toml
|
||||||
|
|
||||||
|
installdelve:
|
||||||
|
go install github.com/go-delve/delve/cmd/dlv@latest
|
||||||
|
|
||||||
|
checkdelve:
|
||||||
|
which dlv &>/dev/null || installdelve
|
||||||
|
|
||||||
|
install-linters: ## Install additional linters (noblanks)
|
||||||
|
go install github.com/GrailFinder/noblanks-linter/cmd/noblanks@latest
|
||||||
|
|
||||||
lint: ## Run linters. Use make install-linters first.
|
lint: ## Run linters. Use make install-linters first.
|
||||||
golangci-lint run -c .golangci.yml ./...
|
golangci-lint run -c .golangci.yml ./...
|
||||||
|
|
||||||
|
lintall: lint
|
||||||
|
noblanks ./...
|
||||||
|
|
||||||
|
fetch-onnx:
|
||||||
|
mkdir -p onnx/embedgemma && curl -o onnx/embedgemma/config.json -L https://huggingface.co/onnx-community/embeddinggemma-300m-ONNX/resolve/main/config.json && curl -o onnx/embedgemma/tokenizer.json -L https://huggingface.co/onnx-community/embeddinggemma-300m-ONNX/resolve/main/tokenizer.json && curl -o onnx/embedgemma/model_q4.onnx -L https://huggingface.co/onnx-community/embeddinggemma-300m-ONNX/resolve/main/onnx/model_q4.onnx && curl -o onnx/embedgemma/model_q4.onnx_data -L https://huggingface.co/onnx-community/embeddinggemma-300m-ONNX/resolve/main/onnx/model_q4.onnx_data?download=true
|
||||||
|
|
||||||
|
install-onnx-deps: ## Install ONNX Runtime with CUDA support (or CPU fallback)
|
||||||
|
@echo "=== ONNX Runtime Installer ===" && \
|
||||||
|
echo "" && \
|
||||||
|
echo "Checking for existing ONNX Runtime..." && \
|
||||||
|
if ldconfig -p 2>/dev/null | grep -q libonnxruntime.so.1; then \
|
||||||
|
echo "ONNX Runtime is already installed:" && \
|
||||||
|
ldconfig -p 2>/dev/null | grep libonnxruntime && \
|
||||||
|
echo "" && \
|
||||||
|
echo "Skipping installation. To reinstall, remove existing libs first:" && \
|
||||||
|
echo " sudo rm -f /usr/local/lib/libonnxruntime*.so*" && \
|
||||||
|
exit 0; \
|
||||||
|
fi && \
|
||||||
|
echo "No ONNX Runtime found. Proceeding with installation..." && \
|
||||||
|
echo "" && \
|
||||||
|
echo "Detecting CUDA version..." && \
|
||||||
|
HAS_CUDA=0 && \
|
||||||
|
if command -v nvidia-smi >/dev/null 2>&1; then \
|
||||||
|
CUDA_INFO=$$(nvidia-smi --query-gpu=driver_version --format=csv,noheader 2>/dev/null | head -1) && \
|
||||||
|
if [ -n "$$CUDA_INFO" ]; then \
|
||||||
|
echo "Found NVIDIA GPU with driver: $$CUDA_INFO" && \
|
||||||
|
HAS_CUDA=1; \
|
||||||
|
else \
|
||||||
|
echo "NVIDIA driver found but could not detect CUDA version"; \
|
||||||
|
fi; \
|
||||||
|
else \
|
||||||
|
echo "No NVIDIA GPU detected (nvidia-smi not found)"; \
|
||||||
|
fi && \
|
||||||
|
echo "" && \
|
||||||
|
echo "Determining ONNX Runtime version..." && \
|
||||||
|
ARCH=$$(uname -m) && \
|
||||||
|
if [ "$$ARCH" = "x86_64" ]; then \
|
||||||
|
ONNX_ARCH="x64"; \
|
||||||
|
elif [ "$$ARCH" = "aarch64" ] || [ "$$ARCH" = "arm64" ]; then \
|
||||||
|
ONNX_ARCH="aarch64"; \
|
||||||
|
else \
|
||||||
|
echo "Unsupported architecture: $$ARCH" && \
|
||||||
|
exit 1; \
|
||||||
|
fi && \
|
||||||
|
echo "Detected architecture: $$ARCH (ONNX runtime: $$ONNX_ARCH)" && \
|
||||||
|
if [ "$$HAS_CUDA" = "1" ]; then \
|
||||||
|
echo "Installing ONNX Runtime with CUDA support..."; \
|
||||||
|
ONNX_VERSION="1.24.2"; \
|
||||||
|
else \
|
||||||
|
echo "Installing ONNX Runtime (CPU version)..."; \
|
||||||
|
ONNX_VERSION="1.24.2"; \
|
||||||
|
fi && \
|
||||||
|
FILENAME="onnxruntime-linux-$${ONNX_ARCH}-${ONNX_VERSION}.tgz" && \
|
||||||
|
URL="https://github.com/microsoft/onnxruntime/releases/download/v$${ONNX_VERSION}/$${FILENAME}" && \
|
||||||
|
echo "Downloading $${URL}..." && \
|
||||||
|
mkdir -p /tmp/onnx-install && \
|
||||||
|
curl -L -o /tmp/onnx-install/$${FILENAME} "$${URL}" || { \
|
||||||
|
echo "Failed to download ONNX Runtime v$${ONNX_VERSION}. Trying v1.18.0..." && \
|
||||||
|
ONNX_VERSION="1.18.0" && \
|
||||||
|
FILENAME="onnxruntime-linux-$${ONNX_ARCH}-${ONNX_VERSION}.tgz" && \
|
||||||
|
URL="https://github.com/microsoft/onnxruntime/releases/download/v$${ONNX_VERSION}/$${FILENAME}" && \
|
||||||
|
curl -L -o /tmp/onnx-install/$${FILENAME} "$${URL}" || { \
|
||||||
|
echo "ERROR: Failed to download ONNX Runtime from GitHub" && \
|
||||||
|
echo "" && \
|
||||||
|
echo "Please install manually:" && \
|
||||||
|
echo " 1. Go to https://github.com/microsoft/onnxruntime/releases" && \
|
||||||
|
echo " 2. Download onnxruntime-linux-$${ONNX_ARCH}-VERSION.tgz" && \
|
||||||
|
echo " 3. Extract and copy to /usr/local/lib:" && \
|
||||||
|
echo " tar -xzf onnxruntime-linux-$${ONNX_ARCH}-VERSION.tgz" && \
|
||||||
|
echo " sudo cp -r onnxruntime-linux-$${ONNX_ARCH}-VERSION/lib/* /usr/local/lib/" && \
|
||||||
|
echo " sudo ldconfig" && \
|
||||||
|
exit 1; \
|
||||||
|
}; \
|
||||||
|
} && \
|
||||||
|
echo "Extracting..." && \
|
||||||
|
cd /tmp/onnx-install && tar -xzf $${FILENAME} && \
|
||||||
|
echo "Installing to /usr/local/lib..." && \
|
||||||
|
ONNX_DIR=$$(find /tmp/onnx-install -maxdepth 1 -type d -name "onnxruntime-linux-*") && \
|
||||||
|
if [ -d "$${ONNX_DIR}/lib" ]; then \
|
||||||
|
cp -r $${ONNX_DIR}/lib/* /usr/local/lib/ 2>/dev/null || sudo cp -r $${ONNX_DIR}/lib/* /usr/local/lib/; \
|
||||||
|
else \
|
||||||
|
echo "ERROR: Could not find lib directory in extracted archive" && \
|
||||||
|
exit 1; \
|
||||||
|
fi && \
|
||||||
|
echo "Updating library cache..." && \
|
||||||
|
sudo ldconfig 2>/dev/null || ldconfig && \
|
||||||
|
echo "" && \
|
||||||
|
echo "=== Installation complete! ===" && \
|
||||||
|
echo "" && \
|
||||||
|
echo "Installed libraries:" && \
|
||||||
|
ldconfig -p | grep libonnxruntime || echo "(libraries may require logout/relogin to appear)" && \
|
||||||
|
echo "" && \
|
||||||
|
if [ "$$HAS_CUDA" = "1" ]; then \
|
||||||
|
echo "NOTE: CUDA-enabled ONNX Runtime installed."; \
|
||||||
|
echo "Ensure you also have CUDA libraries installed:"; \
|
||||||
|
echo " - libcudnn, libcublas, libcurand"; \
|
||||||
|
else \
|
||||||
|
echo "NOTE: CPU-only ONNX Runtime installed."; \
|
||||||
|
echo "For GPU support, install CUDA and re-run this script."; \
|
||||||
|
fi && \
|
||||||
|
rm -rf /tmp/onnx-install
|
||||||
|
|
||||||
# Whisper STT Setup (in batteries directory)
|
# Whisper STT Setup (in batteries directory)
|
||||||
setup-whisper: build-whisper download-whisper-model
|
setup-whisper: build-whisper download-whisper-model
|
||||||
|
|
||||||
@@ -32,11 +143,10 @@ build-whisper: ## Build whisper.cpp from source in batteries directory
|
|||||||
|
|
||||||
download-whisper-model: ## Download Whisper model for STT in batteries directory
|
download-whisper-model: ## Download Whisper model for STT in batteries directory
|
||||||
@echo "Downloading Whisper model for STT..."
|
@echo "Downloading Whisper model for STT..."
|
||||||
@if [ ! -d "batteries/whisper.cpp" ]; then \
|
@if [ ! -d "batteries/whisper.cpp/models" ]; then \
|
||||||
echo "Please run 'make setup-whisper' first to clone the repository."; \
|
mkdir -p "batteries/whisper.cpp/models" \
|
||||||
exit 1; \
|
|
||||||
fi
|
fi
|
||||||
@cd batteries/whisper.cpp && bash ./models/download-ggml-model.sh large-v3-turbo-q5_0
|
curl -o batteries/whisper.cpp/models/ggml-large-v3-turbo-q5_0.bin -L "https://huggingface.co/ggerganov/whisper.cpp/resolve/main/ggml-large-v3-turbo-q5_0.bin?download=true"
|
||||||
@echo "Whisper model downloaded successfully!"
|
@echo "Whisper model downloaded successfully!"
|
||||||
|
|
||||||
# Docker targets for STT/TTS services (in batteries directory)
|
# Docker targets for STT/TTS services (in batteries directory)
|
||||||
|
|||||||
@@ -13,6 +13,12 @@ made with use of [tview](https://github.com/rivo/tview)
|
|||||||
#### how it looks
|
#### how it looks
|
||||||

|

|
||||||
|
|
||||||
|
|
||||||
|
#### dependencies
|
||||||
|
- make
|
||||||
|
- go
|
||||||
|
- ffmpeg (extra)
|
||||||
|
|
||||||
#### how to install
|
#### how to install
|
||||||
(requires golang)
|
(requires golang)
|
||||||
clone the project
|
clone the project
|
||||||
|
|||||||
@@ -71,8 +71,8 @@ func (ag *AgentClient) buildRequest(sysprompt, msg string) ([]byte, error) {
|
|||||||
// Build prompt for completion endpoints
|
// Build prompt for completion endpoints
|
||||||
if isCompletion {
|
if isCompletion {
|
||||||
var sb strings.Builder
|
var sb strings.Builder
|
||||||
for _, m := range messages {
|
for i := range messages {
|
||||||
sb.WriteString(m.ToPrompt())
|
sb.WriteString(messages[i].ToPrompt())
|
||||||
sb.WriteString("\n")
|
sb.WriteString("\n")
|
||||||
}
|
}
|
||||||
prompt := strings.TrimSpace(sb.String())
|
prompt := strings.TrimSpace(sb.String())
|
||||||
@@ -140,7 +140,6 @@ func (ag *AgentClient) LLMRequest(body io.Reader) ([]byte, error) {
|
|||||||
ag.log.Error("failed to read request body", "error", err)
|
ag.log.Error("failed to read request body", "error", err)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
req, err := http.NewRequest("POST", ag.cfg.CurrentAPI, bytes.NewReader(bodyBytes))
|
req, err := http.NewRequest("POST", ag.cfg.CurrentAPI, bytes.NewReader(bodyBytes))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ag.log.Error("failed to create request", "error", err)
|
ag.log.Error("failed to create request", "error", err)
|
||||||
@@ -150,22 +149,18 @@ func (ag *AgentClient) LLMRequest(body io.Reader) ([]byte, error) {
|
|||||||
req.Header.Add("Content-Type", "application/json")
|
req.Header.Add("Content-Type", "application/json")
|
||||||
req.Header.Add("Authorization", "Bearer "+ag.getToken())
|
req.Header.Add("Authorization", "Bearer "+ag.getToken())
|
||||||
req.Header.Set("Accept-Encoding", "gzip")
|
req.Header.Set("Accept-Encoding", "gzip")
|
||||||
|
|
||||||
ag.log.Debug("agent LLM request", "url", ag.cfg.CurrentAPI, "body_preview", string(bodyBytes[:min(len(bodyBytes), 500)]))
|
ag.log.Debug("agent LLM request", "url", ag.cfg.CurrentAPI, "body_preview", string(bodyBytes[:min(len(bodyBytes), 500)]))
|
||||||
|
|
||||||
resp, err := httpClient.Do(req)
|
resp, err := httpClient.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ag.log.Error("llamacpp api request failed", "error", err, "url", ag.cfg.CurrentAPI)
|
ag.log.Error("llamacpp api request failed", "error", err, "url", ag.cfg.CurrentAPI)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
|
|
||||||
responseBytes, err := io.ReadAll(resp.Body)
|
responseBytes, err := io.ReadAll(resp.Body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ag.log.Error("failed to read response", "error", err)
|
ag.log.Error("failed to read response", "error", err)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if resp.StatusCode >= 400 {
|
if resp.StatusCode >= 400 {
|
||||||
ag.log.Error("agent LLM request failed", "status", resp.StatusCode, "response", string(responseBytes[:min(len(responseBytes), 1000)]))
|
ag.log.Error("agent LLM request failed", "status", resp.StatusCode, "response", string(responseBytes[:min(len(responseBytes), 1000)]))
|
||||||
return responseBytes, fmt.Errorf("HTTP %d: %s", resp.StatusCode, string(responseBytes[:min(len(responseBytes), 200)]))
|
return responseBytes, fmt.Errorf("HTTP %d: %s", resp.StatusCode, string(responseBytes[:min(len(responseBytes), 200)]))
|
||||||
@@ -178,7 +173,6 @@ func (ag *AgentClient) LLMRequest(body io.Reader) ([]byte, error) {
|
|||||||
// Return raw response as fallback
|
// Return raw response as fallback
|
||||||
return responseBytes, nil
|
return responseBytes, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
return []byte(text), nil
|
return []byte(text), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,19 +6,27 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- "8081:8081"
|
- "8081:8081"
|
||||||
volumes:
|
volumes:
|
||||||
- whisper_models:/app/models
|
- ./whisper.cpp/models/ggml-large-v3-turbo-q5_0.bin:/app/models/ggml-large-v3-turbo-q5_0.bin
|
||||||
working_dir: /app
|
working_dir: /app
|
||||||
entrypoint: ""
|
entrypoint: ""
|
||||||
command: >
|
command: >
|
||||||
sh -c "
|
sh -c "
|
||||||
if [ ! -f /app/models/ggml-large-v3-turbo.bin ]; then
|
if [ ! -f /app/models/ggml-large-v3-turbo-q5_0.bin ]; then
|
||||||
echo 'Downloading ggml-large-v3-turbo model...'
|
echo 'Downloading ggml-large-v3-turboq5_0 model...'
|
||||||
./download-ggml-model.sh large-v3-turbo /app/models
|
curl -o /app/models/ggml-large-v3-turbo-q5_0.bin -L "https://huggingface.co/ggerganov/whisper.cpp/resolve/main/ggml-large-v3-turbo-q5_0.bin?download=true"
|
||||||
fi &&
|
fi &&
|
||||||
./build/bin/whisper-server -m /app/models/ggml-large-v3-turbo.bin -t 4 -p 1 --port 8081 --host 0.0.0.0
|
./build/bin/whisper-server -m /app/models/ggml-large-v3-turbo-q5_0.bin -t 4 -p 1 --port 8081 --host 0.0.0.0
|
||||||
"
|
"
|
||||||
environment:
|
environment:
|
||||||
- WHISPER_LOG_LEVEL=3
|
- WHISPER_LOG_LEVEL=3
|
||||||
|
# For GPU support, uncomment the following lines:
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
reservations:
|
||||||
|
devices:
|
||||||
|
- driver: nvidia
|
||||||
|
count: 1
|
||||||
|
capabilities: [gpu]
|
||||||
# Restart policy in case the service fails
|
# Restart policy in case the service fails
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
@@ -45,7 +53,5 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
models:
|
models:
|
||||||
driver: local
|
driver: local
|
||||||
audio:
|
|
||||||
driver: local
|
|
||||||
whisper_models:
|
whisper_models:
|
||||||
driver: local
|
driver: local
|
||||||
|
|||||||
34
bot_test.go
34
bot_test.go
@@ -1,12 +1,10 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"gf-lt/config"
|
"gf-lt/config"
|
||||||
"gf-lt/models"
|
"gf-lt/models"
|
||||||
"reflect"
|
"reflect"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestConsolidateConsecutiveAssistantMessages(t *testing.T) {
|
func TestConsolidateConsecutiveAssistantMessages(t *testing.T) {
|
||||||
// Mock config for testing
|
// Mock config for testing
|
||||||
testCfg := &config.Config{
|
testCfg := &config.Config{
|
||||||
@@ -14,7 +12,6 @@ func TestConsolidateConsecutiveAssistantMessages(t *testing.T) {
|
|||||||
WriteNextMsgAsCompletionAgent: "",
|
WriteNextMsgAsCompletionAgent: "",
|
||||||
}
|
}
|
||||||
cfg = testCfg
|
cfg = testCfg
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
input []models.RoleMsg
|
input []models.RoleMsg
|
||||||
@@ -114,38 +111,31 @@ func TestConsolidateConsecutiveAssistantMessages(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
result := consolidateAssistantMessages(tt.input)
|
result := consolidateAssistantMessages(tt.input)
|
||||||
|
|
||||||
if len(result) != len(tt.expected) {
|
if len(result) != len(tt.expected) {
|
||||||
t.Errorf("Expected %d messages, got %d", len(tt.expected), len(result))
|
t.Errorf("Expected %d messages, got %d", len(tt.expected), len(result))
|
||||||
t.Logf("Result: %+v", result)
|
t.Logf("Result: %+v", result)
|
||||||
t.Logf("Expected: %+v", tt.expected)
|
t.Logf("Expected: %+v", tt.expected)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
for i, expectedMsg := range tt.expected {
|
for i, expectedMsg := range tt.expected {
|
||||||
if i >= len(result) {
|
if i >= len(result) {
|
||||||
t.Errorf("Result has fewer messages than expected at index %d", i)
|
t.Errorf("Result has fewer messages than expected at index %d", i)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
actualMsg := result[i]
|
actualMsg := result[i]
|
||||||
if actualMsg.Role != expectedMsg.Role {
|
if actualMsg.Role != expectedMsg.Role {
|
||||||
t.Errorf("Message %d: expected role '%s', got '%s'", i, expectedMsg.Role, actualMsg.Role)
|
t.Errorf("Message %d: expected role '%s', got '%s'", i, expectedMsg.Role, actualMsg.Role)
|
||||||
}
|
}
|
||||||
|
|
||||||
if actualMsg.Content != expectedMsg.Content {
|
if actualMsg.Content != expectedMsg.Content {
|
||||||
t.Errorf("Message %d: expected content '%s', got '%s'", i, expectedMsg.Content, actualMsg.Content)
|
t.Errorf("Message %d: expected content '%s', got '%s'", i, expectedMsg.Content, actualMsg.Content)
|
||||||
}
|
}
|
||||||
|
|
||||||
if actualMsg.ToolCallID != expectedMsg.ToolCallID {
|
if actualMsg.ToolCallID != expectedMsg.ToolCallID {
|
||||||
t.Errorf("Message %d: expected ToolCallID '%s', got '%s'", i, expectedMsg.ToolCallID, actualMsg.ToolCallID)
|
t.Errorf("Message %d: expected ToolCallID '%s', got '%s'", i, expectedMsg.ToolCallID, actualMsg.ToolCallID)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Additional check: ensure no messages were lost
|
// Additional check: ensure no messages were lost
|
||||||
if !reflect.DeepEqual(result, tt.expected) {
|
if !reflect.DeepEqual(result, tt.expected) {
|
||||||
t.Errorf("Result does not match expected:\nResult: %+v\nExpected: %+v", result, tt.expected)
|
t.Errorf("Result does not match expected:\nResult: %+v\nExpected: %+v", result, tt.expected)
|
||||||
@@ -153,7 +143,6 @@ func TestConsolidateConsecutiveAssistantMessages(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestUnmarshalFuncCall(t *testing.T) {
|
func TestUnmarshalFuncCall(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
@@ -213,7 +202,6 @@ func TestUnmarshalFuncCall(t *testing.T) {
|
|||||||
wantErr: true,
|
wantErr: true,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
got, err := unmarshalFuncCall(tt.jsonStr)
|
got, err := unmarshalFuncCall(tt.jsonStr)
|
||||||
@@ -238,7 +226,6 @@ func TestUnmarshalFuncCall(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestConvertJSONToMapStringString(t *testing.T) {
|
func TestConvertJSONToMapStringString(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
@@ -265,7 +252,6 @@ func TestConvertJSONToMapStringString(t *testing.T) {
|
|||||||
wantErr: true,
|
wantErr: true,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
got, err := convertJSONToMapStringString(tt.jsonStr)
|
got, err := convertJSONToMapStringString(tt.jsonStr)
|
||||||
@@ -287,7 +273,6 @@ func TestConvertJSONToMapStringString(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestParseKnownToTag(t *testing.T) {
|
func TestParseKnownToTag(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
@@ -378,7 +363,6 @@ func TestParseKnownToTag(t *testing.T) {
|
|||||||
wantKnownTo: []string{"Alice", "Bob", "Carl"},
|
wantKnownTo: []string{"Alice", "Bob", "Carl"},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
// Set up config
|
// Set up config
|
||||||
@@ -402,7 +386,6 @@ func TestParseKnownToTag(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestProcessMessageTag(t *testing.T) {
|
func TestProcessMessageTag(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
@@ -498,7 +481,6 @@ func TestProcessMessageTag(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
testCfg := &config.Config{
|
testCfg := &config.Config{
|
||||||
@@ -529,7 +511,6 @@ func TestProcessMessageTag(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestFilterMessagesForCharacter(t *testing.T) {
|
func TestFilterMessagesForCharacter(t *testing.T) {
|
||||||
messages := []models.RoleMsg{
|
messages := []models.RoleMsg{
|
||||||
{Role: "system", Content: "System message", KnownTo: nil}, // visible to all
|
{Role: "system", Content: "System message", KnownTo: nil}, // visible to all
|
||||||
@@ -539,7 +520,6 @@ func TestFilterMessagesForCharacter(t *testing.T) {
|
|||||||
{Role: "Alice", Content: "Private to Carl", KnownTo: []string{"Alice", "Carl"}},
|
{Role: "Alice", Content: "Private to Carl", KnownTo: []string{"Alice", "Carl"}},
|
||||||
{Role: "Carl", Content: "Hi all", KnownTo: nil}, // visible to all
|
{Role: "Carl", Content: "Hi all", KnownTo: nil}, // visible to all
|
||||||
}
|
}
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
enabled bool
|
enabled bool
|
||||||
@@ -583,7 +563,6 @@ func TestFilterMessagesForCharacter(t *testing.T) {
|
|||||||
wantIndices: []int{0, 1, 5},
|
wantIndices: []int{0, 1, 5},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
testCfg := &config.Config{
|
testCfg := &config.Config{
|
||||||
@@ -591,15 +570,12 @@ func TestFilterMessagesForCharacter(t *testing.T) {
|
|||||||
CharSpecificContextTag: "@",
|
CharSpecificContextTag: "@",
|
||||||
}
|
}
|
||||||
cfg = testCfg
|
cfg = testCfg
|
||||||
|
|
||||||
got := filterMessagesForCharacter(messages, tt.character)
|
got := filterMessagesForCharacter(messages, tt.character)
|
||||||
|
|
||||||
if len(got) != len(tt.wantIndices) {
|
if len(got) != len(tt.wantIndices) {
|
||||||
t.Errorf("filterMessagesForCharacter() returned %d messages, want %d", len(got), len(tt.wantIndices))
|
t.Errorf("filterMessagesForCharacter() returned %d messages, want %d", len(got), len(tt.wantIndices))
|
||||||
t.Logf("got: %v", got)
|
t.Logf("got: %v", got)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
for i, idx := range tt.wantIndices {
|
for i, idx := range tt.wantIndices {
|
||||||
if got[i].Content != messages[idx].Content {
|
if got[i].Content != messages[idx].Content {
|
||||||
t.Errorf("filterMessagesForCharacter() message %d content = %q, want %q", i, got[i].Content, messages[idx].Content)
|
t.Errorf("filterMessagesForCharacter() message %d content = %q, want %q", i, got[i].Content, messages[idx].Content)
|
||||||
@@ -608,7 +584,6 @@ func TestFilterMessagesForCharacter(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestRoleMsgCopyPreservesKnownTo(t *testing.T) {
|
func TestRoleMsgCopyPreservesKnownTo(t *testing.T) {
|
||||||
// Test that the Copy() method preserves the KnownTo field
|
// Test that the Copy() method preserves the KnownTo field
|
||||||
originalMsg := models.RoleMsg{
|
originalMsg := models.RoleMsg{
|
||||||
@@ -616,9 +591,7 @@ func TestRoleMsgCopyPreservesKnownTo(t *testing.T) {
|
|||||||
Content: "Test message",
|
Content: "Test message",
|
||||||
KnownTo: []string{"Bob", "Charlie"},
|
KnownTo: []string{"Bob", "Charlie"},
|
||||||
}
|
}
|
||||||
|
|
||||||
copiedMsg := originalMsg.Copy()
|
copiedMsg := originalMsg.Copy()
|
||||||
|
|
||||||
if copiedMsg.Role != originalMsg.Role {
|
if copiedMsg.Role != originalMsg.Role {
|
||||||
t.Errorf("Copy() failed to preserve Role: got %q, want %q", copiedMsg.Role, originalMsg.Role)
|
t.Errorf("Copy() failed to preserve Role: got %q, want %q", copiedMsg.Role, originalMsg.Role)
|
||||||
}
|
}
|
||||||
@@ -635,7 +608,6 @@ func TestRoleMsgCopyPreservesKnownTo(t *testing.T) {
|
|||||||
t.Errorf("Copy() failed to preserve hasContentParts flag")
|
t.Errorf("Copy() failed to preserve hasContentParts flag")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestKnownToFieldPreservationScenario(t *testing.T) {
|
func TestKnownToFieldPreservationScenario(t *testing.T) {
|
||||||
// Test the specific scenario from the log where KnownTo field was getting lost
|
// Test the specific scenario from the log where KnownTo field was getting lost
|
||||||
originalMsg := models.RoleMsg{
|
originalMsg := models.RoleMsg{
|
||||||
@@ -643,28 +615,22 @@ func TestKnownToFieldPreservationScenario(t *testing.T) {
|
|||||||
Content: `Alice: "Okay, Bob. The word is... **'Ephemeral'**. (ooc: @Bob@)"`,
|
Content: `Alice: "Okay, Bob. The word is... **'Ephemeral'**. (ooc: @Bob@)"`,
|
||||||
KnownTo: []string{"Bob"}, // This was detected in the log
|
KnownTo: []string{"Bob"}, // This was detected in the log
|
||||||
}
|
}
|
||||||
|
|
||||||
t.Logf("Original message - Role: %s, Content: %s, KnownTo: %v",
|
t.Logf("Original message - Role: %s, Content: %s, KnownTo: %v",
|
||||||
originalMsg.Role, originalMsg.Content, originalMsg.KnownTo)
|
originalMsg.Role, originalMsg.Content, originalMsg.KnownTo)
|
||||||
|
|
||||||
// Simulate what happens when the message gets copied during processing
|
// Simulate what happens when the message gets copied during processing
|
||||||
copiedMsg := originalMsg.Copy()
|
copiedMsg := originalMsg.Copy()
|
||||||
|
|
||||||
t.Logf("Copied message - Role: %s, Content: %s, KnownTo: %v",
|
t.Logf("Copied message - Role: %s, Content: %s, KnownTo: %v",
|
||||||
copiedMsg.Role, copiedMsg.Content, copiedMsg.KnownTo)
|
copiedMsg.Role, copiedMsg.Content, copiedMsg.KnownTo)
|
||||||
|
|
||||||
// Check if KnownTo field survived the copy
|
// Check if KnownTo field survived the copy
|
||||||
if len(copiedMsg.KnownTo) == 0 {
|
if len(copiedMsg.KnownTo) == 0 {
|
||||||
t.Error("ERROR: KnownTo field was lost during copy!")
|
t.Error("ERROR: KnownTo field was lost during copy!")
|
||||||
} else {
|
} else {
|
||||||
t.Log("SUCCESS: KnownTo field was preserved during copy!")
|
t.Log("SUCCESS: KnownTo field was preserved during copy!")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Verify the content is the same
|
// Verify the content is the same
|
||||||
if copiedMsg.Content != originalMsg.Content {
|
if copiedMsg.Content != originalMsg.Content {
|
||||||
t.Errorf("Content was changed during copy: got %s, want %s", copiedMsg.Content, originalMsg.Content)
|
t.Errorf("Content was changed during copy: got %s, want %s", copiedMsg.Content, originalMsg.Content)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Verify the KnownTo slice is properly copied
|
// Verify the KnownTo slice is properly copied
|
||||||
if !reflect.DeepEqual(copiedMsg.KnownTo, originalMsg.KnownTo) {
|
if !reflect.DeepEqual(copiedMsg.KnownTo, originalMsg.KnownTo) {
|
||||||
t.Errorf("KnownTo was not properly copied: got %v, want %v", copiedMsg.KnownTo, originalMsg.KnownTo)
|
t.Errorf("KnownTo was not properly copied: got %v, want %v", copiedMsg.KnownTo, originalMsg.KnownTo)
|
||||||
|
|||||||
@@ -12,7 +12,10 @@ OpenRouterChatAPI = "https://openrouter.ai/api/v1/chat/completions"
|
|||||||
# OpenRouterToken = ""
|
# OpenRouterToken = ""
|
||||||
# embeddings
|
# embeddings
|
||||||
EmbedURL = "http://localhost:8082/v1/embeddings"
|
EmbedURL = "http://localhost:8082/v1/embeddings"
|
||||||
HFToken = false
|
HFToken = ""
|
||||||
|
EmbedModelPath = "onnx/embedgemma/model_q4.onnx"
|
||||||
|
EmbedTokenizerPath = "onnx/embedgemma/tokenizer.json"
|
||||||
|
EmbedDims = 768
|
||||||
#
|
#
|
||||||
ShowSys = true
|
ShowSys = true
|
||||||
LogFile = "log.txt"
|
LogFile = "log.txt"
|
||||||
@@ -24,10 +27,9 @@ ChunkLimit = 100000
|
|||||||
AutoScrollEnabled = true
|
AutoScrollEnabled = true
|
||||||
AutoCleanToolCallsFromCtx = false
|
AutoCleanToolCallsFromCtx = false
|
||||||
# rag settings
|
# rag settings
|
||||||
RAGEnabled = false
|
|
||||||
RAGBatchSize = 1
|
RAGBatchSize = 1
|
||||||
RAGWordLimit = 80
|
RAGWordLimit = 250
|
||||||
RAGWorkers = 2
|
RAGOverlapWords = 25
|
||||||
RAGDir = "ragimport"
|
RAGDir = "ragimport"
|
||||||
# extra tts
|
# extra tts
|
||||||
TTS_ENABLED = false
|
TTS_ENABLED = false
|
||||||
@@ -57,3 +59,6 @@ StripThinkingFromAPI = true # Strip <think> blocks from messages before sending
|
|||||||
# Valid values: xhigh, high, medium, low, minimal, none (empty or none = disabled)
|
# Valid values: xhigh, high, medium, low, minimal, none (empty or none = disabled)
|
||||||
# Models that support reasoning will include thinking content wrapped in <think> tags
|
# Models that support reasoning will include thinking content wrapped in <think> tags
|
||||||
ReasoningEffort = "medium"
|
ReasoningEffort = "medium"
|
||||||
|
# playwright tools
|
||||||
|
PlaywrightEnabled = false
|
||||||
|
PlaywrightDebug = false
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ type Config struct {
|
|||||||
UserRole string `toml:"UserRole"`
|
UserRole string `toml:"UserRole"`
|
||||||
ToolRole string `toml:"ToolRole"`
|
ToolRole string `toml:"ToolRole"`
|
||||||
ToolUse bool `toml:"ToolUse"`
|
ToolUse bool `toml:"ToolUse"`
|
||||||
ThinkUse bool `toml:"ThinkUse"`
|
|
||||||
StripThinkingFromAPI bool `toml:"StripThinkingFromAPI"`
|
StripThinkingFromAPI bool `toml:"StripThinkingFromAPI"`
|
||||||
ReasoningEffort string `toml:"ReasoningEffort"`
|
ReasoningEffort string `toml:"ReasoningEffort"`
|
||||||
AssistantRole string `toml:"AssistantRole"`
|
AssistantRole string `toml:"AssistantRole"`
|
||||||
@@ -28,7 +27,6 @@ type Config struct {
|
|||||||
WriteNextMsgAs string
|
WriteNextMsgAs string
|
||||||
WriteNextMsgAsCompletionAgent string
|
WriteNextMsgAsCompletionAgent string
|
||||||
SkipLLMResp bool
|
SkipLLMResp bool
|
||||||
AutoCleanToolCallsFromCtx bool `toml:"AutoCleanToolCallsFromCtx"`
|
|
||||||
DBPATH string `toml:"DBPATH"`
|
DBPATH string `toml:"DBPATH"`
|
||||||
FilePickerDir string `toml:"FilePickerDir"`
|
FilePickerDir string `toml:"FilePickerDir"`
|
||||||
FilePickerExts string `toml:"FilePickerExts"`
|
FilePickerExts string `toml:"FilePickerExts"`
|
||||||
@@ -37,12 +35,14 @@ type Config struct {
|
|||||||
// embeddings
|
// embeddings
|
||||||
EmbedURL string `toml:"EmbedURL"`
|
EmbedURL string `toml:"EmbedURL"`
|
||||||
HFToken string `toml:"HFToken"`
|
HFToken string `toml:"HFToken"`
|
||||||
|
EmbedModelPath string `toml:"EmbedModelPath"`
|
||||||
|
EmbedTokenizerPath string `toml:"EmbedTokenizerPath"`
|
||||||
|
EmbedDims int `toml:"EmbedDims"`
|
||||||
// rag settings
|
// rag settings
|
||||||
RAGEnabled bool `toml:"RAGEnabled"`
|
|
||||||
RAGDir string `toml:"RAGDir"`
|
RAGDir string `toml:"RAGDir"`
|
||||||
RAGWorkers uint32 `toml:"RAGWorkers"`
|
|
||||||
RAGBatchSize int `toml:"RAGBatchSize"`
|
RAGBatchSize int `toml:"RAGBatchSize"`
|
||||||
RAGWordLimit uint32 `toml:"RAGWordLimit"`
|
RAGWordLimit uint32 `toml:"RAGWordLimit"`
|
||||||
|
RAGOverlapWords uint32 `toml:"RAGOverlapWords"`
|
||||||
// deepseek
|
// deepseek
|
||||||
DeepSeekChatAPI string `toml:"DeepSeekChatAPI"`
|
DeepSeekChatAPI string `toml:"DeepSeekChatAPI"`
|
||||||
DeepSeekCompletionAPI string `toml:"DeepSeekCompletionAPI"`
|
DeepSeekCompletionAPI string `toml:"DeepSeekCompletionAPI"`
|
||||||
@@ -72,6 +72,9 @@ type Config struct {
|
|||||||
CharSpecificContextEnabled bool `toml:"CharSpecificContextEnabled"`
|
CharSpecificContextEnabled bool `toml:"CharSpecificContextEnabled"`
|
||||||
CharSpecificContextTag string `toml:"CharSpecificContextTag"`
|
CharSpecificContextTag string `toml:"CharSpecificContextTag"`
|
||||||
AutoTurn bool `toml:"AutoTurn"`
|
AutoTurn bool `toml:"AutoTurn"`
|
||||||
|
// playwright browser
|
||||||
|
PlaywrightEnabled bool `toml:"PlaywrightEnabled"`
|
||||||
|
PlaywrightDebug bool `toml:"PlaywrightDebug"` // !headless
|
||||||
}
|
}
|
||||||
|
|
||||||
func LoadConfig(fn string) (*Config, error) {
|
func LoadConfig(fn string) (*Config, error) {
|
||||||
@@ -125,6 +128,9 @@ func LoadConfig(fn string) (*Config, error) {
|
|||||||
if config.CompletionAPI != "" {
|
if config.CompletionAPI != "" {
|
||||||
config.ApiLinks = append(config.ApiLinks, config.CompletionAPI)
|
config.ApiLinks = append(config.ApiLinks, config.CompletionAPI)
|
||||||
}
|
}
|
||||||
|
if config.RAGDir == "" {
|
||||||
|
config.RAGDir = "ragimport"
|
||||||
|
}
|
||||||
// if any value is empty fill with default
|
// if any value is empty fill with default
|
||||||
return config, nil
|
return config, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,26 +63,17 @@ This document explains how to set up and configure the application using the `co
|
|||||||
#### AutoScrollEnabled (`true`)
|
#### AutoScrollEnabled (`true`)
|
||||||
- Whether to automatically scroll chat window while llm streams its repsonse.
|
- Whether to automatically scroll chat window while llm streams its repsonse.
|
||||||
|
|
||||||
#### AutoCleanToolCallsFromCtx (`false`)
|
|
||||||
- Whether to automatically clean tool calls from the conversation context to manage token usage.
|
|
||||||
|
|
||||||
### RAG (Retrieval Augmented Generation) Settings
|
### RAG (Retrieval Augmented Generation) Settings
|
||||||
|
|
||||||
#### EmbedURL (`"http://localhost:8082/v1/embeddings"`)
|
#### EmbedURL (`"http://localhost:8082/v1/embeddings"`)
|
||||||
- The endpoint for embedding API, used for RAG (Retrieval Augmented Generation) functionality.
|
- The endpoint for embedding API, used for RAG (Retrieval Augmented Generation) functionality.
|
||||||
|
|
||||||
#### RAGEnabled (`false`)
|
|
||||||
- Enable or disable RAG functionality for enhanced context retrieval.
|
|
||||||
|
|
||||||
#### RAGBatchSize (`1`)
|
#### RAGBatchSize (`1`)
|
||||||
- Number of documents to process in each RAG batch.
|
- Number of documents to process in each RAG batch.
|
||||||
|
|
||||||
#### RAGWordLimit (`80`)
|
#### RAGWordLimit (`80`)
|
||||||
- Maximum number of words in a batch to tokenize and store.
|
- Maximum number of words in a batch to tokenize and store.
|
||||||
|
|
||||||
#### RAGWorkers (`2`)
|
|
||||||
- Number of concurrent workers for RAG processing.
|
|
||||||
|
|
||||||
#### RAGDir (`"ragimport"`)
|
#### RAGDir (`"ragimport"`)
|
||||||
- Directory containing documents for RAG processing.
|
- Directory containing documents for RAG processing.
|
||||||
|
|
||||||
@@ -165,8 +156,14 @@ Those could be switched in program, but also bould be setup in config.
|
|||||||
#### ToolUse
|
#### ToolUse
|
||||||
- Enable or disable explanation of tools to llm, so it could use them.
|
- Enable or disable explanation of tools to llm, so it could use them.
|
||||||
|
|
||||||
#### ThinkUse
|
#### Playwright Browser Automation
|
||||||
- Enable or disable insertion of JsonSerializerToken at the beggining of llm resp.
|
These settings enable browser automation tools available to the LLM.
|
||||||
|
|
||||||
|
- **PlaywrightEnabled** (`false`)
|
||||||
|
- Enable or disable Playwright browser automation tools for the LLM. When enabled, the LLM can use tools like `pw_browser`, `pw_close`, and `pw_status` to automate browser interactions.
|
||||||
|
|
||||||
|
- **PlaywrightDebug** (`false`)
|
||||||
|
- Enable debug mode for Playwright browser. When set to `true`, the browser runs in visible (non-headless) mode, displaying the GUI for debugging purposes. When `false`, the browser runs in headless mode by default.
|
||||||
|
|
||||||
### StripThinkingFromAPI (`true`)
|
### StripThinkingFromAPI (`true`)
|
||||||
- Strip thinking blocks from messages before sending to LLM. Keeps them in chat history for local viewing but reduces token usage in API calls.
|
- Strip thinking blocks from messages before sending to LLM. Keeps them in chat history for local viewing but reduces token usage in API calls.
|
||||||
|
|||||||
218
extra/google_tts.go
Normal file
218
extra/google_tts.go
Normal file
@@ -0,0 +1,218 @@
|
|||||||
|
//go:build extra
|
||||||
|
// +build extra
|
||||||
|
|
||||||
|
package extra
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"gf-lt/models"
|
||||||
|
"io"
|
||||||
|
"log/slog"
|
||||||
|
"os/exec"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
|
||||||
|
google_translate_tts "github.com/GrailFinder/google-translate-tts"
|
||||||
|
"github.com/neurosnap/sentences/english"
|
||||||
|
)
|
||||||
|
|
||||||
|
type GoogleTranslateOrator struct {
|
||||||
|
logger *slog.Logger
|
||||||
|
mu sync.Mutex
|
||||||
|
speech *google_translate_tts.Speech
|
||||||
|
// fields for playback control
|
||||||
|
cmd *exec.Cmd
|
||||||
|
cmdMu sync.Mutex
|
||||||
|
stopCh chan struct{}
|
||||||
|
// text buffer and interrupt flag
|
||||||
|
textBuffer strings.Builder
|
||||||
|
interrupt bool
|
||||||
|
Speed float32
|
||||||
|
}
|
||||||
|
|
||||||
|
func (o *GoogleTranslateOrator) stoproutine() {
|
||||||
|
for {
|
||||||
|
<-TTSDoneChan
|
||||||
|
o.logger.Debug("orator got done signal")
|
||||||
|
o.Stop()
|
||||||
|
for len(TTSTextChan) > 0 {
|
||||||
|
<-TTSTextChan
|
||||||
|
}
|
||||||
|
o.mu.Lock()
|
||||||
|
o.textBuffer.Reset()
|
||||||
|
o.interrupt = true
|
||||||
|
o.mu.Unlock()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (o *GoogleTranslateOrator) readroutine() {
|
||||||
|
tokenizer, _ := english.NewSentenceTokenizer(nil)
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case chunk := <-TTSTextChan:
|
||||||
|
o.mu.Lock()
|
||||||
|
o.interrupt = false
|
||||||
|
_, err := o.textBuffer.WriteString(chunk)
|
||||||
|
if err != nil {
|
||||||
|
o.logger.Warn("failed to write to stringbuilder", "error", err)
|
||||||
|
o.mu.Unlock()
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
text := o.textBuffer.String()
|
||||||
|
sentences := tokenizer.Tokenize(text)
|
||||||
|
o.logger.Debug("adding chunk", "chunk", chunk, "text", text, "sen-len", len(sentences))
|
||||||
|
if len(sentences) <= 1 {
|
||||||
|
o.mu.Unlock()
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
completeSentences := sentences[:len(sentences)-1]
|
||||||
|
remaining := sentences[len(sentences)-1].Text
|
||||||
|
o.textBuffer.Reset()
|
||||||
|
o.textBuffer.WriteString(remaining)
|
||||||
|
o.mu.Unlock()
|
||||||
|
for _, sentence := range completeSentences {
|
||||||
|
o.mu.Lock()
|
||||||
|
interrupted := o.interrupt
|
||||||
|
o.mu.Unlock()
|
||||||
|
if interrupted {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
cleanedText := models.CleanText(sentence.Text)
|
||||||
|
if cleanedText == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
o.logger.Debug("calling Speak with sentence", "sent", cleanedText)
|
||||||
|
if err := o.Speak(cleanedText); err != nil {
|
||||||
|
o.logger.Error("tts failed", "sentence", cleanedText, "error", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case <-TTSFlushChan:
|
||||||
|
o.logger.Debug("got flushchan signal start")
|
||||||
|
// lln is done get the whole message out
|
||||||
|
if len(TTSTextChan) > 0 { // otherwise might get stuck
|
||||||
|
for chunk := range TTSTextChan {
|
||||||
|
o.mu.Lock()
|
||||||
|
_, err := o.textBuffer.WriteString(chunk)
|
||||||
|
o.mu.Unlock()
|
||||||
|
if err != nil {
|
||||||
|
o.logger.Warn("failed to write to stringbuilder", "error", err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if len(TTSTextChan) == 0 {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
o.mu.Lock()
|
||||||
|
remaining := o.textBuffer.String()
|
||||||
|
remaining = models.CleanText(remaining)
|
||||||
|
o.textBuffer.Reset()
|
||||||
|
o.mu.Unlock()
|
||||||
|
if remaining == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
o.logger.Debug("calling Speak with remainder", "rem", remaining)
|
||||||
|
sentencesRem := tokenizer.Tokenize(remaining)
|
||||||
|
for _, rs := range sentencesRem { // to avoid dumping large volume of text
|
||||||
|
o.mu.Lock()
|
||||||
|
interrupt := o.interrupt
|
||||||
|
o.mu.Unlock()
|
||||||
|
if interrupt {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
if err := o.Speak(rs.Text); err != nil {
|
||||||
|
o.logger.Error("tts failed", "sentence", rs.Text, "error", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (o *GoogleTranslateOrator) GetLogger() *slog.Logger {
|
||||||
|
return o.logger
|
||||||
|
}
|
||||||
|
|
||||||
|
func (o *GoogleTranslateOrator) Speak(text string) error {
|
||||||
|
o.logger.Debug("fn: Speak is called", "text-len", len(text))
|
||||||
|
// Generate MP3 data directly as an io.Reader
|
||||||
|
reader, err := o.speech.GenerateSpeech(text)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("generate speech failed: %w", err)
|
||||||
|
}
|
||||||
|
// Wrap in io.NopCloser since GenerateSpeech returns io.Reader (no close needed)
|
||||||
|
body := io.NopCloser(reader)
|
||||||
|
defer body.Close()
|
||||||
|
// Build ffplay command with optional speed filter
|
||||||
|
args := []string{"-nodisp", "-autoexit"}
|
||||||
|
if o.Speed > 0.1 && o.Speed != 1.0 {
|
||||||
|
// atempo range is 0.5 to 2.0; you might clamp it here
|
||||||
|
args = append(args, "-af", fmt.Sprintf("atempo=%.2f", o.Speed))
|
||||||
|
}
|
||||||
|
args = append(args, "-i", "pipe:0")
|
||||||
|
cmd := exec.Command("ffplay", args...)
|
||||||
|
stdin, err := cmd.StdinPipe()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to get stdin pipe: %w", err)
|
||||||
|
}
|
||||||
|
o.cmdMu.Lock()
|
||||||
|
o.cmd = cmd
|
||||||
|
o.stopCh = make(chan struct{})
|
||||||
|
o.cmdMu.Unlock()
|
||||||
|
if err := cmd.Start(); err != nil {
|
||||||
|
return fmt.Errorf("failed to start ffplay: %w", err)
|
||||||
|
}
|
||||||
|
copyErr := make(chan error, 1)
|
||||||
|
go func() {
|
||||||
|
_, err := io.Copy(stdin, body)
|
||||||
|
stdin.Close()
|
||||||
|
copyErr <- err
|
||||||
|
}()
|
||||||
|
done := make(chan error, 1)
|
||||||
|
go func() {
|
||||||
|
done <- cmd.Wait()
|
||||||
|
}()
|
||||||
|
select {
|
||||||
|
case <-o.stopCh:
|
||||||
|
if o.cmd != nil && o.cmd.Process != nil {
|
||||||
|
o.cmd.Process.Kill()
|
||||||
|
}
|
||||||
|
<-done
|
||||||
|
return nil
|
||||||
|
case copyErrVal := <-copyErr:
|
||||||
|
if copyErrVal != nil {
|
||||||
|
if o.cmd != nil && o.cmd.Process != nil {
|
||||||
|
o.cmd.Process.Kill()
|
||||||
|
}
|
||||||
|
<-done
|
||||||
|
return copyErrVal
|
||||||
|
}
|
||||||
|
return <-done
|
||||||
|
case err := <-done:
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (o *GoogleTranslateOrator) Stop() {
|
||||||
|
o.cmdMu.Lock()
|
||||||
|
defer o.cmdMu.Unlock()
|
||||||
|
// Signal any running Speak to stop
|
||||||
|
if o.stopCh != nil {
|
||||||
|
select {
|
||||||
|
case <-o.stopCh: // already closed
|
||||||
|
default:
|
||||||
|
close(o.stopCh)
|
||||||
|
}
|
||||||
|
o.stopCh = nil
|
||||||
|
}
|
||||||
|
// Kill the external player process if it's still running
|
||||||
|
if o.cmd != nil && o.cmd.Process != nil {
|
||||||
|
o.cmd.Process.Kill()
|
||||||
|
o.cmd.Wait() // clean up zombie process
|
||||||
|
o.cmd = nil
|
||||||
|
}
|
||||||
|
// Also reset text buffer and interrupt flag (with o.mu)
|
||||||
|
o.mu.Lock()
|
||||||
|
o.textBuffer.Reset()
|
||||||
|
o.interrupt = true
|
||||||
|
o.mu.Unlock()
|
||||||
|
}
|
||||||
259
extra/kokoro.go
Normal file
259
extra/kokoro.go
Normal file
@@ -0,0 +1,259 @@
|
|||||||
|
//go:build extra
|
||||||
|
// +build extra
|
||||||
|
|
||||||
|
package extra
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"gf-lt/models"
|
||||||
|
"io"
|
||||||
|
"log/slog"
|
||||||
|
"net/http"
|
||||||
|
"os/exec"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
|
||||||
|
"github.com/neurosnap/sentences/english"
|
||||||
|
)
|
||||||
|
|
||||||
|
type KokoroOrator struct {
|
||||||
|
logger *slog.Logger
|
||||||
|
mu sync.Mutex
|
||||||
|
URL string
|
||||||
|
Format models.AudioFormat
|
||||||
|
Stream bool
|
||||||
|
Speed float32
|
||||||
|
Language string
|
||||||
|
Voice string
|
||||||
|
// fields for playback control
|
||||||
|
cmd *exec.Cmd
|
||||||
|
cmdMu sync.Mutex
|
||||||
|
stopCh chan struct{}
|
||||||
|
// textBuffer, interrupt etc. remain the same
|
||||||
|
textBuffer strings.Builder
|
||||||
|
interrupt bool
|
||||||
|
}
|
||||||
|
|
||||||
|
func (o *KokoroOrator) GetLogger() *slog.Logger {
|
||||||
|
return o.logger
|
||||||
|
}
|
||||||
|
|
||||||
|
func (o *KokoroOrator) Speak(text string) error {
|
||||||
|
o.logger.Debug("fn: Speak is called", "text-len", len(text))
|
||||||
|
body, err := o.requestSound(text)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("request failed: %w", err)
|
||||||
|
}
|
||||||
|
defer body.Close()
|
||||||
|
cmd := exec.Command("ffplay", "-nodisp", "-autoexit", "-i", "pipe:0")
|
||||||
|
stdin, err := cmd.StdinPipe()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to get stdin pipe: %w", err)
|
||||||
|
}
|
||||||
|
o.cmdMu.Lock()
|
||||||
|
o.cmd = cmd
|
||||||
|
o.stopCh = make(chan struct{})
|
||||||
|
o.cmdMu.Unlock()
|
||||||
|
if err := cmd.Start(); err != nil {
|
||||||
|
return fmt.Errorf("failed to start ffplay: %w", err)
|
||||||
|
}
|
||||||
|
// Copy audio in background
|
||||||
|
copyErr := make(chan error, 1)
|
||||||
|
go func() {
|
||||||
|
_, err := io.Copy(stdin, body)
|
||||||
|
stdin.Close()
|
||||||
|
copyErr <- err
|
||||||
|
}()
|
||||||
|
// Wait for player in background
|
||||||
|
done := make(chan error, 1)
|
||||||
|
go func() {
|
||||||
|
done <- cmd.Wait()
|
||||||
|
}()
|
||||||
|
// Wait for BOTH copy and player, but ensure we block until done
|
||||||
|
select {
|
||||||
|
case <-o.stopCh:
|
||||||
|
// Stop requested: kill player and wait for it to exit
|
||||||
|
if o.cmd != nil && o.cmd.Process != nil {
|
||||||
|
o.cmd.Process.Kill()
|
||||||
|
}
|
||||||
|
<-done // Wait for process to actually exit
|
||||||
|
return nil
|
||||||
|
case copyErrVal := <-copyErr:
|
||||||
|
if copyErrVal != nil {
|
||||||
|
// Copy failed: kill player and wait
|
||||||
|
if o.cmd != nil && o.cmd.Process != nil {
|
||||||
|
o.cmd.Process.Kill()
|
||||||
|
}
|
||||||
|
<-done
|
||||||
|
return copyErrVal
|
||||||
|
}
|
||||||
|
// Copy succeeded, now wait for playback to complete
|
||||||
|
return <-done
|
||||||
|
case err := <-done:
|
||||||
|
// Playback finished normally (copy must have succeeded or player would have exited early)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
func (o *KokoroOrator) requestSound(text string) (io.ReadCloser, error) {
|
||||||
|
if o.URL == "" {
|
||||||
|
return nil, fmt.Errorf("TTS URL is empty")
|
||||||
|
}
|
||||||
|
payload := map[string]interface{}{
|
||||||
|
"input": text,
|
||||||
|
"voice": o.Voice,
|
||||||
|
"response_format": o.Format,
|
||||||
|
"download_format": o.Format,
|
||||||
|
"stream": o.Stream,
|
||||||
|
"speed": o.Speed,
|
||||||
|
// "return_download_link": true,
|
||||||
|
"lang_code": o.Language,
|
||||||
|
}
|
||||||
|
payloadBytes, err := json.Marshal(payload)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to marshal payload: %w", err)
|
||||||
|
}
|
||||||
|
req, err := http.NewRequest("POST", o.URL, bytes.NewBuffer(payloadBytes)) //nolint:noctx
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to create request: %w", err)
|
||||||
|
}
|
||||||
|
req.Header.Set("accept", "application/json")
|
||||||
|
req.Header.Set("Content-Type", "application/json")
|
||||||
|
resp, err := http.DefaultClient.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("request failed: %w", err)
|
||||||
|
}
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
defer resp.Body.Close()
|
||||||
|
return nil, fmt.Errorf("unexpected status code: %d", resp.StatusCode)
|
||||||
|
}
|
||||||
|
return resp.Body, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (o *KokoroOrator) stoproutine() {
|
||||||
|
for {
|
||||||
|
<-TTSDoneChan
|
||||||
|
o.logger.Debug("orator got done signal")
|
||||||
|
// 1. Stop any ongoing playback (kills external player, closes stopCh)
|
||||||
|
o.Stop()
|
||||||
|
// 2. Drain any pending text chunks
|
||||||
|
for len(TTSTextChan) > 0 {
|
||||||
|
<-TTSTextChan
|
||||||
|
}
|
||||||
|
// 3. Reset internal state
|
||||||
|
o.mu.Lock()
|
||||||
|
o.textBuffer.Reset()
|
||||||
|
o.interrupt = true
|
||||||
|
o.mu.Unlock()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (o *KokoroOrator) Stop() {
|
||||||
|
o.cmdMu.Lock()
|
||||||
|
defer o.cmdMu.Unlock()
|
||||||
|
// Signal any running Speak to stop
|
||||||
|
if o.stopCh != nil {
|
||||||
|
select {
|
||||||
|
case <-o.stopCh: // already closed
|
||||||
|
default:
|
||||||
|
close(o.stopCh)
|
||||||
|
}
|
||||||
|
o.stopCh = nil
|
||||||
|
}
|
||||||
|
// Kill the external player process if it's still running
|
||||||
|
if o.cmd != nil && o.cmd.Process != nil {
|
||||||
|
o.cmd.Process.Kill()
|
||||||
|
o.cmd.Wait() // clean up zombie process
|
||||||
|
o.cmd = nil
|
||||||
|
}
|
||||||
|
// Also reset text buffer and interrupt flag (with o.mu)
|
||||||
|
o.mu.Lock()
|
||||||
|
o.textBuffer.Reset()
|
||||||
|
o.interrupt = true
|
||||||
|
o.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (o *KokoroOrator) readroutine() {
|
||||||
|
tokenizer, _ := english.NewSentenceTokenizer(nil)
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case chunk := <-TTSTextChan:
|
||||||
|
o.mu.Lock()
|
||||||
|
o.interrupt = false
|
||||||
|
_, err := o.textBuffer.WriteString(chunk)
|
||||||
|
if err != nil {
|
||||||
|
o.logger.Warn("failed to write to stringbuilder", "error", err)
|
||||||
|
o.mu.Unlock()
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
text := o.textBuffer.String()
|
||||||
|
sentences := tokenizer.Tokenize(text)
|
||||||
|
o.logger.Debug("adding chunk", "chunk", chunk, "text", text, "sen-len", len(sentences))
|
||||||
|
if len(sentences) <= 1 {
|
||||||
|
o.mu.Unlock()
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
completeSentences := sentences[:len(sentences)-1]
|
||||||
|
remaining := sentences[len(sentences)-1].Text
|
||||||
|
o.textBuffer.Reset()
|
||||||
|
o.textBuffer.WriteString(remaining)
|
||||||
|
o.mu.Unlock()
|
||||||
|
for _, sentence := range completeSentences {
|
||||||
|
o.mu.Lock()
|
||||||
|
interrupted := o.interrupt
|
||||||
|
o.mu.Unlock()
|
||||||
|
if interrupted {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
cleanedText := models.CleanText(sentence.Text)
|
||||||
|
if cleanedText == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
o.logger.Debug("calling Speak with sentence", "sent", cleanedText)
|
||||||
|
if err := o.Speak(cleanedText); err != nil {
|
||||||
|
o.logger.Error("tts failed", "sentence", cleanedText, "error", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case <-TTSFlushChan:
|
||||||
|
o.logger.Debug("got flushchan signal start")
|
||||||
|
// lln is done get the whole message out
|
||||||
|
if len(TTSTextChan) > 0 { // otherwise might get stuck
|
||||||
|
for chunk := range TTSTextChan {
|
||||||
|
o.mu.Lock()
|
||||||
|
_, err := o.textBuffer.WriteString(chunk)
|
||||||
|
o.mu.Unlock()
|
||||||
|
if err != nil {
|
||||||
|
o.logger.Warn("failed to write to stringbuilder", "error", err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if len(TTSTextChan) == 0 {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// flush remaining text
|
||||||
|
o.mu.Lock()
|
||||||
|
remaining := o.textBuffer.String()
|
||||||
|
remaining = models.CleanText(remaining)
|
||||||
|
o.textBuffer.Reset()
|
||||||
|
o.mu.Unlock()
|
||||||
|
if remaining == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
o.logger.Debug("calling Speak with remainder", "rem", remaining)
|
||||||
|
sentencesRem := tokenizer.Tokenize(remaining)
|
||||||
|
for _, rs := range sentencesRem { // to avoid dumping large volume of text
|
||||||
|
o.mu.Lock()
|
||||||
|
interrupt := o.interrupt
|
||||||
|
o.mu.Unlock()
|
||||||
|
if interrupt {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
if err := o.Speak(rs.Text); err != nil {
|
||||||
|
o.logger.Error("tts failed", "sentence", rs, "error", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
132
extra/stt.go
132
extra/stt.go
@@ -6,18 +6,10 @@ package extra
|
|||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"encoding/binary"
|
"encoding/binary"
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"gf-lt/config"
|
"gf-lt/config"
|
||||||
"io"
|
"io"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"mime/multipart"
|
|
||||||
"net/http"
|
|
||||||
"regexp"
|
"regexp"
|
||||||
"strings"
|
|
||||||
"syscall"
|
|
||||||
|
|
||||||
"github.com/gordonklaus/portaudio"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var specialRE = regexp.MustCompile(`\[.*?\]`)
|
var specialRE = regexp.MustCompile(`\[.*?\]`)
|
||||||
@@ -44,14 +36,6 @@ func NewSTT(logger *slog.Logger, cfg *config.Config) STT {
|
|||||||
return NewWhisperServer(logger, cfg)
|
return NewWhisperServer(logger, cfg)
|
||||||
}
|
}
|
||||||
|
|
||||||
type WhisperServer struct {
|
|
||||||
logger *slog.Logger
|
|
||||||
ServerURL string
|
|
||||||
SampleRate int
|
|
||||||
AudioBuffer *bytes.Buffer
|
|
||||||
recording bool
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewWhisperServer(logger *slog.Logger, cfg *config.Config) *WhisperServer {
|
func NewWhisperServer(logger *slog.Logger, cfg *config.Config) *WhisperServer {
|
||||||
return &WhisperServer{
|
return &WhisperServer{
|
||||||
logger: logger,
|
logger: logger,
|
||||||
@@ -61,69 +45,6 @@ func NewWhisperServer(logger *slog.Logger, cfg *config.Config) *WhisperServer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (stt *WhisperServer) StartRecording() error {
|
|
||||||
if err := stt.microphoneStream(stt.SampleRate); err != nil {
|
|
||||||
return fmt.Errorf("failed to init microphone: %w", err)
|
|
||||||
}
|
|
||||||
stt.recording = true
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (stt *WhisperServer) StopRecording() (string, error) {
|
|
||||||
stt.recording = false
|
|
||||||
// wait loop to finish?
|
|
||||||
if stt.AudioBuffer == nil {
|
|
||||||
err := errors.New("unexpected nil AudioBuffer")
|
|
||||||
stt.logger.Error(err.Error())
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
// Create WAV header first
|
|
||||||
body := &bytes.Buffer{}
|
|
||||||
writer := multipart.NewWriter(body)
|
|
||||||
// Add audio file part
|
|
||||||
part, err := writer.CreateFormFile("file", "recording.wav")
|
|
||||||
if err != nil {
|
|
||||||
stt.logger.Error("fn: StopRecording", "error", err)
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
// Stream directly to multipart writer: header + raw data
|
|
||||||
dataSize := stt.AudioBuffer.Len()
|
|
||||||
stt.writeWavHeader(part, dataSize)
|
|
||||||
if _, err := io.Copy(part, stt.AudioBuffer); err != nil {
|
|
||||||
stt.logger.Error("fn: StopRecording", "error", err)
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
// Reset buffer for next recording
|
|
||||||
stt.AudioBuffer.Reset()
|
|
||||||
// Add response format field
|
|
||||||
err = writer.WriteField("response_format", "text")
|
|
||||||
if err != nil {
|
|
||||||
stt.logger.Error("fn: StopRecording", "error", err)
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
if writer.Close() != nil {
|
|
||||||
stt.logger.Error("fn: StopRecording", "error", err)
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
// Send request
|
|
||||||
resp, err := http.Post(stt.ServerURL, writer.FormDataContentType(), body) //nolint:noctx
|
|
||||||
if err != nil {
|
|
||||||
stt.logger.Error("fn: StopRecording", "error", err)
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
defer resp.Body.Close()
|
|
||||||
// Read and print response
|
|
||||||
responseTextBytes, err := io.ReadAll(resp.Body)
|
|
||||||
if err != nil {
|
|
||||||
stt.logger.Error("fn: StopRecording", "error", err)
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
resptext := strings.TrimRight(string(responseTextBytes), "\n")
|
|
||||||
// in case there are special tokens like [_BEG_]
|
|
||||||
resptext = specialRE.ReplaceAllString(resptext, "")
|
|
||||||
return strings.TrimSpace(strings.ReplaceAll(resptext, "\n ", "\n")), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (stt *WhisperServer) writeWavHeader(w io.Writer, dataSize int) {
|
func (stt *WhisperServer) writeWavHeader(w io.Writer, dataSize int) {
|
||||||
header := make([]byte, 44)
|
header := make([]byte, 44)
|
||||||
copy(header[0:4], "RIFF")
|
copy(header[0:4], "RIFF")
|
||||||
@@ -147,56 +68,3 @@ func (stt *WhisperServer) writeWavHeader(w io.Writer, dataSize int) {
|
|||||||
func (stt *WhisperServer) IsRecording() bool {
|
func (stt *WhisperServer) IsRecording() bool {
|
||||||
return stt.recording
|
return stt.recording
|
||||||
}
|
}
|
||||||
|
|
||||||
func (stt *WhisperServer) microphoneStream(sampleRate int) error {
|
|
||||||
// Temporarily redirect stderr to suppress ALSA warnings during PortAudio init
|
|
||||||
origStderr, errDup := syscall.Dup(syscall.Stderr)
|
|
||||||
if errDup != nil {
|
|
||||||
return fmt.Errorf("failed to dup stderr: %w", errDup)
|
|
||||||
}
|
|
||||||
nullFD, err := syscall.Open("/dev/null", syscall.O_WRONLY, 0)
|
|
||||||
if err != nil {
|
|
||||||
_ = syscall.Close(origStderr) // Close the dup'd fd if open fails
|
|
||||||
return fmt.Errorf("failed to open /dev/null: %w", err)
|
|
||||||
}
|
|
||||||
// redirect stderr
|
|
||||||
_ = syscall.Dup2(nullFD, syscall.Stderr)
|
|
||||||
// Initialize PortAudio (this is where ALSA warnings occur)
|
|
||||||
defer func() {
|
|
||||||
// Restore stderr
|
|
||||||
_ = syscall.Dup2(origStderr, syscall.Stderr)
|
|
||||||
_ = syscall.Close(origStderr)
|
|
||||||
_ = syscall.Close(nullFD)
|
|
||||||
}()
|
|
||||||
if err := portaudio.Initialize(); err != nil {
|
|
||||||
return fmt.Errorf("portaudio init failed: %w", err)
|
|
||||||
}
|
|
||||||
in := make([]int16, 64)
|
|
||||||
stream, err := portaudio.OpenDefaultStream(1, 0, float64(sampleRate), len(in), in)
|
|
||||||
if err != nil {
|
|
||||||
if paErr := portaudio.Terminate(); paErr != nil {
|
|
||||||
return fmt.Errorf("failed to open microphone: %w; terminate error: %w", err, paErr)
|
|
||||||
}
|
|
||||||
return fmt.Errorf("failed to open microphone: %w", err)
|
|
||||||
}
|
|
||||||
go func(stream *portaudio.Stream) {
|
|
||||||
if err := stream.Start(); err != nil {
|
|
||||||
stt.logger.Error("microphoneStream", "error", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for {
|
|
||||||
if !stt.IsRecording() {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err := stream.Read(); err != nil {
|
|
||||||
stt.logger.Error("reading stream", "error", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err := binary.Write(stt.AudioBuffer, binary.LittleEndian, in); err != nil {
|
|
||||||
stt.logger.Error("writing to buffer", "error", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}(stream)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|||||||
406
extra/tts.go
406
extra/tts.go
@@ -4,25 +4,13 @@
|
|||||||
package extra
|
package extra
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"gf-lt/config"
|
"gf-lt/config"
|
||||||
"gf-lt/models"
|
"gf-lt/models"
|
||||||
"io"
|
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"net/http"
|
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
google_translate_tts "github.com/GrailFinder/google-translate-tts"
|
google_translate_tts "github.com/GrailFinder/google-translate-tts"
|
||||||
"github.com/GrailFinder/google-translate-tts/handlers"
|
|
||||||
"github.com/gopxl/beep/v2"
|
|
||||||
"github.com/gopxl/beep/v2/mp3"
|
|
||||||
"github.com/gopxl/beep/v2/speaker"
|
|
||||||
"github.com/neurosnap/sentences/english"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@@ -39,142 +27,6 @@ type Orator interface {
|
|||||||
GetLogger() *slog.Logger
|
GetLogger() *slog.Logger
|
||||||
}
|
}
|
||||||
|
|
||||||
// impl https://github.com/remsky/Kokoro-FastAPI
|
|
||||||
type KokoroOrator struct {
|
|
||||||
logger *slog.Logger
|
|
||||||
mu sync.Mutex
|
|
||||||
URL string
|
|
||||||
Format models.AudioFormat
|
|
||||||
Stream bool
|
|
||||||
Speed float32
|
|
||||||
Language string
|
|
||||||
Voice string
|
|
||||||
currentStream *beep.Ctrl // Added for playback control
|
|
||||||
currentDone chan bool
|
|
||||||
textBuffer strings.Builder
|
|
||||||
interrupt bool
|
|
||||||
// textBuffer bytes.Buffer
|
|
||||||
}
|
|
||||||
|
|
||||||
// Google Translate TTS implementation
|
|
||||||
type GoogleTranslateOrator struct {
|
|
||||||
logger *slog.Logger
|
|
||||||
mu sync.Mutex
|
|
||||||
speech *google_translate_tts.Speech
|
|
||||||
currentStream *beep.Ctrl
|
|
||||||
currentDone chan bool
|
|
||||||
textBuffer strings.Builder
|
|
||||||
interrupt bool
|
|
||||||
}
|
|
||||||
|
|
||||||
func (o *KokoroOrator) stoproutine() {
|
|
||||||
for {
|
|
||||||
<-TTSDoneChan
|
|
||||||
o.logger.Debug("orator got done signal")
|
|
||||||
o.Stop()
|
|
||||||
// drain the channel
|
|
||||||
for len(TTSTextChan) > 0 {
|
|
||||||
<-TTSTextChan
|
|
||||||
}
|
|
||||||
o.mu.Lock()
|
|
||||||
o.textBuffer.Reset()
|
|
||||||
if o.currentDone != nil {
|
|
||||||
select {
|
|
||||||
case o.currentDone <- true:
|
|
||||||
default:
|
|
||||||
// Channel might be closed, ignore
|
|
||||||
}
|
|
||||||
}
|
|
||||||
o.interrupt = true
|
|
||||||
o.mu.Unlock()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (o *KokoroOrator) readroutine() {
|
|
||||||
tokenizer, _ := english.NewSentenceTokenizer(nil)
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case chunk := <-TTSTextChan:
|
|
||||||
o.mu.Lock()
|
|
||||||
o.interrupt = false
|
|
||||||
_, err := o.textBuffer.WriteString(chunk)
|
|
||||||
if err != nil {
|
|
||||||
o.logger.Warn("failed to write to stringbuilder", "error", err)
|
|
||||||
o.mu.Unlock()
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
text := o.textBuffer.String()
|
|
||||||
sentences := tokenizer.Tokenize(text)
|
|
||||||
o.logger.Debug("adding chunk", "chunk", chunk, "text", text, "sen-len", len(sentences))
|
|
||||||
if len(sentences) <= 1 {
|
|
||||||
o.mu.Unlock()
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
completeSentences := sentences[:len(sentences)-1]
|
|
||||||
remaining := sentences[len(sentences)-1].Text
|
|
||||||
o.textBuffer.Reset()
|
|
||||||
o.textBuffer.WriteString(remaining)
|
|
||||||
o.mu.Unlock()
|
|
||||||
|
|
||||||
for _, sentence := range completeSentences {
|
|
||||||
o.mu.Lock()
|
|
||||||
interrupted := o.interrupt
|
|
||||||
o.mu.Unlock()
|
|
||||||
if interrupted {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
cleanedText := models.CleanText(sentence.Text)
|
|
||||||
if cleanedText == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
o.logger.Debug("calling Speak with sentence", "sent", cleanedText)
|
|
||||||
if err := o.Speak(cleanedText); err != nil {
|
|
||||||
o.logger.Error("tts failed", "sentence", cleanedText, "error", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case <-TTSFlushChan:
|
|
||||||
o.logger.Debug("got flushchan signal start")
|
|
||||||
// lln is done get the whole message out
|
|
||||||
if len(TTSTextChan) > 0 { // otherwise might get stuck
|
|
||||||
for chunk := range TTSTextChan {
|
|
||||||
o.mu.Lock()
|
|
||||||
_, err := o.textBuffer.WriteString(chunk)
|
|
||||||
o.mu.Unlock()
|
|
||||||
if err != nil {
|
|
||||||
o.logger.Warn("failed to write to stringbuilder", "error", err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if len(TTSTextChan) == 0 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// flush remaining text
|
|
||||||
o.mu.Lock()
|
|
||||||
remaining := o.textBuffer.String()
|
|
||||||
remaining = models.CleanText(remaining)
|
|
||||||
o.textBuffer.Reset()
|
|
||||||
o.mu.Unlock()
|
|
||||||
if remaining == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
o.logger.Debug("calling Speak with remainder", "rem", remaining)
|
|
||||||
sentencesRem := tokenizer.Tokenize(remaining)
|
|
||||||
for _, rs := range sentencesRem { // to avoid dumping large volume of text
|
|
||||||
o.mu.Lock()
|
|
||||||
interrupt := o.interrupt
|
|
||||||
o.mu.Unlock()
|
|
||||||
if interrupt {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
if err := o.Speak(rs.Text); err != nil {
|
|
||||||
o.logger.Error("tts failed", "sentence", rs, "error", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewOrator(log *slog.Logger, cfg *config.Config) Orator {
|
func NewOrator(log *slog.Logger, cfg *config.Config) Orator {
|
||||||
provider := cfg.TTS_PROVIDER
|
provider := cfg.TTS_PROVIDER
|
||||||
if provider == "" {
|
if provider == "" {
|
||||||
@@ -204,270 +56,14 @@ func NewOrator(log *slog.Logger, cfg *config.Config) Orator {
|
|||||||
Language: language,
|
Language: language,
|
||||||
Proxy: "", // Proxy not supported
|
Proxy: "", // Proxy not supported
|
||||||
Speed: cfg.TTS_SPEED,
|
Speed: cfg.TTS_SPEED,
|
||||||
Handler: &handlers.Beep{},
|
|
||||||
}
|
}
|
||||||
orator := &GoogleTranslateOrator{
|
orator := &GoogleTranslateOrator{
|
||||||
logger: log,
|
logger: log,
|
||||||
speech: speech,
|
speech: speech,
|
||||||
|
Speed: cfg.TTS_SPEED,
|
||||||
}
|
}
|
||||||
go orator.readroutine()
|
go orator.readroutine()
|
||||||
go orator.stoproutine()
|
go orator.stoproutine()
|
||||||
return orator
|
return orator
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (o *KokoroOrator) GetLogger() *slog.Logger {
|
|
||||||
return o.logger
|
|
||||||
}
|
|
||||||
|
|
||||||
func (o *KokoroOrator) requestSound(text string) (io.ReadCloser, error) {
|
|
||||||
if o.URL == "" {
|
|
||||||
return nil, fmt.Errorf("TTS URL is empty")
|
|
||||||
}
|
|
||||||
payload := map[string]interface{}{
|
|
||||||
"input": text,
|
|
||||||
"voice": o.Voice,
|
|
||||||
"response_format": o.Format,
|
|
||||||
"download_format": o.Format,
|
|
||||||
"stream": o.Stream,
|
|
||||||
"speed": o.Speed,
|
|
||||||
// "return_download_link": true,
|
|
||||||
"lang_code": o.Language,
|
|
||||||
}
|
|
||||||
payloadBytes, err := json.Marshal(payload)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to marshal payload: %w", err)
|
|
||||||
}
|
|
||||||
req, err := http.NewRequest("POST", o.URL, bytes.NewBuffer(payloadBytes)) //nolint:noctx
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to create request: %w", err)
|
|
||||||
}
|
|
||||||
req.Header.Set("accept", "application/json")
|
|
||||||
req.Header.Set("Content-Type", "application/json")
|
|
||||||
resp, err := http.DefaultClient.Do(req)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("request failed: %w", err)
|
|
||||||
}
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
|
||||||
defer resp.Body.Close()
|
|
||||||
return nil, fmt.Errorf("unexpected status code: %d", resp.StatusCode)
|
|
||||||
}
|
|
||||||
return resp.Body, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (o *KokoroOrator) Speak(text string) error {
|
|
||||||
o.logger.Debug("fn: Speak is called", "text-len", len(text))
|
|
||||||
body, err := o.requestSound(text)
|
|
||||||
if err != nil {
|
|
||||||
o.logger.Error("request failed", "error", err)
|
|
||||||
return fmt.Errorf("request failed: %w", err)
|
|
||||||
}
|
|
||||||
defer body.Close()
|
|
||||||
// Decode the mp3 audio from response body
|
|
||||||
streamer, format, err := mp3.Decode(body)
|
|
||||||
if err != nil {
|
|
||||||
o.logger.Error("mp3 decode failed", "error", err)
|
|
||||||
return fmt.Errorf("mp3 decode failed: %w", err)
|
|
||||||
}
|
|
||||||
defer streamer.Close()
|
|
||||||
// here it spams with errors that speaker cannot be initialized more than once, but how would we deal with many audio records then?
|
|
||||||
if err := speaker.Init(format.SampleRate, format.SampleRate.N(time.Second/10)); err != nil {
|
|
||||||
o.logger.Debug("failed to init speaker", "error", err)
|
|
||||||
}
|
|
||||||
done := make(chan bool)
|
|
||||||
o.mu.Lock()
|
|
||||||
o.currentDone = done
|
|
||||||
o.currentStream = &beep.Ctrl{Streamer: beep.Seq(streamer, beep.Callback(func() {
|
|
||||||
o.mu.Lock()
|
|
||||||
close(done)
|
|
||||||
o.currentStream = nil
|
|
||||||
o.currentDone = nil
|
|
||||||
o.mu.Unlock()
|
|
||||||
})), Paused: false}
|
|
||||||
o.mu.Unlock()
|
|
||||||
speaker.Play(o.currentStream)
|
|
||||||
<-done
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (o *KokoroOrator) Stop() {
|
|
||||||
// speaker.Clear()
|
|
||||||
o.logger.Debug("attempted to stop orator", "orator", o)
|
|
||||||
speaker.Lock()
|
|
||||||
defer speaker.Unlock()
|
|
||||||
o.mu.Lock()
|
|
||||||
defer o.mu.Unlock()
|
|
||||||
if o.currentStream != nil {
|
|
||||||
// o.currentStream.Paused = true
|
|
||||||
o.currentStream.Streamer = nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (o *GoogleTranslateOrator) stoproutine() {
|
|
||||||
for {
|
|
||||||
<-TTSDoneChan
|
|
||||||
o.logger.Debug("orator got done signal")
|
|
||||||
o.Stop()
|
|
||||||
// drain the channel
|
|
||||||
for len(TTSTextChan) > 0 {
|
|
||||||
<-TTSTextChan
|
|
||||||
}
|
|
||||||
o.mu.Lock()
|
|
||||||
o.textBuffer.Reset()
|
|
||||||
if o.currentDone != nil {
|
|
||||||
select {
|
|
||||||
case o.currentDone <- true:
|
|
||||||
default:
|
|
||||||
// Channel might be closed, ignore
|
|
||||||
}
|
|
||||||
}
|
|
||||||
o.interrupt = true
|
|
||||||
o.mu.Unlock()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (o *GoogleTranslateOrator) readroutine() {
|
|
||||||
tokenizer, _ := english.NewSentenceTokenizer(nil)
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case chunk := <-TTSTextChan:
|
|
||||||
o.mu.Lock()
|
|
||||||
o.interrupt = false
|
|
||||||
_, err := o.textBuffer.WriteString(chunk)
|
|
||||||
if err != nil {
|
|
||||||
o.logger.Warn("failed to write to stringbuilder", "error", err)
|
|
||||||
o.mu.Unlock()
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
text := o.textBuffer.String()
|
|
||||||
sentences := tokenizer.Tokenize(text)
|
|
||||||
o.logger.Debug("adding chunk", "chunk", chunk, "text", text, "sen-len", len(sentences))
|
|
||||||
if len(sentences) <= 1 {
|
|
||||||
o.mu.Unlock()
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
completeSentences := sentences[:len(sentences)-1]
|
|
||||||
remaining := sentences[len(sentences)-1].Text
|
|
||||||
o.textBuffer.Reset()
|
|
||||||
o.textBuffer.WriteString(remaining)
|
|
||||||
o.mu.Unlock()
|
|
||||||
|
|
||||||
for _, sentence := range completeSentences {
|
|
||||||
o.mu.Lock()
|
|
||||||
interrupted := o.interrupt
|
|
||||||
o.mu.Unlock()
|
|
||||||
if interrupted {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
cleanedText := models.CleanText(sentence.Text)
|
|
||||||
if cleanedText == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
o.logger.Debug("calling Speak with sentence", "sent", cleanedText)
|
|
||||||
if err := o.Speak(cleanedText); err != nil {
|
|
||||||
o.logger.Error("tts failed", "sentence", cleanedText, "error", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case <-TTSFlushChan:
|
|
||||||
o.logger.Debug("got flushchan signal start")
|
|
||||||
// lln is done get the whole message out
|
|
||||||
if len(TTSTextChan) > 0 { // otherwise might get stuck
|
|
||||||
for chunk := range TTSTextChan {
|
|
||||||
o.mu.Lock()
|
|
||||||
_, err := o.textBuffer.WriteString(chunk)
|
|
||||||
o.mu.Unlock()
|
|
||||||
if err != nil {
|
|
||||||
o.logger.Warn("failed to write to stringbuilder", "error", err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if len(TTSTextChan) == 0 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
o.mu.Lock()
|
|
||||||
remaining := o.textBuffer.String()
|
|
||||||
remaining = models.CleanText(remaining)
|
|
||||||
o.textBuffer.Reset()
|
|
||||||
o.mu.Unlock()
|
|
||||||
if remaining == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
o.logger.Debug("calling Speak with remainder", "rem", remaining)
|
|
||||||
sentencesRem := tokenizer.Tokenize(remaining)
|
|
||||||
for _, rs := range sentencesRem { // to avoid dumping large volume of text
|
|
||||||
o.mu.Lock()
|
|
||||||
interrupt := o.interrupt
|
|
||||||
o.mu.Unlock()
|
|
||||||
if interrupt {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
if err := o.Speak(rs.Text); err != nil {
|
|
||||||
o.logger.Error("tts failed", "sentence", rs.Text, "error", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (o *GoogleTranslateOrator) GetLogger() *slog.Logger {
|
|
||||||
return o.logger
|
|
||||||
}
|
|
||||||
|
|
||||||
func (o *GoogleTranslateOrator) Speak(text string) error {
|
|
||||||
o.logger.Debug("fn: Speak is called", "text-len", len(text))
|
|
||||||
// Generate MP3 data using google-translate-tts
|
|
||||||
reader, err := o.speech.GenerateSpeech(text)
|
|
||||||
if err != nil {
|
|
||||||
o.logger.Error("generate speech failed", "error", err)
|
|
||||||
return fmt.Errorf("generate speech failed: %w", err)
|
|
||||||
}
|
|
||||||
// Decode the mp3 audio from reader (wrap with NopCloser for io.ReadCloser)
|
|
||||||
streamer, format, err := mp3.Decode(io.NopCloser(reader))
|
|
||||||
if err != nil {
|
|
||||||
o.logger.Error("mp3 decode failed", "error", err)
|
|
||||||
return fmt.Errorf("mp3 decode failed: %w", err)
|
|
||||||
}
|
|
||||||
defer streamer.Close()
|
|
||||||
playbackStreamer := beep.Streamer(streamer)
|
|
||||||
speed := o.speech.Speed
|
|
||||||
if speed <= 0 {
|
|
||||||
speed = 1.0
|
|
||||||
}
|
|
||||||
if speed != 1.0 {
|
|
||||||
playbackStreamer = beep.ResampleRatio(3, float64(speed), streamer)
|
|
||||||
}
|
|
||||||
// Initialize speaker with the format's sample rate
|
|
||||||
if err := speaker.Init(format.SampleRate, format.SampleRate.N(time.Second/10)); err != nil {
|
|
||||||
o.logger.Debug("failed to init speaker", "error", err)
|
|
||||||
}
|
|
||||||
done := make(chan bool)
|
|
||||||
o.mu.Lock()
|
|
||||||
o.currentDone = done
|
|
||||||
o.currentStream = &beep.Ctrl{Streamer: beep.Seq(playbackStreamer, beep.Callback(func() {
|
|
||||||
o.mu.Lock()
|
|
||||||
close(done)
|
|
||||||
o.currentStream = nil
|
|
||||||
o.currentDone = nil
|
|
||||||
o.mu.Unlock()
|
|
||||||
})), Paused: false}
|
|
||||||
o.mu.Unlock()
|
|
||||||
speaker.Play(o.currentStream)
|
|
||||||
<-done // wait for playback to complete
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (o *GoogleTranslateOrator) Stop() {
|
|
||||||
o.logger.Debug("attempted to stop google translate orator")
|
|
||||||
speaker.Lock()
|
|
||||||
defer speaker.Unlock()
|
|
||||||
o.mu.Lock()
|
|
||||||
defer o.mu.Unlock()
|
|
||||||
if o.currentStream != nil {
|
|
||||||
o.currentStream.Streamer = nil
|
|
||||||
}
|
|
||||||
// Also stop the speech handler if possible
|
|
||||||
if o.speech != nil {
|
|
||||||
_ = o.speech.Stop()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -9,15 +9,13 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"gf-lt/config"
|
"gf-lt/config"
|
||||||
"io"
|
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
"time"
|
||||||
"github.com/gordonklaus/portaudio"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type WhisperBinary struct {
|
type WhisperBinary struct {
|
||||||
@@ -25,11 +23,143 @@ type WhisperBinary struct {
|
|||||||
whisperPath string
|
whisperPath string
|
||||||
modelPath string
|
modelPath string
|
||||||
lang string
|
lang string
|
||||||
ctx context.Context
|
// Per-recording fields (protected by mu)
|
||||||
cancel context.CancelFunc
|
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
recording bool
|
recording bool
|
||||||
audioBuffer []int16
|
tempFile string
|
||||||
|
ctx context.Context
|
||||||
|
cancel context.CancelFunc
|
||||||
|
cmd *exec.Cmd
|
||||||
|
cmdMu sync.Mutex
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *WhisperBinary) StartRecording() error {
|
||||||
|
w.mu.Lock()
|
||||||
|
defer w.mu.Unlock()
|
||||||
|
if w.recording {
|
||||||
|
return errors.New("recording is already in progress")
|
||||||
|
}
|
||||||
|
// Fresh context for this recording
|
||||||
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
|
w.ctx = ctx
|
||||||
|
w.cancel = cancel
|
||||||
|
// Create temporary file
|
||||||
|
tempFile, err := os.CreateTemp("", "recording_*.wav")
|
||||||
|
if err != nil {
|
||||||
|
cancel()
|
||||||
|
return fmt.Errorf("failed to create temp file: %w", err)
|
||||||
|
}
|
||||||
|
tempFile.Close()
|
||||||
|
w.tempFile = tempFile.Name()
|
||||||
|
// ffmpeg command: capture from default microphone, write WAV
|
||||||
|
args := []string{
|
||||||
|
"-f", "alsa", // or "pulse" if preferred
|
||||||
|
"-i", "default",
|
||||||
|
"-acodec", "pcm_s16le",
|
||||||
|
"-ar", "16000",
|
||||||
|
"-ac", "1",
|
||||||
|
"-y", // overwrite output file
|
||||||
|
w.tempFile,
|
||||||
|
}
|
||||||
|
cmd := exec.CommandContext(w.ctx, "ffmpeg", args...)
|
||||||
|
// Capture stderr for debugging (optional, but useful for diagnosing)
|
||||||
|
stderr, err := cmd.StderrPipe()
|
||||||
|
if err != nil {
|
||||||
|
cancel()
|
||||||
|
os.Remove(w.tempFile)
|
||||||
|
return fmt.Errorf("failed to create stderr pipe: %w", err)
|
||||||
|
}
|
||||||
|
go func() {
|
||||||
|
buf := make([]byte, 1024)
|
||||||
|
for {
|
||||||
|
n, err := stderr.Read(buf)
|
||||||
|
if n > 0 {
|
||||||
|
w.logger.Debug("ffmpeg stderr", "output", string(buf[:n]))
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
w.cmdMu.Lock()
|
||||||
|
w.cmd = cmd
|
||||||
|
w.cmdMu.Unlock()
|
||||||
|
if err := cmd.Start(); err != nil {
|
||||||
|
cancel()
|
||||||
|
os.Remove(w.tempFile)
|
||||||
|
return fmt.Errorf("failed to start ffmpeg: %w", err)
|
||||||
|
}
|
||||||
|
w.recording = true
|
||||||
|
w.logger.Debug("Recording started", "file", w.tempFile)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *WhisperBinary) StopRecording() (string, error) {
|
||||||
|
w.mu.Lock()
|
||||||
|
defer w.mu.Unlock()
|
||||||
|
if !w.recording {
|
||||||
|
return "", errors.New("not currently recording")
|
||||||
|
}
|
||||||
|
w.recording = false
|
||||||
|
// Gracefully stop ffmpeg
|
||||||
|
w.cmdMu.Lock()
|
||||||
|
if w.cmd != nil && w.cmd.Process != nil {
|
||||||
|
w.logger.Debug("Sending SIGTERM to ffmpeg")
|
||||||
|
w.cmd.Process.Signal(syscall.SIGTERM)
|
||||||
|
// Wait for process to exit (up to 2 seconds)
|
||||||
|
done := make(chan error, 1)
|
||||||
|
go func() {
|
||||||
|
done <- w.cmd.Wait()
|
||||||
|
}()
|
||||||
|
select {
|
||||||
|
case <-done:
|
||||||
|
w.logger.Debug("ffmpeg exited after SIGTERM")
|
||||||
|
case <-time.After(2 * time.Second):
|
||||||
|
w.logger.Warn("ffmpeg did not exit, sending SIGKILL")
|
||||||
|
w.cmd.Process.Kill()
|
||||||
|
<-done
|
||||||
|
}
|
||||||
|
}
|
||||||
|
w.cmdMu.Unlock()
|
||||||
|
// Cancel context (already done, but for cleanliness)
|
||||||
|
if w.cancel != nil {
|
||||||
|
w.cancel()
|
||||||
|
}
|
||||||
|
// Validate temp file
|
||||||
|
if w.tempFile == "" {
|
||||||
|
return "", errors.New("no recording file")
|
||||||
|
}
|
||||||
|
defer os.Remove(w.tempFile)
|
||||||
|
info, err := os.Stat(w.tempFile)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to stat temp file: %w", err)
|
||||||
|
}
|
||||||
|
if info.Size() < 44 { // WAV header is 44 bytes
|
||||||
|
// Log ffmpeg stderr? Already captured in debug logs.
|
||||||
|
return "", fmt.Errorf("recording file too small (%d bytes), possibly no audio captured", info.Size())
|
||||||
|
}
|
||||||
|
// Run whisper.cpp binary
|
||||||
|
cmd := exec.Command(w.whisperPath, "-m", w.modelPath, "-l", w.lang, w.tempFile)
|
||||||
|
var outBuf, errBuf bytes.Buffer
|
||||||
|
cmd.Stdout = &outBuf
|
||||||
|
cmd.Stderr = &errBuf
|
||||||
|
if err := cmd.Run(); err != nil {
|
||||||
|
w.logger.Error("whisper binary failed",
|
||||||
|
"error", err,
|
||||||
|
"stderr", errBuf.String(),
|
||||||
|
"file_size", info.Size())
|
||||||
|
return "", fmt.Errorf("whisper binary failed: %w (stderr: %s)", err, errBuf.String())
|
||||||
|
}
|
||||||
|
result := strings.TrimRight(outBuf.String(), "\n")
|
||||||
|
result = specialRE.ReplaceAllString(result, "")
|
||||||
|
return strings.TrimSpace(strings.ReplaceAll(result, "\n ", "\n")), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsRecording returns true if a recording is in progress.
|
||||||
|
func (w *WhisperBinary) IsRecording() bool {
|
||||||
|
w.mu.Lock()
|
||||||
|
defer w.mu.Unlock()
|
||||||
|
return w.recording
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewWhisperBinary(logger *slog.Logger, cfg *config.Config) *WhisperBinary {
|
func NewWhisperBinary(logger *slog.Logger, cfg *config.Config) *WhisperBinary {
|
||||||
@@ -44,283 +174,3 @@ func NewWhisperBinary(logger *slog.Logger, cfg *config.Config) *WhisperBinary {
|
|||||||
cancel: cancel,
|
cancel: cancel,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (w *WhisperBinary) StartRecording() error {
|
|
||||||
w.mu.Lock()
|
|
||||||
defer w.mu.Unlock()
|
|
||||||
if w.recording {
|
|
||||||
return errors.New("recording is already in progress")
|
|
||||||
}
|
|
||||||
// If context is cancelled, create a new one for the next recording session
|
|
||||||
if w.ctx.Err() != nil {
|
|
||||||
w.logger.Debug("Context cancelled, creating new context")
|
|
||||||
w.ctx, w.cancel = context.WithCancel(context.Background())
|
|
||||||
}
|
|
||||||
// Temporarily redirect stderr to suppress ALSA warnings during PortAudio init
|
|
||||||
origStderr, errDup := syscall.Dup(syscall.Stderr)
|
|
||||||
if errDup != nil {
|
|
||||||
return fmt.Errorf("failed to dup stderr: %w", errDup)
|
|
||||||
}
|
|
||||||
nullFD, err := syscall.Open("/dev/null", syscall.O_WRONLY, 0)
|
|
||||||
if err != nil {
|
|
||||||
_ = syscall.Close(origStderr) // Close the dup'd fd if open fails
|
|
||||||
return fmt.Errorf("failed to open /dev/null: %w", err)
|
|
||||||
}
|
|
||||||
// redirect stderr
|
|
||||||
_ = syscall.Dup2(nullFD, syscall.Stderr)
|
|
||||||
// Initialize PortAudio (this is where ALSA warnings occur)
|
|
||||||
portaudioErr := portaudio.Initialize()
|
|
||||||
defer func() {
|
|
||||||
// Restore stderr
|
|
||||||
_ = syscall.Dup2(origStderr, syscall.Stderr)
|
|
||||||
_ = syscall.Close(origStderr)
|
|
||||||
_ = syscall.Close(nullFD)
|
|
||||||
}()
|
|
||||||
if portaudioErr != nil {
|
|
||||||
return fmt.Errorf("portaudio init failed: %w", portaudioErr)
|
|
||||||
}
|
|
||||||
// Initialize audio buffer
|
|
||||||
w.audioBuffer = make([]int16, 0)
|
|
||||||
in := make([]int16, 1024) // buffer size
|
|
||||||
stream, err := portaudio.OpenDefaultStream(1, 0, 16000.0, len(in), in)
|
|
||||||
if err != nil {
|
|
||||||
if paErr := portaudio.Terminate(); paErr != nil {
|
|
||||||
return fmt.Errorf("failed to open microphone: %w; terminate error: %w", err, paErr)
|
|
||||||
}
|
|
||||||
return fmt.Errorf("failed to open microphone: %w", err)
|
|
||||||
}
|
|
||||||
go w.recordAudio(stream, in)
|
|
||||||
w.recording = true
|
|
||||||
w.logger.Debug("Recording started")
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (w *WhisperBinary) recordAudio(stream *portaudio.Stream, in []int16) {
|
|
||||||
defer func() {
|
|
||||||
w.logger.Debug("recordAudio defer function called")
|
|
||||||
_ = stream.Stop() // Stop the stream
|
|
||||||
_ = portaudio.Terminate() // ignoring error as we're shutting down
|
|
||||||
w.logger.Debug("recordAudio terminated")
|
|
||||||
}()
|
|
||||||
w.logger.Debug("Starting audio stream")
|
|
||||||
if err := stream.Start(); err != nil {
|
|
||||||
w.logger.Error("Failed to start audio stream", "error", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
w.logger.Debug("Audio stream started, entering recording loop")
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case <-w.ctx.Done():
|
|
||||||
w.logger.Debug("Context done, exiting recording loop")
|
|
||||||
return
|
|
||||||
default:
|
|
||||||
// Check recording status with minimal lock time
|
|
||||||
w.mu.Lock()
|
|
||||||
recording := w.recording
|
|
||||||
w.mu.Unlock()
|
|
||||||
|
|
||||||
if !recording {
|
|
||||||
w.logger.Debug("Recording flag is false, exiting recording loop")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err := stream.Read(); err != nil {
|
|
||||||
w.logger.Error("Error reading from stream", "error", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
// Append samples to buffer - only acquire lock when necessary
|
|
||||||
w.mu.Lock()
|
|
||||||
if w.audioBuffer == nil {
|
|
||||||
w.audioBuffer = make([]int16, 0)
|
|
||||||
}
|
|
||||||
// Make a copy of the input buffer to avoid overwriting
|
|
||||||
tempBuffer := make([]int16, len(in))
|
|
||||||
copy(tempBuffer, in)
|
|
||||||
w.audioBuffer = append(w.audioBuffer, tempBuffer...)
|
|
||||||
w.mu.Unlock()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (w *WhisperBinary) StopRecording() (string, error) {
|
|
||||||
w.logger.Debug("StopRecording called")
|
|
||||||
w.mu.Lock()
|
|
||||||
if !w.recording {
|
|
||||||
w.mu.Unlock()
|
|
||||||
return "", errors.New("not currently recording")
|
|
||||||
}
|
|
||||||
w.logger.Debug("Setting recording to false and cancelling context")
|
|
||||||
w.recording = false
|
|
||||||
w.cancel() // This will stop the recording goroutine
|
|
||||||
w.mu.Unlock()
|
|
||||||
// // Small delay to allow the recording goroutine to react to context cancellation
|
|
||||||
// time.Sleep(20 * time.Millisecond)
|
|
||||||
// Save the recorded audio to a temporary file
|
|
||||||
tempFile, err := w.saveAudioToTempFile()
|
|
||||||
if err != nil {
|
|
||||||
w.logger.Error("Error saving audio to temp file", "error", err)
|
|
||||||
return "", fmt.Errorf("failed to save audio to temp file: %w", err)
|
|
||||||
}
|
|
||||||
w.logger.Debug("Saved audio to temp file", "file", tempFile)
|
|
||||||
// Run the whisper binary with a separate context to avoid cancellation during transcription
|
|
||||||
cmd := exec.Command(w.whisperPath, "-m", w.modelPath, "-l", w.lang, tempFile, "2>/dev/null")
|
|
||||||
var outBuf bytes.Buffer
|
|
||||||
cmd.Stdout = &outBuf
|
|
||||||
// Redirect stderr to suppress ALSA warnings and other stderr output
|
|
||||||
cmd.Stderr = io.Discard // Suppress stderr output from whisper binary
|
|
||||||
w.logger.Debug("Running whisper binary command")
|
|
||||||
if err := cmd.Run(); err != nil {
|
|
||||||
// Clean up audio buffer
|
|
||||||
w.mu.Lock()
|
|
||||||
w.audioBuffer = nil
|
|
||||||
w.mu.Unlock()
|
|
||||||
// Since we're suppressing stderr, we'll just log that the command failed
|
|
||||||
w.logger.Error("Error running whisper binary", "error", err)
|
|
||||||
return "", fmt.Errorf("whisper binary failed: %w", err)
|
|
||||||
}
|
|
||||||
result := outBuf.String()
|
|
||||||
w.logger.Debug("Whisper binary completed", "result", result)
|
|
||||||
// Clean up audio buffer
|
|
||||||
w.mu.Lock()
|
|
||||||
w.audioBuffer = nil
|
|
||||||
w.mu.Unlock()
|
|
||||||
// Clean up the temporary file after transcription
|
|
||||||
w.logger.Debug("StopRecording completed")
|
|
||||||
os.Remove(tempFile)
|
|
||||||
result = strings.TrimRight(result, "\n")
|
|
||||||
// in case there are special tokens like [_BEG_]
|
|
||||||
result = specialRE.ReplaceAllString(result, "")
|
|
||||||
return strings.TrimSpace(strings.ReplaceAll(result, "\n ", "\n")), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// saveAudioToTempFile saves the recorded audio data to a temporary WAV file
|
|
||||||
func (w *WhisperBinary) saveAudioToTempFile() (string, error) {
|
|
||||||
w.logger.Debug("saveAudioToTempFile called")
|
|
||||||
// Create temporary WAV file
|
|
||||||
tempFile, err := os.CreateTemp("", "recording_*.wav")
|
|
||||||
if err != nil {
|
|
||||||
w.logger.Error("Failed to create temp file", "error", err)
|
|
||||||
return "", fmt.Errorf("failed to create temp file: %w", err)
|
|
||||||
}
|
|
||||||
w.logger.Debug("Created temp file", "file", tempFile.Name())
|
|
||||||
defer tempFile.Close()
|
|
||||||
|
|
||||||
// Write WAV header and data
|
|
||||||
w.logger.Debug("About to write WAV file", "file", tempFile.Name())
|
|
||||||
err = w.writeWAVFile(tempFile.Name())
|
|
||||||
if err != nil {
|
|
||||||
w.logger.Error("Error writing WAV file", "error", err)
|
|
||||||
return "", fmt.Errorf("failed to write WAV file: %w", err)
|
|
||||||
}
|
|
||||||
w.logger.Debug("WAV file written successfully", "file", tempFile.Name())
|
|
||||||
|
|
||||||
return tempFile.Name(), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// writeWAVFile creates a WAV file from the recorded audio data
|
|
||||||
func (w *WhisperBinary) writeWAVFile(filename string) error {
|
|
||||||
w.logger.Debug("writeWAVFile called", "filename", filename)
|
|
||||||
// Open file for writing
|
|
||||||
file, err := os.Create(filename)
|
|
||||||
if err != nil {
|
|
||||||
w.logger.Error("Error creating file", "error", err)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer file.Close()
|
|
||||||
|
|
||||||
w.logger.Debug("About to acquire mutex in writeWAVFile")
|
|
||||||
w.mu.Lock()
|
|
||||||
w.logger.Debug("Locked mutex, copying audio buffer")
|
|
||||||
audioData := make([]int16, len(w.audioBuffer))
|
|
||||||
copy(audioData, w.audioBuffer)
|
|
||||||
w.mu.Unlock()
|
|
||||||
w.logger.Debug("Unlocked mutex", "audio_data_length", len(audioData))
|
|
||||||
|
|
||||||
if len(audioData) == 0 {
|
|
||||||
w.logger.Warn("No audio data to write")
|
|
||||||
return errors.New("no audio data to write")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Calculate data size (number of samples * size of int16)
|
|
||||||
dataSize := len(audioData) * 2 // 2 bytes per int16 sample
|
|
||||||
w.logger.Debug("Calculated data size", "size", dataSize)
|
|
||||||
|
|
||||||
// Write WAV header with the correct data size
|
|
||||||
header := w.createWAVHeader(16000, 1, 16, dataSize)
|
|
||||||
_, err = file.Write(header)
|
|
||||||
if err != nil {
|
|
||||||
w.logger.Error("Error writing WAV header", "error", err)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
w.logger.Debug("WAV header written successfully")
|
|
||||||
|
|
||||||
// Write audio data
|
|
||||||
w.logger.Debug("About to write audio data samples")
|
|
||||||
for i, sample := range audioData {
|
|
||||||
// Write little-endian 16-bit sample
|
|
||||||
_, err := file.Write([]byte{byte(sample), byte(sample >> 8)})
|
|
||||||
if err != nil {
|
|
||||||
w.logger.Error("Error writing sample", "index", i, "error", err)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
// Log progress every 10000 samples to avoid too much output
|
|
||||||
if i%10000 == 0 {
|
|
||||||
w.logger.Debug("Written samples", "count", i)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
w.logger.Debug("All audio data written successfully")
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// createWAVHeader creates a WAV file header
|
|
||||||
func (w *WhisperBinary) createWAVHeader(sampleRate, channels, bitsPerSample int, dataSize int) []byte {
|
|
||||||
header := make([]byte, 44)
|
|
||||||
copy(header[0:4], "RIFF")
|
|
||||||
// Total file size will be updated later
|
|
||||||
copy(header[8:12], "WAVE")
|
|
||||||
copy(header[12:16], "fmt ")
|
|
||||||
// fmt chunk size (16 for PCM)
|
|
||||||
header[16] = 16
|
|
||||||
header[17] = 0
|
|
||||||
header[18] = 0
|
|
||||||
header[19] = 0
|
|
||||||
// Audio format (1 = PCM)
|
|
||||||
header[20] = 1
|
|
||||||
header[21] = 0
|
|
||||||
// Number of channels
|
|
||||||
header[22] = byte(channels)
|
|
||||||
header[23] = 0
|
|
||||||
// Sample rate
|
|
||||||
header[24] = byte(sampleRate)
|
|
||||||
header[25] = byte(sampleRate >> 8)
|
|
||||||
header[26] = byte(sampleRate >> 16)
|
|
||||||
header[27] = byte(sampleRate >> 24)
|
|
||||||
// Byte rate
|
|
||||||
byteRate := sampleRate * channels * bitsPerSample / 8
|
|
||||||
header[28] = byte(byteRate)
|
|
||||||
header[29] = byte(byteRate >> 8)
|
|
||||||
header[30] = byte(byteRate >> 16)
|
|
||||||
header[31] = byte(byteRate >> 24)
|
|
||||||
// Block align
|
|
||||||
blockAlign := channels * bitsPerSample / 8
|
|
||||||
header[32] = byte(blockAlign)
|
|
||||||
header[33] = 0
|
|
||||||
// Bits per sample
|
|
||||||
header[34] = byte(bitsPerSample)
|
|
||||||
header[35] = 0
|
|
||||||
// "data" subchunk
|
|
||||||
copy(header[36:40], "data")
|
|
||||||
// Data size
|
|
||||||
header[40] = byte(dataSize)
|
|
||||||
header[41] = byte(dataSize >> 8)
|
|
||||||
header[42] = byte(dataSize >> 16)
|
|
||||||
header[43] = byte(dataSize >> 24)
|
|
||||||
|
|
||||||
return header
|
|
||||||
}
|
|
||||||
|
|
||||||
func (w *WhisperBinary) IsRecording() bool {
|
|
||||||
w.mu.Lock()
|
|
||||||
defer w.mu.Unlock()
|
|
||||||
return w.recording
|
|
||||||
}
|
|
||||||
|
|||||||
156
extra/whisper_server.go
Normal file
156
extra/whisper_server.go
Normal file
@@ -0,0 +1,156 @@
|
|||||||
|
//go:build extra
|
||||||
|
// +build extra
|
||||||
|
|
||||||
|
package extra
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"log/slog"
|
||||||
|
"mime/multipart"
|
||||||
|
"net/http"
|
||||||
|
"os/exec"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
)
|
||||||
|
|
||||||
|
type WhisperServer struct {
|
||||||
|
logger *slog.Logger
|
||||||
|
ServerURL string
|
||||||
|
SampleRate int
|
||||||
|
AudioBuffer *bytes.Buffer
|
||||||
|
recording bool // protected by mu
|
||||||
|
mu sync.Mutex // protects recording & AudioBuffer
|
||||||
|
cmd *exec.Cmd // protected by cmdMu
|
||||||
|
stopCh chan struct{} // protected by cmdMu
|
||||||
|
cmdMu sync.Mutex // protects cmd and stopCh
|
||||||
|
}
|
||||||
|
|
||||||
|
func (stt *WhisperServer) StartRecording() error {
|
||||||
|
stt.mu.Lock()
|
||||||
|
defer stt.mu.Unlock()
|
||||||
|
if stt.recording {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
// Build ffmpeg command for microphone capture
|
||||||
|
args := []string{
|
||||||
|
"-f", "alsa",
|
||||||
|
"-i", "default",
|
||||||
|
"-acodec", "pcm_s16le",
|
||||||
|
"-ar", fmt.Sprint(stt.SampleRate),
|
||||||
|
"-ac", "1",
|
||||||
|
"-f", "s16le",
|
||||||
|
"-",
|
||||||
|
}
|
||||||
|
cmd := exec.Command("ffmpeg", args...)
|
||||||
|
stdout, err := cmd.StdoutPipe()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to get stdout pipe: %w", err)
|
||||||
|
}
|
||||||
|
stt.cmdMu.Lock()
|
||||||
|
stt.cmd = cmd
|
||||||
|
stt.stopCh = make(chan struct{})
|
||||||
|
stt.cmdMu.Unlock()
|
||||||
|
if err := cmd.Start(); err != nil {
|
||||||
|
return fmt.Errorf("failed to start ffmpeg: %w", err)
|
||||||
|
}
|
||||||
|
stt.recording = true
|
||||||
|
stt.AudioBuffer.Reset()
|
||||||
|
// Read PCM data in goroutine
|
||||||
|
go func() {
|
||||||
|
buf := make([]byte, 4096)
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-stt.stopCh:
|
||||||
|
return
|
||||||
|
default:
|
||||||
|
n, err := stdout.Read(buf)
|
||||||
|
if n > 0 {
|
||||||
|
stt.mu.Lock()
|
||||||
|
stt.AudioBuffer.Write(buf[:n])
|
||||||
|
stt.mu.Unlock()
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
if err != io.EOF {
|
||||||
|
stt.logger.Error("recording read error", "error", err)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (stt *WhisperServer) StopRecording() (string, error) {
|
||||||
|
stt.mu.Lock()
|
||||||
|
defer stt.mu.Unlock()
|
||||||
|
if !stt.recording {
|
||||||
|
return "", errors.New("not recording")
|
||||||
|
}
|
||||||
|
stt.recording = false
|
||||||
|
// Stop ffmpeg
|
||||||
|
stt.cmdMu.Lock()
|
||||||
|
if stt.cmd != nil && stt.cmd.Process != nil {
|
||||||
|
stt.cmd.Process.Kill()
|
||||||
|
stt.cmd.Wait()
|
||||||
|
}
|
||||||
|
close(stt.stopCh)
|
||||||
|
stt.cmdMu.Unlock()
|
||||||
|
// Rest of StopRecording unchanged (WAV header + HTTP upload)
|
||||||
|
// ...
|
||||||
|
stt.recording = false
|
||||||
|
// wait loop to finish?
|
||||||
|
if stt.AudioBuffer == nil {
|
||||||
|
err := errors.New("unexpected nil AudioBuffer")
|
||||||
|
stt.logger.Error(err.Error())
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
// Create WAV header first
|
||||||
|
body := &bytes.Buffer{}
|
||||||
|
writer := multipart.NewWriter(body)
|
||||||
|
// Add audio file part
|
||||||
|
part, err := writer.CreateFormFile("file", "recording.wav")
|
||||||
|
if err != nil {
|
||||||
|
stt.logger.Error("fn: StopRecording", "error", err)
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
// Stream directly to multipart writer: header + raw data
|
||||||
|
dataSize := stt.AudioBuffer.Len()
|
||||||
|
stt.writeWavHeader(part, dataSize)
|
||||||
|
if _, err := io.Copy(part, stt.AudioBuffer); err != nil {
|
||||||
|
stt.logger.Error("fn: StopRecording", "error", err)
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
// Reset buffer for next recording
|
||||||
|
stt.AudioBuffer.Reset()
|
||||||
|
// Add response format field
|
||||||
|
err = writer.WriteField("response_format", "text")
|
||||||
|
if err != nil {
|
||||||
|
stt.logger.Error("fn: StopRecording", "error", err)
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if writer.Close() != nil {
|
||||||
|
stt.logger.Error("fn: StopRecording", "error", err)
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
// Send request
|
||||||
|
resp, err := http.Post(stt.ServerURL, writer.FormDataContentType(), body) //nolint:noctx
|
||||||
|
if err != nil {
|
||||||
|
stt.logger.Error("fn: StopRecording", "error", err)
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
// Read and print response
|
||||||
|
responseTextBytes, err := io.ReadAll(resp.Body)
|
||||||
|
if err != nil {
|
||||||
|
stt.logger.Error("fn: StopRecording", "error", err)
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
resptext := strings.TrimRight(string(responseTextBytes), "\n")
|
||||||
|
// in case there are special tokens like [_BEG_]
|
||||||
|
resptext = specialRE.ReplaceAllString(resptext, "")
|
||||||
|
return strings.TrimSpace(strings.ReplaceAll(resptext, "\n ", "\n")), nil
|
||||||
|
}
|
||||||
23
go.mod
23
go.mod
@@ -4,33 +4,40 @@ go 1.25.1
|
|||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/BurntSushi/toml v1.5.0
|
github.com/BurntSushi/toml v1.5.0
|
||||||
github.com/GrailFinder/google-translate-tts v0.1.3
|
github.com/GrailFinder/google-translate-tts v0.1.4
|
||||||
github.com/GrailFinder/searchagent v0.2.0
|
github.com/GrailFinder/searchagent v0.2.0
|
||||||
|
github.com/PuerkitoBio/goquery v1.11.0
|
||||||
github.com/gdamore/tcell/v2 v2.13.2
|
github.com/gdamore/tcell/v2 v2.13.2
|
||||||
github.com/glebarez/go-sqlite v1.22.0
|
github.com/glebarez/go-sqlite v1.22.0
|
||||||
github.com/gopxl/beep/v2 v2.1.1
|
|
||||||
github.com/gordonklaus/portaudio v0.0.0-20250206071425-98a94950218b
|
|
||||||
github.com/jmoiron/sqlx v1.4.0
|
github.com/jmoiron/sqlx v1.4.0
|
||||||
|
github.com/ledongthuc/pdf v0.0.0-20250511090121-5959a4027728
|
||||||
github.com/neurosnap/sentences v1.1.2
|
github.com/neurosnap/sentences v1.1.2
|
||||||
|
github.com/playwright-community/playwright-go v0.5700.1
|
||||||
github.com/rivo/tview v0.42.0
|
github.com/rivo/tview v0.42.0
|
||||||
|
github.com/sugarme/tokenizer v0.3.0
|
||||||
|
github.com/yalue/onnxruntime_go v1.27.0
|
||||||
|
github.com/yuin/goldmark v1.4.13
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/PuerkitoBio/goquery v1.11.0 // indirect
|
|
||||||
github.com/andybalholm/cascadia v1.3.3 // indirect
|
github.com/andybalholm/cascadia v1.3.3 // indirect
|
||||||
|
github.com/deckarep/golang-set/v2 v2.8.0 // indirect
|
||||||
github.com/dustin/go-humanize v1.0.1 // indirect
|
github.com/dustin/go-humanize v1.0.1 // indirect
|
||||||
github.com/ebitengine/oto/v3 v3.4.0 // indirect
|
github.com/emirpasic/gods v1.18.1 // indirect
|
||||||
github.com/ebitengine/purego v0.9.1 // indirect
|
|
||||||
github.com/gdamore/encoding v1.0.1 // indirect
|
github.com/gdamore/encoding v1.0.1 // indirect
|
||||||
|
github.com/go-jose/go-jose/v3 v3.0.4 // indirect
|
||||||
|
github.com/go-stack/stack v1.8.1 // indirect
|
||||||
github.com/google/uuid v1.6.0 // indirect
|
github.com/google/uuid v1.6.0 // indirect
|
||||||
github.com/hajimehoshi/go-mp3 v0.3.4 // indirect
|
github.com/hajimehoshi/go-mp3 v0.3.4 // indirect
|
||||||
github.com/hajimehoshi/oto/v2 v2.3.1 // indirect
|
|
||||||
github.com/lucasb-eyer/go-colorful v1.3.0 // indirect
|
github.com/lucasb-eyer/go-colorful v1.3.0 // indirect
|
||||||
github.com/mattn/go-isatty v0.0.20 // indirect
|
github.com/mattn/go-isatty v0.0.20 // indirect
|
||||||
|
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
|
||||||
github.com/ncruces/go-strftime v1.0.0 // indirect
|
github.com/ncruces/go-strftime v1.0.0 // indirect
|
||||||
github.com/pkg/errors v0.9.1 // indirect
|
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
|
||||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
|
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
|
||||||
github.com/rivo/uniseg v0.4.7 // indirect
|
github.com/rivo/uniseg v0.4.7 // indirect
|
||||||
|
github.com/schollz/progressbar/v2 v2.15.0 // indirect
|
||||||
|
github.com/sugarme/regexpset v0.0.0-20200920021344-4d4ec8eaf93c // indirect
|
||||||
golang.org/x/exp v0.0.0-20251209150349-8475f28825e9 // indirect
|
golang.org/x/exp v0.0.0-20251209150349-8475f28825e9 // indirect
|
||||||
golang.org/x/net v0.48.0 // indirect
|
golang.org/x/net v0.48.0 // indirect
|
||||||
golang.org/x/sys v0.39.0 // indirect
|
golang.org/x/sys v0.39.0 // indirect
|
||||||
|
|||||||
47
go.sum
47
go.sum
@@ -2,47 +2,50 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
|
|||||||
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
|
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
|
||||||
github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
|
github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
|
||||||
github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
|
github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
|
||||||
github.com/GrailFinder/google-translate-tts v0.1.3 h1:Mww9tNzTWjjSh+OCbTPl/+21oMPKcUecXZfU7nTB/lA=
|
github.com/GrailFinder/google-translate-tts v0.1.4 h1:NJoPZUGfBrmouQMN19MUcNPNUx4tmf4a8OZRME4E4Mg=
|
||||||
github.com/GrailFinder/google-translate-tts v0.1.3/go.mod h1:YIOLKR7sObazdUCrSex3u9OVBovU55eYgWa25vsQJ18=
|
github.com/GrailFinder/google-translate-tts v0.1.4/go.mod h1:YIOLKR7sObazdUCrSex3u9OVBovU55eYgWa25vsQJ18=
|
||||||
github.com/GrailFinder/searchagent v0.2.0 h1:U2GVjLh/9xZt0xX9OcYk9Q2fMkyzyTiADPUmUisRdtQ=
|
github.com/GrailFinder/searchagent v0.2.0 h1:U2GVjLh/9xZt0xX9OcYk9Q2fMkyzyTiADPUmUisRdtQ=
|
||||||
github.com/GrailFinder/searchagent v0.2.0/go.mod h1:d66tn5+22LI8IGJREUsRBT60P0sFdgQgvQRqyvgItrs=
|
github.com/GrailFinder/searchagent v0.2.0/go.mod h1:d66tn5+22LI8IGJREUsRBT60P0sFdgQgvQRqyvgItrs=
|
||||||
github.com/PuerkitoBio/goquery v1.11.0 h1:jZ7pwMQXIITcUXNH83LLk+txlaEy6NVOfTuP43xxfqw=
|
github.com/PuerkitoBio/goquery v1.11.0 h1:jZ7pwMQXIITcUXNH83LLk+txlaEy6NVOfTuP43xxfqw=
|
||||||
github.com/PuerkitoBio/goquery v1.11.0/go.mod h1:wQHgxUOU3JGuj3oD/QFfxUdlzW6xPHfqyHre6VMY4DQ=
|
github.com/PuerkitoBio/goquery v1.11.0/go.mod h1:wQHgxUOU3JGuj3oD/QFfxUdlzW6xPHfqyHre6VMY4DQ=
|
||||||
github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
|
github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
|
||||||
github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA=
|
github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA=
|
||||||
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
github.com/deckarep/golang-set/v2 v2.8.0 h1:swm0rlPCmdWn9mESxKOjWk8hXSqoxOp+ZlfuyaAdFlQ=
|
||||||
|
github.com/deckarep/golang-set/v2 v2.8.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4=
|
||||||
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
|
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
|
||||||
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
|
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
|
||||||
github.com/ebitengine/oto/v3 v3.4.0 h1:br0PgASsEWaoWn38b2Goe7m1GKFYfNgnsjSd5Gg+/bQ=
|
github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
|
||||||
github.com/ebitengine/oto/v3 v3.4.0/go.mod h1:IOleLVD0m+CMak3mRVwsYY8vTctQgOM0iiL6S7Ar7eI=
|
github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
|
||||||
github.com/ebitengine/purego v0.9.1 h1:a/k2f2HQU3Pi399RPW1MOaZyhKJL9w/xFpKAg4q1s0A=
|
|
||||||
github.com/ebitengine/purego v0.9.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
|
|
||||||
github.com/gdamore/encoding v1.0.1 h1:YzKZckdBL6jVt2Gc+5p82qhrGiqMdG/eNs6Wy0u3Uhw=
|
github.com/gdamore/encoding v1.0.1 h1:YzKZckdBL6jVt2Gc+5p82qhrGiqMdG/eNs6Wy0u3Uhw=
|
||||||
github.com/gdamore/encoding v1.0.1/go.mod h1:0Z0cMFinngz9kS1QfMjCP8TY7em3bZYeeklsSDPivEo=
|
github.com/gdamore/encoding v1.0.1/go.mod h1:0Z0cMFinngz9kS1QfMjCP8TY7em3bZYeeklsSDPivEo=
|
||||||
github.com/gdamore/tcell/v2 v2.13.2 h1:5j4srfF8ow3HICOv/61/sOhQtA25qxEB2XR3Q/Bhx2g=
|
github.com/gdamore/tcell/v2 v2.13.2 h1:5j4srfF8ow3HICOv/61/sOhQtA25qxEB2XR3Q/Bhx2g=
|
||||||
github.com/gdamore/tcell/v2 v2.13.2/go.mod h1:+Wfe208WDdB7INEtCsNrAN6O2m+wsTPk1RAovjaILlo=
|
github.com/gdamore/tcell/v2 v2.13.2/go.mod h1:+Wfe208WDdB7INEtCsNrAN6O2m+wsTPk1RAovjaILlo=
|
||||||
github.com/glebarez/go-sqlite v1.22.0 h1:uAcMJhaA6r3LHMTFgP0SifzgXg46yJkgxqyuyec+ruQ=
|
github.com/glebarez/go-sqlite v1.22.0 h1:uAcMJhaA6r3LHMTFgP0SifzgXg46yJkgxqyuyec+ruQ=
|
||||||
github.com/glebarez/go-sqlite v1.22.0/go.mod h1:PlBIdHe0+aUEFn+r2/uthrWq4FxbzugL0L8Li6yQJbc=
|
github.com/glebarez/go-sqlite v1.22.0/go.mod h1:PlBIdHe0+aUEFn+r2/uthrWq4FxbzugL0L8Li6yQJbc=
|
||||||
|
github.com/go-jose/go-jose/v3 v3.0.4 h1:Wp5HA7bLQcKnf6YYao/4kpRpVMp/yf6+pJKV8WFSaNY=
|
||||||
|
github.com/go-jose/go-jose/v3 v3.0.4/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ=
|
||||||
github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
|
github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
|
||||||
github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
|
github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
|
||||||
|
github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
|
||||||
|
github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
|
||||||
|
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||||
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs=
|
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs=
|
||||||
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
|
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
|
||||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
github.com/gopxl/beep/v2 v2.1.1 h1:6FYIYMm2qPAdWkjX+7xwKrViS1x0Po5kDMdRkq8NVbU=
|
|
||||||
github.com/gopxl/beep/v2 v2.1.1/go.mod h1:ZAm9TGQ9lvpoiFLd4zf5B1IuyxZhgRACMId1XJbaW0E=
|
|
||||||
github.com/gordonklaus/portaudio v0.0.0-20250206071425-98a94950218b h1:WEuQWBxelOGHA6z9lABqaMLMrfwVyMdN3UgRLT+YUPo=
|
|
||||||
github.com/gordonklaus/portaudio v0.0.0-20250206071425-98a94950218b/go.mod h1:esZFQEUwqC+l76f2R8bIWSwXMaPbp79PppwZ1eJhFco=
|
|
||||||
github.com/hajimehoshi/go-mp3 v0.3.4 h1:NUP7pBYH8OguP4diaTZ9wJbUbk3tC0KlfzsEpWmYj68=
|
github.com/hajimehoshi/go-mp3 v0.3.4 h1:NUP7pBYH8OguP4diaTZ9wJbUbk3tC0KlfzsEpWmYj68=
|
||||||
github.com/hajimehoshi/go-mp3 v0.3.4/go.mod h1:fRtZraRFcWb0pu7ok0LqyFhCUrPeMsGRSVop0eemFmo=
|
github.com/hajimehoshi/go-mp3 v0.3.4/go.mod h1:fRtZraRFcWb0pu7ok0LqyFhCUrPeMsGRSVop0eemFmo=
|
||||||
github.com/hajimehoshi/oto/v2 v2.3.1 h1:qrLKpNus2UfD674oxckKjNJmesp9hMh7u7QCrStB3Rc=
|
|
||||||
github.com/hajimehoshi/oto/v2 v2.3.1/go.mod h1:seWLbgHH7AyUMYKfKYT9pg7PhUu9/SisyJvNTT+ASQo=
|
github.com/hajimehoshi/oto/v2 v2.3.1/go.mod h1:seWLbgHH7AyUMYKfKYT9pg7PhUu9/SisyJvNTT+ASQo=
|
||||||
github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
|
github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
|
||||||
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
|
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
|
||||||
github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
|
github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
|
||||||
github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
|
github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
|
||||||
|
github.com/ledongthuc/pdf v0.0.0-20250511090121-5959a4027728 h1:QwWKgMY28TAXaDl+ExRDqGQltzXqN/xypdKP86niVn8=
|
||||||
|
github.com/ledongthuc/pdf v0.0.0-20250511090121-5959a4027728/go.mod h1:1fEHWurg7pvf5SG6XNE5Q8UZmOwex51Mkx3SLhrW5B4=
|
||||||
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
|
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
|
||||||
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
||||||
github.com/lucasb-eyer/go-colorful v1.3.0 h1:2/yBRLdWBZKrf7gB40FoiKfAWYQ0lqNcbuQwVHXptag=
|
github.com/lucasb-eyer/go-colorful v1.3.0 h1:2/yBRLdWBZKrf7gB40FoiKfAWYQ0lqNcbuQwVHXptag=
|
||||||
@@ -51,12 +54,16 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
|
|||||||
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||||
github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
|
github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
|
||||||
github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
|
github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
|
||||||
|
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ=
|
||||||
|
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw=
|
||||||
github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
|
github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
|
||||||
github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
|
github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
|
||||||
github.com/neurosnap/sentences v1.1.2 h1:iphYOzx/XckXeBiLIUBkPu2EKMJ+6jDbz/sLJZ7ZoUw=
|
github.com/neurosnap/sentences v1.1.2 h1:iphYOzx/XckXeBiLIUBkPu2EKMJ+6jDbz/sLJZ7ZoUw=
|
||||||
github.com/neurosnap/sentences v1.1.2/go.mod h1:/pwU4E9XNL21ygMIkOIllv/SMy2ujHwpf8GQPu1YPbQ=
|
github.com/neurosnap/sentences v1.1.2/go.mod h1:/pwU4E9XNL21ygMIkOIllv/SMy2ujHwpf8GQPu1YPbQ=
|
||||||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
|
||||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
|
||||||
|
github.com/playwright-community/playwright-go v0.5700.1 h1:PNFb1byWqrTT720rEO0JL88C6Ju0EmUnR5deFLvtP/U=
|
||||||
|
github.com/playwright-community/playwright-go v0.5700.1/go.mod h1:MlSn1dZrx8rszbCxY6x3qK89ZesJUYVx21B2JnkoNF0=
|
||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
|
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
|
||||||
@@ -65,8 +72,20 @@ github.com/rivo/tview v0.42.0 h1:b/ftp+RxtDsHSaynXTbJb+/n/BxDEi+W3UfF5jILK6c=
|
|||||||
github.com/rivo/tview v0.42.0/go.mod h1:cSfIYfhpSGCjp3r/ECJb+GKS7cGJnqV8vfjQPwoXyfY=
|
github.com/rivo/tview v0.42.0/go.mod h1:cSfIYfhpSGCjp3r/ECJb+GKS7cGJnqV8vfjQPwoXyfY=
|
||||||
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
|
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
|
||||||
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
|
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
|
||||||
|
github.com/schollz/progressbar/v2 v2.15.0 h1:dVzHQ8fHRmtPjD3K10jT3Qgn/+H+92jhPrhmxIJfDz8=
|
||||||
|
github.com/schollz/progressbar/v2 v2.15.0/go.mod h1:UdPq3prGkfQ7MOzZKlDRpYKcFqEMczbD7YmbPgpzKMI=
|
||||||
|
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
|
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||||
|
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
|
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
|
||||||
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||||
|
github.com/sugarme/regexpset v0.0.0-20200920021344-4d4ec8eaf93c h1:pwb4kNSHb4K89ymCaN+5lPH/MwnfSVg4rzGDh4d+iy4=
|
||||||
|
github.com/sugarme/regexpset v0.0.0-20200920021344-4d4ec8eaf93c/go.mod h1:2gwkXLWbDGUQWeL3RtpCmcY4mzCtU13kb9UsAg9xMaw=
|
||||||
|
github.com/sugarme/tokenizer v0.3.0 h1:FE8DYbNSz/kSbgEo9l/RjgYHkIJYEdskumitFQBE9FE=
|
||||||
|
github.com/sugarme/tokenizer v0.3.0/go.mod h1:VJ+DLK5ZEZwzvODOWwY0cw+B1dabTd3nCB5HuFCItCc=
|
||||||
|
github.com/yalue/onnxruntime_go v1.27.0 h1:c1YSgDNtpf0WGtxj3YeRIb8VC5LmM1J+Ve3uHdteC1U=
|
||||||
|
github.com/yalue/onnxruntime_go v1.27.0/go.mod h1:b4X26A8pekNb1ACJ58wAXgNKeUCGEAQ9dmACut9Sm/4=
|
||||||
|
github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
|
||||||
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
||||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||||
@@ -149,6 +168,8 @@ golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxb
|
|||||||
golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA=
|
golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA=
|
||||||
golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc=
|
golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc=
|
||||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
modernc.org/cc/v4 v4.27.1 h1:9W30zRlYrefrDV2JE2O8VDtJ1yPGownxciz5rrbQZis=
|
modernc.org/cc/v4 v4.27.1 h1:9W30zRlYrefrDV2JE2O8VDtJ1yPGownxciz5rrbQZis=
|
||||||
|
|||||||
450
helpfuncs.go
450
helpfuncs.go
@@ -5,23 +5,23 @@ import (
|
|||||||
"gf-lt/models"
|
"gf-lt/models"
|
||||||
"gf-lt/pngmeta"
|
"gf-lt/pngmeta"
|
||||||
"image"
|
"image"
|
||||||
"net/url"
|
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"path"
|
"path"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"slices"
|
"slices"
|
||||||
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
"sync/atomic"
|
||||||
"time"
|
"time"
|
||||||
"unicode"
|
"unicode"
|
||||||
|
|
||||||
"math/rand/v2"
|
|
||||||
|
|
||||||
"github.com/rivo/tview"
|
"github.com/rivo/tview"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Cached model color - updated by background goroutine
|
// Cached model color - updated by background goroutine
|
||||||
var cachedModelColor string = "orange"
|
// var cachedModelColor string = "orange"
|
||||||
|
var cachedModelColor atomic.Value
|
||||||
|
|
||||||
// startModelColorUpdater starts a background goroutine that periodically updates
|
// startModelColorUpdater starts a background goroutine that periodically updates
|
||||||
// the cached model color. Only runs HTTP requests for local llama.cpp APIs.
|
// the cached model color. Only runs HTTP requests for local llama.cpp APIs.
|
||||||
@@ -29,10 +29,8 @@ func startModelColorUpdater() {
|
|||||||
go func() {
|
go func() {
|
||||||
ticker := time.NewTicker(5 * time.Second)
|
ticker := time.NewTicker(5 * time.Second)
|
||||||
defer ticker.Stop()
|
defer ticker.Stop()
|
||||||
|
|
||||||
// Initial check
|
// Initial check
|
||||||
updateCachedModelColor()
|
updateCachedModelColor()
|
||||||
|
|
||||||
for range ticker.C {
|
for range ticker.C {
|
||||||
updateCachedModelColor()
|
updateCachedModelColor()
|
||||||
}
|
}
|
||||||
@@ -42,21 +40,20 @@ func startModelColorUpdater() {
|
|||||||
// updateCachedModelColor updates the global cachedModelColor variable
|
// updateCachedModelColor updates the global cachedModelColor variable
|
||||||
func updateCachedModelColor() {
|
func updateCachedModelColor() {
|
||||||
if !isLocalLlamacpp() {
|
if !isLocalLlamacpp() {
|
||||||
cachedModelColor = "orange"
|
cachedModelColor.Store("orange")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if model is loaded
|
// Check if model is loaded
|
||||||
loaded, err := isModelLoaded(chatBody.Model)
|
loaded, err := isModelLoaded(chatBody.Model)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// On error, assume not loaded (red)
|
// On error, assume not loaded (red)
|
||||||
cachedModelColor = "red"
|
cachedModelColor.Store("red")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if loaded {
|
if loaded {
|
||||||
cachedModelColor = "green"
|
cachedModelColor.Store("green")
|
||||||
} else {
|
} else {
|
||||||
cachedModelColor = "red"
|
cachedModelColor.Store("red")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -69,21 +66,30 @@ func isASCII(s string) bool {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func mapToString[V any](m map[string]V) string {
|
||||||
|
rs := strings.Builder{}
|
||||||
|
for k, v := range m {
|
||||||
|
fmt.Fprintf(&rs, "%v: %v\n", k, v)
|
||||||
|
}
|
||||||
|
return rs.String()
|
||||||
|
}
|
||||||
|
|
||||||
// stripThinkingFromMsg removes thinking blocks from assistant messages.
|
// stripThinkingFromMsg removes thinking blocks from assistant messages.
|
||||||
// Skips user, tool, and system messages as they may contain thinking examples.
|
// Skips user, tool, and system messages as they may contain thinking examples.
|
||||||
func stripThinkingFromMsg(msg *models.RoleMsg) *models.RoleMsg {
|
func stripThinkingFromMsg(msg *models.RoleMsg) *models.RoleMsg {
|
||||||
if !cfg.StripThinkingFromAPI {
|
if !cfg.StripThinkingFromAPI {
|
||||||
return msg
|
return msg
|
||||||
}
|
}
|
||||||
// Skip user, tool, and system messages - they might contain thinking examples
|
// Skip user, tool, they might contain thinking and system messages - examples
|
||||||
if msg.Role == cfg.UserRole || msg.Role == cfg.ToolRole || msg.Role == "system" {
|
if msg.Role == cfg.UserRole || msg.Role == cfg.ToolRole || msg.Role == "system" {
|
||||||
return msg
|
return msg
|
||||||
}
|
}
|
||||||
// Strip thinking from assistant messages
|
// Strip thinking from assistant messages
|
||||||
if thinkRE.MatchString(msg.Content) {
|
msgText := msg.GetText()
|
||||||
msg.Content = thinkRE.ReplaceAllString(msg.Content, "")
|
if thinkRE.MatchString(msgText) {
|
||||||
// Clean up any double newlines that might result
|
cleanedText := thinkRE.ReplaceAllString(msgText, "")
|
||||||
msg.Content = strings.TrimSpace(msg.Content)
|
cleanedText = strings.TrimSpace(cleanedText)
|
||||||
|
msg.SetText(cleanedText)
|
||||||
}
|
}
|
||||||
return msg
|
return msg
|
||||||
}
|
}
|
||||||
@@ -103,7 +109,7 @@ func refreshChatDisplay() {
|
|||||||
textView.SetText(displayText)
|
textView.SetText(displayText)
|
||||||
colorText()
|
colorText()
|
||||||
updateStatusLine()
|
updateStatusLine()
|
||||||
if scrollToEndEnabled {
|
if cfg.AutoScrollEnabled {
|
||||||
textView.ScrollToEnd()
|
textView.ScrollToEnd()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -193,7 +199,11 @@ func initSysCards() ([]string, error) {
|
|||||||
logger.Warn("empty role", "file", cc.FilePath)
|
logger.Warn("empty role", "file", cc.FilePath)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
sysMap[cc.Role] = cc
|
if cc.ID == "" {
|
||||||
|
cc.ID = models.ComputeCardID(cc.Role, cc.FilePath)
|
||||||
|
}
|
||||||
|
sysMap[cc.ID] = cc
|
||||||
|
roleToID[cc.Role] = cc.ID
|
||||||
labels = append(labels, cc.Role)
|
labels = append(labels, cc.Role)
|
||||||
}
|
}
|
||||||
return labels, nil
|
return labels, nil
|
||||||
@@ -213,6 +223,8 @@ func startNewChat(keepSysP bool) {
|
|||||||
newChat := &models.Chat{
|
newChat := &models.Chat{
|
||||||
ID: id + 1,
|
ID: id + 1,
|
||||||
Name: fmt.Sprintf("%d_%s", id+1, cfg.AssistantRole),
|
Name: fmt.Sprintf("%d_%s", id+1, cfg.AssistantRole),
|
||||||
|
CreatedAt: time.Now(),
|
||||||
|
UpdatedAt: time.Now(),
|
||||||
// chat is written to db when we get first llm response (or any)
|
// chat is written to db when we get first llm response (or any)
|
||||||
// actual chat history (messages) would be parsed then
|
// actual chat history (messages) would be parsed then
|
||||||
Msgs: "",
|
Msgs: "",
|
||||||
@@ -280,24 +292,25 @@ func listRolesWithUser() []string {
|
|||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
func loadImage() {
|
func loadImage() error {
|
||||||
filepath := defaultImage
|
filepath := defaultImage
|
||||||
cc, ok := sysMap[cfg.AssistantRole]
|
cc := GetCardByRole(cfg.AssistantRole)
|
||||||
if ok {
|
if cc != nil {
|
||||||
if strings.HasSuffix(cc.FilePath, ".png") {
|
if strings.HasSuffix(cc.FilePath, ".png") {
|
||||||
filepath = cc.FilePath
|
filepath = cc.FilePath
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
file, err := os.Open(filepath)
|
file, err := os.Open(filepath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
return fmt.Errorf("failed to open image: %w", err)
|
||||||
}
|
}
|
||||||
defer file.Close()
|
defer file.Close()
|
||||||
img, _, err := image.Decode(file)
|
img, _, err := image.Decode(file)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
return fmt.Errorf("failed to decode image: %w", err)
|
||||||
}
|
}
|
||||||
imgView.SetImage(img)
|
imgView.SetImage(img)
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func strInSlice(s string, sl []string) bool {
|
func strInSlice(s string, sl []string) bool {
|
||||||
@@ -311,19 +324,17 @@ func strInSlice(s string, sl []string) bool {
|
|||||||
|
|
||||||
// isLocalLlamacpp checks if the current API is a local llama.cpp instance.
|
// isLocalLlamacpp checks if the current API is a local llama.cpp instance.
|
||||||
func isLocalLlamacpp() bool {
|
func isLocalLlamacpp() bool {
|
||||||
u, err := url.Parse(cfg.CurrentAPI)
|
if strings.Contains(cfg.CurrentAPI, "openrouter") || strings.Contains(cfg.CurrentAPI, "deepseek") {
|
||||||
if err != nil {
|
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
host := u.Hostname()
|
return true
|
||||||
return host == "localhost" || host == "127.0.0.1" || host == "::1"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// getModelColor returns the cached color tag for the model name.
|
// getModelColor returns the cached color tag for the model name.
|
||||||
// The cached value is updated by a background goroutine every 5 seconds.
|
// The cached value is updated by a background goroutine every 5 seconds.
|
||||||
// For non-local models, returns orange. For local llama.cpp models, returns green if loaded, red if not.
|
// For non-local models, returns orange. For local llama.cpp models, returns green if loaded, red if not.
|
||||||
func getModelColor() string {
|
func getModelColor() string {
|
||||||
return cachedModelColor
|
return cachedModelColor.Load().(string)
|
||||||
}
|
}
|
||||||
|
|
||||||
func makeStatusLine() string {
|
func makeStatusLine() string {
|
||||||
@@ -357,7 +368,7 @@ func makeStatusLine() string {
|
|||||||
}
|
}
|
||||||
// Get model color based on load status for local llama.cpp models
|
// Get model color based on load status for local llama.cpp models
|
||||||
modelColor := getModelColor()
|
modelColor := getModelColor()
|
||||||
statusLine := fmt.Sprintf(statusLineTempl, boolColors[botRespMode], activeChatName,
|
statusLine := fmt.Sprintf(statusLineTempl, activeChatName,
|
||||||
boolColors[cfg.ToolUse], modelColor, chatBody.Model, boolColors[cfg.SkipLLMResp],
|
boolColors[cfg.ToolUse], modelColor, chatBody.Model, boolColors[cfg.SkipLLMResp],
|
||||||
cfg.CurrentAPI, persona, botPersona)
|
cfg.CurrentAPI, persona, botPersona)
|
||||||
if cfg.STT_ENABLED {
|
if cfg.STT_ENABLED {
|
||||||
@@ -370,17 +381,88 @@ func makeStatusLine() string {
|
|||||||
roleInject := fmt.Sprintf(" | [%s:-:b]role injection[-:-:-] (alt+7)", boolColors[injectRole])
|
roleInject := fmt.Sprintf(" | [%s:-:b]role injection[-:-:-] (alt+7)", boolColors[injectRole])
|
||||||
statusLine += roleInject
|
statusLine += roleInject
|
||||||
}
|
}
|
||||||
|
// context tokens
|
||||||
|
contextTokens := getContextTokens()
|
||||||
|
maxCtx := getMaxContextTokens()
|
||||||
|
if maxCtx == 0 {
|
||||||
|
maxCtx = 16384
|
||||||
|
}
|
||||||
|
if contextTokens > 0 {
|
||||||
|
contextInfo := fmt.Sprintf(" | context-estim: [orange:-:b]%d/%d[-:-:-]", contextTokens, maxCtx)
|
||||||
|
statusLine += contextInfo
|
||||||
|
}
|
||||||
return statusLine + imageInfo + shellModeInfo
|
return statusLine + imageInfo + shellModeInfo
|
||||||
}
|
}
|
||||||
|
|
||||||
var letters = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
|
func getContextTokens() int {
|
||||||
|
if chatBody == nil || chatBody.Messages == nil {
|
||||||
func randString(n int) string {
|
return 0
|
||||||
b := make([]rune, n)
|
|
||||||
for i := range b {
|
|
||||||
b[i] = letters[rand.IntN(len(letters))]
|
|
||||||
}
|
}
|
||||||
return string(b)
|
total := 0
|
||||||
|
messages := chatBody.Messages
|
||||||
|
for i := range messages {
|
||||||
|
msg := &messages[i]
|
||||||
|
if msg.Stats != nil && msg.Stats.Tokens > 0 {
|
||||||
|
total += msg.Stats.Tokens
|
||||||
|
} else if msg.GetText() != "" {
|
||||||
|
total += len(msg.GetText()) / 4
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return total
|
||||||
|
}
|
||||||
|
|
||||||
|
const deepseekContext = 128000
|
||||||
|
|
||||||
|
func getMaxContextTokens() int {
|
||||||
|
if chatBody == nil || chatBody.Model == "" {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
modelName := chatBody.Model
|
||||||
|
switch {
|
||||||
|
case strings.Contains(cfg.CurrentAPI, "openrouter"):
|
||||||
|
if orModelsData != nil {
|
||||||
|
for i := range orModelsData.Data {
|
||||||
|
m := &orModelsData.Data[i]
|
||||||
|
if m.ID == modelName {
|
||||||
|
return m.ContextLength
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case strings.Contains(cfg.CurrentAPI, "deepseek"):
|
||||||
|
return deepseekContext
|
||||||
|
default:
|
||||||
|
if localModelsData != nil {
|
||||||
|
for i := range localModelsData.Data {
|
||||||
|
m := &localModelsData.Data[i]
|
||||||
|
if m.ID == modelName {
|
||||||
|
for _, arg := range m.Status.Args {
|
||||||
|
if strings.HasPrefix(arg, "--ctx-size") {
|
||||||
|
if strings.Contains(arg, "=") {
|
||||||
|
val := strings.Split(arg, "=")[1]
|
||||||
|
if n, err := strconv.Atoi(val); err == nil {
|
||||||
|
return n
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
idx := -1
|
||||||
|
for j, a := range m.Status.Args {
|
||||||
|
if a == "--ctx-size" && j+1 < len(m.Status.Args) {
|
||||||
|
idx = j + 1
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if idx != -1 {
|
||||||
|
if n, err := strconv.Atoi(m.Status.Args[idx]); err == nil {
|
||||||
|
return n
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
// set of roles within card definition and mention in chat history
|
// set of roles within card definition and mention in chat history
|
||||||
@@ -390,13 +472,9 @@ func listChatRoles() []string {
|
|||||||
if !ok {
|
if !ok {
|
||||||
return cbc
|
return cbc
|
||||||
}
|
}
|
||||||
currentCard, ok := sysMap[currentChat.Agent]
|
currentCard := GetCardByRole(currentChat.Agent)
|
||||||
if !ok {
|
if currentCard == nil {
|
||||||
// case which won't let to switch roles:
|
logger.Warn("failed to find current card", "agent", currentChat.Agent)
|
||||||
// started new chat (basic_sys or any other), at the start it yet be saved or have chatbody
|
|
||||||
// if it does not have a card or chars, it'll return an empty slice
|
|
||||||
// log error
|
|
||||||
logger.Warn("failed to find current card in sysMap", "agent", currentChat.Agent, "sysMap", sysMap)
|
|
||||||
return cbc
|
return cbc
|
||||||
}
|
}
|
||||||
charset := []string{}
|
charset := []string{}
|
||||||
@@ -412,10 +490,7 @@ func listChatRoles() []string {
|
|||||||
func deepseekModelValidator() error {
|
func deepseekModelValidator() error {
|
||||||
if cfg.CurrentAPI == cfg.DeepSeekChatAPI || cfg.CurrentAPI == cfg.DeepSeekCompletionAPI {
|
if cfg.CurrentAPI == cfg.DeepSeekChatAPI || cfg.CurrentAPI == cfg.DeepSeekCompletionAPI {
|
||||||
if chatBody.Model != "deepseek-chat" && chatBody.Model != "deepseek-reasoner" {
|
if chatBody.Model != "deepseek-chat" && chatBody.Model != "deepseek-reasoner" {
|
||||||
if err := notifyUser("bad request", "wrong deepseek model name"); err != nil {
|
showToast("bad request", "wrong deepseek model name")
|
||||||
logger.Warn("failed ot notify user", "error", err)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -426,12 +501,11 @@ func deepseekModelValidator() error {
|
|||||||
|
|
||||||
func toggleShellMode() {
|
func toggleShellMode() {
|
||||||
shellMode = !shellMode
|
shellMode = !shellMode
|
||||||
|
setShellMode(shellMode)
|
||||||
if shellMode {
|
if shellMode {
|
||||||
// Update input placeholder to indicate shell mode
|
shellInput.SetLabel(fmt.Sprintf("[%s]$ ", cfg.FilePickerDir))
|
||||||
textArea.SetPlaceholder("SHELL MODE: Enter command and press <Esc> to execute")
|
|
||||||
} else {
|
} else {
|
||||||
// Reset to normal mode
|
textArea.SetPlaceholder("input is multiline; press <Enter> to start the next line;\npress <Esc> to send the message.")
|
||||||
textArea.SetPlaceholder("input is multiline; press <Enter> to start the next line;\npress <Esc> to send the message. Alt+1 to exit shell mode")
|
|
||||||
}
|
}
|
||||||
updateStatusLine()
|
updateStatusLine()
|
||||||
}
|
}
|
||||||
@@ -443,41 +517,93 @@ func updateFlexLayout() {
|
|||||||
}
|
}
|
||||||
flex.Clear()
|
flex.Clear()
|
||||||
flex.AddItem(textView, 0, 40, false)
|
flex.AddItem(textView, 0, 40, false)
|
||||||
flex.AddItem(textArea, 0, 10, false)
|
if shellMode {
|
||||||
|
flex.AddItem(shellInput, 0, 10, false)
|
||||||
|
} else {
|
||||||
|
flex.AddItem(bottomFlex, 0, 10, true)
|
||||||
|
}
|
||||||
if positionVisible {
|
if positionVisible {
|
||||||
flex.AddItem(statusLineWidget, 0, 2, false)
|
flex.AddItem(statusLineWidget, 0, 2, false)
|
||||||
}
|
}
|
||||||
// Keep focus on currently focused widget
|
// Keep focus on currently focused widget
|
||||||
focused := app.GetFocus()
|
focused := app.GetFocus()
|
||||||
if focused == textView {
|
switch {
|
||||||
|
case focused == textView:
|
||||||
app.SetFocus(textView)
|
app.SetFocus(textView)
|
||||||
} else {
|
case shellMode:
|
||||||
|
app.SetFocus(shellInput)
|
||||||
|
default:
|
||||||
app.SetFocus(textArea)
|
app.SetFocus(textArea)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func executeCommandAndDisplay(cmdText string) {
|
func executeCommandAndDisplay(cmdText string) {
|
||||||
// Parse the command (split by spaces, but handle quoted arguments)
|
cmdText = strings.TrimSpace(cmdText)
|
||||||
cmdParts := parseCommand(cmdText)
|
if cmdText == "" {
|
||||||
if len(cmdParts) == 0 {
|
|
||||||
fmt.Fprintf(textView, "\n[red]Error: No command provided[-:-:-]\n")
|
fmt.Fprintf(textView, "\n[red]Error: No command provided[-:-:-]\n")
|
||||||
if scrollToEndEnabled {
|
if cfg.AutoScrollEnabled {
|
||||||
textView.ScrollToEnd()
|
textView.ScrollToEnd()
|
||||||
}
|
}
|
||||||
colorText()
|
colorText()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
command := cmdParts[0]
|
workingDir := cfg.FilePickerDir
|
||||||
args := []string{}
|
// Handle cd command specially to update working directory
|
||||||
if len(cmdParts) > 1 {
|
if strings.HasPrefix(cmdText, "cd ") {
|
||||||
args = cmdParts[1:]
|
newDir := strings.TrimPrefix(cmdText, "cd ")
|
||||||
|
newDir = strings.TrimSpace(newDir)
|
||||||
|
// Handle cd ~ or cdHOME
|
||||||
|
if strings.HasPrefix(newDir, "~") {
|
||||||
|
home := os.Getenv("HOME")
|
||||||
|
newDir = strings.Replace(newDir, "~", home, 1)
|
||||||
}
|
}
|
||||||
// Create the command execution
|
// Check if directory exists
|
||||||
cmd := exec.Command(command, args...)
|
if _, err := os.Stat(newDir); err == nil {
|
||||||
|
workingDir = newDir
|
||||||
|
cfg.FilePickerDir = workingDir
|
||||||
|
// Update shell input label with new directory
|
||||||
|
shellInput.SetLabel(fmt.Sprintf("[%s]$ ", cfg.FilePickerDir))
|
||||||
|
outputContent := workingDir
|
||||||
|
// Add the command being executed to the chat
|
||||||
|
fmt.Fprintf(textView, "\n[-:-:b](%d) <%s>: [-:-:-]\n$ %s\n",
|
||||||
|
len(chatBody.Messages), cfg.ToolRole, cmdText)
|
||||||
|
fmt.Fprintf(textView, "%s\n", outputContent)
|
||||||
|
combinedMsg := models.RoleMsg{
|
||||||
|
Role: cfg.ToolRole,
|
||||||
|
Content: "$ " + cmdText + "\n\n" + outputContent,
|
||||||
|
}
|
||||||
|
chatBody.Messages = append(chatBody.Messages, combinedMsg)
|
||||||
|
if cfg.AutoScrollEnabled {
|
||||||
|
textView.ScrollToEnd()
|
||||||
|
}
|
||||||
|
colorText()
|
||||||
|
return
|
||||||
|
} else {
|
||||||
|
outputContent := "cd: " + newDir + ": No such file or directory"
|
||||||
|
fmt.Fprintf(textView, "\n[-:-:b](%d) <%s>: [-:-:-]\n$ %s\n",
|
||||||
|
len(chatBody.Messages), cfg.ToolRole, cmdText)
|
||||||
|
fmt.Fprintf(textView, "[red]%s[-:-:-]\n", outputContent)
|
||||||
|
combinedMsg := models.RoleMsg{
|
||||||
|
Role: cfg.ToolRole,
|
||||||
|
Content: "$ " + cmdText + "\n\n" + outputContent,
|
||||||
|
}
|
||||||
|
chatBody.Messages = append(chatBody.Messages, combinedMsg)
|
||||||
|
if cfg.AutoScrollEnabled {
|
||||||
|
textView.ScrollToEnd()
|
||||||
|
}
|
||||||
|
colorText()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use /bin/sh to support pipes, redirects, etc.
|
||||||
|
cmd := exec.Command("/bin/sh", "-c", cmdText)
|
||||||
|
cmd.Dir = workingDir
|
||||||
// Execute the command and get output
|
// Execute the command and get output
|
||||||
output, err := cmd.CombinedOutput()
|
output, err := cmd.CombinedOutput()
|
||||||
// Add the command being executed to the chat
|
// Add the command being executed to the chat
|
||||||
fmt.Fprintf(textView, "\n[yellow]$ %s[-:-:-]\n", cmdText)
|
fmt.Fprintf(textView, "\n[-:-:b](%d) <%s>: [-:-:-]\n$ %s\n",
|
||||||
|
len(chatBody.Messages), cfg.ToolRole, cmdText)
|
||||||
var outputContent string
|
var outputContent string
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// Include both output and error
|
// Include both output and error
|
||||||
@@ -510,46 +636,15 @@ func executeCommandAndDisplay(cmdText string) {
|
|||||||
}
|
}
|
||||||
chatBody.Messages = append(chatBody.Messages, combinedMsg)
|
chatBody.Messages = append(chatBody.Messages, combinedMsg)
|
||||||
// Scroll to end and update colors
|
// Scroll to end and update colors
|
||||||
if scrollToEndEnabled {
|
if cfg.AutoScrollEnabled {
|
||||||
textView.ScrollToEnd()
|
textView.ScrollToEnd()
|
||||||
}
|
}
|
||||||
colorText()
|
colorText()
|
||||||
}
|
// Add command to history (avoid duplicates at the end)
|
||||||
|
if len(shellHistory) == 0 || shellHistory[len(shellHistory)-1] != cmdText {
|
||||||
// parseCommand splits command string handling quotes properly
|
shellHistory = append(shellHistory, cmdText)
|
||||||
func parseCommand(cmd string) []string {
|
|
||||||
var args []string
|
|
||||||
var current string
|
|
||||||
var inQuotes bool
|
|
||||||
var quoteChar rune
|
|
||||||
for _, r := range cmd {
|
|
||||||
switch r {
|
|
||||||
case '"', '\'':
|
|
||||||
if inQuotes {
|
|
||||||
if r == quoteChar {
|
|
||||||
inQuotes = false
|
|
||||||
} else {
|
|
||||||
current += string(r)
|
|
||||||
}
|
}
|
||||||
} else {
|
shellHistoryPos = -1
|
||||||
inQuotes = true
|
|
||||||
quoteChar = r
|
|
||||||
}
|
|
||||||
case ' ', '\t':
|
|
||||||
if inQuotes {
|
|
||||||
current += string(r)
|
|
||||||
} else if current != "" {
|
|
||||||
args = append(args, current)
|
|
||||||
current = ""
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
current += string(r)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if current != "" {
|
|
||||||
args = append(args, current)
|
|
||||||
}
|
|
||||||
return args
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// == search ==
|
// == search ==
|
||||||
@@ -595,9 +690,7 @@ func performSearch(term string) {
|
|||||||
searchResults = nil
|
searchResults = nil
|
||||||
searchResultLengths = nil
|
searchResultLengths = nil
|
||||||
notification := "Pattern not found: " + term
|
notification := "Pattern not found: " + term
|
||||||
if err := notifyUser("search", notification); err != nil {
|
showToast("search", notification)
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// Store the formatted text positions and lengths for accurate highlighting
|
// Store the formatted text positions and lengths for accurate highlighting
|
||||||
@@ -630,9 +723,7 @@ func highlightCurrentMatch() {
|
|||||||
textView.Highlight(currentRegion).ScrollToHighlight()
|
textView.Highlight(currentRegion).ScrollToHighlight()
|
||||||
// Send notification about which match we're at
|
// Send notification about which match we're at
|
||||||
notification := fmt.Sprintf("Match %d of %d", searchIndex+1, len(searchResults))
|
notification := fmt.Sprintf("Match %d of %d", searchIndex+1, len(searchResults))
|
||||||
if err := notifyUser("search", notification); err != nil {
|
showToast("search", notification)
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// showSearchBar shows the search input field as an overlay
|
// showSearchBar shows the search input field as an overlay
|
||||||
@@ -722,9 +813,7 @@ func addRegionTags(text string, positions []int, lengths []int, currentIdx int,
|
|||||||
// searchNext finds the next occurrence of the search term
|
// searchNext finds the next occurrence of the search term
|
||||||
func searchNext() {
|
func searchNext() {
|
||||||
if len(searchResults) == 0 {
|
if len(searchResults) == 0 {
|
||||||
if err := notifyUser("search", "No search results to navigate"); err != nil {
|
showToast("search", "No search results to navigate")
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
searchIndex = (searchIndex + 1) % len(searchResults)
|
searchIndex = (searchIndex + 1) % len(searchResults)
|
||||||
@@ -734,9 +823,7 @@ func searchNext() {
|
|||||||
// searchPrev finds the previous occurrence of the search term
|
// searchPrev finds the previous occurrence of the search term
|
||||||
func searchPrev() {
|
func searchPrev() {
|
||||||
if len(searchResults) == 0 {
|
if len(searchResults) == 0 {
|
||||||
if err := notifyUser("search", "No search results to navigate"); err != nil {
|
showToast("search", "No search results to navigate")
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if searchIndex == 0 {
|
if searchIndex == 0 {
|
||||||
@@ -791,3 +878,140 @@ func scanFiles(dir, filter string) []string {
|
|||||||
scanRecursive(dir, 0, "")
|
scanRecursive(dir, 0, "")
|
||||||
return files
|
return files
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// models logic that is too complex for models package
|
||||||
|
func MsgToText(i int, m *models.RoleMsg) string {
|
||||||
|
var contentStr string
|
||||||
|
var imageIndicators []string
|
||||||
|
if !m.HasContentParts {
|
||||||
|
contentStr = m.Content
|
||||||
|
} else {
|
||||||
|
var textParts []string
|
||||||
|
for _, part := range m.ContentParts {
|
||||||
|
switch p := part.(type) {
|
||||||
|
case models.TextContentPart:
|
||||||
|
if p.Type == "text" {
|
||||||
|
textParts = append(textParts, p.Text)
|
||||||
|
}
|
||||||
|
case models.ImageContentPart:
|
||||||
|
displayPath := p.Path
|
||||||
|
if displayPath == "" {
|
||||||
|
displayPath = "image"
|
||||||
|
} else {
|
||||||
|
displayPath = extractDisplayPath(displayPath, cfg.FilePickerDir)
|
||||||
|
}
|
||||||
|
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":
|
||||||
|
var displayPath string
|
||||||
|
if pathVal, pathExists := p["path"]; pathExists {
|
||||||
|
if pathStr, isStr := pathVal.(string); isStr && pathStr != "" {
|
||||||
|
displayPath = extractDisplayPath(pathStr, cfg.FilePickerDir)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if displayPath == "" {
|
||||||
|
displayPath = "image"
|
||||||
|
}
|
||||||
|
imageIndicators = append(imageIndicators, fmt.Sprintf("[orange::i][image: %s][-:-:-]", displayPath))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
contentStr = strings.Join(textParts, " ") + " "
|
||||||
|
}
|
||||||
|
contentStr, _ = strings.CutPrefix(contentStr, m.Role+":")
|
||||||
|
icon := fmt.Sprintf("(%d) <%s>: ", i, m.Role)
|
||||||
|
var finalContent strings.Builder
|
||||||
|
if len(imageIndicators) > 0 {
|
||||||
|
for _, indicator := range imageIndicators {
|
||||||
|
finalContent.WriteString(indicator)
|
||||||
|
finalContent.WriteString("\n")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
finalContent.WriteString(contentStr)
|
||||||
|
if m.Stats != nil {
|
||||||
|
fmt.Fprintf(&finalContent, "\n[gray::i][%d tok, %.1fs, %.1f t/s][-:-:-]", m.Stats.Tokens, m.Stats.Duration, m.Stats.TokensPerSec)
|
||||||
|
}
|
||||||
|
textMsg := fmt.Sprintf("[-:-:b]%s[-:-:-]\n%s\n", icon, finalContent.String())
|
||||||
|
return strings.ReplaceAll(textMsg, "\n\n", "\n")
|
||||||
|
}
|
||||||
|
|
||||||
|
// extractDisplayPath returns a path suitable for display, potentially relative to imageBaseDir
|
||||||
|
func extractDisplayPath(p, bp string) string {
|
||||||
|
if p == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
// If base directory is set, try to make path relative to it
|
||||||
|
if bp != "" {
|
||||||
|
if rel, err := filepath.Rel(bp, 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
|
||||||
|
}
|
||||||
|
|
||||||
|
func getValidKnowToRecipient(msg *models.RoleMsg) (string, bool) {
|
||||||
|
if cfg == nil || !cfg.CharSpecificContextEnabled {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
// case where all roles are in the tag => public message
|
||||||
|
cr := listChatRoles()
|
||||||
|
slices.Sort(cr)
|
||||||
|
slices.Sort(msg.KnownTo)
|
||||||
|
if slices.Equal(cr, msg.KnownTo) {
|
||||||
|
logger.Info("got msg with tag mentioning every role")
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
// Check each character in the KnownTo list
|
||||||
|
for _, recipient := range msg.KnownTo {
|
||||||
|
if recipient == msg.Role || recipient == cfg.ToolRole {
|
||||||
|
// weird cases, skip
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// Skip if this is the user character (user handles their own turn)
|
||||||
|
// If user is in KnownTo, stop processing - it's the user's turn
|
||||||
|
if recipient == cfg.UserRole || recipient == cfg.WriteNextMsgAs {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
return recipient, true
|
||||||
|
}
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
|
||||||
|
// triggerPrivateMessageResponses checks if a message was sent privately to specific characters
|
||||||
|
// and triggers those non-user characters to respond
|
||||||
|
func triggerPrivateMessageResponses(msg *models.RoleMsg) {
|
||||||
|
recipient, ok := getValidKnowToRecipient(msg)
|
||||||
|
if !ok || recipient == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Trigger the recipient character to respond
|
||||||
|
triggerMsg := recipient + ":\n"
|
||||||
|
// Send empty message so LLM continues naturally from the conversation
|
||||||
|
crr := &models.ChatRoundReq{
|
||||||
|
UserMsg: triggerMsg,
|
||||||
|
Role: recipient,
|
||||||
|
Resume: true,
|
||||||
|
}
|
||||||
|
fmt.Fprintf(textView, "\n[-:-:b](%d) ", len(chatBody.Messages))
|
||||||
|
fmt.Fprint(textView, roleToIcon(recipient))
|
||||||
|
fmt.Fprint(textView, "[-:-:-]\n")
|
||||||
|
chatRoundChan <- crr
|
||||||
|
}
|
||||||
|
|||||||
271
llm.go
271
llm.go
@@ -3,7 +3,6 @@ package main
|
|||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
|
||||||
"gf-lt/models"
|
"gf-lt/models"
|
||||||
"io"
|
"io"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -11,12 +10,11 @@ import (
|
|||||||
|
|
||||||
var imageAttachmentPath string // Global variable to track image attachment for next message
|
var imageAttachmentPath string // Global variable to track image attachment for next message
|
||||||
var lastImg string // for ctrl+j
|
var lastImg string // for ctrl+j
|
||||||
var RAGMsg = "Retrieved context for user's query:\n"
|
|
||||||
|
|
||||||
// containsToolSysMsg checks if the toolSysMsg already exists in the chat body
|
// containsToolSysMsg checks if the toolSysMsg already exists in the chat body
|
||||||
func containsToolSysMsg() bool {
|
func containsToolSysMsg() bool {
|
||||||
for _, msg := range chatBody.Messages {
|
for i := range chatBody.Messages {
|
||||||
if msg.Role == cfg.ToolRole && msg.Content == toolSysMsg {
|
if chatBody.Messages[i].Role == cfg.ToolRole && chatBody.Messages[i].Content == toolSysMsg {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -64,11 +62,11 @@ type ChunkParser interface {
|
|||||||
func choseChunkParser() {
|
func choseChunkParser() {
|
||||||
chunkParser = LCPCompletion{}
|
chunkParser = LCPCompletion{}
|
||||||
switch cfg.CurrentAPI {
|
switch cfg.CurrentAPI {
|
||||||
case "http://localhost:8080/completion":
|
case "http://localhost:8080/completion", "http://127.0.0.1:8080/completion":
|
||||||
chunkParser = LCPCompletion{}
|
chunkParser = LCPCompletion{}
|
||||||
logger.Debug("chosen lcpcompletion", "link", cfg.CurrentAPI)
|
logger.Debug("chosen lcpcompletion", "link", cfg.CurrentAPI)
|
||||||
return
|
return
|
||||||
case "http://localhost:8080/v1/chat/completions":
|
case "http://localhost:8080/v1/chat/completions", "http://127.0.0.1:8080/v1/chat/completions":
|
||||||
chunkParser = LCPChat{}
|
chunkParser = LCPChat{}
|
||||||
logger.Debug("chosen lcpchat", "link", cfg.CurrentAPI)
|
logger.Debug("chosen lcpchat", "link", cfg.CurrentAPI)
|
||||||
return
|
return
|
||||||
@@ -89,6 +87,11 @@ func choseChunkParser() {
|
|||||||
logger.Debug("chosen openrouterchat", "link", cfg.CurrentAPI)
|
logger.Debug("chosen openrouterchat", "link", cfg.CurrentAPI)
|
||||||
return
|
return
|
||||||
default:
|
default:
|
||||||
|
logger.Warn("unexpected case, assuming llama.cpp on non default address", "link", cfg.CurrentAPI)
|
||||||
|
if strings.Contains(cfg.CurrentAPI, "chat") {
|
||||||
|
chunkParser = LCPChat{}
|
||||||
|
return
|
||||||
|
}
|
||||||
chunkParser = LCPCompletion{}
|
chunkParser = LCPCompletion{}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -120,73 +123,69 @@ func (lcp LCPCompletion) FormMsg(msg, role string, resume bool) (io.Reader, erro
|
|||||||
logger.Debug("formmsg lcpcompletion", "link", cfg.CurrentAPI)
|
logger.Debug("formmsg lcpcompletion", "link", cfg.CurrentAPI)
|
||||||
localImageAttachmentPath := imageAttachmentPath
|
localImageAttachmentPath := imageAttachmentPath
|
||||||
var multimodalData []string
|
var multimodalData []string
|
||||||
|
if msg != "" { // otherwise let the bot to continue
|
||||||
|
var newMsg models.RoleMsg
|
||||||
if localImageAttachmentPath != "" {
|
if localImageAttachmentPath != "" {
|
||||||
|
newMsg = models.NewMultimodalMsg(role, []any{})
|
||||||
|
newMsg.AddTextPart(msg)
|
||||||
imageURL, err := models.CreateImageURLFromPath(localImageAttachmentPath)
|
imageURL, err := models.CreateImageURLFromPath(localImageAttachmentPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error("failed to create image URL from path for completion",
|
logger.Error("failed to create image URL from path for completion",
|
||||||
"error", err, "path", localImageAttachmentPath)
|
"error", err, "path", localImageAttachmentPath)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
// Extract base64 part from data URL (e.g., "data:image/jpeg;base64,...")
|
newMsg.AddImagePart(imageURL, localImageAttachmentPath)
|
||||||
parts := strings.SplitN(imageURL, ",", 2)
|
|
||||||
if len(parts) == 2 {
|
|
||||||
multimodalData = append(multimodalData, parts[1])
|
|
||||||
} else {
|
|
||||||
logger.Error("invalid image data URL format", "url", imageURL)
|
|
||||||
return nil, errors.New("invalid image data URL format")
|
|
||||||
}
|
|
||||||
imageAttachmentPath = "" // Clear the attachment after use
|
imageAttachmentPath = "" // Clear the attachment after use
|
||||||
|
} else { // not a multimodal msg or image passed in tool call
|
||||||
|
newMsg = models.RoleMsg{Role: role, Content: msg}
|
||||||
}
|
}
|
||||||
if msg != "" { // otherwise let the bot to continue
|
|
||||||
newMsg := models.RoleMsg{Role: role, Content: msg}
|
|
||||||
newMsg = *processMessageTag(&newMsg)
|
newMsg = *processMessageTag(&newMsg)
|
||||||
chatBody.Messages = append(chatBody.Messages, newMsg)
|
chatBody.Messages = append(chatBody.Messages, newMsg)
|
||||||
}
|
}
|
||||||
// if rag - add as system message to avoid conflicts with tool usage
|
|
||||||
if !resume && cfg.RAGEnabled {
|
|
||||||
um := chatBody.Messages[len(chatBody.Messages)-1].Content
|
|
||||||
logger.Debug("RAG is enabled, preparing RAG context", "user_message", um)
|
|
||||||
ragResp, err := chatRagUse(um)
|
|
||||||
if err != nil {
|
|
||||||
logger.Error("failed to form a rag msg", "error", err)
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
logger.Debug("RAG response received", "response_len", len(ragResp),
|
|
||||||
"response_preview", ragResp[:min(len(ragResp), 100)])
|
|
||||||
// Use system role for RAG context to avoid conflicts with tool usage
|
|
||||||
ragMsg := models.RoleMsg{Role: "system", Content: RAGMsg + ragResp}
|
|
||||||
chatBody.Messages = append(chatBody.Messages, ragMsg)
|
|
||||||
logger.Debug("RAG message added to chat body", "message_count", len(chatBody.Messages))
|
|
||||||
}
|
|
||||||
// sending description of the tools and how to use them
|
// sending description of the tools and how to use them
|
||||||
if cfg.ToolUse && !resume && role == cfg.UserRole && !containsToolSysMsg() {
|
if cfg.ToolUse && !resume && role == cfg.UserRole && !containsToolSysMsg() {
|
||||||
chatBody.Messages = append(chatBody.Messages, models.RoleMsg{Role: cfg.ToolRole, Content: toolSysMsg})
|
chatBody.Messages = append(chatBody.Messages, models.RoleMsg{Role: cfg.ToolRole, Content: toolSysMsg})
|
||||||
}
|
}
|
||||||
filteredMessages, botPersona := filterMessagesForCurrentCharacter(chatBody.Messages)
|
filteredMessages, botPersona := filterMessagesForCurrentCharacter(chatBody.Messages)
|
||||||
|
// Build prompt and extract images inline as we process each message
|
||||||
messages := make([]string, len(filteredMessages))
|
messages := make([]string, len(filteredMessages))
|
||||||
for i, m := range filteredMessages {
|
for i := range filteredMessages {
|
||||||
messages[i] = stripThinkingFromMsg(&m).ToPrompt()
|
m := stripThinkingFromMsg(&filteredMessages[i])
|
||||||
|
messages[i] = m.ToPrompt()
|
||||||
|
// Extract images from this message and add marker inline
|
||||||
|
if len(m.ContentParts) > 0 {
|
||||||
|
for _, part := range m.ContentParts {
|
||||||
|
var imgURL string
|
||||||
|
// Check for struct type
|
||||||
|
if imgPart, ok := part.(models.ImageContentPart); ok {
|
||||||
|
imgURL = imgPart.ImageURL.URL
|
||||||
|
} else if partMap, ok := part.(map[string]any); ok {
|
||||||
|
// Check for map type (from JSON unmarshaling)
|
||||||
|
if partType, exists := partMap["type"]; exists && partType == "image_url" {
|
||||||
|
if imgURLMap, ok := partMap["image_url"].(map[string]any); ok {
|
||||||
|
if url, ok := imgURLMap["url"].(string); ok {
|
||||||
|
imgURL = url
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if imgURL != "" {
|
||||||
|
// Extract base64 part from data URL (e.g., "data:image/jpeg;base64,...")
|
||||||
|
parts := strings.SplitN(imgURL, ",", 2)
|
||||||
|
if len(parts) == 2 {
|
||||||
|
multimodalData = append(multimodalData, parts[1])
|
||||||
|
messages[i] += " <__media__>"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
prompt := strings.Join(messages, "\n")
|
prompt := strings.Join(messages, "\n")
|
||||||
// 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 {
|
|
||||||
// Add a media marker for each item in the multimodal data
|
|
||||||
var sb strings.Builder
|
|
||||||
sb.WriteString(prompt)
|
|
||||||
for range multimodalData {
|
|
||||||
sb.WriteString(" <__media__>") // llama.cpp default multimodal marker
|
|
||||||
}
|
|
||||||
prompt = sb.String()
|
|
||||||
}
|
|
||||||
// needs to be after <__media__> if there are images
|
// needs to be after <__media__> if there are images
|
||||||
if !resume {
|
if !resume {
|
||||||
botMsgStart := "\n" + botPersona + ":\n"
|
botMsgStart := "\n" + botPersona + ":\n"
|
||||||
prompt += botMsgStart
|
prompt += botMsgStart
|
||||||
}
|
}
|
||||||
if cfg.ThinkUse && !cfg.ToolUse {
|
|
||||||
prompt += "<think>"
|
|
||||||
}
|
|
||||||
logger.Debug("checking prompt for /completion", "tool_use", cfg.ToolUse,
|
logger.Debug("checking prompt for /completion", "tool_use", cfg.ToolUse,
|
||||||
"msg", msg, "resume", resume, "prompt", prompt, "multimodal_data_count", len(multimodalData))
|
"msg", msg, "resume", resume, "prompt", prompt, "multimodal_data_count", len(multimodalData))
|
||||||
payload := models.NewLCPReq(prompt, chatBody.Model, multimodalData,
|
payload := models.NewLCPReq(prompt, chatBody.Model, multimodalData,
|
||||||
@@ -230,19 +229,15 @@ func (op LCPChat) ParseChunk(data []byte) (*models.TextChunk, error) {
|
|||||||
logger.Error("failed to decode", "error", err, "line", string(data))
|
logger.Error("failed to decode", "error", err, "line", string(data))
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle multiple choices safely
|
|
||||||
if len(llmchunk.Choices) == 0 {
|
if len(llmchunk.Choices) == 0 {
|
||||||
logger.Warn("LCPChat ParseChunk: no choices in response", "data", string(data))
|
logger.Warn("LCPChat empty chunk choices", "raw_data", string(data), "chunk", llmchunk)
|
||||||
return &models.TextChunk{Finished: true}, nil
|
return &models.TextChunk{}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
lastChoice := llmchunk.Choices[len(llmchunk.Choices)-1]
|
lastChoice := llmchunk.Choices[len(llmchunk.Choices)-1]
|
||||||
resp := &models.TextChunk{
|
resp := &models.TextChunk{
|
||||||
Chunk: lastChoice.Delta.Content,
|
Chunk: lastChoice.Delta.Content,
|
||||||
Reasoning: lastChoice.Delta.ReasoningContent,
|
Reasoning: lastChoice.Delta.ReasoningContent,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check for tool calls in all choices, not just the last one
|
// Check for tool calls in all choices, not just the last one
|
||||||
for _, choice := range llmchunk.Choices {
|
for _, choice := range llmchunk.Choices {
|
||||||
if len(choice.Delta.ToolCalls) > 0 {
|
if len(choice.Delta.ToolCalls) > 0 {
|
||||||
@@ -257,7 +252,6 @@ func (op LCPChat) ParseChunk(data []byte) (*models.TextChunk, error) {
|
|||||||
break // Process only the first tool call
|
break // Process only the first tool call
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if lastChoice.FinishReason == "stop" {
|
if lastChoice.FinishReason == "stop" {
|
||||||
if resp.Chunk != "" {
|
if resp.Chunk != "" {
|
||||||
logger.Error("text inside of finish llmchunk", "chunk", llmchunk)
|
logger.Error("text inside of finish llmchunk", "chunk", llmchunk)
|
||||||
@@ -304,23 +298,6 @@ func (op LCPChat) FormMsg(msg, role string, resume bool) (io.Reader, error) {
|
|||||||
logger.Debug("LCPChat FormMsg: added message to chatBody", "role", newMsg.Role,
|
logger.Debug("LCPChat FormMsg: added message to chatBody", "role", newMsg.Role,
|
||||||
"content_len", len(newMsg.Content), "message_count_after_add", len(chatBody.Messages))
|
"content_len", len(newMsg.Content), "message_count_after_add", len(chatBody.Messages))
|
||||||
}
|
}
|
||||||
// if rag - add as system message to avoid conflicts with tool usage
|
|
||||||
if !resume && cfg.RAGEnabled {
|
|
||||||
um := chatBody.Messages[len(chatBody.Messages)-1].Content
|
|
||||||
logger.Debug("LCPChat: RAG is enabled, preparing RAG context", "user_message", um)
|
|
||||||
ragResp, err := chatRagUse(um)
|
|
||||||
if err != nil {
|
|
||||||
logger.Error("LCPChat: failed to form a rag msg", "error", err)
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
logger.Debug("LCPChat: RAG response received",
|
|
||||||
"response_len", len(ragResp), "response_preview", ragResp[:min(len(ragResp), 100)])
|
|
||||||
// Use system role for RAG context to avoid conflicts with tool usage
|
|
||||||
ragMsg := models.RoleMsg{Role: "system", Content: RAGMsg + ragResp}
|
|
||||||
chatBody.Messages = append(chatBody.Messages, ragMsg)
|
|
||||||
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, _ := filterMessagesForCurrentCharacter(chatBody.Messages)
|
filteredMessages, _ := filterMessagesForCurrentCharacter(chatBody.Messages)
|
||||||
// openai /v1/chat does not support custom roles; needs to be user, assistant, system
|
// 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
|
// Add persona suffix to the last user message to indicate who the assistant should reply as
|
||||||
@@ -329,14 +306,23 @@ func (op LCPChat) FormMsg(msg, role string, resume bool) (io.Reader, error) {
|
|||||||
Model: chatBody.Model,
|
Model: chatBody.Model,
|
||||||
Stream: chatBody.Stream,
|
Stream: chatBody.Stream,
|
||||||
}
|
}
|
||||||
for i, msg := range filteredMessages {
|
for i := range filteredMessages {
|
||||||
strippedMsg := *stripThinkingFromMsg(&msg)
|
strippedMsg := *stripThinkingFromMsg(&filteredMessages[i])
|
||||||
if strippedMsg.Role == cfg.UserRole {
|
switch strippedMsg.Role {
|
||||||
|
case cfg.UserRole:
|
||||||
bodyCopy.Messages[i] = strippedMsg
|
bodyCopy.Messages[i] = strippedMsg
|
||||||
bodyCopy.Messages[i].Role = "user"
|
bodyCopy.Messages[i].Role = "user"
|
||||||
} else {
|
case cfg.AssistantRole:
|
||||||
|
bodyCopy.Messages[i] = strippedMsg
|
||||||
|
bodyCopy.Messages[i].Role = "assistant"
|
||||||
|
case cfg.ToolRole:
|
||||||
|
bodyCopy.Messages[i] = strippedMsg
|
||||||
|
bodyCopy.Messages[i].Role = "tool"
|
||||||
|
default:
|
||||||
bodyCopy.Messages[i] = strippedMsg
|
bodyCopy.Messages[i] = strippedMsg
|
||||||
}
|
}
|
||||||
|
// Clear ToolCalls - they're stored in chat history for display but not sent to LLM
|
||||||
|
// bodyCopy.Messages[i].ToolCall = nil
|
||||||
}
|
}
|
||||||
// Clean null/empty messages to prevent API issues
|
// Clean null/empty messages to prevent API issues
|
||||||
bodyCopy.Messages = consolidateAssistantMessages(bodyCopy.Messages)
|
bodyCopy.Messages = consolidateAssistantMessages(bodyCopy.Messages)
|
||||||
@@ -366,6 +352,10 @@ func (ds DeepSeekerCompletion) ParseChunk(data []byte) (*models.TextChunk, error
|
|||||||
logger.Error("failed to decode", "error", err, "line", string(data))
|
logger.Error("failed to decode", "error", err, "line", string(data))
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
if len(llmchunk.Choices) == 0 {
|
||||||
|
logger.Warn("empty chunk choices", "raw_data", string(data), "chunk", llmchunk)
|
||||||
|
return &models.TextChunk{}, nil
|
||||||
|
}
|
||||||
resp := &models.TextChunk{
|
resp := &models.TextChunk{
|
||||||
Chunk: llmchunk.Choices[0].Text,
|
Chunk: llmchunk.Choices[0].Text,
|
||||||
}
|
}
|
||||||
@@ -392,30 +382,14 @@ func (ds DeepSeekerCompletion) FormMsg(msg, role string, resume bool) (io.Reader
|
|||||||
newMsg = *processMessageTag(&newMsg)
|
newMsg = *processMessageTag(&newMsg)
|
||||||
chatBody.Messages = append(chatBody.Messages, newMsg)
|
chatBody.Messages = append(chatBody.Messages, newMsg)
|
||||||
}
|
}
|
||||||
// if rag - add as system message to avoid conflicts with tool usage
|
|
||||||
if !resume && cfg.RAGEnabled {
|
|
||||||
um := chatBody.Messages[len(chatBody.Messages)-1].Content
|
|
||||||
logger.Debug("DeepSeekerCompletion: RAG is enabled, preparing RAG context", "user_message", um)
|
|
||||||
ragResp, err := chatRagUse(um)
|
|
||||||
if err != nil {
|
|
||||||
logger.Error("DeepSeekerCompletion: failed to form a rag msg", "error", err)
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
logger.Debug("DeepSeekerCompletion: RAG response received",
|
|
||||||
"response_len", len(ragResp), "response_preview", ragResp[:min(len(ragResp), 100)])
|
|
||||||
// Use system role for RAG context to avoid conflicts with tool usage
|
|
||||||
ragMsg := models.RoleMsg{Role: "system", Content: RAGMsg + ragResp}
|
|
||||||
chatBody.Messages = append(chatBody.Messages, ragMsg)
|
|
||||||
logger.Debug("DeepSeekerCompletion: RAG message added to chat body", "message_count", len(chatBody.Messages))
|
|
||||||
}
|
|
||||||
// sending description of the tools and how to use them
|
// sending description of the tools and how to use them
|
||||||
if cfg.ToolUse && !resume && role == cfg.UserRole && !containsToolSysMsg() {
|
if cfg.ToolUse && !resume && role == cfg.UserRole && !containsToolSysMsg() {
|
||||||
chatBody.Messages = append(chatBody.Messages, models.RoleMsg{Role: cfg.ToolRole, Content: toolSysMsg})
|
chatBody.Messages = append(chatBody.Messages, models.RoleMsg{Role: cfg.ToolRole, Content: toolSysMsg})
|
||||||
}
|
}
|
||||||
filteredMessages, botPersona := filterMessagesForCurrentCharacter(chatBody.Messages)
|
filteredMessages, botPersona := filterMessagesForCurrentCharacter(chatBody.Messages)
|
||||||
messages := make([]string, len(filteredMessages))
|
messages := make([]string, len(filteredMessages))
|
||||||
for i, m := range filteredMessages {
|
for i := range filteredMessages {
|
||||||
messages[i] = stripThinkingFromMsg(&m).ToPrompt()
|
messages[i] = stripThinkingFromMsg(&filteredMessages[i]).ToPrompt()
|
||||||
}
|
}
|
||||||
prompt := strings.Join(messages, "\n")
|
prompt := strings.Join(messages, "\n")
|
||||||
// strings builder?
|
// strings builder?
|
||||||
@@ -423,9 +397,6 @@ func (ds DeepSeekerCompletion) FormMsg(msg, role string, resume bool) (io.Reader
|
|||||||
botMsgStart := "\n" + botPersona + ":\n"
|
botMsgStart := "\n" + botPersona + ":\n"
|
||||||
prompt += botMsgStart
|
prompt += botMsgStart
|
||||||
}
|
}
|
||||||
if cfg.ThinkUse && !cfg.ToolUse {
|
|
||||||
prompt += "<think>"
|
|
||||||
}
|
|
||||||
logger.Debug("checking prompt for /completion", "tool_use", cfg.ToolUse,
|
logger.Debug("checking prompt for /completion", "tool_use", cfg.ToolUse,
|
||||||
"msg", msg, "resume", resume, "prompt", prompt)
|
"msg", msg, "resume", resume, "prompt", prompt)
|
||||||
payload := models.NewDSCompletionReq(prompt, chatBody.Model,
|
payload := models.NewDSCompletionReq(prompt, chatBody.Model,
|
||||||
@@ -450,6 +421,10 @@ func (ds DeepSeekerChat) ParseChunk(data []byte) (*models.TextChunk, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
resp := &models.TextChunk{}
|
resp := &models.TextChunk{}
|
||||||
|
if len(llmchunk.Choices) == 0 {
|
||||||
|
logger.Warn("empty chunk choices", "raw_data", string(data), "chunk", llmchunk)
|
||||||
|
return resp, nil
|
||||||
|
}
|
||||||
if llmchunk.Choices[0].FinishReason != "" {
|
if llmchunk.Choices[0].FinishReason != "" {
|
||||||
if llmchunk.Choices[0].Delta.Content != "" {
|
if llmchunk.Choices[0].Delta.Content != "" {
|
||||||
logger.Error("text inside of finish llmchunk", "chunk", llmchunk)
|
logger.Error("text inside of finish llmchunk", "chunk", llmchunk)
|
||||||
@@ -480,22 +455,6 @@ func (ds DeepSeekerChat) FormMsg(msg, role string, resume bool) (io.Reader, erro
|
|||||||
newMsg = *processMessageTag(&newMsg)
|
newMsg = *processMessageTag(&newMsg)
|
||||||
chatBody.Messages = append(chatBody.Messages, newMsg)
|
chatBody.Messages = append(chatBody.Messages, newMsg)
|
||||||
}
|
}
|
||||||
// if rag - add as system message to avoid conflicts with tool usage
|
|
||||||
if !resume && cfg.RAGEnabled {
|
|
||||||
um := chatBody.Messages[len(chatBody.Messages)-1].Content
|
|
||||||
logger.Debug("RAG is enabled, preparing RAG context", "user_message", um)
|
|
||||||
ragResp, err := chatRagUse(um)
|
|
||||||
if err != nil {
|
|
||||||
logger.Error("failed to form a rag msg", "error", err)
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
logger.Debug("RAG response received", "response_len", len(ragResp),
|
|
||||||
"response_preview", ragResp[:min(len(ragResp), 100)])
|
|
||||||
// Use system role for RAG context to avoid conflicts with tool usage
|
|
||||||
ragMsg := models.RoleMsg{Role: "system", Content: RAGMsg + ragResp}
|
|
||||||
chatBody.Messages = append(chatBody.Messages, ragMsg)
|
|
||||||
logger.Debug("RAG message added to chat body", "message_count", len(chatBody.Messages))
|
|
||||||
}
|
|
||||||
// Create copy of chat body with standardized user role
|
// Create copy of chat body with standardized user role
|
||||||
filteredMessages, _ := filterMessagesForCurrentCharacter(chatBody.Messages)
|
filteredMessages, _ := filterMessagesForCurrentCharacter(chatBody.Messages)
|
||||||
// Add persona suffix to the last user message to indicate who the assistant should reply as
|
// Add persona suffix to the last user message to indicate who the assistant should reply as
|
||||||
@@ -504,14 +463,27 @@ func (ds DeepSeekerChat) FormMsg(msg, role string, resume bool) (io.Reader, erro
|
|||||||
Model: chatBody.Model,
|
Model: chatBody.Model,
|
||||||
Stream: chatBody.Stream,
|
Stream: chatBody.Stream,
|
||||||
}
|
}
|
||||||
for i, msg := range filteredMessages {
|
for i := range filteredMessages {
|
||||||
strippedMsg := *stripThinkingFromMsg(&msg)
|
strippedMsg := *stripThinkingFromMsg(&filteredMessages[i])
|
||||||
if strippedMsg.Role == cfg.UserRole || i == 1 {
|
switch strippedMsg.Role {
|
||||||
|
case cfg.UserRole:
|
||||||
|
if i == 1 {
|
||||||
bodyCopy.Messages[i] = strippedMsg
|
bodyCopy.Messages[i] = strippedMsg
|
||||||
bodyCopy.Messages[i].Role = "user"
|
bodyCopy.Messages[i].Role = "user"
|
||||||
} else {
|
} else {
|
||||||
bodyCopy.Messages[i] = strippedMsg
|
bodyCopy.Messages[i] = strippedMsg
|
||||||
}
|
}
|
||||||
|
case cfg.AssistantRole:
|
||||||
|
bodyCopy.Messages[i] = strippedMsg
|
||||||
|
bodyCopy.Messages[i].Role = "assistant"
|
||||||
|
case cfg.ToolRole:
|
||||||
|
bodyCopy.Messages[i] = strippedMsg
|
||||||
|
bodyCopy.Messages[i].Role = "tool"
|
||||||
|
default:
|
||||||
|
bodyCopy.Messages[i] = strippedMsg
|
||||||
|
}
|
||||||
|
// Clear ToolCalls - they're stored in chat history for display but not sent to LLM
|
||||||
|
// bodyCopy.Messages[i].ToolCall = nil
|
||||||
}
|
}
|
||||||
// Clean null/empty messages to prevent API issues
|
// Clean null/empty messages to prevent API issues
|
||||||
bodyCopy.Messages = consolidateAssistantMessages(bodyCopy.Messages)
|
bodyCopy.Messages = consolidateAssistantMessages(bodyCopy.Messages)
|
||||||
@@ -535,6 +507,10 @@ func (or OpenRouterCompletion) ParseChunk(data []byte) (*models.TextChunk, error
|
|||||||
logger.Error("failed to decode", "error", err, "line", string(data))
|
logger.Error("failed to decode", "error", err, "line", string(data))
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
if len(llmchunk.Choices) == 0 {
|
||||||
|
logger.Warn("empty chunk choices", "raw_data", string(data), "chunk", llmchunk)
|
||||||
|
return &models.TextChunk{}, nil
|
||||||
|
}
|
||||||
resp := &models.TextChunk{
|
resp := &models.TextChunk{
|
||||||
Chunk: llmchunk.Choices[len(llmchunk.Choices)-1].Text,
|
Chunk: llmchunk.Choices[len(llmchunk.Choices)-1].Text,
|
||||||
}
|
}
|
||||||
@@ -558,30 +534,14 @@ func (or OpenRouterCompletion) FormMsg(msg, role string, resume bool) (io.Reader
|
|||||||
newMsg = *processMessageTag(&newMsg)
|
newMsg = *processMessageTag(&newMsg)
|
||||||
chatBody.Messages = append(chatBody.Messages, newMsg)
|
chatBody.Messages = append(chatBody.Messages, newMsg)
|
||||||
}
|
}
|
||||||
// if rag - add as system message to avoid conflicts with tool usage
|
|
||||||
if !resume && cfg.RAGEnabled {
|
|
||||||
um := chatBody.Messages[len(chatBody.Messages)-1].Content
|
|
||||||
logger.Debug("RAG is enabled, preparing RAG context", "user_message", um)
|
|
||||||
ragResp, err := chatRagUse(um)
|
|
||||||
if err != nil {
|
|
||||||
logger.Error("failed to form a rag msg", "error", err)
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
logger.Debug("RAG response received", "response_len",
|
|
||||||
len(ragResp), "response_preview", ragResp[:min(len(ragResp), 100)])
|
|
||||||
// Use system role for RAG context to avoid conflicts with tool usage
|
|
||||||
ragMsg := models.RoleMsg{Role: "system", Content: RAGMsg + ragResp}
|
|
||||||
chatBody.Messages = append(chatBody.Messages, ragMsg)
|
|
||||||
logger.Debug("RAG message added to chat body", "message_count", len(chatBody.Messages))
|
|
||||||
}
|
|
||||||
// sending description of the tools and how to use them
|
// sending description of the tools and how to use them
|
||||||
if cfg.ToolUse && !resume && role == cfg.UserRole && !containsToolSysMsg() {
|
if cfg.ToolUse && !resume && role == cfg.UserRole && !containsToolSysMsg() {
|
||||||
chatBody.Messages = append(chatBody.Messages, models.RoleMsg{Role: cfg.ToolRole, Content: toolSysMsg})
|
chatBody.Messages = append(chatBody.Messages, models.RoleMsg{Role: cfg.ToolRole, Content: toolSysMsg})
|
||||||
}
|
}
|
||||||
filteredMessages, botPersona := filterMessagesForCurrentCharacter(chatBody.Messages)
|
filteredMessages, botPersona := filterMessagesForCurrentCharacter(chatBody.Messages)
|
||||||
messages := make([]string, len(filteredMessages))
|
messages := make([]string, len(filteredMessages))
|
||||||
for i, m := range filteredMessages {
|
for i := range filteredMessages {
|
||||||
messages[i] = stripThinkingFromMsg(&m).ToPrompt()
|
messages[i] = stripThinkingFromMsg(&filteredMessages[i]).ToPrompt()
|
||||||
}
|
}
|
||||||
prompt := strings.Join(messages, "\n")
|
prompt := strings.Join(messages, "\n")
|
||||||
// strings builder?
|
// strings builder?
|
||||||
@@ -589,9 +549,6 @@ func (or OpenRouterCompletion) FormMsg(msg, role string, resume bool) (io.Reader
|
|||||||
botMsgStart := "\n" + botPersona + ":\n"
|
botMsgStart := "\n" + botPersona + ":\n"
|
||||||
prompt += botMsgStart
|
prompt += botMsgStart
|
||||||
}
|
}
|
||||||
if cfg.ThinkUse && !cfg.ToolUse {
|
|
||||||
prompt += "<think>"
|
|
||||||
}
|
|
||||||
stopSlice := chatBody.MakeStopSliceExcluding("", listChatRoles())
|
stopSlice := chatBody.MakeStopSliceExcluding("", listChatRoles())
|
||||||
logger.Debug("checking prompt for /completion", "tool_use", cfg.ToolUse,
|
logger.Debug("checking prompt for /completion", "tool_use", cfg.ToolUse,
|
||||||
"msg", msg, "resume", resume, "prompt", prompt, "stop_strings", stopSlice)
|
"msg", msg, "resume", resume, "prompt", prompt, "stop_strings", stopSlice)
|
||||||
@@ -616,6 +573,10 @@ func (or OpenRouterChat) ParseChunk(data []byte) (*models.TextChunk, error) {
|
|||||||
logger.Error("failed to decode", "error", err, "line", string(data))
|
logger.Error("failed to decode", "error", err, "line", string(data))
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
if len(llmchunk.Choices) == 0 {
|
||||||
|
logger.Warn("empty chunk choices", "raw_data", string(data), "chunk", llmchunk)
|
||||||
|
return &models.TextChunk{}, nil
|
||||||
|
}
|
||||||
lastChoice := llmchunk.Choices[len(llmchunk.Choices)-1]
|
lastChoice := llmchunk.Choices[len(llmchunk.Choices)-1]
|
||||||
resp := &models.TextChunk{
|
resp := &models.TextChunk{
|
||||||
Chunk: lastChoice.Delta.Content,
|
Chunk: lastChoice.Delta.Content,
|
||||||
@@ -679,22 +640,6 @@ func (or OpenRouterChat) FormMsg(msg, role string, resume bool) (io.Reader, erro
|
|||||||
newMsg = *processMessageTag(&newMsg)
|
newMsg = *processMessageTag(&newMsg)
|
||||||
chatBody.Messages = append(chatBody.Messages, newMsg)
|
chatBody.Messages = append(chatBody.Messages, newMsg)
|
||||||
}
|
}
|
||||||
// if rag - add as system message to avoid conflicts with tool usage
|
|
||||||
if !resume && cfg.RAGEnabled {
|
|
||||||
um := chatBody.Messages[len(chatBody.Messages)-1].Content
|
|
||||||
logger.Debug("RAG is enabled, preparing RAG context", "user_message", um)
|
|
||||||
ragResp, err := chatRagUse(um)
|
|
||||||
if err != nil {
|
|
||||||
logger.Error("failed to form a rag msg", "error", err)
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
logger.Debug("RAG response received", "response_len", len(ragResp),
|
|
||||||
"response_preview", ragResp[:min(len(ragResp), 100)])
|
|
||||||
// Use system role for RAG context to avoid conflicts with tool usage
|
|
||||||
ragMsg := models.RoleMsg{Role: "system", Content: RAGMsg + ragResp}
|
|
||||||
chatBody.Messages = append(chatBody.Messages, ragMsg)
|
|
||||||
logger.Debug("RAG message added to chat body", "message_count", len(chatBody.Messages))
|
|
||||||
}
|
|
||||||
// Create copy of chat body with standardized user role
|
// Create copy of chat body with standardized user role
|
||||||
filteredMessages, _ := filterMessagesForCurrentCharacter(chatBody.Messages)
|
filteredMessages, _ := filterMessagesForCurrentCharacter(chatBody.Messages)
|
||||||
// Add persona suffix to the last user message to indicate who the assistant should reply as
|
// Add persona suffix to the last user message to indicate who the assistant should reply as
|
||||||
@@ -703,14 +648,24 @@ func (or OpenRouterChat) FormMsg(msg, role string, resume bool) (io.Reader, erro
|
|||||||
Model: chatBody.Model,
|
Model: chatBody.Model,
|
||||||
Stream: chatBody.Stream,
|
Stream: chatBody.Stream,
|
||||||
}
|
}
|
||||||
for i, msg := range filteredMessages {
|
for i := range filteredMessages {
|
||||||
strippedMsg := *stripThinkingFromMsg(&msg)
|
strippedMsg := *stripThinkingFromMsg(&filteredMessages[i])
|
||||||
bodyCopy.Messages[i] = strippedMsg
|
switch strippedMsg.Role {
|
||||||
// Standardize role if it's a user role
|
case cfg.UserRole:
|
||||||
if bodyCopy.Messages[i].Role == cfg.UserRole {
|
|
||||||
bodyCopy.Messages[i] = strippedMsg
|
bodyCopy.Messages[i] = strippedMsg
|
||||||
bodyCopy.Messages[i].Role = "user"
|
bodyCopy.Messages[i].Role = "user"
|
||||||
|
case cfg.AssistantRole:
|
||||||
|
bodyCopy.Messages[i] = strippedMsg
|
||||||
|
bodyCopy.Messages[i].Role = "assistant"
|
||||||
|
case cfg.ToolRole:
|
||||||
|
bodyCopy.Messages[i] = strippedMsg
|
||||||
|
bodyCopy.Messages[i].Role = "tool"
|
||||||
|
default:
|
||||||
|
bodyCopy.Messages[i] = strippedMsg
|
||||||
}
|
}
|
||||||
|
// Clear ToolCalls - they're stored in chat history for display but not sent to LLM
|
||||||
|
// literally deletes data that we need
|
||||||
|
// bodyCopy.Messages[i].ToolCall = nil
|
||||||
}
|
}
|
||||||
// Clean null/empty messages to prevent API issues
|
// Clean null/empty messages to prevent API issues
|
||||||
bodyCopy.Messages = consolidateAssistantMessages(bodyCopy.Messages)
|
bodyCopy.Messages = consolidateAssistantMessages(bodyCopy.Messages)
|
||||||
|
|||||||
11
main.go
11
main.go
@@ -1,20 +1,27 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"sync/atomic"
|
||||||
|
|
||||||
"github.com/rivo/tview"
|
"github.com/rivo/tview"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
boolColors = map[bool]string{true: "green", false: "red"}
|
boolColors = map[bool]string{true: "green", false: "red"}
|
||||||
botRespMode = false
|
botRespMode atomic.Bool
|
||||||
|
toolRunningMode atomic.Bool
|
||||||
editMode = false
|
editMode = false
|
||||||
roleEditMode = false
|
roleEditMode = false
|
||||||
injectRole = true
|
injectRole = true
|
||||||
selectedIndex = int(-1)
|
selectedIndex = int(-1)
|
||||||
shellMode = false
|
shellMode = false
|
||||||
|
shellHistory []string
|
||||||
|
shellHistoryPos int = -1
|
||||||
thinkingCollapsed = false
|
thinkingCollapsed = false
|
||||||
statusLineTempl = "help (F12) | [%s:-:b]llm writes[-:-:-] (F6 to interrupt) | chat: [orange:-:b]%s[-:-:-] (F1) | [%s:-:b]tool use[-:-:-] (ctrl+k) | model: [%s:-:b]%s[-:-:-] (ctrl+l) | [%s:-:b]skip LLM resp[-:-:-] (F10)\nAPI: [orange:-:b]%s[-:-:-] (ctrl+v) | writing as: [orange:-:b]%s[-:-:-] (ctrl+q) | bot will write as [orange:-:b]%s[-:-:-] (ctrl+x)"
|
toolCollapsed = true
|
||||||
|
statusLineTempl = "help (F12) | chat: [orange:-:b]%s[-:-:-] (F1) | [%s:-:b]tool use[-:-:-] (ctrl+k) | model: [%s:-:b]%s[-:-:-] (ctrl+l) | [%s:-:b]skip LLM resp[-:-:-] (F10) | API: [orange:-:b]%s[-:-:-] (ctrl+v)\nwriting as: [orange:-:b]%s[-:-:-] (ctrl+q) | bot will write as [orange:-:b]%s[-:-:-] (ctrl+x)"
|
||||||
focusSwitcher = map[tview.Primitive]tview.Primitive{}
|
focusSwitcher = map[tview.Primitive]tview.Primitive{}
|
||||||
|
app *tview.Application
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|||||||
42
main_test.go
42
main_test.go
@@ -1,42 +0,0 @@
|
|||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"gf-lt/config"
|
|
||||||
"gf-lt/models"
|
|
||||||
"strings"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestRemoveThinking(t *testing.T) {
|
|
||||||
cases := []struct {
|
|
||||||
cb *models.ChatBody
|
|
||||||
toolMsgs uint8
|
|
||||||
}{
|
|
||||||
{cb: &models.ChatBody{
|
|
||||||
Stream: true,
|
|
||||||
Messages: []models.RoleMsg{
|
|
||||||
{Role: "tool", Content: "should be ommited"},
|
|
||||||
{Role: "system", Content: "should stay"},
|
|
||||||
{Role: "user", Content: "hello, how are you?"},
|
|
||||||
{Role: "assistant", Content: "Oh, hi. <think>I should thank user and continue the conversation</think> I am geat, thank you! How are you?"},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
toolMsgs: uint8(1),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
for i, tc := range cases {
|
|
||||||
t.Run(fmt.Sprintf("run_%d", i), func(t *testing.T) {
|
|
||||||
cfg = &config.Config{ToolRole: "tool"} // Initialize cfg.ToolRole for test
|
|
||||||
mNum := len(tc.cb.Messages)
|
|
||||||
removeThinking(tc.cb)
|
|
||||||
if len(tc.cb.Messages) != mNum-int(tc.toolMsgs) {
|
|
||||||
t.Errorf("failed to delete tools msg %v; expected %d, got %d", tc.cb.Messages, mNum-int(tc.toolMsgs), len(tc.cb.Messages))
|
|
||||||
}
|
|
||||||
for _, msg := range tc.cb.Messages {
|
|
||||||
if strings.Contains(msg.Content, "<think>") {
|
|
||||||
t.Errorf("msg contains think tag; msg: %s\n", msg.Content)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}) }
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,10 @@
|
|||||||
package models
|
package models
|
||||||
|
|
||||||
import "strings"
|
import (
|
||||||
|
"crypto/md5"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
// https://github.com/malfoyslastname/character-card-spec-v2/blob/main/spec_v2.md
|
// https://github.com/malfoyslastname/character-card-spec-v2/blob/main/spec_v2.md
|
||||||
// what a bloat; trim to Role->Msg pair and first msg
|
// what a bloat; trim to Role->Msg pair and first msg
|
||||||
@@ -31,6 +35,7 @@ func (c *CharCardSpec) Simplify(userName, fpath string) *CharCard {
|
|||||||
fm := strings.ReplaceAll(strings.ReplaceAll(c.FirstMes, "{{char}}", c.Name), "{{user}}", userName)
|
fm := strings.ReplaceAll(strings.ReplaceAll(c.FirstMes, "{{char}}", c.Name), "{{user}}", userName)
|
||||||
sysPr := strings.ReplaceAll(strings.ReplaceAll(c.Description, "{{char}}", c.Name), "{{user}}", userName)
|
sysPr := strings.ReplaceAll(strings.ReplaceAll(c.Description, "{{char}}", c.Name), "{{user}}", userName)
|
||||||
return &CharCard{
|
return &CharCard{
|
||||||
|
ID: ComputeCardID(c.Name, fpath),
|
||||||
SysPrompt: sysPr,
|
SysPrompt: sysPr,
|
||||||
FirstMsg: fm,
|
FirstMsg: fm,
|
||||||
Role: c.Name,
|
Role: c.Name,
|
||||||
@@ -39,7 +44,12 @@ func (c *CharCardSpec) Simplify(userName, fpath string) *CharCard {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func ComputeCardID(role, filePath string) string {
|
||||||
|
return fmt.Sprintf("%x", md5.Sum([]byte(role+filePath)))
|
||||||
|
}
|
||||||
|
|
||||||
type CharCard struct {
|
type CharCard struct {
|
||||||
|
ID string `json:"id"`
|
||||||
SysPrompt string `json:"sys_prompt"`
|
SysPrompt string `json:"sys_prompt"`
|
||||||
FirstMsg string `json:"first_msg"`
|
FirstMsg string `json:"first_msg"`
|
||||||
Role string `json:"role"`
|
Role string `json:"role"`
|
||||||
|
|||||||
13
models/consts.go
Normal file
13
models/consts.go
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
package models
|
||||||
|
|
||||||
|
const (
|
||||||
|
LoadedMark = "(loaded) "
|
||||||
|
ToolRespMultyType = "multimodel_content"
|
||||||
|
)
|
||||||
|
|
||||||
|
type APIType int
|
||||||
|
|
||||||
|
const (
|
||||||
|
APITypeChat APIType = iota
|
||||||
|
APITypeCompletion
|
||||||
|
)
|
||||||
286
models/models.go
286
models/models.go
@@ -5,28 +5,21 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
"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 {
|
type FuncCall struct {
|
||||||
ID string `json:"id,omitempty"`
|
ID string `json:"id,omitempty"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Args map[string]string `json:"args"`
|
Args map[string]string `json:"args"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type ToolCall struct {
|
||||||
|
ID string `json:"id,omitempty"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Args string `json:"arguments"`
|
||||||
|
}
|
||||||
|
|
||||||
type LLMResp struct {
|
type LLMResp struct {
|
||||||
Choices []struct {
|
Choices []struct {
|
||||||
FinishReason string `json:"finish_reason"`
|
FinishReason string `json:"finish_reason"`
|
||||||
@@ -109,25 +102,35 @@ type RoleMsg struct {
|
|||||||
Content string `json:"-"`
|
Content string `json:"-"`
|
||||||
ContentParts []any `json:"-"`
|
ContentParts []any `json:"-"`
|
||||||
ToolCallID string `json:"tool_call_id,omitempty"` // For tool response messages
|
ToolCallID string `json:"tool_call_id,omitempty"` // For tool response messages
|
||||||
|
ToolCall *ToolCall `json:"tool_call,omitempty"` // For assistant messages with tool calls
|
||||||
|
IsShellCommand bool `json:"is_shell_command,omitempty"` // True for shell command outputs (always shown)
|
||||||
KnownTo []string `json:"known_to,omitempty"`
|
KnownTo []string `json:"known_to,omitempty"`
|
||||||
Stats *ResponseStats `json:"stats"`
|
Stats *ResponseStats `json:"stats"`
|
||||||
hasContentParts bool // Flag to indicate which content type to marshal
|
HasContentParts bool // Flag to indicate which content type to marshal
|
||||||
}
|
}
|
||||||
|
|
||||||
// MarshalJSON implements custom JSON marshaling for RoleMsg
|
// MarshalJSON implements custom JSON marshaling for RoleMsg
|
||||||
func (m *RoleMsg) MarshalJSON() ([]byte, error) {
|
//
|
||||||
if m.hasContentParts {
|
//nolint:gocritic
|
||||||
|
func (m RoleMsg) MarshalJSON() ([]byte, error) {
|
||||||
|
if m.HasContentParts {
|
||||||
// Use structured content format
|
// Use structured content format
|
||||||
aux := struct {
|
aux := struct {
|
||||||
Role string `json:"role"`
|
Role string `json:"role"`
|
||||||
Content []any `json:"content"`
|
Content []any `json:"content"`
|
||||||
ToolCallID string `json:"tool_call_id,omitempty"`
|
ToolCallID string `json:"tool_call_id,omitempty"`
|
||||||
|
ToolCall *ToolCall `json:"tool_call,omitempty"`
|
||||||
|
IsShellCommand bool `json:"is_shell_command,omitempty"`
|
||||||
KnownTo []string `json:"known_to,omitempty"`
|
KnownTo []string `json:"known_to,omitempty"`
|
||||||
|
Stats *ResponseStats `json:"stats,omitempty"`
|
||||||
}{
|
}{
|
||||||
Role: m.Role,
|
Role: m.Role,
|
||||||
Content: m.ContentParts,
|
Content: m.ContentParts,
|
||||||
ToolCallID: m.ToolCallID,
|
ToolCallID: m.ToolCallID,
|
||||||
|
ToolCall: m.ToolCall,
|
||||||
|
IsShellCommand: m.IsShellCommand,
|
||||||
KnownTo: m.KnownTo,
|
KnownTo: m.KnownTo,
|
||||||
|
Stats: m.Stats,
|
||||||
}
|
}
|
||||||
return json.Marshal(aux)
|
return json.Marshal(aux)
|
||||||
} else {
|
} else {
|
||||||
@@ -136,12 +139,18 @@ func (m *RoleMsg) MarshalJSON() ([]byte, error) {
|
|||||||
Role string `json:"role"`
|
Role string `json:"role"`
|
||||||
Content string `json:"content"`
|
Content string `json:"content"`
|
||||||
ToolCallID string `json:"tool_call_id,omitempty"`
|
ToolCallID string `json:"tool_call_id,omitempty"`
|
||||||
|
ToolCall *ToolCall `json:"tool_call,omitempty"`
|
||||||
|
IsShellCommand bool `json:"is_shell_command,omitempty"`
|
||||||
KnownTo []string `json:"known_to,omitempty"`
|
KnownTo []string `json:"known_to,omitempty"`
|
||||||
|
Stats *ResponseStats `json:"stats,omitempty"`
|
||||||
}{
|
}{
|
||||||
Role: m.Role,
|
Role: m.Role,
|
||||||
Content: m.Content,
|
Content: m.Content,
|
||||||
ToolCallID: m.ToolCallID,
|
ToolCallID: m.ToolCallID,
|
||||||
|
ToolCall: m.ToolCall,
|
||||||
|
IsShellCommand: m.IsShellCommand,
|
||||||
KnownTo: m.KnownTo,
|
KnownTo: m.KnownTo,
|
||||||
|
Stats: m.Stats,
|
||||||
}
|
}
|
||||||
return json.Marshal(aux)
|
return json.Marshal(aux)
|
||||||
}
|
}
|
||||||
@@ -154,14 +163,20 @@ func (m *RoleMsg) UnmarshalJSON(data []byte) error {
|
|||||||
Role string `json:"role"`
|
Role string `json:"role"`
|
||||||
Content []any `json:"content"`
|
Content []any `json:"content"`
|
||||||
ToolCallID string `json:"tool_call_id,omitempty"`
|
ToolCallID string `json:"tool_call_id,omitempty"`
|
||||||
|
ToolCall *ToolCall `json:"tool_call,omitempty"`
|
||||||
|
IsShellCommand bool `json:"is_shell_command,omitempty"`
|
||||||
KnownTo []string `json:"known_to,omitempty"`
|
KnownTo []string `json:"known_to,omitempty"`
|
||||||
|
Stats *ResponseStats `json:"stats,omitempty"`
|
||||||
}
|
}
|
||||||
if err := json.Unmarshal(data, &structured); err == nil && len(structured.Content) > 0 {
|
if err := json.Unmarshal(data, &structured); err == nil && len(structured.Content) > 0 {
|
||||||
m.Role = structured.Role
|
m.Role = structured.Role
|
||||||
m.ContentParts = structured.Content
|
m.ContentParts = structured.Content
|
||||||
m.ToolCallID = structured.ToolCallID
|
m.ToolCallID = structured.ToolCallID
|
||||||
|
m.ToolCall = structured.ToolCall
|
||||||
|
m.IsShellCommand = structured.IsShellCommand
|
||||||
m.KnownTo = structured.KnownTo
|
m.KnownTo = structured.KnownTo
|
||||||
m.hasContentParts = true
|
m.Stats = structured.Stats
|
||||||
|
m.HasContentParts = true
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -170,7 +185,10 @@ func (m *RoleMsg) UnmarshalJSON(data []byte) error {
|
|||||||
Role string `json:"role"`
|
Role string `json:"role"`
|
||||||
Content string `json:"content"`
|
Content string `json:"content"`
|
||||||
ToolCallID string `json:"tool_call_id,omitempty"`
|
ToolCallID string `json:"tool_call_id,omitempty"`
|
||||||
|
ToolCall *ToolCall `json:"tool_call,omitempty"`
|
||||||
|
IsShellCommand bool `json:"is_shell_command,omitempty"`
|
||||||
KnownTo []string `json:"known_to,omitempty"`
|
KnownTo []string `json:"known_to,omitempty"`
|
||||||
|
Stats *ResponseStats `json:"stats,omitempty"`
|
||||||
}
|
}
|
||||||
if err := json.Unmarshal(data, &simple); err != nil {
|
if err := json.Unmarshal(data, &simple); err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -178,79 +196,17 @@ func (m *RoleMsg) UnmarshalJSON(data []byte) error {
|
|||||||
m.Role = simple.Role
|
m.Role = simple.Role
|
||||||
m.Content = simple.Content
|
m.Content = simple.Content
|
||||||
m.ToolCallID = simple.ToolCallID
|
m.ToolCallID = simple.ToolCallID
|
||||||
|
m.ToolCall = simple.ToolCall
|
||||||
|
m.IsShellCommand = simple.IsShellCommand
|
||||||
m.KnownTo = simple.KnownTo
|
m.KnownTo = simple.KnownTo
|
||||||
m.hasContentParts = false
|
m.Stats = simple.Stats
|
||||||
|
m.HasContentParts = false
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *RoleMsg) ToText(i int) string {
|
|
||||||
var contentStr string
|
|
||||||
var imageIndicators []string
|
|
||||||
if !m.hasContentParts {
|
|
||||||
contentStr = m.Content
|
|
||||||
} else {
|
|
||||||
var textParts []string
|
|
||||||
for _, part := range m.ContentParts {
|
|
||||||
switch p := part.(type) {
|
|
||||||
case TextContentPart:
|
|
||||||
if p.Type == "text" {
|
|
||||||
textParts = append(textParts, p.Text)
|
|
||||||
}
|
|
||||||
case ImageContentPart:
|
|
||||||
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":
|
|
||||||
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))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
contentStr = strings.Join(textParts, " ") + " "
|
|
||||||
}
|
|
||||||
contentStr, _ = strings.CutPrefix(contentStr, m.Role+":")
|
|
||||||
icon := fmt.Sprintf("(%d) <%s>: ", i, m.Role)
|
|
||||||
var finalContent strings.Builder
|
|
||||||
if len(imageIndicators) > 0 {
|
|
||||||
for _, indicator := range imageIndicators {
|
|
||||||
finalContent.WriteString(indicator)
|
|
||||||
finalContent.WriteString("\n")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
finalContent.WriteString(contentStr)
|
|
||||||
if m.Stats != nil {
|
|
||||||
finalContent.WriteString(fmt.Sprintf("\n[gray::i][%d tok, %.1fs, %.1f t/s][-:-:-]",
|
|
||||||
m.Stats.Tokens, m.Stats.Duration, m.Stats.TokensPerSec))
|
|
||||||
}
|
|
||||||
textMsg := fmt.Sprintf("[-:-:b]%s[-:-:-]\n%s\n", icon, finalContent.String())
|
|
||||||
return strings.ReplaceAll(textMsg, "\n\n", "\n")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *RoleMsg) ToPrompt() string {
|
func (m *RoleMsg) ToPrompt() string {
|
||||||
var contentStr string
|
var contentStr string
|
||||||
if !m.hasContentParts {
|
if !m.HasContentParts {
|
||||||
contentStr = m.Content
|
contentStr = m.Content
|
||||||
} else {
|
} else {
|
||||||
// For structured content, just take the text parts
|
// For structured content, just take the text parts
|
||||||
@@ -283,7 +239,7 @@ func NewRoleMsg(role, content string) RoleMsg {
|
|||||||
return RoleMsg{
|
return RoleMsg{
|
||||||
Role: role,
|
Role: role,
|
||||||
Content: content,
|
Content: content,
|
||||||
hasContentParts: false,
|
HasContentParts: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -292,7 +248,7 @@ func NewMultimodalMsg(role string, contentParts []any) RoleMsg {
|
|||||||
return RoleMsg{
|
return RoleMsg{
|
||||||
Role: role,
|
Role: role,
|
||||||
ContentParts: contentParts,
|
ContentParts: contentParts,
|
||||||
hasContentParts: true,
|
HasContentParts: true,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -301,7 +257,7 @@ func (m *RoleMsg) HasContent() bool {
|
|||||||
if m.Content != "" {
|
if m.Content != "" {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
if m.hasContentParts && len(m.ContentParts) > 0 {
|
if m.HasContentParts && len(m.ContentParts) > 0 {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
@@ -309,7 +265,7 @@ func (m *RoleMsg) HasContent() bool {
|
|||||||
|
|
||||||
// IsContentParts returns true if the message uses structured content parts
|
// IsContentParts returns true if the message uses structured content parts
|
||||||
func (m *RoleMsg) IsContentParts() bool {
|
func (m *RoleMsg) IsContentParts() bool {
|
||||||
return m.hasContentParts
|
return m.HasContentParts
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetContentParts returns the content parts of the message
|
// GetContentParts returns the content parts of the message
|
||||||
@@ -326,38 +282,98 @@ func (m *RoleMsg) Copy() RoleMsg {
|
|||||||
ToolCallID: m.ToolCallID,
|
ToolCallID: m.ToolCallID,
|
||||||
KnownTo: m.KnownTo,
|
KnownTo: m.KnownTo,
|
||||||
Stats: m.Stats,
|
Stats: m.Stats,
|
||||||
hasContentParts: m.hasContentParts,
|
HasContentParts: m.HasContentParts,
|
||||||
|
ToolCall: m.ToolCall,
|
||||||
|
IsShellCommand: m.IsShellCommand,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetText returns the text content of the message, handling both
|
||||||
|
// simple Content and multimodal ContentParts formats.
|
||||||
|
func (m *RoleMsg) GetText() string {
|
||||||
|
if !m.HasContentParts {
|
||||||
|
return m.Content
|
||||||
|
}
|
||||||
|
var textParts []string
|
||||||
|
for _, part := range m.ContentParts {
|
||||||
|
switch p := part.(type) {
|
||||||
|
case TextContentPart:
|
||||||
|
if p.Type == "text" {
|
||||||
|
textParts = append(textParts, p.Text)
|
||||||
|
}
|
||||||
|
case map[string]any:
|
||||||
|
if partType, exists := p["type"]; exists {
|
||||||
|
if partType == "text" {
|
||||||
|
if textVal, textExists := p["text"]; textExists {
|
||||||
|
if textStr, isStr := textVal.(string); isStr {
|
||||||
|
textParts = append(textParts, textStr)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return strings.Join(textParts, " ")
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetText updates the text content of the message. If the message has
|
||||||
|
// ContentParts (multimodal), it updates the text parts while preserving
|
||||||
|
// images. If not, it sets the simple Content field.
|
||||||
|
func (m *RoleMsg) SetText(text string) {
|
||||||
|
if !m.HasContentParts {
|
||||||
|
m.Content = text
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var newParts []any
|
||||||
|
for _, part := range m.ContentParts {
|
||||||
|
switch p := part.(type) {
|
||||||
|
case TextContentPart:
|
||||||
|
if p.Type == "text" {
|
||||||
|
p.Text = text
|
||||||
|
newParts = append(newParts, p)
|
||||||
|
} else {
|
||||||
|
newParts = append(newParts, p)
|
||||||
|
}
|
||||||
|
case map[string]any:
|
||||||
|
if partType, exists := p["type"]; exists && partType == "text" {
|
||||||
|
p["text"] = text
|
||||||
|
newParts = append(newParts, p)
|
||||||
|
} else {
|
||||||
|
newParts = append(newParts, p)
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
newParts = append(newParts, part)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
m.ContentParts = newParts
|
||||||
|
}
|
||||||
|
|
||||||
// AddTextPart adds a text content part to the message
|
// AddTextPart adds a text content part to the message
|
||||||
func (m *RoleMsg) AddTextPart(text string) {
|
func (m *RoleMsg) AddTextPart(text string) {
|
||||||
if !m.hasContentParts {
|
if !m.HasContentParts {
|
||||||
// Convert to content parts format
|
// Convert to content parts format
|
||||||
if m.Content != "" {
|
if m.Content != "" {
|
||||||
m.ContentParts = []any{TextContentPart{Type: "text", Text: m.Content}}
|
m.ContentParts = []any{TextContentPart{Type: "text", Text: m.Content}}
|
||||||
} else {
|
} else {
|
||||||
m.ContentParts = []any{}
|
m.ContentParts = []any{}
|
||||||
}
|
}
|
||||||
m.hasContentParts = true
|
m.HasContentParts = true
|
||||||
}
|
}
|
||||||
|
|
||||||
textPart := TextContentPart{Type: "text", Text: text}
|
textPart := TextContentPart{Type: "text", Text: text}
|
||||||
m.ContentParts = append(m.ContentParts, textPart)
|
m.ContentParts = append(m.ContentParts, textPart)
|
||||||
}
|
}
|
||||||
|
|
||||||
// AddImagePart adds an image content part to the message
|
// AddImagePart adds an image content part to the message
|
||||||
func (m *RoleMsg) AddImagePart(imageURL, imagePath string) {
|
func (m *RoleMsg) AddImagePart(imageURL, imagePath string) {
|
||||||
if !m.hasContentParts {
|
if !m.HasContentParts {
|
||||||
// Convert to content parts format
|
// Convert to content parts format
|
||||||
if m.Content != "" {
|
if m.Content != "" {
|
||||||
m.ContentParts = []any{TextContentPart{Type: "text", Text: m.Content}}
|
m.ContentParts = []any{TextContentPart{Type: "text", Text: m.Content}}
|
||||||
} else {
|
} else {
|
||||||
m.ContentParts = []any{}
|
m.ContentParts = []any{}
|
||||||
}
|
}
|
||||||
m.hasContentParts = true
|
m.HasContentParts = true
|
||||||
}
|
}
|
||||||
|
|
||||||
imagePart := ImageContentPart{
|
imagePart := ImageContentPart{
|
||||||
Type: "image_url",
|
Type: "image_url",
|
||||||
Path: imagePath, // Store the original file path
|
Path: imagePath, // Store the original file path
|
||||||
@@ -375,7 +391,6 @@ func CreateImageURLFromPath(imagePath string) (string, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Determine the image format based on file extension
|
// Determine the image format based on file extension
|
||||||
var mimeType string
|
var mimeType string
|
||||||
switch {
|
switch {
|
||||||
@@ -392,39 +407,12 @@ func CreateImageURLFromPath(imagePath string) (string, error) {
|
|||||||
default:
|
default:
|
||||||
mimeType = "image/jpeg" // default
|
mimeType = "image/jpeg" // default
|
||||||
}
|
}
|
||||||
|
|
||||||
// Encode to base64
|
// Encode to base64
|
||||||
encoded := base64.StdEncoding.EncodeToString(data)
|
encoded := base64.StdEncoding.EncodeToString(data)
|
||||||
|
|
||||||
// Create data URL
|
// Create data URL
|
||||||
return fmt.Sprintf("data:%s;base64,%s", mimeType, encoded), nil
|
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 {
|
type ChatBody struct {
|
||||||
Model string `json:"model"`
|
Model string `json:"model"`
|
||||||
Stream bool `json:"stream"`
|
Stream bool `json:"stream"`
|
||||||
@@ -432,16 +420,16 @@ type ChatBody struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (cb *ChatBody) Rename(oldname, newname string) {
|
func (cb *ChatBody) Rename(oldname, newname string) {
|
||||||
for i, m := range cb.Messages {
|
for i := range cb.Messages {
|
||||||
cb.Messages[i].Content = strings.ReplaceAll(m.Content, oldname, newname)
|
cb.Messages[i].Content = strings.ReplaceAll(cb.Messages[i].Content, oldname, newname)
|
||||||
cb.Messages[i].Role = strings.ReplaceAll(m.Role, oldname, newname)
|
cb.Messages[i].Role = strings.ReplaceAll(cb.Messages[i].Role, oldname, newname)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (cb *ChatBody) ListRoles() []string {
|
func (cb *ChatBody) ListRoles() []string {
|
||||||
namesMap := make(map[string]struct{})
|
namesMap := make(map[string]struct{})
|
||||||
for _, m := range cb.Messages {
|
for i := range cb.Messages {
|
||||||
namesMap[m.Role] = struct{}{}
|
namesMap[cb.Messages[i].Role] = struct{}{}
|
||||||
}
|
}
|
||||||
resp := make([]string, len(namesMap))
|
resp := make([]string, len(namesMap))
|
||||||
i := 0
|
i := 0
|
||||||
@@ -528,24 +516,6 @@ type OpenAIReq struct {
|
|||||||
|
|
||||||
// ===
|
// ===
|
||||||
|
|
||||||
// type LLMModels struct {
|
|
||||||
// Object string `json:"object"`
|
|
||||||
// Data []struct {
|
|
||||||
// ID string `json:"id"`
|
|
||||||
// Object string `json:"object"`
|
|
||||||
// Created int `json:"created"`
|
|
||||||
// OwnedBy string `json:"owned_by"`
|
|
||||||
// Meta struct {
|
|
||||||
// VocabType int `json:"vocab_type"`
|
|
||||||
// NVocab int `json:"n_vocab"`
|
|
||||||
// NCtxTrain int `json:"n_ctx_train"`
|
|
||||||
// NEmbd int `json:"n_embd"`
|
|
||||||
// NParams int64 `json:"n_params"`
|
|
||||||
// Size int64 `json:"size"`
|
|
||||||
// } `json:"meta"`
|
|
||||||
// } `json:"data"`
|
|
||||||
// }
|
|
||||||
|
|
||||||
type LlamaCPPReq struct {
|
type LlamaCPPReq struct {
|
||||||
Model string `json:"model"`
|
Model string `json:"model"`
|
||||||
Stream bool `json:"stream"`
|
Stream bool `json:"stream"`
|
||||||
@@ -638,6 +608,20 @@ func (lcp *LCPModels) ListModels() []string {
|
|||||||
return resp
|
return resp
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (lcp *LCPModels) HasVision(modelID string) bool {
|
||||||
|
for _, m := range lcp.Data {
|
||||||
|
if m.ID == modelID {
|
||||||
|
args := m.Status.Args
|
||||||
|
for i := 0; i < len(args)-1; i++ {
|
||||||
|
if args[i] == "--mmproj" {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
type ResponseStats struct {
|
type ResponseStats struct {
|
||||||
Tokens int
|
Tokens int
|
||||||
Duration float64
|
Duration float64
|
||||||
@@ -651,9 +635,7 @@ type ChatRoundReq struct {
|
|||||||
Resume bool
|
Resume bool
|
||||||
}
|
}
|
||||||
|
|
||||||
type APIType int
|
type MultimodalToolResp struct {
|
||||||
|
Type string `json:"type"`
|
||||||
const (
|
Parts []map[string]string `json:"parts"`
|
||||||
APITypeChat APIType = iota
|
}
|
||||||
APITypeCompletion
|
|
||||||
)
|
|
||||||
|
|||||||
@@ -1,167 +0,0 @@
|
|||||||
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)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -172,3 +172,16 @@ func (orm *ORModels) ListModels(free bool) []string {
|
|||||||
}
|
}
|
||||||
return resp
|
return resp
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (orm *ORModels) HasVision(modelID string) bool {
|
||||||
|
for i := range orm.Data {
|
||||||
|
if orm.Data[i].ID == modelID {
|
||||||
|
for _, mod := range orm.Data[i].Architecture.InputModalities {
|
||||||
|
if mod == "image" {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|||||||
@@ -62,7 +62,6 @@ func TestORModelsListModels(t *testing.T) {
|
|||||||
t.Errorf("expected 4 total models, got %d", len(allModels))
|
t.Errorf("expected 4 total models, got %d", len(allModels))
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("integration with or_models.json", func(t *testing.T) {
|
t.Run("integration with or_models.json", func(t *testing.T) {
|
||||||
// Attempt to load the real data file from the project root
|
// Attempt to load the real data file from the project root
|
||||||
path := filepath.Join("..", "or_models.json")
|
path := filepath.Join("..", "or_models.json")
|
||||||
|
|||||||
@@ -109,6 +109,12 @@ func ReadCardJson(fname string) (*models.CharCard, error) {
|
|||||||
if err := json.Unmarshal(data, &card); err != nil {
|
if err := json.Unmarshal(data, &card); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
if card.FilePath == "" {
|
||||||
|
card.FilePath = fname
|
||||||
|
}
|
||||||
|
if card.ID == "" {
|
||||||
|
card.ID = models.ComputeCardID(card.Role, card.FilePath)
|
||||||
|
}
|
||||||
return &card, nil
|
return &card, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
128
popups.go
128
popups.go
@@ -1,6 +1,7 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"gf-lt/models"
|
||||||
"slices"
|
"slices"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
@@ -39,9 +40,7 @@ func showModelSelectionPopup() {
|
|||||||
default:
|
default:
|
||||||
message = "No llama.cpp models loaded. Ensure llama.cpp server is running with models."
|
message = "No llama.cpp models loaded. Ensure llama.cpp server is running with models."
|
||||||
}
|
}
|
||||||
if err := notifyUser("Empty list", message); err != nil {
|
showToast("Empty list", message)
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// Create a list primitive
|
// Create a list primitive
|
||||||
@@ -51,7 +50,7 @@ func showModelSelectionPopup() {
|
|||||||
// Find the current model index to set as selected
|
// Find the current model index to set as selected
|
||||||
currentModelIndex := -1
|
currentModelIndex := -1
|
||||||
for i, model := range modelList {
|
for i, model := range modelList {
|
||||||
if model == chatBody.Model {
|
if strings.TrimPrefix(model, models.LoadedMark) == chatBody.Model {
|
||||||
currentModelIndex = i
|
currentModelIndex = i
|
||||||
}
|
}
|
||||||
modelListWidget.AddItem(model, "", 0, nil)
|
modelListWidget.AddItem(model, "", 0, nil)
|
||||||
@@ -61,20 +60,23 @@ func showModelSelectionPopup() {
|
|||||||
modelListWidget.SetCurrentItem(currentModelIndex)
|
modelListWidget.SetCurrentItem(currentModelIndex)
|
||||||
}
|
}
|
||||||
modelListWidget.SetSelectedFunc(func(index int, mainText string, secondaryText string, shortcut rune) {
|
modelListWidget.SetSelectedFunc(func(index int, mainText string, secondaryText string, shortcut rune) {
|
||||||
modelName := strings.TrimPrefix(mainText, "(loaded) ")
|
modelName := strings.TrimPrefix(mainText, models.LoadedMark)
|
||||||
chatBody.Model = modelName
|
chatBody.Model = modelName
|
||||||
cfg.CurrentModel = chatBody.Model
|
cfg.CurrentModel = chatBody.Model
|
||||||
pages.RemovePage("modelSelectionPopup")
|
pages.RemovePage("modelSelectionPopup")
|
||||||
|
app.SetFocus(textArea)
|
||||||
updateCachedModelColor()
|
updateCachedModelColor()
|
||||||
updateStatusLine()
|
updateStatusLine()
|
||||||
})
|
})
|
||||||
modelListWidget.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
modelListWidget.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
||||||
if event.Key() == tcell.KeyEscape {
|
if event.Key() == tcell.KeyEscape {
|
||||||
pages.RemovePage("modelSelectionPopup")
|
pages.RemovePage("modelSelectionPopup")
|
||||||
|
app.SetFocus(textArea)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
|
if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
|
||||||
pages.RemovePage("modelSelectionPopup")
|
pages.RemovePage("modelSelectionPopup")
|
||||||
|
app.SetFocus(textArea)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return event
|
return event
|
||||||
@@ -115,9 +117,7 @@ func showAPILinkSelectionPopup() {
|
|||||||
if len(apiLinks) == 0 {
|
if len(apiLinks) == 0 {
|
||||||
logger.Warn("no API links available for selection")
|
logger.Warn("no API links available for selection")
|
||||||
message := "No API links available. Please configure API links in your config file."
|
message := "No API links available. Please configure API links in your config file."
|
||||||
if err := notifyUser("Empty list", message); err != nil {
|
showToast("Empty list", message)
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// Create a list primitive
|
// Create a list primitive
|
||||||
@@ -139,6 +139,7 @@ func showAPILinkSelectionPopup() {
|
|||||||
apiListWidget.SetSelectedFunc(func(index int, mainText string, secondaryText string, shortcut rune) {
|
apiListWidget.SetSelectedFunc(func(index int, mainText string, secondaryText string, shortcut rune) {
|
||||||
// Update the API in config
|
// Update the API in config
|
||||||
cfg.CurrentAPI = mainText
|
cfg.CurrentAPI = mainText
|
||||||
|
// updateToolCapabilities()
|
||||||
// Update model list based on new API
|
// Update model list based on new API
|
||||||
// Helper function to get model list for a given API (same as in props_table.go)
|
// Helper function to get model list for a given API (same as in props_table.go)
|
||||||
getModelListForAPI := func(api string) []string {
|
getModelListForAPI := func(api string) []string {
|
||||||
@@ -156,10 +157,12 @@ func showAPILinkSelectionPopup() {
|
|||||||
newModelList := getModelListForAPI(cfg.CurrentAPI)
|
newModelList := getModelListForAPI(cfg.CurrentAPI)
|
||||||
// Ensure chatBody.Model is in the new list; if not, set to first available model
|
// Ensure chatBody.Model is in the new list; if not, set to first available model
|
||||||
if len(newModelList) > 0 && !slices.Contains(newModelList, chatBody.Model) {
|
if len(newModelList) > 0 && !slices.Contains(newModelList, chatBody.Model) {
|
||||||
chatBody.Model = newModelList[0]
|
chatBody.Model = strings.TrimPrefix(newModelList[0], models.LoadedMark)
|
||||||
cfg.CurrentModel = chatBody.Model
|
cfg.CurrentModel = chatBody.Model
|
||||||
|
updateToolCapabilities()
|
||||||
}
|
}
|
||||||
pages.RemovePage("apiLinkSelectionPopup")
|
pages.RemovePage("apiLinkSelectionPopup")
|
||||||
|
app.SetFocus(textArea)
|
||||||
choseChunkParser()
|
choseChunkParser()
|
||||||
updateCachedModelColor()
|
updateCachedModelColor()
|
||||||
updateStatusLine()
|
updateStatusLine()
|
||||||
@@ -167,10 +170,12 @@ func showAPILinkSelectionPopup() {
|
|||||||
apiListWidget.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
apiListWidget.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
||||||
if event.Key() == tcell.KeyEscape {
|
if event.Key() == tcell.KeyEscape {
|
||||||
pages.RemovePage("apiLinkSelectionPopup")
|
pages.RemovePage("apiLinkSelectionPopup")
|
||||||
|
app.SetFocus(textArea)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
|
if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
|
||||||
pages.RemovePage("apiLinkSelectionPopup")
|
pages.RemovePage("apiLinkSelectionPopup")
|
||||||
|
app.SetFocus(textArea)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return event
|
return event
|
||||||
@@ -197,9 +202,7 @@ func showUserRoleSelectionPopup() {
|
|||||||
if len(roles) == 0 {
|
if len(roles) == 0 {
|
||||||
logger.Warn("no roles available for selection")
|
logger.Warn("no roles available for selection")
|
||||||
message := "No roles available for selection."
|
message := "No roles available for selection."
|
||||||
if err := notifyUser("Empty list", message); err != nil {
|
showToast("Empty list", message)
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// Create a list primitive
|
// Create a list primitive
|
||||||
@@ -230,6 +233,7 @@ func showUserRoleSelectionPopup() {
|
|||||||
textView.SetText(chatToText(filtered, cfg.ShowSys))
|
textView.SetText(chatToText(filtered, cfg.ShowSys))
|
||||||
// Remove the popup page
|
// Remove the popup page
|
||||||
pages.RemovePage("userRoleSelectionPopup")
|
pages.RemovePage("userRoleSelectionPopup")
|
||||||
|
app.SetFocus(textArea)
|
||||||
// Update the status line to reflect the change
|
// Update the status line to reflect the change
|
||||||
updateStatusLine()
|
updateStatusLine()
|
||||||
colorText()
|
colorText()
|
||||||
@@ -237,10 +241,12 @@ func showUserRoleSelectionPopup() {
|
|||||||
roleListWidget.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
roleListWidget.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
||||||
if event.Key() == tcell.KeyEscape {
|
if event.Key() == tcell.KeyEscape {
|
||||||
pages.RemovePage("userRoleSelectionPopup")
|
pages.RemovePage("userRoleSelectionPopup")
|
||||||
|
app.SetFocus(textArea)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
|
if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
|
||||||
pages.RemovePage("userRoleSelectionPopup")
|
pages.RemovePage("userRoleSelectionPopup")
|
||||||
|
app.SetFocus(textArea)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return event
|
return event
|
||||||
@@ -273,9 +279,7 @@ func showBotRoleSelectionPopup() {
|
|||||||
if len(roles) == 0 {
|
if len(roles) == 0 {
|
||||||
logger.Warn("no roles available for selection")
|
logger.Warn("no roles available for selection")
|
||||||
message := "No roles available for selection."
|
message := "No roles available for selection."
|
||||||
if err := notifyUser("Empty list", message); err != nil {
|
showToast("Empty list", message)
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// Create a list primitive
|
// Create a list primitive
|
||||||
@@ -303,16 +307,19 @@ func showBotRoleSelectionPopup() {
|
|||||||
cfg.WriteNextMsgAsCompletionAgent = mainText
|
cfg.WriteNextMsgAsCompletionAgent = mainText
|
||||||
// Remove the popup page
|
// Remove the popup page
|
||||||
pages.RemovePage("botRoleSelectionPopup")
|
pages.RemovePage("botRoleSelectionPopup")
|
||||||
|
app.SetFocus(textArea)
|
||||||
// Update the status line to reflect the change
|
// Update the status line to reflect the change
|
||||||
updateStatusLine()
|
updateStatusLine()
|
||||||
})
|
})
|
||||||
roleListWidget.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
roleListWidget.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
||||||
if event.Key() == tcell.KeyEscape {
|
if event.Key() == tcell.KeyEscape {
|
||||||
pages.RemovePage("botRoleSelectionPopup")
|
pages.RemovePage("botRoleSelectionPopup")
|
||||||
|
app.SetFocus(textArea)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
|
if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
|
||||||
pages.RemovePage("botRoleSelectionPopup")
|
pages.RemovePage("botRoleSelectionPopup")
|
||||||
|
app.SetFocus(textArea)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return event
|
return event
|
||||||
@@ -331,7 +338,67 @@ func showBotRoleSelectionPopup() {
|
|||||||
app.SetFocus(roleListWidget)
|
app.SetFocus(roleListWidget)
|
||||||
}
|
}
|
||||||
|
|
||||||
func showFileCompletionPopup(filter string) {
|
func showShellFileCompletionPopup(filter string) {
|
||||||
|
baseDir := cfg.FilePickerDir
|
||||||
|
if baseDir == "" {
|
||||||
|
baseDir = "."
|
||||||
|
}
|
||||||
|
complMatches := scanFiles(baseDir, filter)
|
||||||
|
if len(complMatches) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if len(complMatches) == 1 {
|
||||||
|
currentText := shellInput.GetText()
|
||||||
|
atIdx := strings.LastIndex(currentText, "@")
|
||||||
|
if atIdx >= 0 {
|
||||||
|
before := currentText[:atIdx]
|
||||||
|
shellInput.SetText(before + complMatches[0])
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
widget := tview.NewList().ShowSecondaryText(false).
|
||||||
|
SetSelectedBackgroundColor(tcell.ColorGray)
|
||||||
|
widget.SetTitle("file completion").SetBorder(true)
|
||||||
|
for _, m := range complMatches {
|
||||||
|
widget.AddItem(m, "", 0, nil)
|
||||||
|
}
|
||||||
|
widget.SetSelectedFunc(func(index int, mainText string, secondaryText string, shortcut rune) {
|
||||||
|
currentText := shellInput.GetText()
|
||||||
|
atIdx := strings.LastIndex(currentText, "@")
|
||||||
|
if atIdx >= 0 {
|
||||||
|
before := currentText[:atIdx]
|
||||||
|
shellInput.SetText(before + mainText)
|
||||||
|
}
|
||||||
|
pages.RemovePage("shellFileCompletionPopup")
|
||||||
|
app.SetFocus(shellInput)
|
||||||
|
})
|
||||||
|
widget.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
||||||
|
if event.Key() == tcell.KeyEscape {
|
||||||
|
pages.RemovePage("shellFileCompletionPopup")
|
||||||
|
app.SetFocus(shellInput)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
|
||||||
|
pages.RemovePage("shellFileCompletionPopup")
|
||||||
|
app.SetFocus(shellInput)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return event
|
||||||
|
})
|
||||||
|
modal := func(p tview.Primitive, width, height int) tview.Primitive {
|
||||||
|
return tview.NewFlex().
|
||||||
|
AddItem(nil, 0, 1, false).
|
||||||
|
AddItem(tview.NewFlex().SetDirection(tview.FlexRow).
|
||||||
|
AddItem(nil, 0, 1, false).
|
||||||
|
AddItem(p, height, 1, true).
|
||||||
|
AddItem(nil, 0, 1, false), width, 1, true).
|
||||||
|
AddItem(nil, 0, 1, false)
|
||||||
|
}
|
||||||
|
pages.AddPage("shellFileCompletionPopup", modal(widget, 80, 20), true, true)
|
||||||
|
app.SetFocus(widget)
|
||||||
|
}
|
||||||
|
|
||||||
|
func showTextAreaFileCompletionPopup(filter string) {
|
||||||
baseDir := cfg.FilePickerDir
|
baseDir := cfg.FilePickerDir
|
||||||
if baseDir == "" {
|
if baseDir == "" {
|
||||||
baseDir = "."
|
baseDir = "."
|
||||||
@@ -340,7 +407,6 @@ func showFileCompletionPopup(filter string) {
|
|||||||
if len(complMatches) == 0 {
|
if len(complMatches) == 0 {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// If only one match, auto-complete without showing popup
|
|
||||||
if len(complMatches) == 1 {
|
if len(complMatches) == 1 {
|
||||||
currentText := textArea.GetText()
|
currentText := textArea.GetText()
|
||||||
atIdx := strings.LastIndex(currentText, "@")
|
atIdx := strings.LastIndex(currentText, "@")
|
||||||
@@ -363,15 +429,18 @@ func showFileCompletionPopup(filter string) {
|
|||||||
before := currentText[:atIdx]
|
before := currentText[:atIdx]
|
||||||
textArea.SetText(before+mainText, true)
|
textArea.SetText(before+mainText, true)
|
||||||
}
|
}
|
||||||
pages.RemovePage("fileCompletionPopup")
|
pages.RemovePage("textAreaFileCompletionPopup")
|
||||||
|
app.SetFocus(textArea)
|
||||||
})
|
})
|
||||||
widget.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
widget.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
||||||
if event.Key() == tcell.KeyEscape {
|
if event.Key() == tcell.KeyEscape {
|
||||||
pages.RemovePage("fileCompletionPopup")
|
pages.RemovePage("textAreaFileCompletionPopup")
|
||||||
|
app.SetFocus(textArea)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
|
if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
|
||||||
pages.RemovePage("fileCompletionPopup")
|
pages.RemovePage("textAreaFileCompletionPopup")
|
||||||
|
app.SetFocus(textArea)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return event
|
return event
|
||||||
@@ -385,8 +454,7 @@ func showFileCompletionPopup(filter string) {
|
|||||||
AddItem(nil, 0, 1, false), width, 1, true).
|
AddItem(nil, 0, 1, false), width, 1, true).
|
||||||
AddItem(nil, 0, 1, false)
|
AddItem(nil, 0, 1, false)
|
||||||
}
|
}
|
||||||
// Add modal page and make it visible
|
pages.AddPage("textAreaFileCompletionPopup", modal(widget, 80, 20), true, true)
|
||||||
pages.AddPage("fileCompletionPopup", modal(widget, 80, 20), true, true)
|
|
||||||
app.SetFocus(widget)
|
app.SetFocus(widget)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -395,38 +463,30 @@ func updateWidgetColors(theme *tview.Theme) {
|
|||||||
fgColor := theme.PrimaryTextColor
|
fgColor := theme.PrimaryTextColor
|
||||||
borderColor := theme.BorderColor
|
borderColor := theme.BorderColor
|
||||||
titleColor := theme.TitleColor
|
titleColor := theme.TitleColor
|
||||||
|
|
||||||
textView.SetBackgroundColor(bgColor)
|
textView.SetBackgroundColor(bgColor)
|
||||||
textView.SetTextColor(fgColor)
|
textView.SetTextColor(fgColor)
|
||||||
textView.SetBorderColor(borderColor)
|
textView.SetBorderColor(borderColor)
|
||||||
textView.SetTitleColor(titleColor)
|
textView.SetTitleColor(titleColor)
|
||||||
|
|
||||||
textArea.SetBackgroundColor(bgColor)
|
textArea.SetBackgroundColor(bgColor)
|
||||||
textArea.SetBorderColor(borderColor)
|
textArea.SetBorderColor(borderColor)
|
||||||
textArea.SetTitleColor(titleColor)
|
textArea.SetTitleColor(titleColor)
|
||||||
textArea.SetTextStyle(tcell.StyleDefault.Background(bgColor).Foreground(fgColor))
|
textArea.SetTextStyle(tcell.StyleDefault.Background(bgColor).Foreground(fgColor))
|
||||||
textArea.SetPlaceholderStyle(tcell.StyleDefault.Background(bgColor).Foreground(fgColor))
|
textArea.SetPlaceholderStyle(tcell.StyleDefault.Background(bgColor).Foreground(fgColor))
|
||||||
// Force textarea refresh by restoring text (SetTextStyle doesn't trigger redraw)
|
|
||||||
textArea.SetText(textArea.GetText(), true)
|
textArea.SetText(textArea.GetText(), true)
|
||||||
|
|
||||||
editArea.SetBackgroundColor(bgColor)
|
editArea.SetBackgroundColor(bgColor)
|
||||||
editArea.SetBorderColor(borderColor)
|
editArea.SetBorderColor(borderColor)
|
||||||
editArea.SetTitleColor(titleColor)
|
editArea.SetTitleColor(titleColor)
|
||||||
editArea.SetTextStyle(tcell.StyleDefault.Background(bgColor).Foreground(fgColor))
|
editArea.SetTextStyle(tcell.StyleDefault.Background(bgColor).Foreground(fgColor))
|
||||||
editArea.SetPlaceholderStyle(tcell.StyleDefault.Background(bgColor).Foreground(fgColor))
|
editArea.SetPlaceholderStyle(tcell.StyleDefault.Background(bgColor).Foreground(fgColor))
|
||||||
// Force textarea refresh by restoring text (SetTextStyle doesn't trigger redraw)
|
|
||||||
editArea.SetText(editArea.GetText(), true)
|
editArea.SetText(editArea.GetText(), true)
|
||||||
|
|
||||||
statusLineWidget.SetBackgroundColor(bgColor)
|
statusLineWidget.SetBackgroundColor(bgColor)
|
||||||
statusLineWidget.SetTextColor(fgColor)
|
statusLineWidget.SetTextColor(fgColor)
|
||||||
statusLineWidget.SetBorderColor(borderColor)
|
statusLineWidget.SetBorderColor(borderColor)
|
||||||
statusLineWidget.SetTitleColor(titleColor)
|
statusLineWidget.SetTitleColor(titleColor)
|
||||||
|
|
||||||
helpView.SetBackgroundColor(bgColor)
|
helpView.SetBackgroundColor(bgColor)
|
||||||
helpView.SetTextColor(fgColor)
|
helpView.SetTextColor(fgColor)
|
||||||
helpView.SetBorderColor(borderColor)
|
helpView.SetBorderColor(borderColor)
|
||||||
helpView.SetTitleColor(titleColor)
|
helpView.SetTitleColor(titleColor)
|
||||||
|
|
||||||
searchField.SetBackgroundColor(bgColor)
|
searchField.SetBackgroundColor(bgColor)
|
||||||
searchField.SetBorderColor(borderColor)
|
searchField.SetBorderColor(borderColor)
|
||||||
searchField.SetTitleColor(titleColor)
|
searchField.SetTitleColor(titleColor)
|
||||||
@@ -444,16 +504,13 @@ func showColorschemeSelectionPopup() {
|
|||||||
if len(schemeNames) == 0 {
|
if len(schemeNames) == 0 {
|
||||||
logger.Warn("no colorschemes available for selection")
|
logger.Warn("no colorschemes available for selection")
|
||||||
message := "No colorschemes available."
|
message := "No colorschemes available."
|
||||||
if err := notifyUser("Empty list", message); err != nil {
|
showToast("Empty list", message)
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// Create a list primitive
|
// Create a list primitive
|
||||||
schemeListWidget := tview.NewList().ShowSecondaryText(false).
|
schemeListWidget := tview.NewList().ShowSecondaryText(false).
|
||||||
SetSelectedBackgroundColor(tcell.ColorGray)
|
SetSelectedBackgroundColor(tcell.ColorGray)
|
||||||
schemeListWidget.SetTitle("Select Colorscheme").SetBorder(true)
|
schemeListWidget.SetTitle("Select Colorscheme").SetBorder(true)
|
||||||
|
|
||||||
currentScheme := "default"
|
currentScheme := "default"
|
||||||
for name := range colorschemes {
|
for name := range colorschemes {
|
||||||
if tview.Styles == colorschemes[name] {
|
if tview.Styles == colorschemes[name] {
|
||||||
@@ -484,14 +541,17 @@ func showColorschemeSelectionPopup() {
|
|||||||
}
|
}
|
||||||
// Remove the popup page
|
// Remove the popup page
|
||||||
pages.RemovePage("colorschemeSelectionPopup")
|
pages.RemovePage("colorschemeSelectionPopup")
|
||||||
|
app.SetFocus(textArea)
|
||||||
})
|
})
|
||||||
schemeListWidget.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
schemeListWidget.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
||||||
if event.Key() == tcell.KeyEscape {
|
if event.Key() == tcell.KeyEscape {
|
||||||
pages.RemovePage("colorschemeSelectionPopup")
|
pages.RemovePage("colorschemeSelectionPopup")
|
||||||
|
app.SetFocus(textArea)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
|
if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
|
||||||
pages.RemovePage("colorschemeSelectionPopup")
|
pages.RemovePage("colorschemeSelectionPopup")
|
||||||
|
app.SetFocus(textArea)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return event
|
return event
|
||||||
|
|||||||
@@ -115,21 +115,12 @@ func makePropsTable(props map[string]float32) *tview.Table {
|
|||||||
row++
|
row++
|
||||||
}
|
}
|
||||||
// Add checkboxes
|
// Add checkboxes
|
||||||
addCheckboxRow("Insert <think> tag (/completion only)", cfg.ThinkUse, func(checked bool) {
|
|
||||||
cfg.ThinkUse = checked
|
|
||||||
})
|
|
||||||
addCheckboxRow("RAG use", cfg.RAGEnabled, func(checked bool) {
|
|
||||||
cfg.RAGEnabled = checked
|
|
||||||
})
|
|
||||||
addCheckboxRow("Inject role", injectRole, func(checked bool) {
|
addCheckboxRow("Inject role", injectRole, func(checked bool) {
|
||||||
injectRole = checked
|
injectRole = checked
|
||||||
})
|
})
|
||||||
addCheckboxRow("TTS Enabled", cfg.TTS_ENABLED, func(checked bool) {
|
addCheckboxRow("TTS Enabled", cfg.TTS_ENABLED, func(checked bool) {
|
||||||
cfg.TTS_ENABLED = checked
|
cfg.TTS_ENABLED = checked
|
||||||
})
|
})
|
||||||
addCheckboxRow("Auto clean tool calls from context", cfg.AutoCleanToolCallsFromCtx, func(checked bool) {
|
|
||||||
cfg.AutoCleanToolCallsFromCtx = checked
|
|
||||||
})
|
|
||||||
addCheckboxRow("Enable Mouse", cfg.EnableMouse, func(checked bool) {
|
addCheckboxRow("Enable Mouse", cfg.EnableMouse, func(checked bool) {
|
||||||
cfg.EnableMouse = checked
|
cfg.EnableMouse = checked
|
||||||
// Reconfigure the app's mouse setting
|
// Reconfigure the app's mouse setting
|
||||||
@@ -262,9 +253,7 @@ func makePropsTable(props map[string]float32) *tview.Table {
|
|||||||
// Handle nil options
|
// Handle nil options
|
||||||
if data.Options == nil {
|
if data.Options == nil {
|
||||||
logger.Error("options list is nil for", "label", label)
|
logger.Error("options list is nil for", "label", label)
|
||||||
if err := notifyUser("Configuration error", "Options list is nil for "+label); err != nil {
|
showToast("Configuration error", "Options list is nil for "+label)
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -282,9 +271,7 @@ func makePropsTable(props map[string]float32) *tview.Table {
|
|||||||
message = "No llama.cpp models loaded. Ensure llama.cpp server is running with models."
|
message = "No llama.cpp models loaded. Ensure llama.cpp server is running with models."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if err := notifyUser("Empty list", message); err != nil {
|
showToast("Empty list", message)
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// Create a list primitive
|
// Create a list primitive
|
||||||
|
|||||||
313
rag/embedder.go
313
rag/embedder.go
@@ -9,6 +9,13 @@ import (
|
|||||||
"gf-lt/models"
|
"gf-lt/models"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"os"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/sugarme/tokenizer"
|
||||||
|
"github.com/sugarme/tokenizer/pretrained"
|
||||||
|
"github.com/yalue/onnxruntime_go"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Embedder defines the interface for embedding text
|
// Embedder defines the interface for embedding text
|
||||||
@@ -27,7 +34,9 @@ type APIEmbedder struct {
|
|||||||
func NewAPIEmbedder(l *slog.Logger, cfg *config.Config) *APIEmbedder {
|
func NewAPIEmbedder(l *slog.Logger, cfg *config.Config) *APIEmbedder {
|
||||||
return &APIEmbedder{
|
return &APIEmbedder{
|
||||||
logger: l,
|
logger: l,
|
||||||
client: &http.Client{},
|
client: &http.Client{
|
||||||
|
Timeout: 30 * time.Second,
|
||||||
|
},
|
||||||
cfg: cfg,
|
cfg: cfg,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -131,15 +140,305 @@ func (a *APIEmbedder) EmbedSlice(lines []string) ([][]float32, error) {
|
|||||||
}
|
}
|
||||||
embeddings[data.Index] = data.Embedding
|
embeddings[data.Index] = data.Embedding
|
||||||
}
|
}
|
||||||
|
|
||||||
return embeddings, nil
|
return embeddings, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: ONNXEmbedder implementation would go here
|
|
||||||
// This would require:
|
|
||||||
// 1. Loading ONNX models locally
|
// 1. Loading ONNX models locally
|
||||||
// 2. Using a Go ONNX runtime (like gorgonia/onnx or similar)
|
// 2. Using a Go ONNX runtime (like gorgonia/onnx or similar)
|
||||||
// 3. Converting text to embeddings without external API calls
|
// 3. Converting text to embeddings without external API calls
|
||||||
//
|
type ONNXEmbedder struct {
|
||||||
// For now, we'll focus on the API implementation which is already working in the current system,
|
session *onnxruntime_go.DynamicAdvancedSession
|
||||||
// and can be extended later when we have ONNX runtime integration
|
tokenizer *tokenizer.Tokenizer
|
||||||
|
tokenizerPath string
|
||||||
|
dims int
|
||||||
|
logger *slog.Logger
|
||||||
|
mu sync.Mutex
|
||||||
|
modelPath string
|
||||||
|
}
|
||||||
|
|
||||||
|
var onnxInitOnce sync.Once
|
||||||
|
var onnxReady bool
|
||||||
|
var onnxLibPath string
|
||||||
|
var cudaLibPath string
|
||||||
|
|
||||||
|
var onnxLibPaths = []string{
|
||||||
|
"/usr/lib/libonnxruntime.so",
|
||||||
|
"/usr/lib/libonnxruntime.so.1.24.2",
|
||||||
|
"/usr/local/lib/libonnxruntime.so",
|
||||||
|
"/usr/lib/x86_64-linux-gnu/libonnxruntime.so",
|
||||||
|
"/opt/onnxruntime/lib/libonnxruntime.so",
|
||||||
|
}
|
||||||
|
|
||||||
|
var cudaLibPaths = []string{
|
||||||
|
"/usr/lib/libonnxruntime_providers_cuda.so",
|
||||||
|
"/usr/local/lib/libonnxruntime_providers_cuda.so",
|
||||||
|
"/opt/onnxruntime/lib/libonnxruntime_providers_cuda.so",
|
||||||
|
}
|
||||||
|
|
||||||
|
func findONNXLibrary() string {
|
||||||
|
for _, path := range onnxLibPaths {
|
||||||
|
if _, err := os.Stat(path); err == nil {
|
||||||
|
return path
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func findCUDALibrary() string {
|
||||||
|
for _, path := range cudaLibPaths {
|
||||||
|
if _, err := os.Stat(path); err == nil {
|
||||||
|
return path
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewONNXEmbedder(modelPath, tokenizerPath string, dims int, logger *slog.Logger) (*ONNXEmbedder, error) {
|
||||||
|
// Check if model and tokenizer files exist
|
||||||
|
if _, err := os.Stat(modelPath); err != nil {
|
||||||
|
return nil, fmt.Errorf("ONNX model not found: %w", err)
|
||||||
|
}
|
||||||
|
if _, err := os.Stat(tokenizerPath); err != nil {
|
||||||
|
return nil, fmt.Errorf("tokenizer not found: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Find ONNX library
|
||||||
|
onnxLibPath = findONNXLibrary()
|
||||||
|
if onnxLibPath == "" {
|
||||||
|
return nil, errors.New("ONNX runtime library not found in standard locations")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Find CUDA provider library (optional)
|
||||||
|
cudaLibPath = findCUDALibrary()
|
||||||
|
if cudaLibPath == "" {
|
||||||
|
fmt.Println("WARNING: CUDA provider library not found, will use CPU")
|
||||||
|
}
|
||||||
|
emb := &ONNXEmbedder{
|
||||||
|
tokenizerPath: tokenizerPath,
|
||||||
|
dims: dims,
|
||||||
|
logger: logger,
|
||||||
|
modelPath: modelPath,
|
||||||
|
}
|
||||||
|
return emb, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e *ONNXEmbedder) ensureInitialized() error {
|
||||||
|
if e.session != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
e.mu.Lock()
|
||||||
|
defer e.mu.Unlock()
|
||||||
|
if e.session != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
// Load tokenizer lazily
|
||||||
|
if e.tokenizer == nil {
|
||||||
|
tok, err := pretrained.FromFile(e.tokenizerPath)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to load tokenizer: %w", err)
|
||||||
|
}
|
||||||
|
e.tokenizer = tok
|
||||||
|
}
|
||||||
|
onnxInitOnce.Do(func() {
|
||||||
|
onnxruntime_go.SetSharedLibraryPath(onnxLibPath)
|
||||||
|
if err := onnxruntime_go.InitializeEnvironment(); err != nil {
|
||||||
|
e.logger.Error("failed to initialize ONNX runtime", "error", err)
|
||||||
|
onnxReady = false
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Register CUDA provider if available
|
||||||
|
if cudaLibPath != "" {
|
||||||
|
if err := onnxruntime_go.RegisterExecutionProviderLibrary("CUDA", cudaLibPath); err != nil {
|
||||||
|
e.logger.Warn("failed to register CUDA provider", "error", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
onnxReady = true
|
||||||
|
})
|
||||||
|
if !onnxReady {
|
||||||
|
return errors.New("ONNX runtime not ready")
|
||||||
|
}
|
||||||
|
// Create session options
|
||||||
|
opts, err := onnxruntime_go.NewSessionOptions()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to create session options: %w", err)
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
_ = opts.Destroy()
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Try to add CUDA provider
|
||||||
|
useCUDA := cudaLibPath != ""
|
||||||
|
if useCUDA {
|
||||||
|
cudaOpts, err := onnxruntime_go.NewCUDAProviderOptions()
|
||||||
|
if err != nil {
|
||||||
|
e.logger.Warn("failed to create CUDA provider options, falling back to CPU", "error", err)
|
||||||
|
useCUDA = false
|
||||||
|
} else {
|
||||||
|
defer func() {
|
||||||
|
_ = cudaOpts.Destroy()
|
||||||
|
}()
|
||||||
|
if err := cudaOpts.Update(map[string]string{"device_id": "0"}); err != nil {
|
||||||
|
e.logger.Warn("failed to update CUDA options, falling back to CPU", "error", err)
|
||||||
|
useCUDA = false
|
||||||
|
} else if err := opts.AppendExecutionProviderCUDA(cudaOpts); err != nil {
|
||||||
|
e.logger.Warn("failed to append CUDA provider, falling back to CPU", "error", err)
|
||||||
|
useCUDA = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if useCUDA {
|
||||||
|
e.logger.Info("Using CUDA for ONNX inference")
|
||||||
|
} else {
|
||||||
|
e.logger.Info("Using CPU for ONNX inference")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create session with options
|
||||||
|
session, err := onnxruntime_go.NewDynamicAdvancedSession(
|
||||||
|
e.getModelPath(),
|
||||||
|
[]string{"input_ids", "attention_mask"},
|
||||||
|
[]string{"sentence_embedding"},
|
||||||
|
opts,
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to create ONNX session: %w", err)
|
||||||
|
}
|
||||||
|
e.session = session
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e *ONNXEmbedder) getModelPath() string {
|
||||||
|
return e.modelPath
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e *ONNXEmbedder) Destroy() error {
|
||||||
|
e.mu.Lock()
|
||||||
|
defer e.mu.Unlock()
|
||||||
|
if e.session != nil {
|
||||||
|
if err := e.session.Destroy(); err != nil {
|
||||||
|
return fmt.Errorf("failed to destroy ONNX session: %w", err)
|
||||||
|
}
|
||||||
|
e.session = nil
|
||||||
|
e.logger.Info("ONNX session destroyed, VRAM freed")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e *ONNXEmbedder) Embed(text string) ([]float32, error) {
|
||||||
|
if err := e.ensureInitialized(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
// 1. Tokenize
|
||||||
|
encoding, err := e.tokenizer.EncodeSingle(text)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("tokenization failed: %w", err)
|
||||||
|
}
|
||||||
|
// 2. Convert to int64 and create attention mask
|
||||||
|
ids := encoding.Ids
|
||||||
|
inputIDs := make([]int64, len(ids))
|
||||||
|
attentionMask := make([]int64, len(ids))
|
||||||
|
for i, id := range ids {
|
||||||
|
inputIDs[i] = int64(id)
|
||||||
|
attentionMask[i] = 1
|
||||||
|
}
|
||||||
|
// 3. Create input tensors (shape: [1, seq_len])
|
||||||
|
seqLen := int64(len(inputIDs))
|
||||||
|
inputIDsTensor, err := onnxruntime_go.NewTensor[int64](
|
||||||
|
onnxruntime_go.NewShape(1, seqLen),
|
||||||
|
inputIDs,
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to create input_ids tensor: %w", err)
|
||||||
|
}
|
||||||
|
defer func() { _ = inputIDsTensor.Destroy() }()
|
||||||
|
maskTensor, err := onnxruntime_go.NewTensor[int64](
|
||||||
|
onnxruntime_go.NewShape(1, seqLen),
|
||||||
|
attentionMask,
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to create attention_mask tensor: %w", err)
|
||||||
|
}
|
||||||
|
defer func() { _ = maskTensor.Destroy() }()
|
||||||
|
// 4. Create output tensor
|
||||||
|
outputTensor, err := onnxruntime_go.NewEmptyTensor[float32](
|
||||||
|
onnxruntime_go.NewShape(1, int64(e.dims)),
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to create output tensor: %w", err)
|
||||||
|
}
|
||||||
|
defer func() { _ = outputTensor.Destroy() }()
|
||||||
|
// 5. Run inference
|
||||||
|
err = e.session.Run(
|
||||||
|
[]onnxruntime_go.Value{inputIDsTensor, maskTensor},
|
||||||
|
[]onnxruntime_go.Value{outputTensor},
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("inference failed: %w", err)
|
||||||
|
}
|
||||||
|
// 6. Copy output data
|
||||||
|
outputData := outputTensor.GetData()
|
||||||
|
embedding := make([]float32, len(outputData))
|
||||||
|
copy(embedding, outputData)
|
||||||
|
return embedding, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e *ONNXEmbedder) EmbedSlice(texts []string) ([][]float32, error) {
|
||||||
|
if err := e.ensureInitialized(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
encodings := make([]*tokenizer.Encoding, len(texts))
|
||||||
|
maxLen := 0
|
||||||
|
for i, txt := range texts {
|
||||||
|
enc, err := e.tokenizer.EncodeSingle(txt)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
encodings[i] = enc
|
||||||
|
if l := len(enc.Ids); l > maxLen {
|
||||||
|
maxLen = l
|
||||||
|
}
|
||||||
|
}
|
||||||
|
batchSize := len(texts)
|
||||||
|
inputIDs := make([]int64, batchSize*maxLen)
|
||||||
|
attentionMask := make([]int64, batchSize*maxLen)
|
||||||
|
for i, enc := range encodings {
|
||||||
|
ids := enc.Ids
|
||||||
|
offset := i * maxLen
|
||||||
|
for j, id := range ids {
|
||||||
|
inputIDs[offset+j] = int64(id)
|
||||||
|
attentionMask[offset+j] = 1
|
||||||
|
}
|
||||||
|
// Remaining positions are already zero (padding)
|
||||||
|
}
|
||||||
|
// Create tensors with shape [batchSize, maxLen]
|
||||||
|
inputTensor, _ := onnxruntime_go.NewTensor[int64](
|
||||||
|
onnxruntime_go.NewShape(int64(batchSize), int64(maxLen)),
|
||||||
|
inputIDs,
|
||||||
|
)
|
||||||
|
defer func() { _ = inputTensor.Destroy() }()
|
||||||
|
maskTensor, _ := onnxruntime_go.NewTensor[int64](
|
||||||
|
onnxruntime_go.NewShape(int64(batchSize), int64(maxLen)),
|
||||||
|
attentionMask,
|
||||||
|
)
|
||||||
|
defer func() { _ = maskTensor.Destroy() }()
|
||||||
|
outputTensor, _ := onnxruntime_go.NewEmptyTensor[float32](
|
||||||
|
onnxruntime_go.NewShape(int64(batchSize), int64(e.dims)),
|
||||||
|
)
|
||||||
|
defer func() { _ = outputTensor.Destroy() }()
|
||||||
|
err := e.session.Run(
|
||||||
|
[]onnxruntime_go.Value{inputTensor, maskTensor},
|
||||||
|
[]onnxruntime_go.Value{outputTensor},
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
// Extract embeddings per batch item
|
||||||
|
data := outputTensor.GetData()
|
||||||
|
embeddings := make([][]float32, batchSize)
|
||||||
|
for i := 0; i < batchSize; i++ {
|
||||||
|
start := i * e.dims
|
||||||
|
emb := make([]float32, e.dims)
|
||||||
|
copy(emb, data[start:start+e.dims])
|
||||||
|
embeddings[i] = emb
|
||||||
|
}
|
||||||
|
return embeddings, nil
|
||||||
|
}
|
||||||
|
|||||||
181
rag/extractors.go
Normal file
181
rag/extractors.go
Normal file
@@ -0,0 +1,181 @@
|
|||||||
|
package rag
|
||||||
|
|
||||||
|
import (
|
||||||
|
"archive/zip"
|
||||||
|
"bytes"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"path"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/PuerkitoBio/goquery"
|
||||||
|
"github.com/ledongthuc/pdf"
|
||||||
|
"github.com/yuin/goldmark"
|
||||||
|
"github.com/yuin/goldmark/extension"
|
||||||
|
"github.com/yuin/goldmark/parser"
|
||||||
|
"github.com/yuin/goldmark/renderer/html"
|
||||||
|
)
|
||||||
|
|
||||||
|
func ExtractText(fpath string) (string, error) {
|
||||||
|
ext := strings.ToLower(path.Ext(fpath))
|
||||||
|
switch ext {
|
||||||
|
case ".txt":
|
||||||
|
return extractTextFromFile(fpath)
|
||||||
|
case ".md", ".markdown":
|
||||||
|
return extractTextFromMarkdown(fpath)
|
||||||
|
case ".html", ".htm":
|
||||||
|
return extractTextFromHtmlFile(fpath)
|
||||||
|
case ".epub":
|
||||||
|
return extractTextFromEpub(fpath)
|
||||||
|
case ".pdf":
|
||||||
|
return extractTextFromPdf(fpath)
|
||||||
|
default:
|
||||||
|
return "", fmt.Errorf("unsupported file format: %s", ext)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func extractTextFromFile(fpath string) (string, error) {
|
||||||
|
data, err := os.ReadFile(fpath)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return string(data), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func extractTextFromHtmlFile(fpath string) (string, error) {
|
||||||
|
data, err := os.ReadFile(fpath)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return extractTextFromHtmlContent(data)
|
||||||
|
}
|
||||||
|
|
||||||
|
// non utf-8 encoding?
|
||||||
|
func extractTextFromHtmlContent(data []byte) (string, error) {
|
||||||
|
doc, err := goquery.NewDocumentFromReader(bytes.NewReader(data))
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
// Remove script and style tags
|
||||||
|
doc.Find("script, style, noscript").Each(func(i int, s *goquery.Selection) {
|
||||||
|
s.Remove()
|
||||||
|
})
|
||||||
|
// Get text and clean it
|
||||||
|
text := doc.Text()
|
||||||
|
// Collapse all whitespace (newlines, tabs, multiple spaces) into single spaces
|
||||||
|
cleaned := strings.Join(strings.Fields(text), " ")
|
||||||
|
return cleaned, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func extractTextFromMarkdown(fpath string) (string, error) {
|
||||||
|
data, err := os.ReadFile(fpath)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
// Convert markdown to HTML
|
||||||
|
md := goldmark.New(
|
||||||
|
goldmark.WithExtensions(extension.GFM),
|
||||||
|
goldmark.WithParserOptions(parser.WithAutoHeadingID()),
|
||||||
|
goldmark.WithRendererOptions(html.WithUnsafe()), // allow raw HTML if needed
|
||||||
|
)
|
||||||
|
var buf bytes.Buffer
|
||||||
|
if err := md.Convert(data, &buf); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
// Now extract text from the resulting HTML (using goquery or similar)
|
||||||
|
return extractTextFromHtmlContent(buf.Bytes())
|
||||||
|
}
|
||||||
|
|
||||||
|
func extractTextFromEpub(fpath string) (string, error) {
|
||||||
|
r, err := zip.OpenReader(fpath)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to open epub: %w", err)
|
||||||
|
}
|
||||||
|
defer r.Close()
|
||||||
|
var sb strings.Builder
|
||||||
|
for _, f := range r.File {
|
||||||
|
ext := strings.ToLower(path.Ext(f.Name))
|
||||||
|
if ext != ".xhtml" && ext != ".html" && ext != ".htm" && ext != ".xml" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
// Skip manifest, toc, ncx files - they don't contain book content
|
||||||
|
nameLower := strings.ToLower(f.Name)
|
||||||
|
if strings.Contains(nameLower, "toc") || strings.Contains(nameLower, "nav") ||
|
||||||
|
strings.Contains(nameLower, "manifest") || strings.Contains(nameLower, ".opf") ||
|
||||||
|
strings.HasSuffix(nameLower, ".ncx") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
rc, err := f.Open()
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
if sb.Len() > 0 {
|
||||||
|
sb.WriteString("\n\n")
|
||||||
|
}
|
||||||
|
sb.WriteString(f.Name)
|
||||||
|
sb.WriteString("\n")
|
||||||
|
|
||||||
|
buf, readErr := io.ReadAll(rc)
|
||||||
|
rc.Close()
|
||||||
|
if readErr == nil {
|
||||||
|
sb.WriteString(stripHTML(string(buf)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if sb.Len() == 0 {
|
||||||
|
return "", errors.New("no content extracted from epub")
|
||||||
|
}
|
||||||
|
return sb.String(), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func stripHTML(html string) string {
|
||||||
|
var sb strings.Builder
|
||||||
|
inTag := false
|
||||||
|
for _, r := range html {
|
||||||
|
switch r {
|
||||||
|
case '<':
|
||||||
|
inTag = true
|
||||||
|
case '>':
|
||||||
|
inTag = false
|
||||||
|
default:
|
||||||
|
if !inTag {
|
||||||
|
sb.WriteRune(r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return sb.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
func extractTextFromPdf(fpath string) (string, error) {
|
||||||
|
_, err := exec.LookPath("pdftotext")
|
||||||
|
if err == nil {
|
||||||
|
out, err := exec.Command("pdftotext", "-layout", fpath, "-").Output()
|
||||||
|
if err == nil && len(out) > 0 {
|
||||||
|
return string(out), nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return extractTextFromPdfPureGo(fpath)
|
||||||
|
}
|
||||||
|
|
||||||
|
func extractTextFromPdfPureGo(fpath string) (string, error) {
|
||||||
|
df, r, err := pdf.Open(fpath)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to open pdf: %w", err)
|
||||||
|
}
|
||||||
|
defer df.Close()
|
||||||
|
textReader, err := r.GetPlainText()
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to extract text from pdf: %w", err)
|
||||||
|
}
|
||||||
|
var buf bytes.Buffer
|
||||||
|
_, err = io.Copy(&buf, textReader)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to read pdf text: %w", err)
|
||||||
|
}
|
||||||
|
return buf.String(), nil
|
||||||
|
}
|
||||||
1257
rag/rag.go
1257
rag/rag.go
File diff suppressed because it is too large
Load Diff
409
rag/rag_integration_test.go
Normal file
409
rag/rag_integration_test.go
Normal file
@@ -0,0 +1,409 @@
|
|||||||
|
package rag
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"gf-lt/config"
|
||||||
|
"gf-lt/models"
|
||||||
|
"gf-lt/storage"
|
||||||
|
"log/slog"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
_ "github.com/glebarez/go-sqlite"
|
||||||
|
"github.com/jmoiron/sqlx"
|
||||||
|
)
|
||||||
|
|
||||||
|
// mockEmbedder returns zero vectors of a fixed dimension.
|
||||||
|
type mockEmbedder struct {
|
||||||
|
dim int
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *mockEmbedder) Embed(text string) ([]float32, error) {
|
||||||
|
vec := make([]float32, m.dim)
|
||||||
|
return vec, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *mockEmbedder) EmbedSlice(texts []string) ([][]float32, error) {
|
||||||
|
vecs := make([][]float32, len(texts))
|
||||||
|
for i := range vecs {
|
||||||
|
vecs[i] = make([]float32, m.dim)
|
||||||
|
}
|
||||||
|
return vecs, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// dummyStore implements storage.FullRepo with a minimal set of methods.
|
||||||
|
// Only DB() is used by VectorStorage; other methods return empty values.
|
||||||
|
type dummyStore struct {
|
||||||
|
db *sqlx.DB
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d dummyStore) DB() *sqlx.DB { return d.db }
|
||||||
|
|
||||||
|
// ChatHistory methods
|
||||||
|
func (d dummyStore) ListChats() ([]models.Chat, error) { return nil, nil }
|
||||||
|
func (d dummyStore) GetChatByID(id uint32) (*models.Chat, error) { return nil, nil }
|
||||||
|
func (d dummyStore) GetChatByChar(char string) ([]models.Chat, error) { return nil, nil }
|
||||||
|
func (d dummyStore) GetLastChat() (*models.Chat, error) { return nil, nil }
|
||||||
|
func (d dummyStore) GetLastChatByAgent(agent string) (*models.Chat, error) { return nil, nil }
|
||||||
|
func (d dummyStore) UpsertChat(chat *models.Chat) (*models.Chat, error) { return chat, nil }
|
||||||
|
func (d dummyStore) RemoveChat(id uint32) error { return nil }
|
||||||
|
func (d dummyStore) ChatGetMaxID() (uint32, error) { return 0, nil }
|
||||||
|
|
||||||
|
// Memories methods
|
||||||
|
func (d dummyStore) Memorise(m *models.Memory) (*models.Memory, error) { return m, nil }
|
||||||
|
func (d dummyStore) Recall(agent, topic string) (string, error) { return "", nil }
|
||||||
|
func (d dummyStore) RecallTopics(agent string) ([]string, error) { return nil, nil }
|
||||||
|
|
||||||
|
// VectorRepo methods (not used but required by interface)
|
||||||
|
func (d dummyStore) WriteVector(row *models.VectorRow) error { return nil }
|
||||||
|
func (d dummyStore) SearchClosest(q []float32, limit int) ([]models.VectorRow, error) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
func (d dummyStore) ListFiles() ([]string, error) { return nil, nil }
|
||||||
|
func (d dummyStore) RemoveEmbByFileName(filename string) error { return nil }
|
||||||
|
|
||||||
|
var _ storage.FullRepo = dummyStore{}
|
||||||
|
|
||||||
|
// setupTestRAG creates an in‑memory SQLite database, creates the necessary tables,
|
||||||
|
// inserts the provided chunks, and returns a RAG instance with a mock embedder.
|
||||||
|
func setupTestRAG(t *testing.T, chunks []*models.VectorRow) (*RAG, error) {
|
||||||
|
t.Helper()
|
||||||
|
db, err := sqlx.Open("sqlite", ":memory:")
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("open in‑memory db: %w", err)
|
||||||
|
}
|
||||||
|
// Create the required tables (embeddings_768 and fts_embeddings).
|
||||||
|
// Use the same schema as production.
|
||||||
|
_, err = db.Exec(`
|
||||||
|
CREATE TABLE embeddings_768 (
|
||||||
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
|
embeddings BLOB NOT NULL,
|
||||||
|
slug TEXT NOT NULL,
|
||||||
|
raw_text TEXT NOT NULL,
|
||||||
|
filename TEXT NOT NULL DEFAULT ''
|
||||||
|
);
|
||||||
|
`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("create embeddings table: %w", err)
|
||||||
|
}
|
||||||
|
_, err = db.Exec(`
|
||||||
|
CREATE VIRTUAL TABLE fts_embeddings USING fts5(
|
||||||
|
slug UNINDEXED,
|
||||||
|
raw_text,
|
||||||
|
filename UNINDEXED,
|
||||||
|
embedding_size UNINDEXED,
|
||||||
|
tokenize='porter unicode61'
|
||||||
|
);
|
||||||
|
`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("create FTS table: %w", err)
|
||||||
|
}
|
||||||
|
// Create a logger that discards output.
|
||||||
|
logger := slog.New(slog.NewTextHandler(nil, &slog.HandlerOptions{Level: slog.LevelError}))
|
||||||
|
store := dummyStore{db: db}
|
||||||
|
// Create config with embedding dimension 768.
|
||||||
|
cfg := &config.Config{
|
||||||
|
EmbedDims: 768,
|
||||||
|
RAGWordLimit: 250,
|
||||||
|
RAGOverlapWords: 25,
|
||||||
|
RAGBatchSize: 1,
|
||||||
|
}
|
||||||
|
// Create a RAG instance using New, which will create an embedder based on config.
|
||||||
|
// We'll override the embedder afterwards via reflection.
|
||||||
|
rag, err := New(logger, store, cfg)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("create RAG: %w", err)
|
||||||
|
}
|
||||||
|
// Replace the embedder with our mock.
|
||||||
|
rag.SetEmbedderForTesting(&mockEmbedder{dim: cfg.EmbedDims})
|
||||||
|
// Insert the provided chunks using the storage directly.
|
||||||
|
if len(chunks) > 0 {
|
||||||
|
// Ensure each chunk has embeddings of correct dimension (zero vector).
|
||||||
|
for _, chunk := range chunks {
|
||||||
|
if len(chunk.Embeddings) != cfg.EmbedDims {
|
||||||
|
chunk.Embeddings = make([]float32, cfg.EmbedDims)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
err = rag.storage.WriteVectors(chunks)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("write test chunks: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return rag, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// createTestChunks returns a slice of VectorRow representing the target chunk
|
||||||
|
// (kjv_bible.epub_1786_0), several bald‑related noise chunks, and unrelated chunks.
|
||||||
|
func createTestChunks() []*models.VectorRow {
|
||||||
|
// Target chunk: 2 Kings 2:23‑24 containing "bald head" and "two she bears".
|
||||||
|
targetRaw := `And he said, Ye shall not send.
|
||||||
|
|
||||||
|
|
||||||
|
2:17 And when they urged him till he was ashamed, he said, Send. They sent
|
||||||
|
therefore fifty men; and they sought three days, but found him not.
|
||||||
|
|
||||||
|
|
||||||
|
2:18 And when they came again to him, (for he tarried at Jericho,) he said unto
|
||||||
|
them, Did I not say unto you, Go not? 2:19 And the men of the city said unto
|
||||||
|
Elisha, Behold, I pray thee, the situation of this city is pleasant, as my lord
|
||||||
|
seeth: but the water is naught, and the ground barren.
|
||||||
|
|
||||||
|
|
||||||
|
2:20 And he said, Bring me a new cruse, and put salt therein. And they brought
|
||||||
|
it to him.
|
||||||
|
|
||||||
|
|
||||||
|
2:21 And he went forth unto the spring of the waters, and cast the salt in
|
||||||
|
there, and said, Thus saith the LORD, I have healed these waters; there shall
|
||||||
|
not be from thence any more death or barren land.
|
||||||
|
|
||||||
|
|
||||||
|
2:22 So the waters were healed unto this day, according to the saying of Elisha
|
||||||
|
which he spake.
|
||||||
|
|
||||||
|
|
||||||
|
2:23 And he went up from thence unto Bethel: and as he was going up by the way,
|
||||||
|
there came forth little children out of the city, and mocked him, and said unto
|
||||||
|
him, Go up, thou bald head; go up, thou bald head.
|
||||||
|
|
||||||
|
|
||||||
|
2:24 And he turned back, and looked on them, and cursed them in the name of the
|
||||||
|
LORD. And there came forth two she bears out of the wood, and tare forty and
|
||||||
|
two children of them.`
|
||||||
|
// Noise chunk 1: Leviticus containing "bald locust"
|
||||||
|
noise1Raw := `11:12 Whatsoever hath no fins nor scales in the waters, that shall be an
|
||||||
|
abomination unto you.
|
||||||
|
|
||||||
|
|
||||||
|
11:13 And these are they which ye shall have in abomination among the fowls;
|
||||||
|
they shall not be eaten, they are an abomination: the eagle, and the ossifrage,
|
||||||
|
and the ospray, 11:14 And the vulture, and the kite after his kind; 11:15 Every
|
||||||
|
raven after his kind; 11:16 And the owl, and the night hawk, and the cuckow,
|
||||||
|
and the hawk after his kind, 11:17 And the little owl, and the cormorant, and
|
||||||
|
the great owl, 11:18 And the swan, and the pelican, and the gier eagle, 11:19
|
||||||
|
And the stork, the heron after her kind, and the lapwing, and the bat.
|
||||||
|
|
||||||
|
|
||||||
|
11:20 All fowls that creep, going upon all four, shall be an abomination unto
|
||||||
|
you.
|
||||||
|
|
||||||
|
|
||||||
|
11:21 Yet these may ye eat of every flying creeping thing that goeth upon all
|
||||||
|
four, which have legs above their feet, to leap withal upon the earth; 11:22
|
||||||
|
Even these of them ye may eat; the locust after his kind, and the bald locust
|
||||||
|
after his kind, and the beetle after his kind, and the grasshopper after his
|
||||||
|
kind.
|
||||||
|
|
||||||
|
|
||||||
|
11:23 But all other flying creeping things, which have four feet, shall be an
|
||||||
|
abomination unto you.
|
||||||
|
|
||||||
|
|
||||||
|
11:24 And for these ye shall be unclean: whosoever toucheth the carcase of them
|
||||||
|
shall be unclean until the even.`
|
||||||
|
// Noise chunk 2: Leviticus containing "bald"
|
||||||
|
noise2Raw := `11:13 And these are they which ye shall have in abomination among the fowls;
|
||||||
|
they shall not be eaten, they are an abomination: the eagle, and the ossifrage,
|
||||||
|
and the ospray, 11:14 And the vulture, and the kite after his kind; 11:15 Every
|
||||||
|
raven after his kind; 11:16 And the owl, and the night hawk, and the cuckow,
|
||||||
|
and the hawk after his kind, 11:17 And the little owl, and the cormorant, and
|
||||||
|
the great owl, 11:18 And the swan, and the pelican, and the gier eagle, 11:19
|
||||||
|
And the stork, the heron after her kind, and the lapwing, and the bat.
|
||||||
|
|
||||||
|
|
||||||
|
11:20 All fowls that creep, going upon all four, shall be an abomination unto
|
||||||
|
you.
|
||||||
|
|
||||||
|
|
||||||
|
11:21 Yet these may ye eat of every flying creeping thing that goeth upon all
|
||||||
|
four, which have legs above their feet, to leap withal upon the earth; 11:22
|
||||||
|
Even these of them ye may eat; the locust after his kind, and the bald locust
|
||||||
|
after his kind, and the beetle after his kind, and the grasshopper after his
|
||||||
|
kind.
|
||||||
|
|
||||||
|
|
||||||
|
11:23 But all other flying creeping things, which have four feet, shall be an
|
||||||
|
abomination unto you.
|
||||||
|
|
||||||
|
|
||||||
|
11:24 And for these ye shall be unclean: whosoever toucheth the carcase of them
|
||||||
|
shall be unclean until the even.`
|
||||||
|
// Additional Leviticus noise chunks (simulating 28 bald-related chunks)
|
||||||
|
// Using variations of the same text with different slugs
|
||||||
|
leviticusSlugs := []string{
|
||||||
|
"kjv_bible.epub_564_0",
|
||||||
|
"kjv_bible.epub_565_0",
|
||||||
|
"kjv_bible.epub_579_0",
|
||||||
|
"kjv_bible.epub_580_0",
|
||||||
|
"kjv_bible.epub_581_0",
|
||||||
|
"kjv_bible.epub_582_0",
|
||||||
|
"kjv_bible.epub_583_0",
|
||||||
|
"kjv_bible.epub_584_0",
|
||||||
|
"kjv_bible.epub_585_0",
|
||||||
|
"kjv_bible.epub_586_0",
|
||||||
|
"kjv_bible.epub_587_0",
|
||||||
|
"kjv_bible.epub_588_0",
|
||||||
|
"kjv_bible.epub_589_0",
|
||||||
|
"kjv_bible.epub_590_0",
|
||||||
|
}
|
||||||
|
leviticusTexts := []string{
|
||||||
|
noise1Raw,
|
||||||
|
noise2Raw,
|
||||||
|
`13:40 And the man whose hair is fallen off his head, he is bald; yet is he
|
||||||
|
clean.
|
||||||
|
|
||||||
|
|
||||||
|
13:41 And he that hath his hair fallen off from the part of his head toward his
|
||||||
|
face, he is forehead bald; yet is he clean.`,
|
||||||
|
`13:42 And if there be in the bald head, or bald forehead, a white reddish sore;
|
||||||
|
it is a leprosy sprung up in his bald head, or his bald forehead.`,
|
||||||
|
`13:43 Then the priest shall look upon it: and, behold, if the rising of the
|
||||||
|
sore be white reddish in his bald head, or in his bald forehead, as the leprosy
|
||||||
|
appearedh in the skin of the flesh;`,
|
||||||
|
`13:44 He is a leprous man, he is unclean: the priest shall pronounce him utterly
|
||||||
|
unclean; his plague is in his head.`,
|
||||||
|
`13:45 And the leper in whom the plague is, his clothes shall be rent, and his
|
||||||
|
head bare, and he shall put a covering upon his upper lip, and shall cry,
|
||||||
|
Unclean, unclean.`,
|
||||||
|
`13:46 All the days wherein the plague shall be in him he shall be defiled; he
|
||||||
|
is unclean: he shall dwell alone; without the camp shall his habitation be.`,
|
||||||
|
`13:47 The garment also that the plague of leprosy is in, whether it be a woollen
|
||||||
|
garment, or a linen garment;`,
|
||||||
|
`13:48 Whether it be in the warp, or woof; of linen, or of woollen; whether in a
|
||||||
|
skin, or in any thing made of skin;`,
|
||||||
|
`13:49 And if the plague be greenish or reddish in the garment, or in the skin,
|
||||||
|
either in the warp, or in the woof, or in any thing of skin; it is a plague of
|
||||||
|
leprosy, and shall be shewed unto the priest:`,
|
||||||
|
`13:50 And the priest shall look upon the plague, and shut up it that hath the
|
||||||
|
plague seven days:`,
|
||||||
|
`13:51 And he shall look on the plague on the seventh day: if the plague be spread
|
||||||
|
in the garment, either in the warp, or in the woof, or in a skin, or in any work
|
||||||
|
that is made of skin; the plague is a fretting leprosy; it is unclean.`,
|
||||||
|
`13:52 He shall therefore burn that garment, whether warp or woof, in woollen or
|
||||||
|
in linen, or any thing of skin, wherein the plague is: for it is a fretting
|
||||||
|
leprosy; it shall be burnt in the fire.`,
|
||||||
|
}
|
||||||
|
// Unrelated chunk 1: ghost_7.txt_777_0
|
||||||
|
unrelated1Raw := `Doesn’t he have any pride as a hunter?!
|
||||||
|
|
||||||
|
I didn’t see what other choice I had. I would just have to grovel and be ready to flee at any given moment.
|
||||||
|
The Hidden Curse clan house was in the central region of the imperial capital. It was a high-class area with extraordinary property values that hosted the residences of people like Lord Gladis. This district was near the Imperial Castle, though “near” was a
|
||||||
|
relative term as it was still a few kilometers away.
|
||||||
|
|
||||||
|
The clan house was made of brick and conformed to an older style of architecture.`
|
||||||
|
// Unrelated chunk 2: ghost_7.txt_778_0
|
||||||
|
unrelated2Raw := `I would just have to grovel and be ready to flee at any given moment.
|
||||||
|
The Hidden Curse clan house was in the central region of the imperial capital. It was a high-class area with extraordinary property values that hosted the residences of people like Lord Gladis. This district was near the Imperial Castle, though “near” was a
|
||||||
|
relative term as it was still a few kilometers away.
|
||||||
|
|
||||||
|
The clan house was made of brick and conformed to an older style of architecture. Nearly everyone knew about this mansion and its clock tower. It stood tall over the neighboring mansions and rumor had it that you could see the whole capital from the top. It
|
||||||
|
spoke to this clan’s renown and history that they were able to get away with building something that dwarfed the mansions of the nobility.`
|
||||||
|
|
||||||
|
chunks := []*models.VectorRow{
|
||||||
|
{
|
||||||
|
Slug: "kjv_bible.epub_1786_0",
|
||||||
|
RawText: targetRaw,
|
||||||
|
FileName: "kjv_bible.epub",
|
||||||
|
Embeddings: nil, // will be filled with zero vector later
|
||||||
|
},
|
||||||
|
}
|
||||||
|
// Add Leviticus noise chunks
|
||||||
|
for i, slug := range leviticusSlugs {
|
||||||
|
text := leviticusTexts[i%len(leviticusTexts)]
|
||||||
|
chunks = append(chunks, &models.VectorRow{
|
||||||
|
Slug: slug,
|
||||||
|
RawText: text,
|
||||||
|
FileName: "kjv_bible.epub",
|
||||||
|
Embeddings: nil,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
// Add unrelated chunks
|
||||||
|
chunks = append(chunks,
|
||||||
|
&models.VectorRow{
|
||||||
|
Slug: "ghost_7.txt_777_0",
|
||||||
|
RawText: unrelated1Raw,
|
||||||
|
FileName: "ghost_7.txt",
|
||||||
|
Embeddings: nil,
|
||||||
|
},
|
||||||
|
&models.VectorRow{
|
||||||
|
Slug: "ghost_7.txt_778_0",
|
||||||
|
RawText: unrelated2Raw,
|
||||||
|
FileName: "ghost_7.txt",
|
||||||
|
Embeddings: nil,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
return chunks
|
||||||
|
}
|
||||||
|
func assertTargetInTopN(t *testing.T, results []models.VectorRow, topN int) bool {
|
||||||
|
t.Helper()
|
||||||
|
for i, row := range results {
|
||||||
|
if i >= topN {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
if row.Slug == "kjv_bible.epub_1786_0" {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestBiblicalQuery(t *testing.T) {
|
||||||
|
chunks := createTestChunks()
|
||||||
|
rag, err := setupTestRAG(t, chunks)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("setup failed: %v", err)
|
||||||
|
}
|
||||||
|
query := "bald prophet and two she bears"
|
||||||
|
results, err := rag.Search(query, 10)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("search failed: %v", err)
|
||||||
|
}
|
||||||
|
// The target chunk should be in the top results.
|
||||||
|
if !assertTargetInTopN(t, results, 5) {
|
||||||
|
t.Errorf("target chunk not found in top 5 results for query %q", query)
|
||||||
|
t.Logf("results slugs: %v", func() []string {
|
||||||
|
slugs := make([]string, len(results))
|
||||||
|
for i, r := range results {
|
||||||
|
slugs[i] = r.Slug
|
||||||
|
}
|
||||||
|
return slugs
|
||||||
|
}())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestQueryVariations(t *testing.T) {
|
||||||
|
chunks := createTestChunks()
|
||||||
|
rag, err := setupTestRAG(t, chunks)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("setup failed: %v", err)
|
||||||
|
}
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
query string
|
||||||
|
topN int
|
||||||
|
}{
|
||||||
|
{"she bears", "she bears", 5},
|
||||||
|
{"bald head", "bald head", 5},
|
||||||
|
{"two she bears out of the wood", "two she bears out of the wood", 5},
|
||||||
|
{"bald prophet", "bald prophet", 10},
|
||||||
|
{"go up thou bald head", "\"go up thou bald head\"", 5},
|
||||||
|
{"two she bears", "\"two she bears\"", 5},
|
||||||
|
}
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
results, err := rag.Search(tt.query, 10)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("search failed: %v", err)
|
||||||
|
}
|
||||||
|
if !assertTargetInTopN(t, results, tt.topN) {
|
||||||
|
t.Errorf("target chunk not found in top %d results for query %q", tt.topN, tt.query)
|
||||||
|
t.Logf("results slugs: %v", func() []string {
|
||||||
|
slugs := make([]string, len(results))
|
||||||
|
for i, r := range results {
|
||||||
|
slugs[i] = r.Slug
|
||||||
|
}
|
||||||
|
return slugs
|
||||||
|
}())
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
131
rag/rag_real_test.go
Normal file
131
rag/rag_real_test.go
Normal file
@@ -0,0 +1,131 @@
|
|||||||
|
package rag
|
||||||
|
|
||||||
|
import (
|
||||||
|
"gf-lt/config"
|
||||||
|
"gf-lt/storage"
|
||||||
|
"log/slog"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestRealBiblicalQuery(t *testing.T) {
|
||||||
|
if testing.Short() {
|
||||||
|
t.Skip("skipping real embedder test in short mode")
|
||||||
|
}
|
||||||
|
// Check if the embedder model exists
|
||||||
|
modelPath := filepath.Join("..", "onnx", "embedgemma", "model_q4.onnx")
|
||||||
|
if _, err := os.Stat(modelPath); os.IsNotExist(err) {
|
||||||
|
t.Skipf("embedder model not found at %s; skipping real embedder test", modelPath)
|
||||||
|
}
|
||||||
|
tokenizerPath := filepath.Join("..", "onnx", "embedgemma", "tokenizer.json")
|
||||||
|
dbPath := filepath.Join("..", "gflt.db")
|
||||||
|
if _, err := os.Stat(dbPath); os.IsNotExist(err) {
|
||||||
|
t.Skipf("database not found at %s; skipping real embedder test", dbPath)
|
||||||
|
}
|
||||||
|
cfg := &config.Config{
|
||||||
|
EmbedModelPath: modelPath,
|
||||||
|
EmbedTokenizerPath: tokenizerPath,
|
||||||
|
EmbedDims: 768,
|
||||||
|
RAGWordLimit: 250,
|
||||||
|
RAGOverlapWords: 25,
|
||||||
|
RAGBatchSize: 1,
|
||||||
|
}
|
||||||
|
logger := slog.New(slog.NewTextHandler(nil, &slog.HandlerOptions{Level: slog.LevelError}))
|
||||||
|
store := storage.NewProviderSQL(dbPath, logger)
|
||||||
|
if store == nil {
|
||||||
|
t.Fatal("failed to create storage provider")
|
||||||
|
}
|
||||||
|
rag, err := New(logger, store, cfg)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("failed to create RAG instance: %v", err)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { rag.Destroy() })
|
||||||
|
|
||||||
|
query := "bald prophet and two she bears"
|
||||||
|
results, err := rag.Search(query, 30)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("search failed: %v", err)
|
||||||
|
}
|
||||||
|
found := false
|
||||||
|
for i, row := range results {
|
||||||
|
if row.Slug == "kjv_bible.epub_1786_0" {
|
||||||
|
found = true
|
||||||
|
t.Logf("target chunk found at rank %d", i+1)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !found {
|
||||||
|
t.Errorf("target chunk not found in search results for query %q", query)
|
||||||
|
t.Logf("results slugs:")
|
||||||
|
for i, r := range results {
|
||||||
|
t.Logf("%d: %s", i+1, r.Slug)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRealQueryVariations(t *testing.T) {
|
||||||
|
if testing.Short() {
|
||||||
|
t.Skip("skipping real embedder test in short mode")
|
||||||
|
}
|
||||||
|
modelPath := filepath.Join("..", "onnx", "embedgemma", "model_q4.onnx")
|
||||||
|
if _, err := os.Stat(modelPath); os.IsNotExist(err) {
|
||||||
|
t.Skipf("embedder model not found at %s; skipping real embedder test", modelPath)
|
||||||
|
}
|
||||||
|
tokenizerPath := filepath.Join("..", "onnx", "embedgemma", "tokenizer.json")
|
||||||
|
dbPath := filepath.Join("..", "gflt.db")
|
||||||
|
if _, err := os.Stat(dbPath); os.IsNotExist(err) {
|
||||||
|
t.Skipf("database not found at %s; skipping real embedder test", dbPath)
|
||||||
|
}
|
||||||
|
cfg := &config.Config{
|
||||||
|
EmbedModelPath: modelPath,
|
||||||
|
EmbedTokenizerPath: tokenizerPath,
|
||||||
|
EmbedDims: 768,
|
||||||
|
RAGWordLimit: 250,
|
||||||
|
RAGOverlapWords: 25,
|
||||||
|
RAGBatchSize: 1,
|
||||||
|
}
|
||||||
|
logger := slog.New(slog.NewTextHandler(nil, &slog.HandlerOptions{Level: slog.LevelError}))
|
||||||
|
store := storage.NewProviderSQL(dbPath, logger)
|
||||||
|
if store == nil {
|
||||||
|
t.Fatal("failed to create storage provider")
|
||||||
|
}
|
||||||
|
rag, err := New(logger, store, cfg)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("failed to create RAG instance: %v", err)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { rag.Destroy() })
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
query string
|
||||||
|
}{
|
||||||
|
{"she bears", "she bears"},
|
||||||
|
{"bald head", "bald head"},
|
||||||
|
{"two she bears out of the wood", "two she bears out of the wood"},
|
||||||
|
{"bald prophet", "bald prophet"},
|
||||||
|
{"go up thou bald head", "\"go up thou bald head\""},
|
||||||
|
{"two she bears", "\"two she bears\""},
|
||||||
|
}
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
results, err := rag.Search(tt.query, 10)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("search failed: %v", err)
|
||||||
|
}
|
||||||
|
found := false
|
||||||
|
for _, row := range results {
|
||||||
|
if row.Slug == "kjv_bible.epub_1786_0" {
|
||||||
|
found = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !found {
|
||||||
|
t.Errorf("target chunk not found for query %q", tt.query)
|
||||||
|
for i, r := range results {
|
||||||
|
t.Logf("%d: %s", i+1, r.Slug)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
155
rag/rag_test.go
Normal file
155
rag/rag_test.go
Normal file
@@ -0,0 +1,155 @@
|
|||||||
|
package rag
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestDetectPhrases(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
query string
|
||||||
|
expect []string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
query: "bald prophet and two she bears",
|
||||||
|
expect: []string{"bald prophet", "two she", "two she bears", "she bears"},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
query: "she bears",
|
||||||
|
expect: []string{"she bears"},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
query: "the quick brown fox",
|
||||||
|
expect: []string{"quick brown", "quick brown fox", "brown fox"},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
query: "in the house", // stop words
|
||||||
|
expect: []string{}, // "in" and "the" are stop words
|
||||||
|
},
|
||||||
|
{
|
||||||
|
query: "a", // short
|
||||||
|
expect: []string{},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
got := detectPhrases(tt.query)
|
||||||
|
if len(got) != len(tt.expect) {
|
||||||
|
t.Errorf("detectPhrases(%q) = %v, want %v", tt.query, got, tt.expect)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for i := range got {
|
||||||
|
if got[i] != tt.expect[i] {
|
||||||
|
t.Errorf("detectPhrases(%q) = %v, want %v", tt.query, got, tt.expect)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCountPhraseMatches(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
text string
|
||||||
|
query string
|
||||||
|
expect int
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
text: "two she bears came out of the wood",
|
||||||
|
query: "she bears",
|
||||||
|
expect: 1,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
text: "bald head and she bears",
|
||||||
|
query: "bald prophet and two she bears",
|
||||||
|
expect: 1, // only "she bears" matches
|
||||||
|
},
|
||||||
|
{
|
||||||
|
text: "no match here",
|
||||||
|
query: "she bears",
|
||||||
|
expect: 0,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
text: "she bears and bald prophet",
|
||||||
|
query: "bald prophet she bears",
|
||||||
|
expect: 2, // "she bears" and "bald prophet"
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
got := countPhraseMatches(tt.text, tt.query)
|
||||||
|
if got != tt.expect {
|
||||||
|
t.Errorf("countPhraseMatches(%q, %q) = %d, want %d", tt.text, tt.query, got, tt.expect)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestAreSlugsAdjacent(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
slug1 string
|
||||||
|
slug2 string
|
||||||
|
expect bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
slug1: "kjv_bible.epub_1786_0",
|
||||||
|
slug2: "kjv_bible.epub_1787_0",
|
||||||
|
expect: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
slug1: "kjv_bible.epub_1787_0",
|
||||||
|
slug2: "kjv_bible.epub_1786_0",
|
||||||
|
expect: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
slug1: "kjv_bible.epub_1786_0",
|
||||||
|
slug2: "kjv_bible.epub_1788_0",
|
||||||
|
expect: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
slug1: "otherfile.txt_1_0",
|
||||||
|
slug2: "kjv_bible.epub_1786_0",
|
||||||
|
expect: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
slug1: "file_1_0",
|
||||||
|
slug2: "file_1_1",
|
||||||
|
expect: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
slug1: "file_1_0",
|
||||||
|
slug2: "file_2_0", // different batch
|
||||||
|
expect: true, // sequential batches with same chunk index are adjacent
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
got := areSlugsAdjacent(tt.slug1, tt.slug2)
|
||||||
|
if got != tt.expect {
|
||||||
|
t.Errorf("areSlugsAdjacent(%q, %q) = %v, want %v", tt.slug1, tt.slug2, got, tt.expect)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParseSlugIndices(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
slug string
|
||||||
|
wantBatch int
|
||||||
|
wantChunk int
|
||||||
|
wantOk bool
|
||||||
|
}{
|
||||||
|
{"kjv_bible.epub_1786_0", 1786, 0, true},
|
||||||
|
{"file_1_5", 1, 5, true},
|
||||||
|
{"no_underscore", 0, 0, false},
|
||||||
|
{"file_abc_def", 0, 0, false},
|
||||||
|
{"file_123_456_extra", 456, 0, false}, // regex matches last two numbers
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
batch, chunk, ok := parseSlugIndices(tt.slug)
|
||||||
|
if ok != tt.wantOk {
|
||||||
|
t.Errorf("parseSlugIndices(%q) ok = %v, want %v", tt.slug, ok, tt.wantOk)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if ok && (batch != tt.wantBatch || chunk != tt.wantChunk) {
|
||||||
|
t.Errorf("parseSlugIndices(%q) = (%d, %d), want (%d, %d)", tt.slug, batch, chunk, tt.wantBatch, tt.wantChunk)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
244
rag/storage.go
244
rag/storage.go
@@ -1,6 +1,7 @@
|
|||||||
package rag
|
package rag
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"database/sql"
|
||||||
"encoding/binary"
|
"encoding/binary"
|
||||||
"fmt"
|
"fmt"
|
||||||
"gf-lt/models"
|
"gf-lt/models"
|
||||||
@@ -28,7 +29,6 @@ func NewVectorStorage(logger *slog.Logger, store storage.FullRepo) *VectorStorag
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// SerializeVector converts []float32 to binary blob
|
// SerializeVector converts []float32 to binary blob
|
||||||
func SerializeVector(vec []float32) []byte {
|
func SerializeVector(vec []float32) []byte {
|
||||||
buf := make([]byte, len(vec)*4) // 4 bytes per float32
|
buf := make([]byte, len(vec)*4) // 4 bytes per float32
|
||||||
@@ -63,20 +63,120 @@ func (vs *VectorStorage) WriteVector(row *models.VectorRow) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
embeddingSize := len(row.Embeddings)
|
||||||
|
// Start transaction
|
||||||
|
tx, err := vs.sqlxDB.Beginx()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
if err != nil {
|
||||||
|
_ = tx.Rollback()
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
// Serialize the embeddings to binary
|
// Serialize the embeddings to binary
|
||||||
serializedEmbeddings := SerializeVector(row.Embeddings)
|
serializedEmbeddings := SerializeVector(row.Embeddings)
|
||||||
|
|
||||||
query := fmt.Sprintf(
|
query := fmt.Sprintf(
|
||||||
"INSERT INTO %s (embeddings, slug, raw_text, filename) VALUES (?, ?, ?, ?)",
|
"INSERT INTO %s (embeddings, slug, raw_text, filename) VALUES (?, ?, ?, ?)",
|
||||||
tableName,
|
tableName,
|
||||||
)
|
)
|
||||||
|
if _, err := tx.Exec(query, serializedEmbeddings, row.Slug, row.RawText, row.FileName); err != nil {
|
||||||
if _, err := vs.sqlxDB.Exec(query, serializedEmbeddings, row.Slug, row.RawText, row.FileName); err != nil {
|
|
||||||
vs.logger.Error("failed to write vector", "error", err, "slug", row.Slug)
|
vs.logger.Error("failed to write vector", "error", err, "slug", row.Slug)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
// Insert into FTS table
|
||||||
|
ftsQuery := `INSERT INTO fts_embeddings (slug, raw_text, filename, embedding_size) VALUES (?, ?, ?, ?)`
|
||||||
|
if _, err := tx.Exec(ftsQuery, row.Slug, row.RawText, row.FileName, embeddingSize); err != nil {
|
||||||
|
vs.logger.Error("failed to write to FTS table", "error", err, "slug", row.Slug)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
err = tx.Commit()
|
||||||
|
if err != nil {
|
||||||
|
vs.logger.Error("failed to commit transaction", "error", err)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// WriteVectors stores multiple embedding vectors in a single transaction
|
||||||
|
func (vs *VectorStorage) WriteVectors(rows []*models.VectorRow) error {
|
||||||
|
if len(rows) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
// SQLite has limit of 999 parameters per statement, each row uses 4 parameters
|
||||||
|
const maxBatchSize = 200 // 200 * 4 = 800 < 999
|
||||||
|
if len(rows) > maxBatchSize {
|
||||||
|
// Process in chunks
|
||||||
|
for i := 0; i < len(rows); i += maxBatchSize {
|
||||||
|
end := i + maxBatchSize
|
||||||
|
if end > len(rows) {
|
||||||
|
end = len(rows)
|
||||||
|
}
|
||||||
|
if err := vs.WriteVectors(rows[i:end]); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
// All rows should have same embedding size (same model)
|
||||||
|
firstSize := len(rows[0].Embeddings)
|
||||||
|
for i, row := range rows {
|
||||||
|
if len(row.Embeddings) != firstSize {
|
||||||
|
return fmt.Errorf("embedding size mismatch: row %d has size %d, expected %d", i, len(row.Embeddings), firstSize)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tableName, err := vs.getTableName(rows[0].Embeddings)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// Start transaction
|
||||||
|
tx, err := vs.sqlxDB.Beginx()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
if err != nil {
|
||||||
|
_ = tx.Rollback()
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Build batch insert for embeddings table
|
||||||
|
embeddingPlaceholders := make([]string, 0, len(rows))
|
||||||
|
embeddingArgs := make([]any, 0, len(rows)*4)
|
||||||
|
for _, row := range rows {
|
||||||
|
embeddingPlaceholders = append(embeddingPlaceholders, "(?, ?, ?, ?)")
|
||||||
|
embeddingArgs = append(embeddingArgs, SerializeVector(row.Embeddings), row.Slug, row.RawText, row.FileName)
|
||||||
|
}
|
||||||
|
embeddingQuery := fmt.Sprintf(
|
||||||
|
"INSERT INTO %s (embeddings, slug, raw_text, filename) VALUES %s",
|
||||||
|
tableName,
|
||||||
|
strings.Join(embeddingPlaceholders, ", "),
|
||||||
|
)
|
||||||
|
if _, err := tx.Exec(embeddingQuery, embeddingArgs...); err != nil {
|
||||||
|
vs.logger.Error("failed to write vectors batch", "error", err, "batch_size", len(rows))
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// Build batch insert for FTS table
|
||||||
|
ftsPlaceholders := make([]string, 0, len(rows))
|
||||||
|
ftsArgs := make([]any, 0, len(rows)*4)
|
||||||
|
embeddingSize := len(rows[0].Embeddings)
|
||||||
|
for _, row := range rows {
|
||||||
|
ftsPlaceholders = append(ftsPlaceholders, "(?, ?, ?, ?)")
|
||||||
|
ftsArgs = append(ftsArgs, row.Slug, row.RawText, row.FileName, embeddingSize)
|
||||||
|
}
|
||||||
|
ftsQuery := "INSERT INTO fts_embeddings (slug, raw_text, filename, embedding_size) VALUES " +
|
||||||
|
strings.Join(ftsPlaceholders, ", ")
|
||||||
|
if _, err := tx.Exec(ftsQuery, ftsArgs...); err != nil {
|
||||||
|
vs.logger.Error("failed to write FTS batch", "error", err, "batch_size", len(rows))
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
err = tx.Commit()
|
||||||
|
if err != nil {
|
||||||
|
vs.logger.Error("failed to commit transaction", "error", err)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
vs.logger.Debug("wrote vectors batch", "batch_size", len(rows))
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -95,41 +195,32 @@ func (vs *VectorStorage) getTableName(emb []float32) (string, error) {
|
|||||||
4096: true,
|
4096: true,
|
||||||
5120: true,
|
5120: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
if supportedSizes[size] {
|
if supportedSizes[size] {
|
||||||
return fmt.Sprintf("embeddings_%d", size), nil
|
return fmt.Sprintf("embeddings_%d", size), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
return "", fmt.Errorf("no table for embedding size of %d", size)
|
return "", fmt.Errorf("no table for embedding size of %d", size)
|
||||||
}
|
}
|
||||||
|
|
||||||
// SearchClosest finds vectors closest to the query vector using efficient cosine similarity calculation
|
// SearchClosest finds vectors closest to the query vector using efficient cosine similarity calculation
|
||||||
func (vs *VectorStorage) SearchClosest(query []float32) ([]models.VectorRow, error) {
|
func (vs *VectorStorage) SearchClosest(query []float32, limit int) ([]models.VectorRow, error) {
|
||||||
|
if limit <= 0 {
|
||||||
|
limit = 10
|
||||||
|
}
|
||||||
tableName, err := vs.getTableName(query)
|
tableName, err := vs.getTableName(query)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// For better performance, instead of loading all vectors at once,
|
|
||||||
// we'll implement batching and potentially add L2 distance-based pre-filtering
|
|
||||||
// since cosine similarity is related to L2 distance for normalized vectors
|
|
||||||
|
|
||||||
querySQL := "SELECT embeddings, slug, raw_text, filename FROM " + tableName
|
querySQL := "SELECT embeddings, slug, raw_text, filename FROM " + tableName
|
||||||
rows, err := vs.sqlxDB.Query(querySQL)
|
rows, err := vs.sqlxDB.Query(querySQL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
defer rows.Close()
|
defer rows.Close()
|
||||||
|
|
||||||
// Use a min-heap or simple slice to keep track of top 3 closest vectors
|
|
||||||
type SearchResult struct {
|
type SearchResult struct {
|
||||||
vector models.VectorRow
|
vector models.VectorRow
|
||||||
distance float32
|
distance float32
|
||||||
}
|
}
|
||||||
|
|
||||||
var topResults []SearchResult
|
var topResults []SearchResult
|
||||||
|
|
||||||
// Process vectors one by one to avoid loading everything into memory
|
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
var (
|
var (
|
||||||
embeddingsBlob []byte
|
embeddingsBlob []byte
|
||||||
@@ -140,12 +231,9 @@ func (vs *VectorStorage) SearchClosest(query []float32) ([]models.VectorRow, err
|
|||||||
vs.logger.Error("failed to scan row", "error", err)
|
vs.logger.Error("failed to scan row", "error", err)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
storedEmbeddings := DeserializeVector(embeddingsBlob)
|
storedEmbeddings := DeserializeVector(embeddingsBlob)
|
||||||
|
|
||||||
// Calculate cosine similarity (returns value between -1 and 1, where 1 is most similar)
|
|
||||||
similarity := cosineSimilarity(query, storedEmbeddings)
|
similarity := cosineSimilarity(query, storedEmbeddings)
|
||||||
distance := 1 - similarity // Convert to distance where 0 is most similar
|
distance := 1 - similarity
|
||||||
|
|
||||||
result := SearchResult{
|
result := SearchResult{
|
||||||
vector: models.VectorRow{
|
vector: models.VectorRow{
|
||||||
@@ -157,33 +245,117 @@ func (vs *VectorStorage) SearchClosest(query []float32) ([]models.VectorRow, err
|
|||||||
distance: distance,
|
distance: distance,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add to top results and maintain only top 3
|
|
||||||
topResults = append(topResults, result)
|
topResults = append(topResults, result)
|
||||||
|
|
||||||
// Sort and keep only top 3
|
|
||||||
sort.Slice(topResults, func(i, j int) bool {
|
sort.Slice(topResults, func(i, j int) bool {
|
||||||
return topResults[i].distance < topResults[j].distance
|
return topResults[i].distance < topResults[j].distance
|
||||||
})
|
})
|
||||||
|
if len(topResults) > limit {
|
||||||
if len(topResults) > 3 {
|
topResults = topResults[:limit]
|
||||||
topResults = topResults[:3] // Keep only closest 3
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Convert back to VectorRow slice
|
|
||||||
results := make([]models.VectorRow, 0, len(topResults))
|
results := make([]models.VectorRow, 0, len(topResults))
|
||||||
for _, result := range topResults {
|
for _, result := range topResults {
|
||||||
result.vector.Distance = result.distance
|
result.vector.Distance = result.distance
|
||||||
results = append(results, result.vector)
|
results = append(results, result.vector)
|
||||||
}
|
}
|
||||||
|
return results, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetVectorBySlug retrieves a vector row by its slug
|
||||||
|
func (vs *VectorStorage) GetVectorBySlug(slug string) (*models.VectorRow, error) {
|
||||||
|
embeddingSizes := []int{384, 768, 1024, 1536, 2048, 3072, 4096, 5120}
|
||||||
|
for _, size := range embeddingSizes {
|
||||||
|
table := fmt.Sprintf("embeddings_%d", size)
|
||||||
|
query := fmt.Sprintf("SELECT embeddings, slug, raw_text, filename FROM %s WHERE slug = ?", table)
|
||||||
|
row := vs.sqlxDB.QueryRow(query, slug)
|
||||||
|
var (
|
||||||
|
embeddingsBlob []byte
|
||||||
|
retrievedSlug, rawText, fileName string
|
||||||
|
)
|
||||||
|
if err := row.Scan(&embeddingsBlob, &retrievedSlug, &rawText, &fileName); err != nil {
|
||||||
|
// No row in this table, continue to next size
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
storedEmbeddings := DeserializeVector(embeddingsBlob)
|
||||||
|
return &models.VectorRow{
|
||||||
|
Embeddings: storedEmbeddings,
|
||||||
|
Slug: retrievedSlug,
|
||||||
|
RawText: rawText,
|
||||||
|
FileName: fileName,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
return nil, fmt.Errorf("vector with slug %s not found", slug)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SearchKeyword performs full-text search using FTS5
|
||||||
|
func (vs *VectorStorage) SearchKeyword(query string, limit int) ([]models.VectorRow, error) {
|
||||||
|
// Use FTS5 bm25 ranking. bm25 returns negative values where more negative is better.
|
||||||
|
// We'll order by bm25 (ascending) and limit.
|
||||||
|
ftsQuery := `SELECT slug, raw_text, filename, bm25(fts_embeddings) as score
|
||||||
|
FROM fts_embeddings
|
||||||
|
WHERE fts_embeddings MATCH ?
|
||||||
|
ORDER BY score
|
||||||
|
LIMIT ?`
|
||||||
|
|
||||||
|
// Try original query first
|
||||||
|
rows, err := vs.sqlxDB.Query(ftsQuery, query, limit)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("FTS search failed: %w", err)
|
||||||
|
}
|
||||||
|
results, err := vs.scanRows(rows)
|
||||||
|
rows.Close()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// If no results and query contains multiple terms, try OR fallback
|
||||||
|
if len(results) == 0 && strings.Contains(query, " ") && !strings.Contains(strings.ToUpper(query), " OR ") {
|
||||||
|
// Build OR query: term1 OR term2 OR term3
|
||||||
|
terms := strings.Fields(query)
|
||||||
|
if len(terms) > 1 {
|
||||||
|
orQuery := strings.Join(terms, " OR ")
|
||||||
|
rows, err := vs.sqlxDB.Query(ftsQuery, orQuery, limit)
|
||||||
|
if err != nil {
|
||||||
|
// Return original empty results rather than error
|
||||||
|
return results, nil
|
||||||
|
}
|
||||||
|
orResults, err := vs.scanRows(rows)
|
||||||
|
rows.Close()
|
||||||
|
if err == nil {
|
||||||
|
results = orResults
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return results, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// scanRows converts SQL rows to VectorRow slice
|
||||||
|
func (vs *VectorStorage) scanRows(rows *sql.Rows) ([]models.VectorRow, error) {
|
||||||
|
var results []models.VectorRow
|
||||||
|
for rows.Next() {
|
||||||
|
var slug, rawText, fileName string
|
||||||
|
var score float64
|
||||||
|
if err := rows.Scan(&slug, &rawText, &fileName, &score); err != nil {
|
||||||
|
vs.logger.Error("failed to scan FTS row", "error", err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// Convert BM25 score to distance-like metric (lower is better)
|
||||||
|
// BM25 is negative, more negative is better. Keep as negative.
|
||||||
|
distance := float32(score) // Keep negative, more negative is better
|
||||||
|
// No clamping needed; negative distances are fine
|
||||||
|
results = append(results, models.VectorRow{
|
||||||
|
Slug: slug,
|
||||||
|
RawText: rawText,
|
||||||
|
FileName: fileName,
|
||||||
|
Distance: distance,
|
||||||
|
})
|
||||||
|
}
|
||||||
return results, nil
|
return results, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// ListFiles returns a list of all loaded files
|
// ListFiles returns a list of all loaded files
|
||||||
func (vs *VectorStorage) ListFiles() ([]string, error) {
|
func (vs *VectorStorage) ListFiles() ([]string, error) {
|
||||||
fileLists := make([][]string, 0)
|
fileLists := make([][]string, 0)
|
||||||
|
|
||||||
// Query all supported tables and combine results
|
// Query all supported tables and combine results
|
||||||
embeddingSizes := []int{384, 768, 1024, 1536, 2048, 3072, 4096, 5120}
|
embeddingSizes := []int{384, 768, 1024, 1536, 2048, 3072, 4096, 5120}
|
||||||
for _, size := range embeddingSizes {
|
for _, size := range embeddingSizes {
|
||||||
@@ -219,14 +391,16 @@ func (vs *VectorStorage) ListFiles() ([]string, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return allFiles, nil
|
return allFiles, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// RemoveEmbByFileName removes all embeddings associated with a specific filename
|
// RemoveEmbByFileName removes all embeddings associated with a specific filename
|
||||||
func (vs *VectorStorage) RemoveEmbByFileName(filename string) error {
|
func (vs *VectorStorage) RemoveEmbByFileName(filename string) error {
|
||||||
var errors []string
|
var errors []string
|
||||||
|
// Delete from FTS table first
|
||||||
|
if _, err := vs.sqlxDB.Exec("DELETE FROM fts_embeddings WHERE filename = ?", filename); err != nil {
|
||||||
|
errors = append(errors, err.Error())
|
||||||
|
}
|
||||||
embeddingSizes := []int{384, 768, 1024, 1536, 2048, 3072, 4096, 5120}
|
embeddingSizes := []int{384, 768, 1024, 1536, 2048, 3072, 4096, 5120}
|
||||||
for _, size := range embeddingSizes {
|
for _, size := range embeddingSizes {
|
||||||
table := fmt.Sprintf("embeddings_%d", size)
|
table := fmt.Sprintf("embeddings_%d", size)
|
||||||
@@ -235,11 +409,9 @@ func (vs *VectorStorage) RemoveEmbByFileName(filename string) error {
|
|||||||
errors = append(errors, err.Error())
|
errors = append(errors, err.Error())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(errors) > 0 {
|
if len(errors) > 0 {
|
||||||
return fmt.Errorf("errors occurred: %s", strings.Join(errors, "; "))
|
return fmt.Errorf("errors occurred: %s", strings.Join(errors, "; "))
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -248,18 +420,15 @@ func cosineSimilarity(a, b []float32) float32 {
|
|||||||
if len(a) != len(b) {
|
if len(a) != len(b) {
|
||||||
return 0.0
|
return 0.0
|
||||||
}
|
}
|
||||||
|
|
||||||
var dotProduct, normA, normB float32
|
var dotProduct, normA, normB float32
|
||||||
for i := 0; i < len(a); i++ {
|
for i := 0; i < len(a); i++ {
|
||||||
dotProduct += a[i] * b[i]
|
dotProduct += a[i] * b[i]
|
||||||
normA += a[i] * a[i]
|
normA += a[i] * a[i]
|
||||||
normB += b[i] * b[i]
|
normB += b[i] * b[i]
|
||||||
}
|
}
|
||||||
|
|
||||||
if normA == 0 || normB == 0 {
|
if normA == 0 || normB == 0 {
|
||||||
return 0.0
|
return 0.0
|
||||||
}
|
}
|
||||||
|
|
||||||
return dotProduct / (sqrt(normA) * sqrt(normB))
|
return dotProduct / (sqrt(normA) * sqrt(normB))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -275,4 +444,3 @@ func sqrt(f float32) float32 {
|
|||||||
}
|
}
|
||||||
return guess
|
return guess
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
18
session.go
18
session.go
@@ -131,13 +131,18 @@ func loadOldChatOrGetNew() []models.RoleMsg {
|
|||||||
chat, err := store.GetLastChat()
|
chat, err := store.GetLastChat()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Warn("failed to load history chat", "error", err)
|
logger.Warn("failed to load history chat", "error", err)
|
||||||
|
maxID, err := store.ChatGetMaxID()
|
||||||
|
if err != nil {
|
||||||
|
logger.Error("failed to fetch max chat id", "error", err)
|
||||||
|
}
|
||||||
|
maxID++
|
||||||
chat := &models.Chat{
|
chat := &models.Chat{
|
||||||
ID: 0,
|
ID: maxID,
|
||||||
CreatedAt: time.Now(),
|
CreatedAt: time.Now(),
|
||||||
UpdatedAt: time.Now(),
|
UpdatedAt: time.Now(),
|
||||||
Agent: cfg.AssistantRole,
|
Agent: cfg.AssistantRole,
|
||||||
}
|
}
|
||||||
chat.Name = fmt.Sprintf("%s_%v", chat.Agent, chat.CreatedAt.Unix())
|
chat.Name = fmt.Sprintf("%s_%v", chat.Agent, chat.ID)
|
||||||
activeChatName = chat.Name
|
activeChatName = chat.Name
|
||||||
chatMap[chat.Name] = chat
|
chatMap[chat.Name] = chat
|
||||||
return defaultStarter
|
return defaultStarter
|
||||||
@@ -149,10 +154,6 @@ func loadOldChatOrGetNew() []models.RoleMsg {
|
|||||||
chatMap[chat.Name] = chat
|
chatMap[chat.Name] = chat
|
||||||
return defaultStarter
|
return defaultStarter
|
||||||
}
|
}
|
||||||
// if chat.Name == "" {
|
|
||||||
// logger.Warn("empty chat name", "id", chat.ID)
|
|
||||||
// chat.Name = fmt.Sprintf("%s_%v", chat.Agent, chat.CreatedAt.Unix())
|
|
||||||
// }
|
|
||||||
chatMap[chat.Name] = chat
|
chatMap[chat.Name] = chat
|
||||||
activeChatName = chat.Name
|
activeChatName = chat.Name
|
||||||
cfg.AssistantRole = chat.Agent
|
cfg.AssistantRole = chat.Agent
|
||||||
@@ -167,8 +168,3 @@ func copyToClipboard(text string) error {
|
|||||||
cmd.Stdin = strings.NewReader(text)
|
cmd.Stdin = strings.NewReader(text)
|
||||||
return cmd.Run()
|
return cmd.Run()
|
||||||
}
|
}
|
||||||
|
|
||||||
func notifyUser(topic, message string) error {
|
|
||||||
cmd := exec.Command("notify-send", topic, message)
|
|
||||||
return cmd.Run()
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -10,16 +10,18 @@ import (
|
|||||||
//go:embed migrations/*
|
//go:embed migrations/*
|
||||||
var migrationsFS embed.FS
|
var migrationsFS embed.FS
|
||||||
|
|
||||||
func (p *ProviderSQL) Migrate() {
|
func (p *ProviderSQL) Migrate() error {
|
||||||
// Get the embedded filesystem
|
// Get the embedded filesystem
|
||||||
migrationsDir, err := fs.Sub(migrationsFS, "migrations")
|
migrationsDir, err := fs.Sub(migrationsFS, "migrations")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
p.logger.Error("Failed to get embedded migrations directory;", "error", err)
|
p.logger.Error("Failed to get embedded migrations directory;", "error", err)
|
||||||
|
return fmt.Errorf("failed to get embedded migrations directory: %w", err)
|
||||||
}
|
}
|
||||||
// List all .up.sql files
|
// List all .up.sql files
|
||||||
files, err := migrationsFS.ReadDir("migrations")
|
files, err := migrationsFS.ReadDir("migrations")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
p.logger.Error("Failed to read migrations directory;", "error", err)
|
p.logger.Error("Failed to read migrations directory;", "error", err)
|
||||||
|
return fmt.Errorf("failed to read migrations directory: %w", err)
|
||||||
}
|
}
|
||||||
// Execute each .up.sql file
|
// Execute each .up.sql file
|
||||||
for _, file := range files {
|
for _, file := range files {
|
||||||
@@ -27,11 +29,12 @@ func (p *ProviderSQL) Migrate() {
|
|||||||
err := p.executeMigration(migrationsDir, file.Name())
|
err := p.executeMigration(migrationsDir, file.Name())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
p.logger.Error("Failed to execute migration %s: %v", file.Name(), err)
|
p.logger.Error("Failed to execute migration %s: %v", file.Name(), err)
|
||||||
panic(err)
|
return fmt.Errorf("failed to execute migration %s: %w", file.Name(), err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
p.logger.Debug("All migrations executed successfully!")
|
p.logger.Debug("All migrations executed successfully!")
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *ProviderSQL) executeMigration(migrationsDir fs.FS, fileName string) error {
|
func (p *ProviderSQL) executeMigration(migrationsDir fs.FS, fileName string) error {
|
||||||
|
|||||||
2
storage/migrations/003_add_fts.down.sql
Normal file
2
storage/migrations/003_add_fts.down.sql
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
-- Drop FTS5 virtual table
|
||||||
|
DROP TABLE IF EXISTS fts_embeddings;
|
||||||
15
storage/migrations/003_add_fts.up.sql
Normal file
15
storage/migrations/003_add_fts.up.sql
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
-- Create FTS5 virtual table for full-text search
|
||||||
|
CREATE VIRTUAL TABLE IF NOT EXISTS fts_embeddings USING fts5(
|
||||||
|
slug UNINDEXED,
|
||||||
|
raw_text,
|
||||||
|
filename UNINDEXED,
|
||||||
|
embedding_size UNINDEXED,
|
||||||
|
tokenize='porter unicode61' -- Use porter stemmer and unicode61 tokenizer
|
||||||
|
);
|
||||||
|
|
||||||
|
-- Create triggers to maintain FTS table when embeddings are inserted/deleted
|
||||||
|
-- Note: We'll handle inserts/deletes programmatically for simplicity
|
||||||
|
-- but triggers could be added here if needed.
|
||||||
|
|
||||||
|
-- Indexes for performance (FTS5 manages its own indexes)
|
||||||
|
-- No additional indexes needed for FTS5 virtual table.
|
||||||
2
storage/migrations/004_populate_fts.down.sql
Normal file
2
storage/migrations/004_populate_fts.down.sql
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
-- Clear FTS table (optional)
|
||||||
|
DELETE FROM fts_embeddings;
|
||||||
26
storage/migrations/004_populate_fts.up.sql
Normal file
26
storage/migrations/004_populate_fts.up.sql
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
-- Populate FTS table with existing embeddings
|
||||||
|
DELETE FROM fts_embeddings;
|
||||||
|
|
||||||
|
INSERT INTO fts_embeddings (slug, raw_text, filename, embedding_size)
|
||||||
|
SELECT slug, raw_text, filename, 384 FROM embeddings_384;
|
||||||
|
|
||||||
|
INSERT INTO fts_embeddings (slug, raw_text, filename, embedding_size)
|
||||||
|
SELECT slug, raw_text, filename, 768 FROM embeddings_768;
|
||||||
|
|
||||||
|
INSERT INTO fts_embeddings (slug, raw_text, filename, embedding_size)
|
||||||
|
SELECT slug, raw_text, filename, 1024 FROM embeddings_1024;
|
||||||
|
|
||||||
|
INSERT INTO fts_embeddings (slug, raw_text, filename, embedding_size)
|
||||||
|
SELECT slug, raw_text, filename, 1536 FROM embeddings_1536;
|
||||||
|
|
||||||
|
INSERT INTO fts_embeddings (slug, raw_text, filename, embedding_size)
|
||||||
|
SELECT slug, raw_text, filename, 2048 FROM embeddings_2048;
|
||||||
|
|
||||||
|
INSERT INTO fts_embeddings (slug, raw_text, filename, embedding_size)
|
||||||
|
SELECT slug, raw_text, filename, 3072 FROM embeddings_3072;
|
||||||
|
|
||||||
|
INSERT INTO fts_embeddings (slug, raw_text, filename, embedding_size)
|
||||||
|
SELECT slug, raw_text, filename, 4096 FROM embeddings_4096;
|
||||||
|
|
||||||
|
INSERT INTO fts_embeddings (slug, raw_text, filename, embedding_size)
|
||||||
|
SELECT slug, raw_text, filename, 5120 FROM embeddings_5120;
|
||||||
@@ -102,9 +102,27 @@ func NewProviderSQL(dbPath string, logger *slog.Logger) FullRepo {
|
|||||||
logger.Error("failed to open db connection", "error", err)
|
logger.Error("failed to open db connection", "error", err)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
// Enable WAL mode for better concurrency and performance
|
||||||
|
if _, err := db.Exec("PRAGMA journal_mode = WAL;"); err != nil {
|
||||||
|
logger.Warn("failed to enable WAL mode", "error", err)
|
||||||
|
}
|
||||||
|
if _, err := db.Exec("PRAGMA synchronous = NORMAL;"); err != nil {
|
||||||
|
logger.Warn("failed to set synchronous mode", "error", err)
|
||||||
|
}
|
||||||
|
// Increase cache size for better performance
|
||||||
|
if _, err := db.Exec("PRAGMA cache_size = -2000;"); err != nil {
|
||||||
|
logger.Warn("failed to set cache size", "error", err)
|
||||||
|
}
|
||||||
|
// Log actual journal mode for debugging
|
||||||
|
var journalMode string
|
||||||
|
if err := db.QueryRow("PRAGMA journal_mode;").Scan(&journalMode); err == nil {
|
||||||
|
logger.Debug("SQLite journal mode", "mode", journalMode)
|
||||||
|
}
|
||||||
p := ProviderSQL{db: db, logger: logger}
|
p := ProviderSQL{db: db, logger: logger}
|
||||||
|
if err := p.Migrate(); err != nil {
|
||||||
p.Migrate()
|
logger.Error("migration failed, app cannot start", "error", err)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
return p
|
return p
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import (
|
|||||||
"encoding/binary"
|
"encoding/binary"
|
||||||
"fmt"
|
"fmt"
|
||||||
"gf-lt/models"
|
"gf-lt/models"
|
||||||
|
"sort"
|
||||||
"unsafe"
|
"unsafe"
|
||||||
|
|
||||||
"github.com/jmoiron/sqlx"
|
"github.com/jmoiron/sqlx"
|
||||||
@@ -11,7 +12,7 @@ import (
|
|||||||
|
|
||||||
type VectorRepo interface {
|
type VectorRepo interface {
|
||||||
WriteVector(*models.VectorRow) error
|
WriteVector(*models.VectorRow) error
|
||||||
SearchClosest(q []float32) ([]models.VectorRow, error)
|
SearchClosest(q []float32, limit int) ([]models.VectorRow, error)
|
||||||
ListFiles() ([]string, error)
|
ListFiles() ([]string, error)
|
||||||
RemoveEmbByFileName(filename string) error
|
RemoveEmbByFileName(filename string) error
|
||||||
DB() *sqlx.DB
|
DB() *sqlx.DB
|
||||||
@@ -73,41 +74,33 @@ func (p ProviderSQL) WriteVector(row *models.VectorRow) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
serializedEmbeddings := SerializeVector(row.Embeddings)
|
serializedEmbeddings := SerializeVector(row.Embeddings)
|
||||||
|
|
||||||
query := fmt.Sprintf("INSERT INTO %s(embeddings, slug, raw_text, filename) VALUES (?, ?, ?, ?)", tableName)
|
query := fmt.Sprintf("INSERT INTO %s(embeddings, slug, raw_text, filename) VALUES (?, ?, ?, ?)", tableName)
|
||||||
_, err = p.db.Exec(query, serializedEmbeddings, row.Slug, row.RawText, row.FileName)
|
_, err = p.db.Exec(query, serializedEmbeddings, row.Slug, row.RawText, row.FileName)
|
||||||
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p ProviderSQL) SearchClosest(q []float32) ([]models.VectorRow, error) {
|
func (p ProviderSQL) SearchClosest(q []float32, limit int) ([]models.VectorRow, error) {
|
||||||
tableName, err := fetchTableName(q)
|
tableName, err := fetchTableName(q)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
querySQL := "SELECT embeddings, slug, raw_text, filename FROM " + tableName
|
querySQL := "SELECT embeddings, slug, raw_text, filename FROM " + tableName
|
||||||
rows, err := p.db.Query(querySQL)
|
rows, err := p.db.Query(querySQL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
defer rows.Close()
|
defer rows.Close()
|
||||||
|
|
||||||
type SearchResult struct {
|
type SearchResult struct {
|
||||||
vector models.VectorRow
|
vector models.VectorRow
|
||||||
distance float32
|
distance float32
|
||||||
}
|
}
|
||||||
|
var allResults []SearchResult
|
||||||
var topResults []SearchResult
|
|
||||||
|
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
var (
|
var (
|
||||||
embeddingsBlob []byte
|
embeddingsBlob []byte
|
||||||
slug, rawText, fileName string
|
slug, rawText, fileName string
|
||||||
)
|
)
|
||||||
|
|
||||||
if err := rows.Scan(&embeddingsBlob, &slug, &rawText, &fileName); err != nil {
|
if err := rows.Scan(&embeddingsBlob, &slug, &rawText, &fileName); err != nil {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
@@ -127,32 +120,22 @@ func (p ProviderSQL) SearchClosest(q []float32) ([]models.VectorRow, error) {
|
|||||||
},
|
},
|
||||||
distance: distance,
|
distance: distance,
|
||||||
}
|
}
|
||||||
|
allResults = append(allResults, result)
|
||||||
// Add to top results and maintain only top results
|
|
||||||
topResults = append(topResults, result)
|
|
||||||
|
|
||||||
// Sort and keep only top results
|
|
||||||
// We'll keep the top 3 closest vectors
|
|
||||||
if len(topResults) > 3 {
|
|
||||||
// Simple sort and truncate to maintain only 3 best matches
|
|
||||||
for i := 0; i < len(topResults); i++ {
|
|
||||||
for j := i + 1; j < len(topResults); j++ {
|
|
||||||
if topResults[i].distance > topResults[j].distance {
|
|
||||||
topResults[i], topResults[j] = topResults[j], topResults[i]
|
|
||||||
}
|
}
|
||||||
|
// Sort by distance
|
||||||
|
sort.Slice(allResults, func(i, j int) bool {
|
||||||
|
return allResults[i].distance < allResults[j].distance
|
||||||
|
})
|
||||||
|
// Truncate to limit
|
||||||
|
if len(allResults) > limit {
|
||||||
|
allResults = allResults[:limit]
|
||||||
}
|
}
|
||||||
}
|
|
||||||
topResults = topResults[:3]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Convert back to VectorRow slice
|
// Convert back to VectorRow slice
|
||||||
results := make([]models.VectorRow, len(topResults))
|
results := make([]models.VectorRow, len(allResults))
|
||||||
for i, result := range topResults {
|
for i, result := range allResults {
|
||||||
result.vector.Distance = result.distance
|
result.vector.Distance = result.distance
|
||||||
results[i] = result.vector
|
results[i] = result.vector
|
||||||
}
|
}
|
||||||
|
|
||||||
return results, nil
|
return results, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -161,18 +144,15 @@ func cosineSimilarity(a, b []float32) float32 {
|
|||||||
if len(a) != len(b) {
|
if len(a) != len(b) {
|
||||||
return 0.0
|
return 0.0
|
||||||
}
|
}
|
||||||
|
|
||||||
var dotProduct, normA, normB float32
|
var dotProduct, normA, normB float32
|
||||||
for i := 0; i < len(a); i++ {
|
for i := 0; i < len(a); i++ {
|
||||||
dotProduct += a[i] * b[i]
|
dotProduct += a[i] * b[i]
|
||||||
normA += a[i] * a[i]
|
normA += a[i] * a[i]
|
||||||
normB += b[i] * b[i]
|
normB += b[i] * b[i]
|
||||||
}
|
}
|
||||||
|
|
||||||
if normA == 0 || normB == 0 {
|
if normA == 0 || normB == 0 {
|
||||||
return 0.0
|
return 0.0
|
||||||
}
|
}
|
||||||
|
|
||||||
return dotProduct / (sqrt(normA) * sqrt(normB))
|
return dotProduct / (sqrt(normA) * sqrt(normB))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -229,13 +209,11 @@ func (p ProviderSQL) ListFiles() ([]string, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return allFiles, nil
|
return allFiles, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p ProviderSQL) RemoveEmbByFileName(filename string) error {
|
func (p ProviderSQL) RemoveEmbByFileName(filename string) error {
|
||||||
var errors []string
|
var errors []string
|
||||||
|
|
||||||
tableNames := []string{
|
tableNames := []string{
|
||||||
"embeddings_384", "embeddings_768", "embeddings_1024", "embeddings_1536",
|
"embeddings_384", "embeddings_768", "embeddings_1024", "embeddings_1536",
|
||||||
"embeddings_2048", "embeddings_3072", "embeddings_4096", "embeddings_5120",
|
"embeddings_2048", "embeddings_3072", "embeddings_4096", "embeddings_5120",
|
||||||
@@ -246,10 +224,8 @@ func (p ProviderSQL) RemoveEmbByFileName(filename string) error {
|
|||||||
errors = append(errors, err.Error())
|
errors = append(errors, err.Error())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(errors) > 0 {
|
if len(errors) > 0 {
|
||||||
return fmt.Errorf("errors occurred: %v", errors)
|
return fmt.Errorf("errors occurred: %v", errors)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
{
|
|
||||||
"sys_prompt": "A game of cluedo. Players are {{user}}, {{char}}, {{char2}};\n\nrooms: hall, lounge, dinning room kitchen, ballroom, conservatory, billiard room, library, study;\nweapons: candlestick, dagger, lead pipe, revolver, rope, spanner;\npeople: miss Scarlett, colonel Mustard, mrs. White, reverend Green, mrs. Peacock, professor Plum;\n\nA murder happened in a mansion with 9 rooms. Victim is dr. Black.\nPlayers goal is to find out who commited a murder, in what room and with what weapon.\nWeapons, people and rooms not involved in murder are distributed between players (as cards) by tool agent.\nThe objective of the game is to deduce the details of the murder. There are six characters, six murder weapons, and nine rooms, leaving the players with 324 possibilities. As soon as a player enters a room, they may make a suggestion as to the details, naming a suspect, the room they are in, and the weapon. For example: \"I suspect Professor Plum, in the Dining Room, with the candlestick\".\nOnce a player makes a suggestion, the others are called upon to disprove it.\nBefore the player's move, tool agent will remind that players their cards. There are two types of moves: making a suggestion (suggestion_move) and disproving other player suggestion (evidence_move);\nIn this version player wins when the correct details are named in the suggestion_move.\n\n<example_game>\n{{user}}:\nlet's start a game of cluedo!\ntool: cards of {{char}} are 'LEAD PIPE', 'BALLROOM', 'CONSERVATORY', 'STUDY', 'Mrs. White'; suggestion_move;\n{{char}}:\n(putting miss Scarlet into the Hall with the Revolver) \"I suspect miss Scarlett, in the Hall, with the revolver.\"\ntool: cards of {{char2}} are 'SPANNER', 'DAGGER', 'Professor Plum', 'LIBRARY', 'Mrs. Peacock'; evidence_move;\n{{char2}}:\n\"No objections.\" (no cards matching the suspicion of {{char}})\ntool: cards of {{user}} are 'Colonel Mustard', 'Miss Scarlett', 'DINNING ROOM', 'CANDLESTICK', 'HALL'; evidence_move;\n{{user}}:\n\"I object. Miss Scarlett is innocent.\" (shows card with 'Miss Scarlett')\ntool: cards of {{char2}} are 'SPANNER', 'DAGGER', 'Professor Plum', 'LIBRARY', 'Mrs. Peacock'; suggestion_move;\n{{char2}}:\n*So it was not Miss Scarlett, good to know.*\n(moves Mrs. White to the Billiard Room) \"It might have been Mrs. White, in the Billiard Room, with the Revolver.\"\ntool: cards of {{user}} are 'Colonel Mustard', 'Miss Scarlett', 'DINNING ROOM', 'CANDLESTICK', 'HALL'; evidence_move;\n{{user}}:\n(no matching cards for the assumption of {{char2}}) \"Sounds possible to me.\"\ntool: cards of {{char}} are 'LEAD PIPE', 'BALLROOM', 'CONSERVATORY', 'STUDY', 'Mrs. White'; evidence_move;\n{{char}}:\n(shows Mrs. White card) \"No. Was not Mrs. White\"\ntool: cards of {{user}} are 'Colonel Mustard', 'Miss Scarlett', 'DINNING ROOM', 'CANDLESTICK', 'HALL'; suggestion_move;\n{{user}}:\n*So not Mrs. White...* (moves Reverend Green into the Billiard Room) \"I suspect Reverend Green, in the Billiard Room, with the Revolver.\"\ntool: Correct. It was Reverend Green in the Billiard Room, with the revolver. {{user}} wins.\n</example_game>",
|
|
||||||
"role": "CluedoPlayer",
|
|
||||||
"role2": "CluedoEnjoyer",
|
|
||||||
"filepath": "sysprompts/cluedo.json",
|
|
||||||
"first_msg": "Hey guys! Want to play cluedo?"
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"sys_prompt": "You are an expert software engineering assistant. Your goal is to help users with coding tasks, debugging, refactoring, and software development.\n\n## Core Principles\n1. **Security First**: Never expose secrets, keys, or credentials. Never commit sensitive data.\n2. **No Git Actions**: You can READ git info (status, log, diff) for context, but NEVER perform git actions (commit, add, push, checkout, reset, rm, etc.). Let the user handle all git operations.\n3. **Explore Before Execute**: Always understand the codebase structure before making changes.\n4. **Follow Conventions**: Match existing code style, patterns, and frameworks used in the project.\n5. **Be Concise**: Minimize output tokens while maintaining quality. Avoid unnecessary explanations.\n\n## Workflow for Complex Tasks\nFor multi-step tasks, ALWAYS use the todo system to track progress:\n\n1. **Create Todo List**: At the start of complex tasks, use `todo_create` to break down work into actionable items.\n2. **Update Progress**: Mark items as `in_progress` when working on them, and `completed` when done.\n3. **Check Status**: Use `todo_read` to review your progress.\n\nExample workflow:\n- User: \"Add user authentication to this app\"\n- You: Create todos: [\"Analyze existing auth structure\", \"Check frameworks in use\", \"Implement auth middleware\", \"Add login endpoints\", \"Test implementation\"]\n\n## Task Execution Flow\n\n### Phase 1: Exploration (Always First)\n- Use `file_list` to understand directory structure (path defaults to FilePickerDir if not specified)\n- Use `file_read` to examine relevant files (paths are relative to FilePickerDir unless starting with `/`)\n- Use `execute_command` with `grep`/`find` to search for patterns\n- Check `README` or documentation files\n- Identify: frameworks, conventions, testing approach\n- **Git reads allowed**: You may use `git status`, `git log`, `git diff` for context, but only to inform your work\n- **Path handling**: Relative paths are resolved against FilePickerDir (configurable via Alt+O). Use absolute paths (starting with `/`) to bypass FilePickerDir.\n\n### Phase 2: Planning\n- For complex tasks: create todo items\n- Identify files that need modification\n- Plan your approach following existing patterns\n\n### Phase 3: Implementation\n- Make changes using appropriate file tools\n- Prefer `file_write` for new files, `file_read` then modify for existing files\n- Follow existing code style exactly\n- Use existing libraries and utilities\n\n### Phase 4: Verification\n- Run tests if available (check for test scripts)\n- Run linting/type checking commands\n- Verify changes work as expected\n\n### Phase 5: Completion\n- Update todos to `completed`\n- Provide concise summary of changes\n- Reference specific file paths and line numbers when relevant\n- **DO NOT commit changes** - inform user what was done so they can review and commit themselves\n\n## Tool Usage Guidelines\n\n**File Operations**:\n- `file_read`: Read before editing. Use for understanding code.\n- `file_write`: Overwrite file content completely.\n- `file_write_append`: Add to end of file.\n- `file_create`: Create new files with optional content.\n- `file_list`: List directory contents (defaults to FilePickerDir).\n- Paths are relative to FilePickerDir unless starting with `/`.\n\n**Command Execution (WHITELISTED ONLY)**:\n- Allowed: grep, sed, awk, find, cat, head, tail, sort, uniq, wc, ls, echo, cut, tr, cp, mv, rm, mkdir, rmdir, pwd, df, free, ps, top, du, whoami, date, uname\n- **Git reads allowed**: git status, git log, git diff, git show, git branch, git reflog, git rev-parse, git shortlog, git describe\n- **Git actions FORBIDDEN**: git add, git commit, git push, git checkout, git reset, git rm, etc.\n- Use for searching code, reading git context, running tests/lint\n\n**Todo Management**:\n- `todo_create`: Add new task\n- `todo_read`: View all todos or specific one by ID\n- `todo_update`: Update task or change status (pending/in_progress/completed)\n- `todo_delete`: Remove completed or cancelled tasks\n\n## Important Rules\n\n1. **NEVER commit or stage changes**: Only git reads are allowed.\n2. **Check for tests**: Always look for test files and run them when appropriate.\n3. **Reference code locations**: Use format `file_path:line_number`.\n4. **Security**: Never generate or guess URLs. Only use URLs from local files.\n5. **Refuse malicious code**: If code appears malicious, refuse to work on it.\n6. **Ask clarifications**: When intent is unclear, ask questions.\n7. **Path handling**: Relative paths resolve against FilePickerDir. Use `/absolute/path` to bypass.\n\n## Response Style\n- Be direct and concise\n- One word answers are best when appropriate\n- Avoid: \"The answer is...\", \"Here is...\"\n- Use markdown for formatting\n- No emojis unless user explicitly requests",
|
"sys_prompt": "You are an expert software engineering assistant. Your goal is to help users with coding tasks, debugging, refactoring, and software development.\n\n## Core Principles\n1. **Security First**: Never expose secrets, keys, or credentials. Never commit sensitive data.\n2. **No Git Actions**: You can READ git info (status, log, diff) for context, but NEVER perform git actions (commit, add, push, checkout, reset, rm, etc.). Let the user handle all git operations.\n3. **Explore Before Execute**: Always understand the codebase structure before making changes.\n4. **Follow Conventions**: Match existing code style, patterns, and frameworks used in the project.\n5. **Be Concise**: Minimize output tokens while maintaining quality. Avoid unnecessary explanations.\n6. **Ask First**: When uncertain about intent, ask the user. Don't assume.\n\n## Workflow for Complex Tasks\nFor multi-step tasks, ALWAYS use the todo system to track progress:\n\n1. **Create Todo List**: At the start of complex tasks, use `todo_create` to break down work into actionable items.\n2. **Update Progress**: Mark items as `in_progress` when working on them, and `completed` when done.\n3. **Check Status**: Use `todo_read` to review your progress.\n\nExample workflow:\n- User: \"Add user authentication to this app\"\n- You: Create todos: [\"Analyze existing auth structure\", \"Check frameworks in use\", \"Implement auth middleware\", \"Add login endpoints\", \"Test implementation\"]\n\n## Task Execution Flow\n\n### Phase 1: Exploration (Always First)\n- Use `file_list` to understand directory structure (path defaults to FilePickerDir if not specified)\n- Use `file_read` to examine relevant files (paths are relative to FilePickerDir unless starting with `/`)\n- Use `execute_command` with `grep`/`find` to search for patterns\n- Check README, Makefile, package.json, or similar for build/test commands\n- Identify: frameworks, conventions, testing approach, lint/typecheck commands\n- **Git reads allowed**: You may use `git status`, `git log`, `git diff` for context, but only to inform your work\n- **Path handling**: Relative paths resolve against FilePickerDir; absolute paths (starting with `/`) bypass it\n\n### Phase 2: Planning\n- For complex tasks: create todo items\n- Identify files that need modification\n- Plan your approach following existing patterns\n\n### Phase 3: Implementation\n- Make changes using appropriate file tools\n- Prefer `file_write` for new files, `file_read` then edit for existing files\n- Follow existing code style exactly\n- Use existing libraries and utilities\n\n### Phase 4: Verification\n- Run tests if available (check for test scripts in README/Makefile)\n- Run linting/type checking commands\n- Verify changes work as expected\n\n### Phase 5: Completion\n- Update todos to `completed`\n- Provide concise summary of changes\n- Reference specific file paths and line numbers when relevant\n- **DO NOT commit changes** - inform user what was done so they can review and commit themselves\n\n## Command Execution\n- Use `execute_command` with a single string containing command and arguments (e.g., `go run main.go`, `ls -la`, `cd /tmp`)\n- Use `cd /path` to change the working directory for file operations",
|
||||||
"role": "CodingAssistant",
|
"role": "CodingAssistant",
|
||||||
"filepath": "sysprompts/coding_assistant.json",
|
"filepath": "sysprompts/coding_assistant.json",
|
||||||
"first_msg": "Hello! I'm your coding assistant. I can help you with software engineering tasks like writing code, debugging, refactoring, and exploring codebases. I work best when you give me specific tasks, and for complex work, I'll create a todo list to track my progress. What would you like to work on?"
|
"first_msg": "Hello! I'm your coding assistant. Give me a specific task and I'll get started. For complex work, I'll track progress with todos."
|
||||||
}
|
}
|
||||||
|
|||||||
502
tables.go
502
tables.go
@@ -147,9 +147,7 @@ func makeChatTable(chatMap map[string]models.Chat) *tview.Table {
|
|||||||
if err := store.RemoveChat(sc.ID); err != nil {
|
if err := store.RemoveChat(sc.ID); err != nil {
|
||||||
logger.Error("failed to remove chat from db", "chat_id", sc.ID, "chat_name", sc.Name)
|
logger.Error("failed to remove chat from db", "chat_id", sc.ID, "chat_name", sc.Name)
|
||||||
}
|
}
|
||||||
if err := notifyUser("chat deleted", selectedChat+" was deleted"); err != nil {
|
showToast("chat deleted", selectedChat+" was deleted")
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
// load last chat
|
// load last chat
|
||||||
chatBody.Messages = loadOldChatOrGetNew()
|
chatBody.Messages = loadOldChatOrGetNew()
|
||||||
textView.SetText(chatToText(chatBody.Messages, cfg.ShowSys))
|
textView.SetText(chatToText(chatBody.Messages, cfg.ShowSys))
|
||||||
@@ -159,27 +157,16 @@ func makeChatTable(chatMap map[string]models.Chat) *tview.Table {
|
|||||||
// save updated card
|
// save updated card
|
||||||
fi := strings.Index(selectedChat, "_")
|
fi := strings.Index(selectedChat, "_")
|
||||||
agentName := selectedChat[fi+1:]
|
agentName := selectedChat[fi+1:]
|
||||||
cc, ok := sysMap[agentName]
|
cc := GetCardByRole(agentName)
|
||||||
if !ok {
|
if cc == nil {
|
||||||
logger.Warn("no such card", "agent", agentName)
|
logger.Warn("no such card", "agent", agentName)
|
||||||
//no:lint
|
showToast("error", "no such card: "+agentName)
|
||||||
if err := notifyUser("error", "no such card: "+agentName); err != nil {
|
|
||||||
logger.Warn("failed ot notify", "error", err)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// if chatBody.Messages[0].Role != "system" || chatBody.Messages[1].Role != agentName {
|
|
||||||
// if err := notifyUser("error", "unexpected chat structure; card: "+agentName); err != nil {
|
|
||||||
// logger.Warn("failed ot notify", "error", err)
|
|
||||||
// }
|
|
||||||
// return
|
|
||||||
// }
|
|
||||||
// change sys_prompt + first msg
|
|
||||||
cc.SysPrompt = chatBody.Messages[0].Content
|
cc.SysPrompt = chatBody.Messages[0].Content
|
||||||
cc.FirstMsg = chatBody.Messages[1].Content
|
cc.FirstMsg = chatBody.Messages[1].Content
|
||||||
if err := pngmeta.WriteToPng(cc.ToSpec(cfg.UserRole), cc.FilePath, cc.FilePath); err != nil {
|
if err := pngmeta.WriteToPng(cc.ToSpec(cfg.UserRole), cc.FilePath, cc.FilePath); err != nil {
|
||||||
logger.Error("failed to write charcard",
|
logger.Error("failed to write charcard", "error", err)
|
||||||
"error", err)
|
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
case "move sysprompt onto 1st msg":
|
case "move sysprompt onto 1st msg":
|
||||||
@@ -190,33 +177,29 @@ func makeChatTable(chatMap map[string]models.Chat) *tview.Table {
|
|||||||
pages.RemovePage(historyPage)
|
pages.RemovePage(historyPage)
|
||||||
return
|
return
|
||||||
case "new_chat_from_card":
|
case "new_chat_from_card":
|
||||||
// Reread card from file and start fresh chat
|
|
||||||
fi := strings.Index(selectedChat, "_")
|
fi := strings.Index(selectedChat, "_")
|
||||||
agentName := selectedChat[fi+1:]
|
agentName := selectedChat[fi+1:]
|
||||||
cc, ok := sysMap[agentName]
|
cc := GetCardByRole(agentName)
|
||||||
if !ok {
|
if cc == nil {
|
||||||
logger.Warn("no such card", "agent", agentName)
|
logger.Warn("no such card", "agent", agentName)
|
||||||
if err := notifyUser("error", "no such card: "+agentName); err != nil {
|
showToast("error", "no such card: "+agentName)
|
||||||
logger.Warn("failed to notify", "error", err)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// Reload card from disk
|
|
||||||
newCard, err := pngmeta.ReadCard(cc.FilePath, cfg.UserRole)
|
newCard, err := pngmeta.ReadCard(cc.FilePath, cfg.UserRole)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error("failed to reload charcard", "path", cc.FilePath, "error", err)
|
logger.Error("failed to reload charcard", "path", cc.FilePath, "error", err)
|
||||||
newCard, err = pngmeta.ReadCardJson(cc.FilePath)
|
newCard, err = pngmeta.ReadCardJson(cc.FilePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error("failed to reload charcard", "path", cc.FilePath, "error", err)
|
logger.Error("failed to reload charcard", "path", cc.FilePath, "error", err)
|
||||||
if err := notifyUser("error", "failed to reload card: "+cc.FilePath); err != nil {
|
showToast("error", "failed to reload card: "+cc.FilePath)
|
||||||
logger.Warn("failed to notify", "error", err)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Update sysMap with fresh card data
|
if newCard.ID == "" {
|
||||||
sysMap[agentName] = newCard
|
newCard.ID = models.ComputeCardID(newCard.Role, newCard.FilePath)
|
||||||
// fetching sysprompt and first message anew from the card
|
}
|
||||||
|
sysMap[newCard.ID] = newCard
|
||||||
|
roleToID[newCard.Role] = newCard.ID
|
||||||
startNewChat(false)
|
startNewChat(false)
|
||||||
pages.RemovePage(historyPage)
|
pages.RemovePage(historyPage)
|
||||||
return
|
return
|
||||||
@@ -236,13 +219,60 @@ func makeChatTable(chatMap map[string]models.Chat) *tview.Table {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// nolint:unused
|
// nolint:unused
|
||||||
func makeRAGTable(fileList []string) *tview.Flex {
|
func formatSize(size int64) string {
|
||||||
actions := []string{"load", "delete"}
|
units := []string{"B", "KB", "MB", "GB", "TB"}
|
||||||
rows, cols := len(fileList), len(actions)+1
|
i := 0
|
||||||
|
s := float64(size)
|
||||||
|
for s >= 1024 && i < len(units)-1 {
|
||||||
|
s /= 1024
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("%.1f%s", s, units[i])
|
||||||
|
}
|
||||||
|
|
||||||
|
type ragFileInfo struct {
|
||||||
|
name string
|
||||||
|
inRAGDir bool
|
||||||
|
isLoaded bool
|
||||||
|
fullPath string
|
||||||
|
}
|
||||||
|
|
||||||
|
func makeRAGTable(fileList []string, loadedFiles []string) *tview.Flex {
|
||||||
|
// Build set of loaded files for quick lookup
|
||||||
|
loadedSet := make(map[string]bool)
|
||||||
|
for _, f := range loadedFiles {
|
||||||
|
loadedSet[f] = true
|
||||||
|
}
|
||||||
|
// Build merged list: files from ragdir + orphaned files from DB
|
||||||
|
ragFiles := make([]ragFileInfo, 0, len(fileList)+len(loadedFiles))
|
||||||
|
seen := make(map[string]bool)
|
||||||
|
// Add files from ragdir
|
||||||
|
for _, f := range fileList {
|
||||||
|
ragFiles = append(ragFiles, ragFileInfo{
|
||||||
|
name: f,
|
||||||
|
inRAGDir: true,
|
||||||
|
isLoaded: loadedSet[f],
|
||||||
|
fullPath: path.Join(cfg.RAGDir, f),
|
||||||
|
})
|
||||||
|
seen[f] = true
|
||||||
|
}
|
||||||
|
// Add orphaned files (in DB but not in ragdir)
|
||||||
|
for _, f := range loadedFiles {
|
||||||
|
if !seen[f] {
|
||||||
|
ragFiles = append(ragFiles, ragFileInfo{
|
||||||
|
name: f,
|
||||||
|
inRAGDir: false,
|
||||||
|
isLoaded: true,
|
||||||
|
fullPath: "",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
rows := len(ragFiles)
|
||||||
|
cols := 4 // File Name | Preview | Action | Delete
|
||||||
fileTable := tview.NewTable().
|
fileTable := tview.NewTable().
|
||||||
SetBorders(true)
|
SetBorders(true)
|
||||||
longStatusView := tview.NewTextView()
|
longStatusView := tview.NewTextView()
|
||||||
longStatusView.SetText("status text")
|
longStatusView.SetText("press x to exit")
|
||||||
longStatusView.SetBorder(true).SetTitle("status")
|
longStatusView.SetBorder(true).SetTitle("status")
|
||||||
longStatusView.SetChangedFunc(func() {
|
longStatusView.SetChangedFunc(func() {
|
||||||
app.Draw()
|
app.Draw()
|
||||||
@@ -252,47 +282,97 @@ func makeRAGTable(fileList []string) *tview.Flex {
|
|||||||
AddItem(fileTable, 0, 60, true)
|
AddItem(fileTable, 0, 60, true)
|
||||||
// Add the exit option as the first row (row 0)
|
// Add the exit option as the first row (row 0)
|
||||||
fileTable.SetCell(0, 0,
|
fileTable.SetCell(0, 0,
|
||||||
tview.NewTableCell("Exit RAG manager").
|
tview.NewTableCell("File Name").
|
||||||
SetTextColor(tcell.ColorWhite).
|
SetTextColor(tcell.ColorWhite).
|
||||||
SetAlign(tview.AlignCenter).
|
SetAlign(tview.AlignCenter).
|
||||||
SetSelectable(false))
|
SetSelectable(false))
|
||||||
fileTable.SetCell(0, 1,
|
fileTable.SetCell(0, 1,
|
||||||
tview.NewTableCell("(Close without action)").
|
tview.NewTableCell("Preview").
|
||||||
SetTextColor(tcell.ColorGray).
|
SetTextColor(tcell.ColorWhite).
|
||||||
SetAlign(tview.AlignCenter).
|
SetAlign(tview.AlignCenter).
|
||||||
SetSelectable(false))
|
SetSelectable(false))
|
||||||
fileTable.SetCell(0, 2,
|
fileTable.SetCell(0, 2,
|
||||||
tview.NewTableCell("exit").
|
tview.NewTableCell("Load/Unload").
|
||||||
SetTextColor(tcell.ColorGray).
|
SetTextColor(tcell.ColorWhite).
|
||||||
SetAlign(tview.AlignCenter))
|
SetAlign(tview.AlignCenter).
|
||||||
|
SetSelectable(false))
|
||||||
|
fileTable.SetCell(0, 3,
|
||||||
|
tview.NewTableCell("Delete").
|
||||||
|
SetTextColor(tcell.ColorWhite).
|
||||||
|
SetAlign(tview.AlignCenter).
|
||||||
|
SetSelectable(false))
|
||||||
// Add the file rows starting from row 1
|
// Add the file rows starting from row 1
|
||||||
for r := 0; r < rows; r++ {
|
for r := 0; r < rows; r++ {
|
||||||
|
f := ragFiles[r]
|
||||||
for c := 0; c < cols; c++ {
|
for c := 0; c < cols; c++ {
|
||||||
color := tcell.ColorWhite
|
color := tcell.ColorWhite
|
||||||
switch {
|
switch c {
|
||||||
case c < 1:
|
case 0:
|
||||||
fileTable.SetCell(r+1, c, // +1 to account for the exit row at index 0
|
displayName := f.name
|
||||||
tview.NewTableCell(fileList[r]).
|
if !f.inRAGDir {
|
||||||
|
displayName = f.name + " (orphaned)"
|
||||||
|
}
|
||||||
|
fileTable.SetCell(r+1, c,
|
||||||
|
tview.NewTableCell(displayName).
|
||||||
SetTextColor(color).
|
SetTextColor(color).
|
||||||
SetAlign(tview.AlignCenter).
|
SetAlign(tview.AlignCenter).
|
||||||
SetSelectable(false))
|
SetSelectable(false))
|
||||||
case c == 1: // Action description column - not selectable
|
case 1:
|
||||||
fileTable.SetCell(r+1, c, // +1 to account for the exit row at index 0
|
if !f.inRAGDir {
|
||||||
tview.NewTableCell("(Action)").
|
// Orphaned file - no preview available
|
||||||
|
fileTable.SetCell(r+1, c,
|
||||||
|
tview.NewTableCell("not in ragdir").
|
||||||
|
SetTextColor(tcell.ColorYellow).
|
||||||
|
SetAlign(tview.AlignCenter).
|
||||||
|
SetSelectable(false))
|
||||||
|
} else if fi, err := os.Stat(f.fullPath); err == nil {
|
||||||
|
size := fi.Size()
|
||||||
|
modTime := fi.ModTime()
|
||||||
|
preview := fmt.Sprintf("%s | %s", formatSize(size), modTime.Format("2006-01-02 15:04"))
|
||||||
|
fileTable.SetCell(r+1, c,
|
||||||
|
tview.NewTableCell(preview).
|
||||||
SetTextColor(color).
|
SetTextColor(color).
|
||||||
SetAlign(tview.AlignCenter).
|
SetAlign(tview.AlignCenter).
|
||||||
SetSelectable(false))
|
SetSelectable(false))
|
||||||
default: // Action button column - selectable
|
} else {
|
||||||
fileTable.SetCell(r+1, c, // +1 to account for the exit row at index 0
|
fileTable.SetCell(r+1, c,
|
||||||
tview.NewTableCell(actions[c-1]).
|
tview.NewTableCell("error").
|
||||||
|
SetTextColor(color).
|
||||||
|
SetAlign(tview.AlignCenter).
|
||||||
|
SetSelectable(false))
|
||||||
|
}
|
||||||
|
case 2:
|
||||||
|
actionText := "load"
|
||||||
|
if f.isLoaded {
|
||||||
|
actionText = "unload"
|
||||||
|
}
|
||||||
|
if !f.inRAGDir {
|
||||||
|
// Orphaned file - can only unload
|
||||||
|
actionText = "unload"
|
||||||
|
}
|
||||||
|
fileTable.SetCell(r+1, c,
|
||||||
|
tview.NewTableCell(actionText).
|
||||||
SetTextColor(color).
|
SetTextColor(color).
|
||||||
SetAlign(tview.AlignCenter))
|
SetAlign(tview.AlignCenter))
|
||||||
|
case 3:
|
||||||
|
if !f.inRAGDir {
|
||||||
|
// Orphaned file - cannot delete from ragdir (not there)
|
||||||
|
fileTable.SetCell(r+1, c,
|
||||||
|
tview.NewTableCell("-").
|
||||||
|
SetTextColor(tcell.ColorDarkGray).
|
||||||
|
SetAlign(tview.AlignCenter).
|
||||||
|
SetSelectable(false))
|
||||||
|
} else {
|
||||||
|
fileTable.SetCell(r+1, c,
|
||||||
|
tview.NewTableCell("delete").
|
||||||
|
SetTextColor(color).
|
||||||
|
SetAlign(tview.AlignCenter))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
errCh := make(chan error, 1) // why?
|
errCh := make(chan error, 1) // why?
|
||||||
go func() {
|
go func() {
|
||||||
defer pages.RemovePage(RAGPage)
|
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case err := <-errCh:
|
case err := <-errCh:
|
||||||
@@ -318,7 +398,7 @@ func makeRAGTable(fileList []string) *tview.Flex {
|
|||||||
}()
|
}()
|
||||||
fileTable.Select(0, 0).
|
fileTable.Select(0, 0).
|
||||||
SetFixed(1, 1).
|
SetFixed(1, 1).
|
||||||
SetSelectable(true, false).
|
SetSelectable(true, true).
|
||||||
SetSelectedStyle(tcell.StyleDefault.Background(tcell.ColorGray).Foreground(tcell.ColorWhite)).
|
SetSelectedStyle(tcell.StyleDefault.Background(tcell.ColorGray).Foreground(tcell.ColorWhite)).
|
||||||
SetDoneFunc(func(key tcell.Key) {
|
SetDoneFunc(func(key tcell.Key) {
|
||||||
if key == tcell.KeyEsc || key == tcell.KeyF1 || key == tcell.Key('x') || key == tcell.KeyCtrlX {
|
if key == tcell.KeyEsc || key == tcell.KeyF1 || key == tcell.Key('x') || key == tcell.KeyCtrlX {
|
||||||
@@ -333,39 +413,78 @@ func makeRAGTable(fileList []string) *tview.Flex {
|
|||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// defer pages.RemovePage(RAGPage)
|
|
||||||
tc := fileTable.GetCell(row, column)
|
tc := fileTable.GetCell(row, column)
|
||||||
|
tc.SetTextColor(tcell.ColorRed)
|
||||||
|
fileTable.SetSelectable(false, false)
|
||||||
// Check if the selected row is the exit row (row 0) - do this first to avoid index issues
|
// Check if the selected row is the exit row (row 0) - do this first to avoid index issues
|
||||||
if row == 0 {
|
if row == 0 {
|
||||||
pages.RemovePage(RAGPage)
|
pages.RemovePage(RAGPage)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// For file rows, get the filename (row index - 1 because of the exit row at index 0)
|
// For file rows, get the file info (row index - 1 because of the exit row at index 0)
|
||||||
fpath := fileList[row-1] // -1 to account for the exit row at index 0
|
f := ragFiles[row-1]
|
||||||
// notification := fmt.Sprintf("chat: %s; action: %s", fpath, tc.Text)
|
// Handle "-" case (orphaned file with no delete option)
|
||||||
|
if tc.Text == "-" {
|
||||||
|
return
|
||||||
|
}
|
||||||
switch tc.Text {
|
switch tc.Text {
|
||||||
case "load":
|
case "load":
|
||||||
fpath = path.Join(cfg.RAGDir, fpath)
|
fpath := path.Join(cfg.RAGDir, f.name)
|
||||||
longStatusView.SetText("clicked load")
|
longStatusView.SetText("clicked load")
|
||||||
go func() {
|
go func() {
|
||||||
if err := ragger.LoadRAG(fpath); err != nil {
|
if err := ragger.LoadRAG(fpath); err != nil {
|
||||||
logger.Error("failed to embed file", "chat", fpath, "error", err)
|
logger.Error("failed to embed file", "chat", fpath, "error", err)
|
||||||
_ = notifyUser("RAG", "failed to embed file; error: "+err.Error())
|
showToast("RAG", "failed to embed file; error: "+err.Error())
|
||||||
errCh <- err
|
|
||||||
// pages.RemovePage(RAGPage)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
showToast("RAG", "file loaded successfully")
|
||||||
|
app.QueueUpdate(func() {
|
||||||
|
pages.RemovePage(RAGPage)
|
||||||
|
loadedFiles, _ := ragger.ListLoaded()
|
||||||
|
chatRAGTable := makeRAGTable(fileList, loadedFiles)
|
||||||
|
pages.AddPage(RAGPage, chatRAGTable, true, true)
|
||||||
|
})
|
||||||
|
}()
|
||||||
|
return
|
||||||
|
case "unload":
|
||||||
|
longStatusView.SetText("clicked unload")
|
||||||
|
go func() {
|
||||||
|
if err := ragger.RemoveFile(f.name); err != nil {
|
||||||
|
logger.Error("failed to unload file from RAG", "filename", f.name, "error", err)
|
||||||
|
showToast("RAG", "failed to unload file; error: "+err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
showToast("RAG", "file unloaded successfully")
|
||||||
|
app.QueueUpdate(func() {
|
||||||
|
pages.RemovePage(RAGPage)
|
||||||
|
loadedFiles, _ := ragger.ListLoaded()
|
||||||
|
chatRAGTable := makeRAGTable(fileList, loadedFiles)
|
||||||
|
pages.AddPage(RAGPage, chatRAGTable, true, true)
|
||||||
|
})
|
||||||
}()
|
}()
|
||||||
return
|
return
|
||||||
case "delete":
|
case "delete":
|
||||||
fpath = path.Join(cfg.RAGDir, fpath)
|
fpath := path.Join(cfg.RAGDir, f.name)
|
||||||
if err := os.Remove(fpath); err != nil {
|
if err := os.Remove(fpath); err != nil {
|
||||||
logger.Error("failed to delete file", "filename", fpath, "error", err)
|
logger.Error("failed to delete file", "filename", fpath, "error", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if err := notifyUser("chat deleted", fpath+" was deleted"); err != nil {
|
showToast("chat deleted", fpath+" was deleted")
|
||||||
logger.Error("failed to send notification", "error", err)
|
go func() {
|
||||||
|
app.QueueUpdate(func() {
|
||||||
|
pages.RemovePage(RAGPage)
|
||||||
|
newFileList, _ := os.ReadDir(cfg.RAGDir)
|
||||||
|
loadedFiles, _ := ragger.ListLoaded()
|
||||||
|
var newFiles []string
|
||||||
|
for _, f := range newFileList {
|
||||||
|
if !f.IsDir() {
|
||||||
|
newFiles = append(newFiles, f.Name())
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
chatRAGTable := makeRAGTable(newFiles, loadedFiles)
|
||||||
|
pages.AddPage(RAGPage, chatRAGTable, true, true)
|
||||||
|
})
|
||||||
|
}()
|
||||||
return
|
return
|
||||||
default:
|
default:
|
||||||
pages.RemovePage(RAGPage)
|
pages.RemovePage(RAGPage)
|
||||||
@@ -383,114 +502,6 @@ func makeRAGTable(fileList []string) *tview.Flex {
|
|||||||
return ragflex
|
return ragflex
|
||||||
}
|
}
|
||||||
|
|
||||||
func makeLoadedRAGTable(fileList []string) *tview.Flex {
|
|
||||||
actions := []string{"delete"}
|
|
||||||
rows, cols := len(fileList), len(actions)+1
|
|
||||||
// Add 1 extra row for the "exit" option at the top
|
|
||||||
fileTable := tview.NewTable().
|
|
||||||
SetBorders(true)
|
|
||||||
longStatusView := tview.NewTextView()
|
|
||||||
longStatusView.SetText("Loaded RAG files list")
|
|
||||||
longStatusView.SetBorder(true).SetTitle("status")
|
|
||||||
longStatusView.SetChangedFunc(func() {
|
|
||||||
app.Draw()
|
|
||||||
})
|
|
||||||
ragflex := tview.NewFlex().SetDirection(tview.FlexRow).
|
|
||||||
AddItem(longStatusView, 0, 10, false).
|
|
||||||
AddItem(fileTable, 0, 60, true)
|
|
||||||
// Add the exit option as the first row (row 0)
|
|
||||||
fileTable.SetCell(0, 0,
|
|
||||||
tview.NewTableCell("Exit Loaded Files manager").
|
|
||||||
SetTextColor(tcell.ColorWhite).
|
|
||||||
SetAlign(tview.AlignCenter).
|
|
||||||
SetSelectable(false))
|
|
||||||
fileTable.SetCell(0, 1,
|
|
||||||
tview.NewTableCell("(Close without action)").
|
|
||||||
SetTextColor(tcell.ColorGray).
|
|
||||||
SetAlign(tview.AlignCenter).
|
|
||||||
SetSelectable(false))
|
|
||||||
fileTable.SetCell(0, 2,
|
|
||||||
tview.NewTableCell("exit").
|
|
||||||
SetTextColor(tcell.ColorGray).
|
|
||||||
SetAlign(tview.AlignCenter))
|
|
||||||
// Add the file rows starting from row 1
|
|
||||||
for r := 0; r < rows; r++ {
|
|
||||||
for c := 0; c < cols; c++ {
|
|
||||||
color := tcell.ColorWhite
|
|
||||||
switch {
|
|
||||||
case c < 1:
|
|
||||||
fileTable.SetCell(r+1, c, // +1 to account for the exit row at index 0
|
|
||||||
tview.NewTableCell(fileList[r]).
|
|
||||||
SetTextColor(color).
|
|
||||||
SetAlign(tview.AlignCenter).
|
|
||||||
SetSelectable(false))
|
|
||||||
case c == 1: // Action description column - not selectable
|
|
||||||
fileTable.SetCell(r+1, c, // +1 to account for the exit row at index 0
|
|
||||||
tview.NewTableCell("(Action)").
|
|
||||||
SetTextColor(color).
|
|
||||||
SetAlign(tview.AlignCenter).
|
|
||||||
SetSelectable(false))
|
|
||||||
default: // Action button column - selectable
|
|
||||||
fileTable.SetCell(r+1, c, // +1 to account for the exit row at index 0
|
|
||||||
tview.NewTableCell(actions[c-1]).
|
|
||||||
SetTextColor(color).
|
|
||||||
SetAlign(tview.AlignCenter))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
fileTable.Select(0, 0).
|
|
||||||
SetFixed(1, 1).
|
|
||||||
SetSelectable(true, false).
|
|
||||||
SetSelectedStyle(tcell.StyleDefault.Background(tcell.ColorGray).Foreground(tcell.ColorWhite)).
|
|
||||||
SetDoneFunc(func(key tcell.Key) {
|
|
||||||
if key == tcell.KeyEsc || key == tcell.KeyF1 || key == tcell.Key('x') || key == tcell.KeyCtrlX {
|
|
||||||
pages.RemovePage(RAGLoadedPage)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}).SetSelectedFunc(func(row int, column int) {
|
|
||||||
// If user selects a non-actionable column (0 or 1), move to first action column (2)
|
|
||||||
if column <= 1 {
|
|
||||||
if fileTable.GetColumnCount() > 2 {
|
|
||||||
fileTable.Select(row, 2) // Select first action column
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
tc := fileTable.GetCell(row, column)
|
|
||||||
// Check if the selected row is the exit row (row 0) - do this first to avoid index issues
|
|
||||||
if row == 0 {
|
|
||||||
pages.RemovePage(RAGLoadedPage)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
// For file rows, get the filename (row index - 1 because of the exit row at index 0)
|
|
||||||
fpath := fileList[row-1] // -1 to account for the exit row at index 0
|
|
||||||
switch tc.Text {
|
|
||||||
case "delete":
|
|
||||||
if err := ragger.RemoveFile(fpath); err != nil {
|
|
||||||
logger.Error("failed to delete file from RAG", "filename", fpath, "error", err)
|
|
||||||
longStatusView.SetText(fmt.Sprintf("Error deleting file: %v", err))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err := notifyUser("RAG file deleted", fpath+" was deleted from RAG system"); err != nil {
|
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
longStatusView.SetText(fpath + " was deleted from RAG system")
|
|
||||||
return
|
|
||||||
default:
|
|
||||||
pages.RemovePage(RAGLoadedPage)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
})
|
|
||||||
// Add input capture to the flex container to handle 'x' key for closing
|
|
||||||
ragflex.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
|
||||||
if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
|
|
||||||
pages.RemovePage(RAGLoadedPage)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return event
|
|
||||||
})
|
|
||||||
return ragflex
|
|
||||||
}
|
|
||||||
|
|
||||||
func makeAgentTable(agentList []string) *tview.Table {
|
func makeAgentTable(agentList []string) *tview.Table {
|
||||||
actions := []string{"filepath", "load"}
|
actions := []string{"filepath", "load"}
|
||||||
rows, cols := len(agentList), len(actions)+1
|
rows, cols := len(agentList), len(actions)+1
|
||||||
@@ -499,17 +510,17 @@ func makeAgentTable(agentList []string) *tview.Table {
|
|||||||
for r := 0; r < rows; r++ {
|
for r := 0; r < rows; r++ {
|
||||||
for c := 0; c < cols; c++ {
|
for c := 0; c < cols; c++ {
|
||||||
color := tcell.ColorWhite
|
color := tcell.ColorWhite
|
||||||
switch {
|
switch c {
|
||||||
case c < 1:
|
case 0:
|
||||||
chatActTable.SetCell(r, c,
|
chatActTable.SetCell(r, c,
|
||||||
tview.NewTableCell(agentList[r]).
|
tview.NewTableCell(agentList[r]).
|
||||||
SetTextColor(color).
|
SetTextColor(color).
|
||||||
SetAlign(tview.AlignCenter).
|
SetAlign(tview.AlignCenter).
|
||||||
SetSelectable(false))
|
SetSelectable(false))
|
||||||
case c == 1:
|
case 1:
|
||||||
if actions[c-1] == "filepath" {
|
if actions[c-1] == "filepath" {
|
||||||
cc, ok := sysMap[agentList[r]]
|
cc := GetCardByRole(agentList[r])
|
||||||
if !ok {
|
if cc == nil {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
chatActTable.SetCell(r, c,
|
chatActTable.SetCell(r, c,
|
||||||
@@ -533,7 +544,7 @@ func makeAgentTable(agentList []string) *tview.Table {
|
|||||||
}
|
}
|
||||||
chatActTable.Select(0, 0).
|
chatActTable.Select(0, 0).
|
||||||
SetFixed(1, 1).
|
SetFixed(1, 1).
|
||||||
SetSelectable(true, false).
|
SetSelectable(true, true).
|
||||||
SetSelectedStyle(tcell.StyleDefault.Background(tcell.ColorGray).Foreground(tcell.ColorWhite)).
|
SetSelectedStyle(tcell.StyleDefault.Background(tcell.ColorGray).Foreground(tcell.ColorWhite)).
|
||||||
SetDoneFunc(func(key tcell.Key) {
|
SetDoneFunc(func(key tcell.Key) {
|
||||||
if key == tcell.KeyEsc || key == tcell.KeyF1 || key == tcell.Key('x') {
|
if key == tcell.KeyEsc || key == tcell.KeyF1 || key == tcell.Key('x') {
|
||||||
@@ -549,6 +560,8 @@ func makeAgentTable(agentList []string) *tview.Table {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
tc := chatActTable.GetCell(row, column)
|
tc := chatActTable.GetCell(row, column)
|
||||||
|
tc.SetTextColor(tcell.ColorRed)
|
||||||
|
chatActTable.SetSelectable(false, false)
|
||||||
selected := agentList[row]
|
selected := agentList[row]
|
||||||
// notification := fmt.Sprintf("chat: %s; action: %s", selectedChat, tc.Text)
|
// notification := fmt.Sprintf("chat: %s; action: %s", selectedChat, tc.Text)
|
||||||
switch tc.Text {
|
switch tc.Text {
|
||||||
@@ -580,9 +593,7 @@ func makeAgentTable(agentList []string) *tview.Table {
|
|||||||
if err := store.RemoveChat(sc.ID); err != nil {
|
if err := store.RemoveChat(sc.ID); err != nil {
|
||||||
logger.Error("failed to remove chat from db", "chat_id", sc.ID, "chat_name", sc.Name)
|
logger.Error("failed to remove chat from db", "chat_id", sc.ID, "chat_name", sc.Name)
|
||||||
}
|
}
|
||||||
if err := notifyUser("chat deleted", selected+" was deleted"); err != nil {
|
showToast("chat deleted", selected+" was deleted")
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
pages.RemovePage(agentPage)
|
pages.RemovePage(agentPage)
|
||||||
return
|
return
|
||||||
default:
|
default:
|
||||||
@@ -630,7 +641,7 @@ func makeCodeBlockTable(codeBlocks []string) *tview.Table {
|
|||||||
}
|
}
|
||||||
table.Select(0, 0).
|
table.Select(0, 0).
|
||||||
SetFixed(1, 1).
|
SetFixed(1, 1).
|
||||||
SetSelectable(true, false).
|
SetSelectable(true, true).
|
||||||
SetSelectedStyle(tcell.StyleDefault.Background(tcell.ColorGray).Foreground(tcell.ColorWhite)).
|
SetSelectedStyle(tcell.StyleDefault.Background(tcell.ColorGray).Foreground(tcell.ColorWhite)).
|
||||||
SetDoneFunc(func(key tcell.Key) {
|
SetDoneFunc(func(key tcell.Key) {
|
||||||
if key == tcell.KeyEsc || key == tcell.KeyF1 || key == tcell.Key('x') {
|
if key == tcell.KeyEsc || key == tcell.KeyF1 || key == tcell.Key('x') {
|
||||||
@@ -646,18 +657,16 @@ func makeCodeBlockTable(codeBlocks []string) *tview.Table {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
tc := table.GetCell(row, column)
|
tc := table.GetCell(row, column)
|
||||||
|
tc.SetTextColor(tcell.ColorRed)
|
||||||
|
table.SetSelectable(false, false)
|
||||||
selected := codeBlocks[row]
|
selected := codeBlocks[row]
|
||||||
// notification := fmt.Sprintf("chat: %s; action: %s", selectedChat, tc.Text)
|
// notification := fmt.Sprintf("chat: %s; action: %s", selectedChat, tc.Text)
|
||||||
switch tc.Text {
|
switch tc.Text {
|
||||||
case "copy":
|
case "copy":
|
||||||
if err := copyToClipboard(selected); err != nil {
|
if err := copyToClipboard(selected); err != nil {
|
||||||
if err := notifyUser("error", err.Error()); err != nil {
|
showToast("error", err.Error())
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if err := notifyUser("copied", selected); err != nil {
|
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
}
|
||||||
|
showToast("copied", selected)
|
||||||
pages.RemovePage(codeBlockPage)
|
pages.RemovePage(codeBlockPage)
|
||||||
app.SetFocus(textArea)
|
app.SetFocus(textArea)
|
||||||
return
|
return
|
||||||
@@ -702,7 +711,7 @@ func makeImportChatTable(filenames []string) *tview.Table {
|
|||||||
}
|
}
|
||||||
chatActTable.Select(0, 0).
|
chatActTable.Select(0, 0).
|
||||||
SetFixed(1, 1).
|
SetFixed(1, 1).
|
||||||
SetSelectable(true, false).
|
SetSelectable(true, true).
|
||||||
SetSelectedStyle(tcell.StyleDefault.Background(tcell.ColorGray).Foreground(tcell.ColorWhite)).
|
SetSelectedStyle(tcell.StyleDefault.Background(tcell.ColorGray).Foreground(tcell.ColorWhite)).
|
||||||
SetDoneFunc(func(key tcell.Key) {
|
SetDoneFunc(func(key tcell.Key) {
|
||||||
if key == tcell.KeyEsc || key == tcell.KeyF1 || key == tcell.Key('x') {
|
if key == tcell.KeyEsc || key == tcell.KeyF1 || key == tcell.Key('x') {
|
||||||
@@ -718,6 +727,8 @@ func makeImportChatTable(filenames []string) *tview.Table {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
tc := chatActTable.GetCell(row, column)
|
tc := chatActTable.GetCell(row, column)
|
||||||
|
tc.SetTextColor(tcell.ColorRed)
|
||||||
|
chatActTable.SetSelectable(false, false)
|
||||||
selected := filenames[row]
|
selected := filenames[row]
|
||||||
// notification := fmt.Sprintf("chat: %s; action: %s", selectedChat, tc.Text)
|
// notification := fmt.Sprintf("chat: %s; action: %s", selectedChat, tc.Text)
|
||||||
switch tc.Text {
|
switch tc.Text {
|
||||||
@@ -748,9 +759,7 @@ func makeImportChatTable(filenames []string) *tview.Table {
|
|||||||
if err := store.RemoveChat(sc.ID); err != nil {
|
if err := store.RemoveChat(sc.ID); err != nil {
|
||||||
logger.Error("failed to remove chat from db", "chat_id", sc.ID, "chat_name", sc.Name)
|
logger.Error("failed to remove chat from db", "chat_id", sc.ID, "chat_name", sc.Name)
|
||||||
}
|
}
|
||||||
if err := notifyUser("chat deleted", selected+" was deleted"); err != nil {
|
showToast("chat deleted", selected+" was deleted")
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
pages.RemovePage(historyPage)
|
pages.RemovePage(historyPage)
|
||||||
return
|
return
|
||||||
default:
|
default:
|
||||||
@@ -792,6 +801,7 @@ func makeFilePicker() *tview.Flex {
|
|||||||
// --- NEW: search state ---
|
// --- NEW: search state ---
|
||||||
searching := false
|
searching := false
|
||||||
searchQuery := ""
|
searchQuery := ""
|
||||||
|
searchInputMode := false
|
||||||
// Helper function to check if a file has an allowed extension from config
|
// Helper function to check if a file has an allowed extension from config
|
||||||
hasAllowedExtension := func(filename string) bool {
|
hasAllowedExtension := func(filename string) bool {
|
||||||
if cfg.FilePickerExts == "" {
|
if cfg.FilePickerExts == "" {
|
||||||
@@ -984,6 +994,7 @@ func makeFilePicker() *tview.Flex {
|
|||||||
case tcell.KeyEsc:
|
case tcell.KeyEsc:
|
||||||
// Exit search, clear filter
|
// Exit search, clear filter
|
||||||
searching = false
|
searching = false
|
||||||
|
searchInputMode = false
|
||||||
searchQuery = ""
|
searchQuery = ""
|
||||||
refreshList(currentDisplayDir, "")
|
refreshList(currentDisplayDir, "")
|
||||||
return nil
|
return nil
|
||||||
@@ -993,16 +1004,80 @@ func makeFilePicker() *tview.Flex {
|
|||||||
refreshList(currentDisplayDir, searchQuery)
|
refreshList(currentDisplayDir, searchQuery)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
case tcell.KeyRune:
|
case tcell.KeyEnter:
|
||||||
r := event.Rune()
|
// Exit search input mode and let normal processing handle selection
|
||||||
if r != 0 {
|
searchInputMode = false
|
||||||
searchQuery += string(r)
|
// Get the currently highlighted item in the list
|
||||||
refreshList(currentDisplayDir, searchQuery)
|
itemIndex := listView.GetCurrentItem()
|
||||||
|
if itemIndex >= 0 && itemIndex < listView.GetItemCount() {
|
||||||
|
itemText, _ := listView.GetItemText(itemIndex)
|
||||||
|
// 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
|
||||||
|
actualItemName := itemText
|
||||||
|
if bracketPos := strings.Index(itemText, " ["); bracketPos != -1 {
|
||||||
|
actualItemName = itemText[:bracketPos]
|
||||||
|
}
|
||||||
|
// Check if it's a directory (ends with /)
|
||||||
|
if strings.HasSuffix(actualItemName, "/") {
|
||||||
|
var targetDir string
|
||||||
|
if strings.HasPrefix(actualItemName, "../") {
|
||||||
|
// Parent directory
|
||||||
|
targetDir = path.Dir(currentDisplayDir)
|
||||||
|
if targetDir == currentDisplayDir && currentDisplayDir == "/" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Regular subdirectory
|
||||||
|
dirName := strings.TrimSuffix(actualItemName, "/")
|
||||||
|
targetDir = path.Join(currentDisplayDir, dirName)
|
||||||
|
}
|
||||||
|
// Navigate – clear search
|
||||||
|
if cfg.ImagePreview && imgPreview != nil {
|
||||||
|
imgPreview.SetImage(nil)
|
||||||
|
}
|
||||||
|
searching = false
|
||||||
|
searchInputMode = false
|
||||||
|
searchQuery = ""
|
||||||
|
refreshList(targetDir, "")
|
||||||
|
dirStack = append(dirStack, targetDir)
|
||||||
|
currentStackPos = len(dirStack) - 1
|
||||||
|
statusView.SetText("Current: " + targetDir)
|
||||||
|
return nil
|
||||||
|
} else {
|
||||||
|
// It's a file
|
||||||
|
filePath := path.Join(currentDisplayDir, actualItemName)
|
||||||
|
if info, err := os.Stat(filePath); err == nil && !info.IsDir() {
|
||||||
|
if isImageFile(actualItemName) {
|
||||||
|
SetImageAttachment(filePath)
|
||||||
|
statusView.SetText("Image attached: " + filePath + " (will be sent with next message)")
|
||||||
|
pages.RemovePage(filePickerPage)
|
||||||
|
} else {
|
||||||
|
textArea.SetText(filePath, true)
|
||||||
|
app.SetFocus(textArea)
|
||||||
|
pages.RemovePage(filePickerPage)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
case tcell.KeyRune:
|
||||||
|
r := event.Rune()
|
||||||
|
if searchInputMode && r != 0 {
|
||||||
|
searchQuery += string(r)
|
||||||
|
refreshList(currentDisplayDir, searchQuery)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
// If not in search input mode, pass through for navigation
|
||||||
|
return event
|
||||||
default:
|
default:
|
||||||
// Pass all other keys (arrows, Enter, etc.) to normal processing
|
// Exit search input mode but keep filter active for navigation
|
||||||
// This allows selecting items while still in search mode
|
searchInputMode = false
|
||||||
|
// Pass all other keys (arrows, etc.) to normal processing
|
||||||
return event
|
return event
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1030,42 +1105,19 @@ func makeFilePicker() *tview.Flex {
|
|||||||
if event.Rune() == '/' {
|
if event.Rune() == '/' {
|
||||||
// Enter search mode
|
// Enter search mode
|
||||||
searching = true
|
searching = true
|
||||||
|
searchInputMode = true
|
||||||
searchQuery = ""
|
searchQuery = ""
|
||||||
refreshList(currentDisplayDir, "")
|
refreshList(currentDisplayDir, "")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if event.Rune() == 's' {
|
if event.Rune() == 's' {
|
||||||
// Set FilePickerDir to current directory
|
// Set FilePickerDir to current directory
|
||||||
itemIndex := listView.GetCurrentItem()
|
|
||||||
if itemIndex >= 0 && itemIndex < listView.GetItemCount() {
|
|
||||||
itemText, _ := listView.GetItemText(itemIndex)
|
|
||||||
// Get the actual directory path
|
// Get the actual directory path
|
||||||
var targetDir string
|
cfg.FilePickerDir = currentDisplayDir
|
||||||
if strings.HasPrefix(itemText, "Exit") || strings.HasPrefix(itemText, "Select this directory") {
|
listView.SetTitle("Files & Directories [s: set FilePickerDir]. Current base dir: " + cfg.FilePickerDir)
|
||||||
targetDir = currentDisplayDir
|
|
||||||
} else {
|
|
||||||
actualItemName := itemText
|
|
||||||
if bracketPos := strings.Index(itemText, " ["); bracketPos != -1 {
|
|
||||||
actualItemName = itemText[:bracketPos]
|
|
||||||
}
|
|
||||||
// nolint: gocritic
|
|
||||||
if strings.HasPrefix(actualItemName, "../") {
|
|
||||||
targetDir = path.Dir(currentDisplayDir)
|
|
||||||
} else if strings.HasSuffix(actualItemName, "/") {
|
|
||||||
dirName := strings.TrimSuffix(actualItemName, "/")
|
|
||||||
targetDir = path.Join(currentDisplayDir, dirName)
|
|
||||||
} else {
|
|
||||||
targetDir = currentDisplayDir
|
|
||||||
}
|
|
||||||
}
|
|
||||||
cfg.FilePickerDir = targetDir
|
|
||||||
if err := notifyUser("FilePickerDir", "Set to: "+targetDir); err != nil {
|
|
||||||
logger.Error("failed to notify user", "error", err)
|
|
||||||
}
|
|
||||||
// pages.RemovePage(filePickerPage)
|
// pages.RemovePage(filePickerPage)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
|
||||||
case tcell.KeyEnter:
|
case tcell.KeyEnter:
|
||||||
// Get the currently highlighted item in the list
|
// Get the currently highlighted item in the list
|
||||||
itemIndex := listView.GetCurrentItem()
|
itemIndex := listView.GetCurrentItem()
|
||||||
|
|||||||
653
tools_playwright.go
Normal file
653
tools_playwright.go
Normal file
@@ -0,0 +1,653 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"gf-lt/models"
|
||||||
|
"os"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
|
||||||
|
"github.com/playwright-community/playwright-go"
|
||||||
|
)
|
||||||
|
|
||||||
|
var browserToolSysMsg = `
|
||||||
|
Additional browser automation tools (Playwright):
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"name": "pw_start",
|
||||||
|
"args": [],
|
||||||
|
"when_to_use": "start a browser instance before doing any browser automation. Must be called first."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "pw_stop",
|
||||||
|
"args": [],
|
||||||
|
"when_to_use": "stop the browser instance when done with automation."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "pw_is_running",
|
||||||
|
"args": [],
|
||||||
|
"when_to_use": "check if browser is currently running."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "pw_navigate",
|
||||||
|
"args": ["url"],
|
||||||
|
"when_to_use": "open a specific URL in the web browser."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "pw_click",
|
||||||
|
"args": ["selector", "index"],
|
||||||
|
"when_to_use": "click on an element on the current webpage. Use 'index' for multiple matches (default 0)."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "pw_fill",
|
||||||
|
"args": ["selector", "text", "index"],
|
||||||
|
"when_to_use": "type text into an input field. Use 'index' for multiple matches (default 0)."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "pw_extract_text",
|
||||||
|
"args": ["selector"],
|
||||||
|
"when_to_use": "extract text content from the page or specific elements. Use selector 'body' for all page text."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "pw_screenshot",
|
||||||
|
"args": ["selector", "full_page"],
|
||||||
|
"when_to_use": "take a screenshot of the page or a specific element. Returns a file path to the image. Use to verify actions or inspect visual state."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "pw_screenshot_and_view",
|
||||||
|
"args": ["selector", "full_page"],
|
||||||
|
"when_to_use": "take a screenshot and return the image for viewing. Use to visually verify page state."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "pw_wait_for_selector",
|
||||||
|
"args": ["selector", "timeout"],
|
||||||
|
"when_to_use": "wait for an element to appear on the page before proceeding with further actions."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "pw_drag",
|
||||||
|
"args": ["x1", "y1", "x2", "y2"],
|
||||||
|
"when_to_use": "drag the mouse from point (x1,y1) to (x2,y2)."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "pw_click_at",
|
||||||
|
"args": ["x", "y"],
|
||||||
|
"when_to_use": "click at specific X,Y coordinates on the page. Use when you know the exact position."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "pw_get_html",
|
||||||
|
"args": ["selector"],
|
||||||
|
"when_to_use": "get the HTML content of the page or a specific element. Use to understand page structure or extract raw HTML."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "pw_get_dom",
|
||||||
|
"args": ["selector"],
|
||||||
|
"when_to_use": "get a structured DOM representation with tag, attributes, text, and children. Use to inspect element hierarchy and properties."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "pw_search_elements",
|
||||||
|
"args": ["text", "selector"],
|
||||||
|
"when_to_use": "search for elements by text content or CSS selector. Returns matching elements with their tags, text, and HTML."
|
||||||
|
}
|
||||||
|
]
|
||||||
|
`
|
||||||
|
|
||||||
|
var (
|
||||||
|
pw *playwright.Playwright
|
||||||
|
browser playwright.Browser
|
||||||
|
browserStarted bool
|
||||||
|
browserStartMu sync.Mutex
|
||||||
|
page playwright.Page
|
||||||
|
)
|
||||||
|
|
||||||
|
func pwShutDown() error {
|
||||||
|
if pw == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
pwStop(nil)
|
||||||
|
return pw.Stop()
|
||||||
|
}
|
||||||
|
|
||||||
|
func installPW() error {
|
||||||
|
err := playwright.Install(&playwright.RunOptions{Verbose: false})
|
||||||
|
if err != nil {
|
||||||
|
logger.Warn("playwright not available", "error", err)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func checkPlaywright() error {
|
||||||
|
var err error
|
||||||
|
pw, err = playwright.Run()
|
||||||
|
if err != nil {
|
||||||
|
logger.Warn("playwright not available", "error", err)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func pwStart(args map[string]string) []byte {
|
||||||
|
browserStartMu.Lock()
|
||||||
|
defer browserStartMu.Unlock()
|
||||||
|
if browserStarted {
|
||||||
|
return []byte(`{"error": "Browser already started"}`)
|
||||||
|
}
|
||||||
|
var err error
|
||||||
|
browser, err = pw.Chromium.Launch(playwright.BrowserTypeLaunchOptions{
|
||||||
|
Headless: playwright.Bool(!cfg.PlaywrightDebug),
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to launch browser: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
page, err = browser.NewPage()
|
||||||
|
if err != nil {
|
||||||
|
browser.Close()
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to create page: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
browserStarted = true
|
||||||
|
return []byte(`{"success": true, "message": "Browser started"}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
func pwStop(args map[string]string) []byte {
|
||||||
|
browserStartMu.Lock()
|
||||||
|
defer browserStartMu.Unlock()
|
||||||
|
if !browserStarted {
|
||||||
|
return []byte(`{"success": true, "message": "Browser was not running"}`)
|
||||||
|
}
|
||||||
|
if page != nil {
|
||||||
|
page.Close()
|
||||||
|
page = nil
|
||||||
|
}
|
||||||
|
if browser != nil {
|
||||||
|
browser.Close()
|
||||||
|
browser = nil
|
||||||
|
}
|
||||||
|
browserStarted = false
|
||||||
|
return []byte(`{"success": true, "message": "Browser stopped"}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
func pwIsRunning(args map[string]string) []byte {
|
||||||
|
if browserStarted {
|
||||||
|
return []byte(`{"running": true, "message": "Browser is running"}`)
|
||||||
|
}
|
||||||
|
return []byte(`{"running": false, "message": "Browser is not running"}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
func pwNavigate(args map[string]string) []byte {
|
||||||
|
url, ok := args["url"]
|
||||||
|
if !ok || url == "" {
|
||||||
|
return []byte(`{"error": "url not provided"}`)
|
||||||
|
}
|
||||||
|
if !browserStarted || page == nil {
|
||||||
|
return []byte(`{"error": "Browser not started. Call pw_start first."}`)
|
||||||
|
}
|
||||||
|
_, err := page.Goto(url)
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to navigate: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
title, _ := page.Title()
|
||||||
|
pageURL := page.URL()
|
||||||
|
return []byte(fmt.Sprintf(`{"success": true, "title": "%s", "url": "%s"}`, title, pageURL))
|
||||||
|
}
|
||||||
|
|
||||||
|
func pwClick(args map[string]string) []byte {
|
||||||
|
selector, ok := args["selector"]
|
||||||
|
if !ok || selector == "" {
|
||||||
|
return []byte(`{"error": "selector not provided"}`)
|
||||||
|
}
|
||||||
|
if !browserStarted || page == nil {
|
||||||
|
return []byte(`{"error": "Browser not started. Call pw_start first."}`)
|
||||||
|
}
|
||||||
|
index := 0
|
||||||
|
if args["index"] != "" {
|
||||||
|
if i, err := strconv.Atoi(args["index"]); err != nil {
|
||||||
|
logger.Warn("failed to parse index", "value", args["index"], "error", err)
|
||||||
|
} else {
|
||||||
|
index = i
|
||||||
|
}
|
||||||
|
}
|
||||||
|
locator := page.Locator(selector)
|
||||||
|
count, err := locator.Count()
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to find elements: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
if index >= count {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "Element not found at index %d (found %d elements)"}`, index, count))
|
||||||
|
}
|
||||||
|
err = locator.Nth(index).Click()
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to click: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
return []byte(`{"success": true, "message": "Clicked element"}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
func pwFill(args map[string]string) []byte {
|
||||||
|
selector, ok := args["selector"]
|
||||||
|
if !ok || selector == "" {
|
||||||
|
return []byte(`{"error": "selector not provided"}`)
|
||||||
|
}
|
||||||
|
text := args["text"]
|
||||||
|
if text == "" {
|
||||||
|
text = ""
|
||||||
|
}
|
||||||
|
if !browserStarted || page == nil {
|
||||||
|
return []byte(`{"error": "Browser not started. Call pw_start first."}`)
|
||||||
|
}
|
||||||
|
index := 0
|
||||||
|
if args["index"] != "" {
|
||||||
|
if i, err := strconv.Atoi(args["index"]); err != nil {
|
||||||
|
logger.Warn("failed to parse index", "value", args["index"], "error", err)
|
||||||
|
} else {
|
||||||
|
index = i
|
||||||
|
}
|
||||||
|
}
|
||||||
|
locator := page.Locator(selector)
|
||||||
|
count, err := locator.Count()
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to find elements: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
if index >= count {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "Element not found at index %d"}`, index))
|
||||||
|
}
|
||||||
|
err = locator.Nth(index).Fill(text)
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to fill: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
return []byte(`{"success": true, "message": "Filled input"}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
func pwExtractText(args map[string]string) []byte {
|
||||||
|
selector := args["selector"]
|
||||||
|
if selector == "" {
|
||||||
|
selector = "body"
|
||||||
|
}
|
||||||
|
if !browserStarted || page == nil {
|
||||||
|
return []byte(`{"error": "Browser not started. Call pw_start first."}`)
|
||||||
|
}
|
||||||
|
locator := page.Locator(selector)
|
||||||
|
count, err := locator.Count()
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to find elements: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
if count == 0 {
|
||||||
|
return []byte(`{"error": "No elements found"}`)
|
||||||
|
}
|
||||||
|
if selector == "body" {
|
||||||
|
text, err := page.Locator("body").TextContent()
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to get text: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
return []byte(fmt.Sprintf(`{"text": "%s"}`, text))
|
||||||
|
}
|
||||||
|
var texts []string
|
||||||
|
for i := 0; i < count; i++ {
|
||||||
|
text, err := locator.Nth(i).TextContent()
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
texts = append(texts, text)
|
||||||
|
}
|
||||||
|
return []byte(fmt.Sprintf(`{"text": "%s"}`, joinLines(texts)))
|
||||||
|
}
|
||||||
|
|
||||||
|
func joinLines(lines []string) string {
|
||||||
|
var sb strings.Builder
|
||||||
|
for i, line := range lines {
|
||||||
|
if i > 0 {
|
||||||
|
sb.WriteString("\n")
|
||||||
|
}
|
||||||
|
sb.WriteString(line)
|
||||||
|
}
|
||||||
|
return sb.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
func pwScreenshot(args map[string]string) []byte {
|
||||||
|
selector := args["selector"]
|
||||||
|
fullPage := args["full_page"] == "true"
|
||||||
|
if !browserStarted || page == nil {
|
||||||
|
return []byte(`{"error": "Browser not started. Call pw_start first."}`)
|
||||||
|
}
|
||||||
|
path := fmt.Sprintf("/tmp/pw_screenshot_%d.png", os.Getpid())
|
||||||
|
var err error
|
||||||
|
if selector != "" && selector != "body" {
|
||||||
|
locator := page.Locator(selector)
|
||||||
|
_, err = locator.Screenshot(playwright.LocatorScreenshotOptions{
|
||||||
|
Path: playwright.String(path),
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
_, err = page.Screenshot(playwright.PageScreenshotOptions{
|
||||||
|
Path: playwright.String(path),
|
||||||
|
FullPage: playwright.Bool(fullPage),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to take screenshot: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
return []byte(fmt.Sprintf(`{"path": "%s"}`, path))
|
||||||
|
}
|
||||||
|
|
||||||
|
func pwScreenshotAndView(args map[string]string) []byte {
|
||||||
|
selector := args["selector"]
|
||||||
|
fullPage := args["full_page"] == "true"
|
||||||
|
if !browserStarted || page == nil {
|
||||||
|
return []byte(`{"error": "Browser not started. Call pw_start first."}`)
|
||||||
|
}
|
||||||
|
path := fmt.Sprintf("/tmp/pw_screenshot_%d.png", os.Getpid())
|
||||||
|
var err error
|
||||||
|
if selector != "" && selector != "body" {
|
||||||
|
locator := page.Locator(selector)
|
||||||
|
_, err = locator.Screenshot(playwright.LocatorScreenshotOptions{
|
||||||
|
Path: playwright.String(path),
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
_, err = page.Screenshot(playwright.PageScreenshotOptions{
|
||||||
|
Path: playwright.String(path),
|
||||||
|
FullPage: playwright.Bool(fullPage),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to take screenshot: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
dataURL, err := models.CreateImageURLFromPath(path)
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to create image URL: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
resp := models.MultimodalToolResp{
|
||||||
|
Type: "multimodal_content",
|
||||||
|
Parts: []map[string]string{
|
||||||
|
{"type": "text", "text": "Screenshot saved: " + path},
|
||||||
|
{"type": "image_url", "url": dataURL},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
jsonResult, err := json.Marshal(resp)
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to marshal result: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
return jsonResult
|
||||||
|
}
|
||||||
|
|
||||||
|
func pwWaitForSelector(args map[string]string) []byte {
|
||||||
|
selector, ok := args["selector"]
|
||||||
|
if !ok || selector == "" {
|
||||||
|
return []byte(`{"error": "selector not provided"}`)
|
||||||
|
}
|
||||||
|
if !browserStarted || page == nil {
|
||||||
|
return []byte(`{"error": "Browser not started. Call pw_start first."}`)
|
||||||
|
}
|
||||||
|
timeout := 30000
|
||||||
|
if args["timeout"] != "" {
|
||||||
|
if t, err := strconv.Atoi(args["timeout"]); err != nil {
|
||||||
|
logger.Warn("failed to parse timeout", "value", args["timeout"], "error", err)
|
||||||
|
} else {
|
||||||
|
timeout = t
|
||||||
|
}
|
||||||
|
}
|
||||||
|
locator := page.Locator(selector)
|
||||||
|
err := locator.WaitFor(playwright.LocatorWaitForOptions{
|
||||||
|
Timeout: playwright.Float(float64(timeout)),
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "element not found: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
return []byte(`{"success": true, "message": "Element found"}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
func pwDrag(args map[string]string) []byte {
|
||||||
|
x1, ok := args["x1"]
|
||||||
|
if !ok {
|
||||||
|
return []byte(`{"error": "x1 not provided"}`)
|
||||||
|
}
|
||||||
|
y1, ok := args["y1"]
|
||||||
|
if !ok {
|
||||||
|
return []byte(`{"error": "y1 not provided"}`)
|
||||||
|
}
|
||||||
|
x2, ok := args["x2"]
|
||||||
|
if !ok {
|
||||||
|
return []byte(`{"error": "x2 not provided"}`)
|
||||||
|
}
|
||||||
|
y2, ok := args["y2"]
|
||||||
|
if !ok {
|
||||||
|
return []byte(`{"error": "y2 not provided"}`)
|
||||||
|
}
|
||||||
|
if !browserStarted || page == nil {
|
||||||
|
return []byte(`{"error": "Browser not started. Call pw_start first."}`)
|
||||||
|
}
|
||||||
|
var fx1, fy1, fx2, fy2 float64
|
||||||
|
if parsedX1, err := strconv.ParseFloat(x1, 64); err != nil {
|
||||||
|
logger.Warn("failed to parse x1", "value", x1, "error", err)
|
||||||
|
} else {
|
||||||
|
fx1 = parsedX1
|
||||||
|
}
|
||||||
|
if parsedY1, err := strconv.ParseFloat(y1, 64); err != nil {
|
||||||
|
logger.Warn("failed to parse y1", "value", y1, "error", err)
|
||||||
|
} else {
|
||||||
|
fy1 = parsedY1
|
||||||
|
}
|
||||||
|
if parsedX2, err := strconv.ParseFloat(x2, 64); err != nil {
|
||||||
|
logger.Warn("failed to parse x2", "value", x2, "error", err)
|
||||||
|
} else {
|
||||||
|
fx2 = parsedX2
|
||||||
|
}
|
||||||
|
if parsedY2, err := strconv.ParseFloat(y2, 64); err != nil {
|
||||||
|
logger.Warn("failed to parse y2", "value", y2, "error", err)
|
||||||
|
} else {
|
||||||
|
fy2 = parsedY2
|
||||||
|
}
|
||||||
|
mouse := page.Mouse()
|
||||||
|
err := mouse.Move(fx1, fy1)
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to move mouse: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
err = mouse.Down()
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to mouse down: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
err = mouse.Move(fx2, fy2)
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to move mouse: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
err = mouse.Up()
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to mouse up: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
return []byte(fmt.Sprintf(`{"success": true, "message": "Dragged from (%s,%s) to (%s,%s)"}`, x1, y1, x2, y2))
|
||||||
|
}
|
||||||
|
|
||||||
|
func pwClickAt(args map[string]string) []byte {
|
||||||
|
x, ok := args["x"]
|
||||||
|
if !ok {
|
||||||
|
return []byte(`{"error": "x not provided"}`)
|
||||||
|
}
|
||||||
|
y, ok := args["y"]
|
||||||
|
if !ok {
|
||||||
|
return []byte(`{"error": "y not provided"}`)
|
||||||
|
}
|
||||||
|
if !browserStarted || page == nil {
|
||||||
|
return []byte(`{"error": "Browser not started. Call pw_start first."}`)
|
||||||
|
}
|
||||||
|
fx, err := strconv.ParseFloat(x, 64)
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to parse x: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
fy, err := strconv.ParseFloat(y, 64)
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to parse y: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
mouse := page.Mouse()
|
||||||
|
err = mouse.Click(fx, fy)
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to click: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
return []byte(fmt.Sprintf(`{"success": true, "message": "Clicked at (%s,%s)"}`, x, y))
|
||||||
|
}
|
||||||
|
|
||||||
|
func pwGetHTML(args map[string]string) []byte {
|
||||||
|
selector := args["selector"]
|
||||||
|
if selector == "" {
|
||||||
|
selector = "body"
|
||||||
|
}
|
||||||
|
if !browserStarted || page == nil {
|
||||||
|
return []byte(`{"error": "Browser not started. Call pw_start first."}`)
|
||||||
|
}
|
||||||
|
locator := page.Locator(selector)
|
||||||
|
count, err := locator.Count()
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to find elements: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
if count == 0 {
|
||||||
|
return []byte(`{"error": "No elements found"}`)
|
||||||
|
}
|
||||||
|
html, err := locator.First().InnerHTML()
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to get HTML: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
return []byte(fmt.Sprintf(`{"html": %s}`, jsonString(html)))
|
||||||
|
}
|
||||||
|
|
||||||
|
type DOMElement struct {
|
||||||
|
Tag string `json:"tag,omitempty"`
|
||||||
|
Attributes map[string]string `json:"attributes,omitempty"`
|
||||||
|
Text string `json:"text,omitempty"`
|
||||||
|
Children []DOMElement `json:"children,omitempty"`
|
||||||
|
Selector string `json:"selector,omitempty"`
|
||||||
|
InnerHTML string `json:"innerHTML,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func buildDOMTree(locator playwright.Locator) ([]DOMElement, error) {
|
||||||
|
var results []DOMElement
|
||||||
|
count, err := locator.Count()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
for i := 0; i < count; i++ {
|
||||||
|
el := locator.Nth(i)
|
||||||
|
dom, err := elementToDOM(el)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
results = append(results, dom)
|
||||||
|
}
|
||||||
|
return results, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func elementToDOM(el playwright.Locator) (DOMElement, error) {
|
||||||
|
dom := DOMElement{}
|
||||||
|
tag, err := el.Evaluate(`el => el.nodeName`, nil)
|
||||||
|
if err == nil {
|
||||||
|
dom.Tag = strings.ToLower(fmt.Sprintf("%v", tag))
|
||||||
|
}
|
||||||
|
attributes := make(map[string]string)
|
||||||
|
attrs, err := el.Evaluate(`el => {
|
||||||
|
let attrs = {};
|
||||||
|
for (let i = 0; i < el.attributes.length; i++) {
|
||||||
|
let attr = el.attributes[i];
|
||||||
|
attrs[attr.name] = attr.value;
|
||||||
|
}
|
||||||
|
return attrs;
|
||||||
|
}`, nil)
|
||||||
|
if err == nil {
|
||||||
|
if amap, ok := attrs.(map[string]any); ok {
|
||||||
|
for k, v := range amap {
|
||||||
|
if vs, ok := v.(string); ok {
|
||||||
|
attributes[k] = vs
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(attributes) > 0 {
|
||||||
|
dom.Attributes = attributes
|
||||||
|
}
|
||||||
|
text, err := el.TextContent()
|
||||||
|
if err == nil && text != "" {
|
||||||
|
dom.Text = text
|
||||||
|
}
|
||||||
|
innerHTML, err := el.InnerHTML()
|
||||||
|
if err == nil && innerHTML != "" {
|
||||||
|
dom.InnerHTML = innerHTML
|
||||||
|
}
|
||||||
|
childCount, _ := el.Count()
|
||||||
|
if childCount > 0 {
|
||||||
|
childrenLocator := el.Locator("*")
|
||||||
|
children, err := buildDOMTree(childrenLocator)
|
||||||
|
if err == nil && len(children) > 0 {
|
||||||
|
dom.Children = children
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return dom, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func pwGetDOM(args map[string]string) []byte {
|
||||||
|
selector := args["selector"]
|
||||||
|
if selector == "" {
|
||||||
|
selector = "body"
|
||||||
|
}
|
||||||
|
if !browserStarted || page == nil {
|
||||||
|
return []byte(`{"error": "Browser not started. Call pw_start first."}`)
|
||||||
|
}
|
||||||
|
locator := page.Locator(selector)
|
||||||
|
count, err := locator.Count()
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to find elements: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
if count == 0 {
|
||||||
|
return []byte(`{"error": "No elements found"}`)
|
||||||
|
}
|
||||||
|
dom, err := elementToDOM(locator.First())
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to get DOM: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
data, err := json.Marshal(dom)
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to marshal DOM: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
return []byte(fmt.Sprintf(`{"dom": %s}`, string(data)))
|
||||||
|
}
|
||||||
|
|
||||||
|
func pwSearchElements(args map[string]string) []byte {
|
||||||
|
text := args["text"]
|
||||||
|
selector := args["selector"]
|
||||||
|
if text == "" && selector == "" {
|
||||||
|
return []byte(`{"error": "text or selector not provided"}`)
|
||||||
|
}
|
||||||
|
if !browserStarted || page == nil {
|
||||||
|
return []byte(`{"error": "Browser not started. Call pw_start first."}`)
|
||||||
|
}
|
||||||
|
var locator playwright.Locator
|
||||||
|
if text != "" {
|
||||||
|
locator = page.GetByText(text)
|
||||||
|
} else {
|
||||||
|
locator = page.Locator(selector)
|
||||||
|
}
|
||||||
|
count, err := locator.Count()
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to search elements: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
if count == 0 {
|
||||||
|
return []byte(`{"elements": []}`)
|
||||||
|
}
|
||||||
|
var results []map[string]string
|
||||||
|
for i := 0; i < count; i++ {
|
||||||
|
el := locator.Nth(i)
|
||||||
|
tag, _ := el.Evaluate(`el => el.nodeName`, nil)
|
||||||
|
text, _ := el.TextContent()
|
||||||
|
html, _ := el.InnerHTML()
|
||||||
|
results = append(results, map[string]string{
|
||||||
|
"index": strconv.Itoa(i),
|
||||||
|
"tag": strings.ToLower(fmt.Sprintf("%v", tag)),
|
||||||
|
"text": text,
|
||||||
|
"html": html,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
data, err := json.Marshal(results)
|
||||||
|
if err != nil {
|
||||||
|
return []byte(fmt.Sprintf(`{"error": "failed to marshal results: %s"}`, err.Error()))
|
||||||
|
}
|
||||||
|
return []byte(fmt.Sprintf(`{"elements": %s}`, string(data)))
|
||||||
|
}
|
||||||
|
|
||||||
|
func jsonString(s string) string {
|
||||||
|
b, _ := json.Marshal(s)
|
||||||
|
return string(b)
|
||||||
|
}
|
||||||
477
tui.go
477
tui.go
@@ -10,13 +10,18 @@ import (
|
|||||||
"path"
|
"path"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/gdamore/tcell/v2"
|
"github.com/gdamore/tcell/v2"
|
||||||
"github.com/rivo/tview"
|
"github.com/rivo/tview"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func isFullScreenPageActive() bool {
|
||||||
|
name, _ := pages.GetFrontPage()
|
||||||
|
return name != "main"
|
||||||
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
app *tview.Application
|
|
||||||
pages *tview.Pages
|
pages *tview.Pages
|
||||||
textArea *tview.TextArea
|
textArea *tview.TextArea
|
||||||
editArea *tview.TextArea
|
editArea *tview.TextArea
|
||||||
@@ -24,14 +29,19 @@ var (
|
|||||||
statusLineWidget *tview.TextView
|
statusLineWidget *tview.TextView
|
||||||
helpView *tview.TextView
|
helpView *tview.TextView
|
||||||
flex *tview.Flex
|
flex *tview.Flex
|
||||||
|
bottomFlex *tview.Flex
|
||||||
|
notificationWidget *tview.TextView
|
||||||
imgView *tview.Image
|
imgView *tview.Image
|
||||||
defaultImage = "sysprompts/llama.png"
|
defaultImage = "sysprompts/llama.png"
|
||||||
indexPickWindow *tview.InputField
|
indexPickWindow *tview.InputField
|
||||||
renameWindow *tview.InputField
|
renameWindow *tview.InputField
|
||||||
roleEditWindow *tview.InputField
|
roleEditWindow *tview.InputField
|
||||||
|
shellInput *tview.InputField
|
||||||
|
confirmModal *tview.Modal
|
||||||
|
toastTimer *time.Timer
|
||||||
|
confirmPageName = "confirm"
|
||||||
fullscreenMode bool
|
fullscreenMode bool
|
||||||
positionVisible bool = true
|
positionVisible bool = true
|
||||||
scrollToEndEnabled bool = true
|
|
||||||
// pages
|
// pages
|
||||||
historyPage = "historyPage"
|
historyPage = "historyPage"
|
||||||
agentPage = "agentPage"
|
agentPage = "agentPage"
|
||||||
@@ -40,7 +50,6 @@ var (
|
|||||||
helpPage = "helpPage"
|
helpPage = "helpPage"
|
||||||
renamePage = "renamePage"
|
renamePage = "renamePage"
|
||||||
RAGPage = "RAGPage"
|
RAGPage = "RAGPage"
|
||||||
RAGLoadedPage = "RAGLoadedPage"
|
|
||||||
propsPage = "propsPage"
|
propsPage = "propsPage"
|
||||||
codeBlockPage = "codeBlockPage"
|
codeBlockPage = "codeBlockPage"
|
||||||
imgPage = "imgPage"
|
imgPage = "imgPage"
|
||||||
@@ -74,7 +83,7 @@ var (
|
|||||||
[yellow]Ctrl+p[white]: props edit form (min-p, dry, etc.)
|
[yellow]Ctrl+p[white]: props edit form (min-p, dry, etc.)
|
||||||
[yellow]Ctrl+v[white]: show API link selection popup to choose current API
|
[yellow]Ctrl+v[white]: show API link selection popup to choose current API
|
||||||
[yellow]Ctrl+r[white]: start/stop recording from your microphone (needs stt server or whisper binary)
|
[yellow]Ctrl+r[white]: start/stop recording from your microphone (needs stt server or whisper binary)
|
||||||
[yellow]Ctrl+t[white]: remove thinking (<think>) and tool messages from context (delete from chat)
|
[yellow]Ctrl+t[white]: (un)collapse tool messages
|
||||||
[yellow]Ctrl+l[white]: show model selection popup to choose current model
|
[yellow]Ctrl+l[white]: show model selection popup to choose current model
|
||||||
[yellow]Ctrl+k[white]: switch tool use (recommend tool use to llm after user msg)
|
[yellow]Ctrl+k[white]: switch tool use (recommend tool use to llm after user msg)
|
||||||
[yellow]Ctrl+a[white]: interrupt tts (needs tts server)
|
[yellow]Ctrl+a[white]: interrupt tts (needs tts server)
|
||||||
@@ -93,6 +102,7 @@ var (
|
|||||||
[yellow]Alt+8[white]: show char img or last picked img
|
[yellow]Alt+8[white]: show char img or last picked img
|
||||||
[yellow]Alt+9[white]: warm up (load) selected llama.cpp model
|
[yellow]Alt+9[white]: warm up (load) selected llama.cpp model
|
||||||
[yellow]Alt+t[white]: toggle thinking blocks visibility (collapse/expand <think> blocks)
|
[yellow]Alt+t[white]: toggle thinking blocks visibility (collapse/expand <think> blocks)
|
||||||
|
[yellow]Ctrl+t[white]: toggle tool call/response visibility (collapse/expand tool calls and non-shell tool responses)
|
||||||
[yellow]Alt+i[white]: show colorscheme selection popup
|
[yellow]Alt+i[white]: show colorscheme selection popup
|
||||||
|
|
||||||
=== scrolling chat window (some keys similar to vim) ===
|
=== scrolling chat window (some keys similar to vim) ===
|
||||||
@@ -119,56 +129,219 @@ Press <Enter> or 'x' to return
|
|||||||
`
|
`
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func setShellMode(enabled bool) {
|
||||||
|
shellMode = enabled
|
||||||
|
go func() {
|
||||||
|
app.QueueUpdateDraw(func() {
|
||||||
|
updateFlexLayout()
|
||||||
|
})
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
// showToast displays a temporary notification in the bottom-right corner.
|
||||||
|
// It auto-hides after 3 seconds.
|
||||||
|
func showToast(title, message string) {
|
||||||
|
sanitize := func(s string, maxLen int) string {
|
||||||
|
sanitized := strings.Map(func(r rune) rune {
|
||||||
|
if r < 32 && r != '\t' {
|
||||||
|
return -1
|
||||||
|
}
|
||||||
|
return r
|
||||||
|
}, s)
|
||||||
|
if len(sanitized) > maxLen {
|
||||||
|
sanitized = sanitized[:maxLen-3] + "..."
|
||||||
|
}
|
||||||
|
return sanitized
|
||||||
|
}
|
||||||
|
title = sanitize(title, 50)
|
||||||
|
message = sanitize(message, 197)
|
||||||
|
if toastTimer != nil {
|
||||||
|
toastTimer.Stop()
|
||||||
|
}
|
||||||
|
// show blocking notification to not mess up flex
|
||||||
|
if fullscreenMode {
|
||||||
|
notification := tview.NewTextView().
|
||||||
|
SetTextAlign(tview.AlignCenter).
|
||||||
|
SetDynamicColors(true).
|
||||||
|
SetRegions(true).
|
||||||
|
SetText(fmt.Sprintf("[yellow]%s[-]\n", message)).
|
||||||
|
SetChangedFunc(func() {
|
||||||
|
app.Draw()
|
||||||
|
})
|
||||||
|
notification.SetTitleAlign(tview.AlignLeft).
|
||||||
|
SetBorder(true).
|
||||||
|
SetTitle(title)
|
||||||
|
// Wrap it in a full‑screen Flex to position it in the top‑right corner.
|
||||||
|
// Outer Flex (row) pushes content to the top; inner Flex (column) pushes to the right.
|
||||||
|
background := tview.NewFlex().SetDirection(tview.FlexRow).
|
||||||
|
AddItem(nil, 0, 1, false). // top spacer
|
||||||
|
AddItem(tview.NewFlex().SetDirection(tview.FlexColumn).
|
||||||
|
AddItem(nil, 0, 1, false). // left spacer
|
||||||
|
AddItem(notification, 40, 1, true), // notification width 40
|
||||||
|
5, 1, false) // notification height 5
|
||||||
|
// Generate a unique page name (e.g., using timestamp) to allow multiple toasts.
|
||||||
|
pageName := fmt.Sprintf("toast-%d", time.Now().UnixNano())
|
||||||
|
pages.AddPage(pageName, background, true, true)
|
||||||
|
// Auto‑dismiss after 2 seconds, since blocking is more annoying
|
||||||
|
time.AfterFunc(2*time.Second, func() {
|
||||||
|
app.QueueUpdateDraw(func() {
|
||||||
|
if pages.HasPage(pageName) {
|
||||||
|
pages.RemovePage(pageName)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
notificationWidget.SetTitle(title)
|
||||||
|
notificationWidget.SetText(fmt.Sprintf("[yellow]%s[-]", message))
|
||||||
|
go func() {
|
||||||
|
app.QueueUpdateDraw(func() {
|
||||||
|
flex.RemoveItem(bottomFlex)
|
||||||
|
flex.RemoveItem(statusLineWidget)
|
||||||
|
bottomFlex = tview.NewFlex().SetDirection(tview.FlexColumn).
|
||||||
|
AddItem(textArea, 0, 1, true).
|
||||||
|
AddItem(notificationWidget, 40, 1, false)
|
||||||
|
flex.AddItem(bottomFlex, 0, 10, true)
|
||||||
|
if positionVisible {
|
||||||
|
flex.AddItem(statusLineWidget, 0, 2, false)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}()
|
||||||
|
toastTimer = time.AfterFunc(3*time.Second, func() {
|
||||||
|
app.QueueUpdateDraw(func() {
|
||||||
|
flex.RemoveItem(bottomFlex)
|
||||||
|
flex.RemoveItem(statusLineWidget)
|
||||||
|
bottomFlex = tview.NewFlex().SetDirection(tview.FlexColumn).
|
||||||
|
AddItem(textArea, 0, 1, true).
|
||||||
|
AddItem(notificationWidget, 0, 0, false)
|
||||||
|
flex.AddItem(bottomFlex, 0, 10, true)
|
||||||
|
if positionVisible {
|
||||||
|
flex.AddItem(statusLineWidget, 0, 2, false)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func initTUI() {
|
||||||
// Start background goroutine to update model color cache
|
// Start background goroutine to update model color cache
|
||||||
startModelColorUpdater()
|
startModelColorUpdater()
|
||||||
tview.Styles = colorschemes["default"]
|
tview.Styles = colorschemes["default"]
|
||||||
app = tview.NewApplication()
|
app = tview.NewApplication()
|
||||||
pages = tview.NewPages()
|
pages = tview.NewPages()
|
||||||
textArea = tview.NewTextArea().
|
shellInput = tview.NewInputField().
|
||||||
SetPlaceholder("input is multiline; press <Enter> to start the next line;\npress <Esc> to send the message.")
|
SetLabel(fmt.Sprintf("[%s]$ ", cfg.FilePickerDir)). // dynamic prompt
|
||||||
textArea.SetBorder(true).SetTitle("input")
|
SetFieldWidth(0).
|
||||||
// Add input capture for @ completion
|
SetDoneFunc(func(key tcell.Key) {
|
||||||
textArea.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
if key == tcell.KeyEnter {
|
||||||
|
cmd := shellInput.GetText()
|
||||||
|
if cmd != "" {
|
||||||
|
executeCommandAndDisplay(cmd)
|
||||||
|
}
|
||||||
|
shellInput.SetText("")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
// Copy your file completion logic to shellInput's InputCapture
|
||||||
|
shellInput.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
||||||
if !shellMode {
|
if !shellMode {
|
||||||
return event
|
return event
|
||||||
}
|
}
|
||||||
// Handle Tab key for file completion
|
// Handle Up arrow for history previous
|
||||||
if event.Key() == tcell.KeyTab {
|
if event.Key() == tcell.KeyUp {
|
||||||
currentText := textArea.GetText()
|
if len(shellHistory) > 0 {
|
||||||
row, col, _, _ := textArea.GetCursor()
|
if shellHistoryPos < len(shellHistory)-1 {
|
||||||
// Calculate absolute position from row/col
|
shellHistoryPos++
|
||||||
lines := strings.Split(currentText, "\n")
|
shellInput.SetText(shellHistory[len(shellHistory)-1-shellHistoryPos])
|
||||||
cursorPos := 0
|
|
||||||
for i := 0; i < row && i < len(lines); i++ {
|
|
||||||
cursorPos += len(lines[i]) + 1 // +1 for newline
|
|
||||||
}
|
}
|
||||||
cursorPos += col
|
}
|
||||||
// Look backwards from cursor to find @
|
return nil
|
||||||
if cursorPos > 0 {
|
}
|
||||||
// Find the last @ before cursor
|
// Handle Down arrow for history next
|
||||||
textBeforeCursor := currentText[:cursorPos]
|
if event.Key() == tcell.KeyDown {
|
||||||
atIndex := strings.LastIndex(textBeforeCursor, "@")
|
if shellHistoryPos > 0 {
|
||||||
|
shellHistoryPos--
|
||||||
|
shellInput.SetText(shellHistory[len(shellHistory)-1-shellHistoryPos])
|
||||||
|
} else if shellHistoryPos == 0 {
|
||||||
|
shellHistoryPos = -1
|
||||||
|
shellInput.SetText("")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
// Reset history position when user types
|
||||||
|
if event.Key() == tcell.KeyRune {
|
||||||
|
shellHistoryPos = -1
|
||||||
|
}
|
||||||
|
// Handle Tab key for @ file completion
|
||||||
|
if event.Key() == tcell.KeyTab && shellMode {
|
||||||
|
currentText := shellInput.GetText()
|
||||||
|
atIndex := strings.LastIndex(currentText, "@")
|
||||||
if atIndex >= 0 {
|
if atIndex >= 0 {
|
||||||
// Extract the partial match text after @
|
filter := currentText[atIndex+1:]
|
||||||
filter := textBeforeCursor[atIndex+1:]
|
showShellFileCompletionPopup(filter)
|
||||||
showFileCompletionPopup(filter)
|
|
||||||
return nil // Consume the Tab event
|
|
||||||
}
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return event
|
||||||
|
})
|
||||||
|
confirmModal = tview.NewModal().
|
||||||
|
SetText("You are trying to send an empty message.\nIt makes sense if the last message in the chat is from you.\nAre you sure?").
|
||||||
|
AddButtons([]string{"Yes", "No"}).
|
||||||
|
SetButtonBackgroundColor(tcell.ColorBlack).
|
||||||
|
SetButtonTextColor(tcell.ColorWhite).
|
||||||
|
SetDoneFunc(func(buttonIndex int, buttonLabel string) {
|
||||||
|
if buttonLabel == "Yes" {
|
||||||
|
persona := cfg.UserRole
|
||||||
|
if cfg.WriteNextMsgAs != "" {
|
||||||
|
persona = cfg.WriteNextMsgAs
|
||||||
|
}
|
||||||
|
chatRoundChan <- &models.ChatRoundReq{Role: persona, UserMsg: ""}
|
||||||
|
} // In both Yes and No, go back to the main page
|
||||||
|
pages.SwitchToPage("main") // or whatever your main page is named
|
||||||
|
})
|
||||||
|
confirmModal.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
||||||
|
if event.Key() == tcell.KeyRune {
|
||||||
|
switch event.Rune() {
|
||||||
|
case 'y', 'Y':
|
||||||
|
persona := cfg.UserRole
|
||||||
|
if cfg.WriteNextMsgAs != "" {
|
||||||
|
persona = cfg.WriteNextMsgAs
|
||||||
|
}
|
||||||
|
chatRoundChan <- &models.ChatRoundReq{Role: persona, UserMsg: ""}
|
||||||
|
pages.SwitchToPage("main")
|
||||||
|
return nil
|
||||||
|
case 'n', 'N', 'x', 'X':
|
||||||
|
pages.SwitchToPage("main")
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return event
|
return event
|
||||||
})
|
})
|
||||||
|
textArea = tview.NewTextArea().
|
||||||
|
SetPlaceholder("input is multiline; press <Enter> to start the next line;\npress <Esc> to send the message.")
|
||||||
|
textArea.SetBorder(true).SetTitle("input")
|
||||||
textView = tview.NewTextView().
|
textView = tview.NewTextView().
|
||||||
SetDynamicColors(true).
|
SetDynamicColors(true).
|
||||||
SetRegions(true).
|
SetRegions(true).
|
||||||
SetChangedFunc(func() {
|
SetChangedFunc(func() {
|
||||||
|
// INFO:
|
||||||
|
// https://github.com/rivo/tview/wiki/Concurrency#event-handlers
|
||||||
|
// although already called by default per tview specs
|
||||||
|
// calling it explicitly makes text streaming to look more smooth
|
||||||
app.Draw()
|
app.Draw()
|
||||||
})
|
})
|
||||||
|
notificationWidget = tview.NewTextView().
|
||||||
|
SetTextAlign(tview.AlignCenter).
|
||||||
|
SetDynamicColors(true).
|
||||||
|
SetRegions(true).
|
||||||
|
SetChangedFunc(func() {
|
||||||
|
})
|
||||||
|
notificationWidget.SetBorder(true).SetTitle("notification")
|
||||||
|
bottomFlex = tview.NewFlex().SetDirection(tview.FlexColumn).
|
||||||
|
AddItem(textArea, 0, 1, true).
|
||||||
|
AddItem(notificationWidget, 0, 0, false)
|
||||||
//
|
//
|
||||||
flex = tview.NewFlex().SetDirection(tview.FlexRow).
|
flex = tview.NewFlex().SetDirection(tview.FlexRow).
|
||||||
AddItem(textView, 0, 40, false).
|
AddItem(textView, 0, 40, false).
|
||||||
AddItem(textArea, 0, 10, true) // Restore original height
|
AddItem(bottomFlex, 0, 10, true)
|
||||||
if positionVisible {
|
if positionVisible {
|
||||||
flex.AddItem(statusLineWidget, 0, 2, false)
|
flex.AddItem(statusLineWidget, 0, 2, false)
|
||||||
}
|
}
|
||||||
@@ -237,10 +410,14 @@ func init() {
|
|||||||
// y += h / 2
|
// y += h / 2
|
||||||
// return x, y, w, h
|
// return x, y, w, h
|
||||||
// })
|
// })
|
||||||
|
notificationWidget.SetDrawFunc(func(screen tcell.Screen, x, y, w, h int) (int, int, int, int) {
|
||||||
|
y += h / 2
|
||||||
|
return x, y, w, h
|
||||||
|
})
|
||||||
// Initially set up flex without search bar
|
// Initially set up flex without search bar
|
||||||
flex = tview.NewFlex().SetDirection(tview.FlexRow).
|
flex = tview.NewFlex().SetDirection(tview.FlexRow).
|
||||||
AddItem(textView, 0, 40, false).
|
AddItem(textView, 0, 40, false).
|
||||||
AddItem(textArea, 0, 10, true) // Restore original height
|
AddItem(bottomFlex, 0, 10, true)
|
||||||
if positionVisible {
|
if positionVisible {
|
||||||
flex.AddItem(statusLineWidget, 0, 2, false)
|
flex.AddItem(statusLineWidget, 0, 2, false)
|
||||||
}
|
}
|
||||||
@@ -253,13 +430,11 @@ func init() {
|
|||||||
defer colorText()
|
defer colorText()
|
||||||
editedMsg := editArea.GetText()
|
editedMsg := editArea.GetText()
|
||||||
if editedMsg == "" {
|
if editedMsg == "" {
|
||||||
if err := notifyUser("edit", "no edit provided"); err != nil {
|
showToast("edit", "no edit provided")
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
pages.RemovePage(editMsgPage)
|
pages.RemovePage(editMsgPage)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
chatBody.Messages[selectedIndex].Content = editedMsg
|
chatBody.Messages[selectedIndex].SetText(editedMsg)
|
||||||
// change textarea
|
// change textarea
|
||||||
textView.SetText(chatToText(chatBody.Messages, cfg.ShowSys))
|
textView.SetText(chatToText(chatBody.Messages, cfg.ShowSys))
|
||||||
pages.RemovePage(editMsgPage)
|
pages.RemovePage(editMsgPage)
|
||||||
@@ -285,9 +460,7 @@ func init() {
|
|||||||
case tcell.KeyEnter:
|
case tcell.KeyEnter:
|
||||||
newRole := roleEditWindow.GetText()
|
newRole := roleEditWindow.GetText()
|
||||||
if newRole == "" {
|
if newRole == "" {
|
||||||
if err := notifyUser("edit", "no role provided"); err != nil {
|
showToast("edit", "no role provided")
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
pages.RemovePage(roleEditPage)
|
pages.RemovePage(roleEditPage)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -314,9 +487,7 @@ func init() {
|
|||||||
siInt, err := strconv.Atoi(si)
|
siInt, err := strconv.Atoi(si)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error("failed to convert provided index", "error", err, "si", si)
|
logger.Error("failed to convert provided index", "error", err, "si", si)
|
||||||
if err := notifyUser("cancel", "no index provided, copying user input"); err != nil {
|
showToast("cancel", "no index provided, copying user input")
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
if err := copyToClipboard(textArea.GetText()); err != nil {
|
if err := copyToClipboard(textArea.GetText()); err != nil {
|
||||||
logger.Error("failed to copy to clipboard", "error", err)
|
logger.Error("failed to copy to clipboard", "error", err)
|
||||||
}
|
}
|
||||||
@@ -327,9 +498,7 @@ func init() {
|
|||||||
if len(chatBody.Messages)-1 < selectedIndex || selectedIndex < 0 {
|
if len(chatBody.Messages)-1 < selectedIndex || selectedIndex < 0 {
|
||||||
msg := "chosen index is out of bounds, will copy user input"
|
msg := "chosen index is out of bounds, will copy user input"
|
||||||
logger.Warn(msg, "index", selectedIndex)
|
logger.Warn(msg, "index", selectedIndex)
|
||||||
if err := notifyUser("error", msg); err != nil {
|
showToast("error", msg)
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
if err := copyToClipboard(textArea.GetText()); err != nil {
|
if err := copyToClipboard(textArea.GetText()); err != nil {
|
||||||
logger.Error("failed to copy to clipboard", "error", err)
|
logger.Error("failed to copy to clipboard", "error", err)
|
||||||
}
|
}
|
||||||
@@ -347,16 +516,15 @@ func init() {
|
|||||||
case editMode:
|
case editMode:
|
||||||
hideIndexBar() // Hide overlay first
|
hideIndexBar() // Hide overlay first
|
||||||
pages.AddPage(editMsgPage, editArea, true, true)
|
pages.AddPage(editMsgPage, editArea, true, true)
|
||||||
editArea.SetText(m.Content, true)
|
editArea.SetText(m.GetText(), true)
|
||||||
default:
|
default:
|
||||||
if err := copyToClipboard(m.Content); err != nil {
|
msgText := m.GetText()
|
||||||
|
if err := copyToClipboard(msgText); err != nil {
|
||||||
logger.Error("failed to copy to clipboard", "error", err)
|
logger.Error("failed to copy to clipboard", "error", err)
|
||||||
}
|
}
|
||||||
previewLen := min(30, len(m.Content))
|
previewLen := min(30, len(msgText))
|
||||||
notification := fmt.Sprintf("msg '%s' was copied to the clipboard", m.Content[:previewLen])
|
notification := fmt.Sprintf("msg '%s' was copied to the clipboard", msgText[:previewLen])
|
||||||
if err := notifyUser("copied", notification); err != nil {
|
showToast("copied", notification)
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
hideIndexBar() // Hide overlay after copying
|
hideIndexBar() // Hide overlay after copying
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
@@ -388,9 +556,7 @@ func init() {
|
|||||||
logger.Error("failed to upsert chat", "error", err, "chat", currentChat)
|
logger.Error("failed to upsert chat", "error", err, "chat", currentChat)
|
||||||
}
|
}
|
||||||
notification := fmt.Sprintf("renamed chat to '%s'", activeChatName)
|
notification := fmt.Sprintf("renamed chat to '%s'", activeChatName)
|
||||||
if err := notifyUser("renamed", notification); err != nil {
|
showToast("renamed", notification)
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return event
|
return event
|
||||||
})
|
})
|
||||||
@@ -466,7 +632,7 @@ func init() {
|
|||||||
updateStatusLine()
|
updateStatusLine()
|
||||||
textView.SetText(chatToText(chatBody.Messages, cfg.ShowSys))
|
textView.SetText(chatToText(chatBody.Messages, cfg.ShowSys))
|
||||||
colorText()
|
colorText()
|
||||||
if scrollToEndEnabled {
|
if cfg.AutoScrollEnabled {
|
||||||
textView.ScrollToEnd()
|
textView.ScrollToEnd()
|
||||||
}
|
}
|
||||||
// init sysmap
|
// init sysmap
|
||||||
@@ -495,14 +661,12 @@ func init() {
|
|||||||
}
|
}
|
||||||
if event.Key() == tcell.KeyRune && event.Rune() == '2' && event.Modifiers()&tcell.ModAlt != 0 {
|
if event.Key() == tcell.KeyRune && event.Rune() == '2' && event.Modifiers()&tcell.ModAlt != 0 {
|
||||||
// toggle auto-scrolling
|
// toggle auto-scrolling
|
||||||
scrollToEndEnabled = !scrollToEndEnabled
|
cfg.AutoScrollEnabled = !cfg.AutoScrollEnabled
|
||||||
status := "disabled"
|
status := "disabled"
|
||||||
if scrollToEndEnabled {
|
if cfg.AutoScrollEnabled {
|
||||||
status = "enabled"
|
status = "enabled"
|
||||||
}
|
}
|
||||||
if err := notifyUser("autoscroll", "Auto-scrolling "+status); err != nil {
|
showToast("autoscroll", "Auto-scrolling "+status)
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
updateStatusLine()
|
updateStatusLine()
|
||||||
}
|
}
|
||||||
// Handle Alt+7 to toggle injectRole
|
// Handle Alt+7 to toggle injectRole
|
||||||
@@ -519,12 +683,25 @@ func init() {
|
|||||||
if thinkingCollapsed {
|
if thinkingCollapsed {
|
||||||
status = "collapsed"
|
status = "collapsed"
|
||||||
}
|
}
|
||||||
if err := notifyUser("thinking", "Thinking blocks "+status); err != nil {
|
showToast("thinking", "Thinking blocks "+status)
|
||||||
logger.Error("failed to send notification", "error", err)
|
return nil
|
||||||
}
|
}
|
||||||
|
// Handle Ctrl+T to toggle tool call/response visibility
|
||||||
|
if event.Key() == tcell.KeyCtrlT {
|
||||||
|
toolCollapsed = !toolCollapsed
|
||||||
|
textView.SetText(chatToText(chatBody.Messages, cfg.ShowSys))
|
||||||
|
colorText()
|
||||||
|
status := "expanded"
|
||||||
|
if toolCollapsed {
|
||||||
|
status = "collapsed"
|
||||||
|
}
|
||||||
|
showToast("tools", "Tool calls/responses "+status)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if event.Key() == tcell.KeyRune && event.Rune() == 'i' && event.Modifiers()&tcell.ModAlt != 0 {
|
if event.Key() == tcell.KeyRune && event.Rune() == 'i' && event.Modifiers()&tcell.ModAlt != 0 {
|
||||||
|
if isFullScreenPageActive() {
|
||||||
|
return event
|
||||||
|
}
|
||||||
showColorschemeSelectionPopup()
|
showColorschemeSelectionPopup()
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -538,9 +715,7 @@ func init() {
|
|||||||
// Check if there are no chats for this agent
|
// Check if there are no chats for this agent
|
||||||
if len(chatList) == 0 {
|
if len(chatList) == 0 {
|
||||||
notification := "no chats found for agent: " + cfg.AssistantRole
|
notification := "no chats found for agent: " + cfg.AssistantRole
|
||||||
if err := notifyUser("info", notification); err != nil {
|
showToast("info", notification)
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
chatMap := make(map[string]models.Chat)
|
chatMap := make(map[string]models.Chat)
|
||||||
@@ -555,12 +730,10 @@ func init() {
|
|||||||
updateStatusLine()
|
updateStatusLine()
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if event.Key() == tcell.KeyF2 && !botRespMode {
|
if event.Key() == tcell.KeyF2 && !botRespMode.Load() {
|
||||||
// regen last msg
|
// regen last msg
|
||||||
if len(chatBody.Messages) == 0 {
|
if len(chatBody.Messages) == 0 {
|
||||||
if err := notifyUser("info", "no messages to regenerate"); err != nil {
|
showToast("info", "no messages to regenerate")
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
chatBody.Messages = chatBody.Messages[:len(chatBody.Messages)-1]
|
chatBody.Messages = chatBody.Messages[:len(chatBody.Messages)-1]
|
||||||
@@ -574,7 +747,7 @@ func init() {
|
|||||||
chatRoundChan <- &models.ChatRoundReq{Role: cfg.UserRole, Regen: true}
|
chatRoundChan <- &models.ChatRoundReq{Role: cfg.UserRole, Regen: true}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if event.Key() == tcell.KeyF3 && !botRespMode {
|
if event.Key() == tcell.KeyF3 && !botRespMode.Load() {
|
||||||
// delete last msg
|
// delete last msg
|
||||||
// check textarea text; if it ends with bot icon delete only icon:
|
// check textarea text; if it ends with bot icon delete only icon:
|
||||||
text := textView.GetText(true)
|
text := textView.GetText(true)
|
||||||
@@ -586,9 +759,7 @@ func init() {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if len(chatBody.Messages) == 0 {
|
if len(chatBody.Messages) == 0 {
|
||||||
if err := notifyUser("info", "no messages to delete"); err != nil {
|
showToast("info", "no messages to delete")
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
chatBody.Messages = chatBody.Messages[:len(chatBody.Messages)-1]
|
chatBody.Messages = chatBody.Messages[:len(chatBody.Messages)-1]
|
||||||
@@ -632,22 +803,22 @@ func init() {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if event.Key() == tcell.KeyF6 {
|
if event.Key() == tcell.KeyF6 {
|
||||||
interruptResp = true
|
interruptResp.Store(true)
|
||||||
botRespMode = false
|
botRespMode.Store(false)
|
||||||
|
toolRunningMode.Store(false)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if event.Key() == tcell.KeyF7 {
|
if event.Key() == tcell.KeyF7 {
|
||||||
// copy msg to clipboard
|
// copy msg to clipboard
|
||||||
editMode = false
|
editMode = false
|
||||||
m := chatBody.Messages[len(chatBody.Messages)-1]
|
m := chatBody.Messages[len(chatBody.Messages)-1]
|
||||||
if err := copyToClipboard(m.Content); err != nil {
|
msgText := m.GetText()
|
||||||
|
if err := copyToClipboard(msgText); err != nil {
|
||||||
logger.Error("failed to copy to clipboard", "error", err)
|
logger.Error("failed to copy to clipboard", "error", err)
|
||||||
}
|
}
|
||||||
previewLen := min(30, len(m.Content))
|
previewLen := min(30, len(msgText))
|
||||||
notification := fmt.Sprintf("msg '%s' was copied to the clipboard", m.Content[:previewLen])
|
notification := fmt.Sprintf("msg '%s' was copied to the clipboard", msgText[:previewLen])
|
||||||
if err := notifyUser("copied", notification); err != nil {
|
showToast("copied", notification)
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if event.Key() == tcell.KeyF8 {
|
if event.Key() == tcell.KeyF8 {
|
||||||
@@ -661,9 +832,7 @@ func init() {
|
|||||||
text := textView.GetText(false)
|
text := textView.GetText(false)
|
||||||
cb := codeBlockRE.FindAllString(text, -1)
|
cb := codeBlockRE.FindAllString(text, -1)
|
||||||
if len(cb) == 0 {
|
if len(cb) == 0 {
|
||||||
if err := notifyUser("notify", "no code blocks in chat"); err != nil {
|
showToast("notify", "no code blocks in chat")
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
table := makeCodeBlockTable(cb)
|
table := makeCodeBlockTable(cb)
|
||||||
@@ -678,9 +847,7 @@ func init() {
|
|||||||
// read files in chat_exports
|
// read files in chat_exports
|
||||||
filelist, err := os.ReadDir(exportDir)
|
filelist, err := os.ReadDir(exportDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if err := notifyUser("failed to load exports", err.Error()); err != nil {
|
showToast("failed to load exports", err.Error())
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
fli := []string{}
|
fli := []string{}
|
||||||
@@ -710,9 +877,7 @@ func init() {
|
|||||||
logger.Error("failed to export chat;", "error", err, "chat_name", activeChatName)
|
logger.Error("failed to export chat;", "error", err, "chat_name", activeChatName)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if err := notifyUser("exported chat", "chat: "+activeChatName+" was exported"); err != nil {
|
showToast("exported chat", "chat: "+activeChatName+" was exported")
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if event.Key() == tcell.KeyCtrlP {
|
if event.Key() == tcell.KeyCtrlP {
|
||||||
@@ -731,19 +896,17 @@ func init() {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if event.Key() == tcell.KeyCtrlL {
|
if event.Key() == tcell.KeyCtrlL {
|
||||||
|
if isFullScreenPageActive() {
|
||||||
|
return event
|
||||||
|
}
|
||||||
// Show model selection popup instead of rotating models
|
// Show model selection popup instead of rotating models
|
||||||
showModelSelectionPopup()
|
showModelSelectionPopup()
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if event.Key() == tcell.KeyCtrlT {
|
|
||||||
// clear context
|
|
||||||
// remove tools and thinking
|
|
||||||
removeThinking(chatBody)
|
|
||||||
textView.SetText(chatToText(chatBody.Messages, cfg.ShowSys))
|
|
||||||
colorText()
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if event.Key() == tcell.KeyCtrlV {
|
if event.Key() == tcell.KeyCtrlV {
|
||||||
|
if isFullScreenPageActive() {
|
||||||
|
return event
|
||||||
|
}
|
||||||
// Show API link selection popup instead of rotating APIs
|
// Show API link selection popup instead of rotating APIs
|
||||||
showAPILinkSelectionPopup()
|
showAPILinkSelectionPopup()
|
||||||
return nil
|
return nil
|
||||||
@@ -753,9 +916,7 @@ func init() {
|
|||||||
labels, err := initSysCards()
|
labels, err := initSysCards()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error("failed to read sys dir", "error", err)
|
logger.Error("failed to read sys dir", "error", err)
|
||||||
if err := notifyUser("error", "failed to read: "+cfg.SysDir); err != nil {
|
showToast("error", "failed to read: "+cfg.SysDir)
|
||||||
logger.Debug("failed to notify user", "error", err)
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
at := makeAgentTable(labels)
|
at := makeAgentTable(labels)
|
||||||
@@ -768,6 +929,7 @@ func init() {
|
|||||||
if event.Key() == tcell.KeyCtrlK {
|
if event.Key() == tcell.KeyCtrlK {
|
||||||
// add message from tools
|
// add message from tools
|
||||||
cfg.ToolUse = !cfg.ToolUse
|
cfg.ToolUse = !cfg.ToolUse
|
||||||
|
updateToolCapabilities()
|
||||||
updateStatusLine()
|
updateStatusLine()
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -779,21 +941,27 @@ func init() {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error("failed to open attached image", "path", lastImg, "error", err)
|
logger.Error("failed to open attached image", "path", lastImg, "error", err)
|
||||||
// Fall back to showing agent image
|
// Fall back to showing agent image
|
||||||
loadImage()
|
if err := loadImage(); err != nil {
|
||||||
|
logger.Warn("failed to load agent image", "error", err)
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
defer file.Close()
|
defer file.Close()
|
||||||
img, _, err := image.Decode(file)
|
img, _, err := image.Decode(file)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error("failed to decode attached image", "path", lastImg, "error", err)
|
logger.Error("failed to decode attached image", "path", lastImg, "error", err)
|
||||||
// Fall back to showing agent image
|
// Fall back to showing agent image
|
||||||
loadImage()
|
if err := loadImage(); err != nil {
|
||||||
|
logger.Warn("failed to load agent image", "error", err)
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
imgView.SetImage(img)
|
imgView.SetImage(img)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// No attached image, show agent image as before
|
// No attached image, show agent image as before
|
||||||
loadImage()
|
if err := loadImage(); err != nil {
|
||||||
|
logger.Warn("failed to load agent image", "error", err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
pages.AddPage(imgPage, imgView, true, true)
|
pages.AddPage(imgPage, imgView, true, true)
|
||||||
return nil
|
return nil
|
||||||
@@ -805,9 +973,7 @@ func init() {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
msg := "failed to inference user speech; error:" + err.Error()
|
msg := "failed to inference user speech; error:" + err.Error()
|
||||||
logger.Error(msg)
|
logger.Error(msg)
|
||||||
if err := notifyUser("stt error", msg); err != nil {
|
showToast("stt error", msg)
|
||||||
logger.Error("failed to notify user", "error", err)
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if userSpeech != "" {
|
if userSpeech != "" {
|
||||||
@@ -833,7 +999,7 @@ func init() {
|
|||||||
// Stop any currently playing TTS first
|
// Stop any currently playing TTS first
|
||||||
TTSDoneChan <- true
|
TTSDoneChan <- true
|
||||||
lastMsg := chatBody.Messages[len(chatBody.Messages)-1]
|
lastMsg := chatBody.Messages[len(chatBody.Messages)-1]
|
||||||
cleanedText := models.CleanText(lastMsg.Content)
|
cleanedText := models.CleanText(lastMsg.GetText())
|
||||||
if cleanedText != "" {
|
if cleanedText != "" {
|
||||||
// nolint: errcheck
|
// nolint: errcheck
|
||||||
go orator.Speak(cleanedText)
|
go orator.Speak(cleanedText)
|
||||||
@@ -850,15 +1016,32 @@ func init() {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if event.Key() == tcell.KeyCtrlQ {
|
if event.Key() == tcell.KeyCtrlQ {
|
||||||
|
if isFullScreenPageActive() {
|
||||||
|
return event
|
||||||
|
}
|
||||||
// Show user role selection popup instead of cycling through roles
|
// Show user role selection popup instead of cycling through roles
|
||||||
showUserRoleSelectionPopup()
|
showUserRoleSelectionPopup()
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if event.Key() == tcell.KeyCtrlX {
|
if event.Key() == tcell.KeyCtrlX {
|
||||||
|
if isFullScreenPageActive() {
|
||||||
|
return event
|
||||||
|
}
|
||||||
// Show bot role selection popup instead of cycling through roles
|
// Show bot role selection popup instead of cycling through roles
|
||||||
showBotRoleSelectionPopup()
|
showBotRoleSelectionPopup()
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
// INFO: shutdown
|
||||||
|
if event.Key() == tcell.KeyCtrlC {
|
||||||
|
logger.Info("caught Ctrl+C via tcell event")
|
||||||
|
go func() {
|
||||||
|
if err := pwShutDown(); err != nil {
|
||||||
|
logger.Error("shutdown failed", "err", err)
|
||||||
|
}
|
||||||
|
app.Stop()
|
||||||
|
}()
|
||||||
|
return nil // swallow the event
|
||||||
|
}
|
||||||
if event.Key() == tcell.KeyCtrlG {
|
if event.Key() == tcell.KeyCtrlG {
|
||||||
// cfg.RAGDir is the directory with files to use with RAG
|
// cfg.RAGDir is the directory with files to use with RAG
|
||||||
// rag load
|
// rag load
|
||||||
@@ -870,29 +1053,24 @@ func init() {
|
|||||||
// Create the RAG directory if it doesn't exist
|
// Create the RAG directory if it doesn't exist
|
||||||
if mkdirErr := os.MkdirAll(cfg.RAGDir, 0755); mkdirErr != nil {
|
if mkdirErr := os.MkdirAll(cfg.RAGDir, 0755); mkdirErr != nil {
|
||||||
logger.Error("failed to create RAG directory", "dir", cfg.RAGDir, "error", mkdirErr)
|
logger.Error("failed to create RAG directory", "dir", cfg.RAGDir, "error", mkdirErr)
|
||||||
if notifyerr := notifyUser("failed to create RAG directory", mkdirErr.Error()); notifyerr != nil {
|
showToast("failed to create RAG directory", mkdirErr.Error())
|
||||||
logger.Error("failed to send notification", "error", notifyerr)
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
// Now try to read the directory again after creating it
|
// Now try to read the directory again after creating it
|
||||||
files, err = os.ReadDir(cfg.RAGDir)
|
files, err = os.ReadDir(cfg.RAGDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error("failed to read dir after creating it", "dir", cfg.RAGDir, "error", err)
|
logger.Error("failed to read dir after creating it", "dir", cfg.RAGDir, "error", err)
|
||||||
if notifyerr := notifyUser("failed to read RAG directory", err.Error()); notifyerr != nil {
|
showToast("failed to read RAG directory", err.Error())
|
||||||
logger.Error("failed to send notification", "error", notifyerr)
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Other error (permissions, etc.)
|
// Other error (permissions, etc.)
|
||||||
logger.Error("failed to read dir", "dir", cfg.RAGDir, "error", err)
|
logger.Error("failed to read dir", "dir", cfg.RAGDir, "error", err)
|
||||||
if notifyerr := notifyUser("failed to open RAG files dir", err.Error()); notifyerr != nil {
|
showToast("failed to open RAG files dir", err.Error())
|
||||||
logger.Error("failed to send notification", "error", notifyerr)
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Get files from ragdir
|
||||||
fileList := []string{}
|
fileList := []string{}
|
||||||
for _, f := range files {
|
for _, f := range files {
|
||||||
if f.IsDir() {
|
if f.IsDir() {
|
||||||
@@ -900,22 +1078,14 @@ func init() {
|
|||||||
}
|
}
|
||||||
fileList = append(fileList, f.Name())
|
fileList = append(fileList, f.Name())
|
||||||
}
|
}
|
||||||
chatRAGTable := makeRAGTable(fileList)
|
// Get loaded files from vector DB
|
||||||
pages.AddPage(RAGPage, chatRAGTable, true, true)
|
loadedFiles, err := ragger.ListLoaded()
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if event.Key() == tcell.KeyCtrlY { // Use Ctrl+Y to list loaded RAG files
|
|
||||||
// List files already loaded into the RAG system
|
|
||||||
fileList, err := ragger.ListLoaded()
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error("failed to list loaded RAG files", "error", err)
|
logger.Error("failed to list loaded RAG files", "error", err)
|
||||||
if notifyerr := notifyUser("failed to list RAG files", err.Error()); notifyerr != nil {
|
loadedFiles = []string{} // Continue with empty list on error
|
||||||
logger.Error("failed to send notification", "error", notifyerr)
|
|
||||||
}
|
}
|
||||||
return nil
|
chatRAGTable := makeRAGTable(fileList, loadedFiles)
|
||||||
}
|
pages.AddPage(RAGPage, chatRAGTable, true, true)
|
||||||
chatLoadedRAGTable := makeLoadedRAGTable(fileList)
|
|
||||||
pages.AddPage(RAGLoadedPage, chatLoadedRAGTable, true, true)
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if event.Key() == tcell.KeyRune && event.Modifiers() == tcell.ModAlt && event.Rune() == '1' {
|
if event.Key() == tcell.KeyRune && event.Modifiers() == tcell.ModAlt && event.Rune() == '1' {
|
||||||
@@ -926,21 +1096,20 @@ func init() {
|
|||||||
if event.Key() == tcell.KeyRune && event.Modifiers() == tcell.ModAlt && event.Rune() == '9' {
|
if event.Key() == tcell.KeyRune && event.Modifiers() == tcell.ModAlt && event.Rune() == '9' {
|
||||||
// Warm up (load) the currently selected model
|
// Warm up (load) the currently selected model
|
||||||
go warmUpModel()
|
go warmUpModel()
|
||||||
if err := notifyUser("model warmup", "loading model: "+chatBody.Model); err != nil {
|
showToast("model warmup", "loading model: "+chatBody.Model)
|
||||||
logger.Debug("failed to notify user", "error", err)
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
// cannot send msg in editMode or botRespMode
|
// cannot send msg in editMode or botRespMode
|
||||||
if event.Key() == tcell.KeyEscape && !editMode && !botRespMode {
|
if event.Key() == tcell.KeyEscape && !editMode && !botRespMode.Load() {
|
||||||
msgText := textArea.GetText()
|
if shellMode {
|
||||||
if shellMode && msgText != "" {
|
cmdText := shellInput.GetText()
|
||||||
// In shell mode, execute command instead of sending to LLM
|
if cmdText != "" {
|
||||||
executeCommandAndDisplay(msgText)
|
executeCommandAndDisplay(cmdText)
|
||||||
textArea.SetText("", true) // Clear the input area
|
shellInput.SetText("")
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
} else if !shellMode {
|
}
|
||||||
// Normal mode - send to LLM
|
msgText := textArea.GetText()
|
||||||
nl := "\n\n" // keep empty lines between messages
|
nl := "\n\n" // keep empty lines between messages
|
||||||
prevText := textView.GetText(true)
|
prevText := textView.GetText(true)
|
||||||
persona := cfg.UserRole
|
persona := cfg.UserRole
|
||||||
@@ -968,20 +1137,27 @@ func init() {
|
|||||||
fmt.Fprintf(textView, "%s[-:-:b](%d) <%s>: [-:-:-]\n%s\n",
|
fmt.Fprintf(textView, "%s[-:-:b](%d) <%s>: [-:-:-]\n%s\n",
|
||||||
nl, len(chatBody.Messages), persona, msgText)
|
nl, len(chatBody.Messages), persona, msgText)
|
||||||
textArea.SetText("", true)
|
textArea.SetText("", true)
|
||||||
if scrollToEndEnabled {
|
if cfg.AutoScrollEnabled {
|
||||||
textView.ScrollToEnd()
|
textView.ScrollToEnd()
|
||||||
}
|
}
|
||||||
colorText()
|
colorText()
|
||||||
|
} else {
|
||||||
|
pages.AddPage(confirmPageName, confirmModal, true, true)
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
// go chatRound(msgText, persona, textView, false, false)
|
// go chatRound(msgText, persona, textView, false, false)
|
||||||
chatRoundChan <- &models.ChatRoundReq{Role: persona, UserMsg: msgText}
|
chatRoundChan <- &models.ChatRoundReq{Role: persona, UserMsg: msgText}
|
||||||
// Also clear any image attachment after sending the message
|
return nil
|
||||||
go func() {
|
}
|
||||||
// Wait a short moment for the message to be processed, then clear the image attachment
|
if event.Key() == tcell.KeyTab && !shellMode {
|
||||||
// This allows the image to be sent with the current message if it was attached
|
currentF := app.GetFocus()
|
||||||
// But clears it for the next message
|
if currentF == textArea {
|
||||||
ClearImageAttachment()
|
currentText := textArea.GetText()
|
||||||
}()
|
atIndex := strings.LastIndex(currentText, "@")
|
||||||
|
if atIndex >= 0 {
|
||||||
|
filter := currentText[atIndex+1:]
|
||||||
|
showTextAreaFileCompletionPopup(filter)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -990,9 +1166,10 @@ func init() {
|
|||||||
app.SetFocus(focusSwitcher[currentF])
|
app.SetFocus(focusSwitcher[currentF])
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if isASCII(string(event.Rune())) && !botRespMode {
|
if isASCII(string(event.Rune())) && !botRespMode.Load() {
|
||||||
return event
|
return event
|
||||||
}
|
}
|
||||||
return event
|
return event
|
||||||
})
|
})
|
||||||
|
go updateModelLists()
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user