Merge pull request #44 from hobbyistlabs-coder/bolt/optimize-has-attachments-8726962502433119075
⚡ Bolt: Optimize hasAttachments in routing by bypassing strings.ToLower for most inputs
This commit is contained in:
commit
0af5a5e9ce
12 changed files with 70 additions and 53 deletions
|
|
@ -4,3 +4,7 @@
|
|||
## 2024-05-25 - Efficient String Building in Loops
|
||||
**Learning:** In Go, string concatenation (`+=`) in a loop leads to $O(N^2)$ complexity due to immutability. Using `strings.Builder` provides $O(N)$ efficiency. Additionally, `fmt.Fprintf` has overhead due to format string parsing; direct `sb.WriteString` calls are significantly faster.
|
||||
**Action:** Use `strings.Builder` for building strings in loops and prefer direct `WriteString` calls over `fmt.Fprintf` for maximum performance in hot paths.
|
||||
|
||||
## 2024-05-26 - Avoid Unnecessary `strings.ToLower`
|
||||
**Learning:** Calling `strings.ToLower` on the entire message content allocates a new string and iterates over all runes. This causes measurable GC pressure and latency on hot paths like feature extraction during routing.
|
||||
**Action:** Use fast paths to bypass `strings.ToLower`. For instance, check if a requisite character (like a dot `.`) exists, or check common casings directly (`DATA:IMAGE` vs `data:image`) before falling back to full case-normalization.
|
||||
|
|
|
|||
|
|
@ -844,15 +844,15 @@ func TestTargetReasoningChannelID_AllChannels(t *testing.T) {
|
|||
t.Fatalf("Failed to create channel manager: %v", err)
|
||||
}
|
||||
for name, id := range map[string]string{
|
||||
"whatsapp": "rid-whatsapp",
|
||||
"telegram": "rid-telegram",
|
||||
"discord": "rid-discord",
|
||||
"maixcam": "rid-maixcam",
|
||||
"qq": "rid-qq",
|
||||
"dingtalk": "rid-dingtalk",
|
||||
"slack": "rid-slack",
|
||||
"line": "rid-line",
|
||||
"onebot": "rid-onebot",
|
||||
"whatsapp": "rid-whatsapp",
|
||||
"telegram": "rid-telegram",
|
||||
"discord": "rid-discord",
|
||||
"maixcam": "rid-maixcam",
|
||||
"qq": "rid-qq",
|
||||
"dingtalk": "rid-dingtalk",
|
||||
"slack": "rid-slack",
|
||||
"line": "rid-line",
|
||||
"onebot": "rid-onebot",
|
||||
} {
|
||||
chManager.RegisterChannel(name, &fakeChannel{id: id})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
package config
|
||||
|
||||
type ChannelsConfig struct {
|
||||
WhatsApp WhatsAppConfig `json:"whatsapp"`
|
||||
Telegram TelegramConfig `json:"telegram"`
|
||||
Discord DiscordConfig `json:"discord"`
|
||||
MaixCam MaixCamConfig `json:"maixcam"`
|
||||
QQ QQConfig `json:"qq"`
|
||||
DingTalk DingTalkConfig `json:"dingtalk"`
|
||||
Slack SlackConfig `json:"slack"`
|
||||
Matrix MatrixConfig `json:"matrix"`
|
||||
LINE LINEConfig `json:"line"`
|
||||
OneBot OneBotConfig `json:"onebot"`
|
||||
Pico PicoConfig `json:"pico"`
|
||||
IRC IRCConfig `json:"irc"`
|
||||
WhatsApp WhatsAppConfig `json:"whatsapp"`
|
||||
Telegram TelegramConfig `json:"telegram"`
|
||||
Discord DiscordConfig `json:"discord"`
|
||||
MaixCam MaixCamConfig `json:"maixcam"`
|
||||
QQ QQConfig `json:"qq"`
|
||||
DingTalk DingTalkConfig `json:"dingtalk"`
|
||||
Slack SlackConfig `json:"slack"`
|
||||
Matrix MatrixConfig `json:"matrix"`
|
||||
LINE LINEConfig `json:"line"`
|
||||
OneBot OneBotConfig `json:"onebot"`
|
||||
Pico PicoConfig `json:"pico"`
|
||||
IRC IRCConfig `json:"irc"`
|
||||
}
|
||||
|
||||
// GroupTriggerConfig controls when the bot responds in group chats.
|
||||
|
|
|
|||
|
|
@ -66,12 +66,12 @@ func (rt *ResourceTracker) logResources() {
|
|||
sysMB := float64(m.Sys) / 1024 / 1024
|
||||
|
||||
logger.InfoCF("SystemHealth", "Resource tracking telemetry", map[string]any{
|
||||
"goroutines": goroutines,
|
||||
"memory_alloc_mb": allocMB,
|
||||
"memory_total_mb": totalAllocMB,
|
||||
"memory_sys_mb": sysMB,
|
||||
"num_gc": m.NumGC,
|
||||
"gc_pause_ns": m.PauseNs[(m.NumGC+255)%256], // Latest GC pause time
|
||||
"goroutines": goroutines,
|
||||
"memory_alloc_mb": allocMB,
|
||||
"memory_total_mb": totalAllocMB,
|
||||
"memory_sys_mb": sysMB,
|
||||
"num_gc": m.NumGC,
|
||||
"gc_pause_ns": m.PauseNs[(m.NumGC+255)%256], // Latest GC pause time
|
||||
"gc_pause_total_ns": m.PauseTotalNs,
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,9 +34,9 @@ var (
|
|||
currentTimeFormat = "15:04:05"
|
||||
logger zerolog.Logger
|
||||
fileLogger zerolog.Logger
|
||||
logFile *os.File
|
||||
once sync.Once
|
||||
mu sync.RWMutex
|
||||
logFile *os.File
|
||||
once sync.Once
|
||||
mu sync.RWMutex
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@ var migrateableDirs = []string{
|
|||
}
|
||||
|
||||
var supportedChannels = map[string]bool{
|
||||
"whatsapp": true,
|
||||
"telegram": true,
|
||||
"discord": true,
|
||||
"maixcam": true,
|
||||
"qq": true,
|
||||
"dingtalk": true,
|
||||
"slack": true,
|
||||
"matrix": true,
|
||||
"line": true,
|
||||
"onebot": true,
|
||||
"whatsapp": true,
|
||||
"telegram": true,
|
||||
"discord": true,
|
||||
"maixcam": true,
|
||||
"qq": true,
|
||||
"dingtalk": true,
|
||||
"slack": true,
|
||||
"matrix": true,
|
||||
"line": true,
|
||||
"onebot": true,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -105,21 +105,34 @@ func countRecentToolCalls(history []providers.Message) int {
|
|||
// false negatives (missing an attachment) just mean the routing falls back to
|
||||
// the primary model anyway.
|
||||
func hasAttachments(msg string) bool {
|
||||
lower := strings.ToLower(msg)
|
||||
|
||||
// Base64 data URIs embedded directly in the message
|
||||
if strings.Contains(lower, "data:image/") ||
|
||||
strings.Contains(lower, "data:audio/") ||
|
||||
strings.Contains(lower, "data:video/") {
|
||||
// Bolt: Fast path to avoid strings.ToLower memory allocation and full string pass
|
||||
// for the vast majority of messages that contain no media.
|
||||
hasDataURI := strings.Contains(msg, "data:image/") || strings.Contains(msg, "DATA:IMAGE/") ||
|
||||
strings.Contains(msg, "data:audio/") || strings.Contains(msg, "DATA:AUDIO/") ||
|
||||
strings.Contains(msg, "data:video/") || strings.Contains(msg, "DATA:VIDEO/")
|
||||
if hasDataURI {
|
||||
return true
|
||||
}
|
||||
|
||||
// Common image/audio extensions in URLs or file references
|
||||
// Extensions must have a dot
|
||||
if !strings.Contains(msg, ".") {
|
||||
return false
|
||||
}
|
||||
|
||||
// Check common extensions without ToLower first to capture standard lowercase domains
|
||||
mediaExts := []string{
|
||||
".jpg", ".jpeg", ".png", ".gif", ".webp", ".bmp",
|
||||
".mp3", ".wav", ".ogg", ".m4a", ".flac",
|
||||
".mp4", ".avi", ".mov", ".webm",
|
||||
}
|
||||
for _, ext := range mediaExts {
|
||||
if strings.Contains(msg, ext) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
// Fallback to ToLower for weirdly cased extensions
|
||||
lower := strings.ToLower(msg)
|
||||
for _, ext := range mediaExts {
|
||||
if strings.Contains(lower, ext) {
|
||||
return true
|
||||
|
|
|
|||
|
|
@ -107,8 +107,8 @@ func (t *AlpacaTool) getPrice(symbol string) *tools.ToolResult {
|
|||
|
||||
func (t *AlpacaTool) getSMA(symbol string) *tools.ToolResult {
|
||||
req := marketdata.GetBarsRequest{
|
||||
TimeFrame: marketdata.OneDay,
|
||||
TotalLimit: 10, // 10-day simple moving average
|
||||
TimeFrame: marketdata.OneDay,
|
||||
TotalLimit: 10, // 10-day simple moving average
|
||||
}
|
||||
bars, err := t.marketData.GetBars(symbol, req)
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -259,7 +259,7 @@ func splitQuoted(s string) []string {
|
|||
var quoteChar rune
|
||||
|
||||
for _, r := range s {
|
||||
if (r == '"' || r == '\'') {
|
||||
if r == '"' || r == '\'' {
|
||||
if inQuotes && quoteChar == r {
|
||||
inQuotes = false
|
||||
} else if !inQuotes {
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ package tools
|
|||
|
||||
import (
|
||||
"context"
|
||||
"testing"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestSplitQuoted(t *testing.T) {
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
package web
|
||||
|
||||
import (
|
||||
"jane/pkg/tools"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"jane/pkg/tools"
|
||||
"net"
|
||||
"net/http"
|
||||
"net/url"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
package web
|
||||
|
||||
import (
|
||||
"jane/pkg/tools"
|
||||
"context"
|
||||
"fmt"
|
||||
"jane/pkg/tools"
|
||||
)
|
||||
|
||||
type WebSearchTool struct {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue