mirror of
https://gitcode.com/JianFeeeee/HomeAgent.git
synced 2026-09-22 01:48:11 +00:00
重构: 插件自注册 + .so 动态加载 + 中断打断机制
- 所有内置插件 init() 自注册 (plugin.RegisterFactory), 移除 main.go 硬编码 - 新增 .so 动态加载器 (internal/plugin/dynamic.go), 插件可编译为 plugin.so - 新增 plugin.json 元数据 (internal/plugin/manifest.go) - 新增 interceptLoop 独立 goroutine: (a) cancelLLM() 取消进行中的 HTTP 请求 (b) interceptCh → drainInterrupt() 注入 [打断消息] 到 LLM 上下文 (c) InjectInput 空闲时触发新处理循环 - 新增 internal/plugins/all.go 空白导入触发所有内置插件 init() - internal/sdk/ 作为 PluginSDK 正式 Go API - internal/api/ → internal/plugins/webui/ 迁移 - 删除旧 cmd/cli/, 使用 cmd/waiter/ 替代 - 更新 PLAN.md / ARCHITECTURE.md / README.md 文档
This commit is contained in:
@ -150,12 +150,11 @@ func (r *ConfigRegistry) Close() error {
|
||||
return r.db.Close()
|
||||
}
|
||||
|
||||
// SeedFrom 从 *types.Config 批量导入默认值到 config 表(仅空表时写入)
|
||||
func (r *ConfigRegistry) SeedFrom(cfg *types.Config) {
|
||||
// SeedDefaults 用硬编码默认值填充 config 表(仅空表时写入),不再依赖 YAML
|
||||
func (r *ConfigRegistry) SeedDefaults(dataDir string) {
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
|
||||
// 检查是否已有数据
|
||||
var count int
|
||||
r.db.QueryRow(`SELECT COUNT(*) FROM config`).Scan(&count)
|
||||
if count > 0 {
|
||||
@ -177,44 +176,54 @@ func (r *ConfigRegistry) SeedFrom(cfg *types.Config) {
|
||||
set := func(k, v string) { stmt.Exec(k, v) }
|
||||
|
||||
// daemon
|
||||
set("core.daemon.listen_addr", cfg.Daemon.ListenAddr)
|
||||
set("core.daemon.data_dir", cfg.Daemon.DataDir)
|
||||
set("core.daemon.heartbeat_interval", cfg.Daemon.HeartbeatInterval.String())
|
||||
set("core.daemon.check_interval", cfg.Daemon.CheckInterval.String())
|
||||
set("core.daemon.log_level", cfg.Daemon.LogLevel)
|
||||
set("core.daemon.listen_addr", ":8080")
|
||||
set("core.daemon.data_dir", dataDir)
|
||||
set("core.daemon.heartbeat_interval", "15s")
|
||||
set("core.daemon.check_interval", "30s")
|
||||
set("core.daemon.log_level", "info")
|
||||
|
||||
// llm
|
||||
set("core.llm.provider", cfg.LLM.Provider)
|
||||
set("core.llm.model", cfg.LLM.Model)
|
||||
set("core.llm.base_url", cfg.LLM.BaseURL)
|
||||
set("core.llm.adapter", cfg.LLM.Adapter)
|
||||
set("core.llm.temperature", strconv.FormatFloat(cfg.LLM.Temperature, 'f', 2, 64))
|
||||
set("core.llm.max_tokens", strconv.Itoa(cfg.LLM.MaxTokens))
|
||||
set("core.llm.provider", "deepseek")
|
||||
set("core.llm.model", "deepseek-v4-flash")
|
||||
set("core.llm.base_url", "https://api.deepseek.com")
|
||||
set("core.llm.adapter", "deepseek")
|
||||
set("core.llm.temperature", "0.7")
|
||||
set("core.llm.max_tokens", "4096")
|
||||
|
||||
// llm sources
|
||||
for _, src := range cfg.LLM.Sources {
|
||||
p := "core.llm.sources." + src.Name
|
||||
set(p+".base_url", src.BaseURL)
|
||||
set(p+".model", src.Model)
|
||||
set(p+".adapter", src.Adapter)
|
||||
set(p+".adapter_path", src.AdapterPath)
|
||||
sources := map[string]map[string]string{
|
||||
"deepseek": {"base_url": "https://api.deepseek.com", "model": "deepseek-v4-flash", "adapter": "deepseek", "adapter_path": "adapters/deepseek.lua"},
|
||||
"openai": {"base_url": "https://api.openai.com/v1", "model": "gpt-4o", "adapter": "openai", "adapter_path": "adapters/openai.lua"},
|
||||
"anthropic": {"base_url": "https://api.anthropic.com", "model": "claude-sonnet-4-20250514", "adapter": "anthropic", "adapter_path": "adapters/anthropic.lua"},
|
||||
"gemini": {"base_url": "https://generativelanguage.googleapis.com", "model": "gemini-2.0-flash", "adapter": "gemini", "adapter_path": "adapters/gemini.lua"},
|
||||
"mistral": {"base_url": "https://api.mistral.ai", "model": "mistral-large-latest", "adapter": "mistral", "adapter_path": "adapters/mistral.lua"},
|
||||
"groq": {"base_url": "https://api.groq.com", "model": "llama3-70b-8192", "adapter": "groq", "adapter_path": "adapters/groq.lua"},
|
||||
"github": {"base_url": "https://models.inference.ai.azure.com", "model": "gpt-4o", "adapter": "github", "adapter_path": "adapters/github.lua"},
|
||||
"ollama": {"base_url": "http://localhost:11434", "model": "llama3", "adapter": "ollama", "adapter_path": "adapters/ollama.lua"},
|
||||
}
|
||||
for name, props := range sources {
|
||||
p := "core.llm.sources." + name
|
||||
set(p+".base_url", props["base_url"])
|
||||
set(p+".model", props["model"])
|
||||
set(p+".adapter", props["adapter"])
|
||||
set(p+".adapter_path", props["adapter_path"])
|
||||
}
|
||||
|
||||
// defaults
|
||||
set("core.defaults.image", cfg.Defaults.Image)
|
||||
set("core.defaults.openclaw_enabled", strconv.FormatBool(cfg.Defaults.OpenClawEnabled))
|
||||
set("core.defaults.snapshot.interval", cfg.Defaults.SnapshotPolicy.Interval.String())
|
||||
set("core.defaults.snapshot.max_snapshots", strconv.Itoa(cfg.Defaults.SnapshotPolicy.MaxSnapshots))
|
||||
set("core.defaults.snapshot.pre_action", strconv.FormatBool(cfg.Defaults.SnapshotPolicy.PreAction))
|
||||
set("core.defaults.snapshot.post_action", strconv.FormatBool(cfg.Defaults.SnapshotPolicy.PostAction))
|
||||
set("core.defaults.rollback.max_retries", strconv.Itoa(cfg.Defaults.RollbackPolicy.MaxRetries))
|
||||
set("core.defaults.rollback.health_threshold", strconv.Itoa(int(cfg.Defaults.RollbackPolicy.HealthThreshold)))
|
||||
set("core.defaults.rollback.cooldown_period", cfg.Defaults.RollbackPolicy.CooldownPeriod.String())
|
||||
set("core.defaults.rollback.auto_rollback", strconv.FormatBool(cfg.Defaults.RollbackPolicy.AutoRollback))
|
||||
set("core.defaults.resource.cpu", cfg.Defaults.ResourceLimit.CPU)
|
||||
set("core.defaults.resource.memory", cfg.Defaults.ResourceLimit.Memory)
|
||||
set("core.defaults.resource.disk", cfg.Defaults.ResourceLimit.Disk)
|
||||
set("core.defaults.resource.network", strconv.FormatBool(cfg.Defaults.ResourceLimit.Network))
|
||||
set("core.defaults.image", "homeagent/agent-base:latest")
|
||||
set("core.defaults.openclaw_enabled", "true")
|
||||
set("core.defaults.snapshot.interval", "10m")
|
||||
set("core.defaults.snapshot.max_snapshots", "20")
|
||||
set("core.defaults.snapshot.pre_action", "true")
|
||||
set("core.defaults.snapshot.post_action", "false")
|
||||
set("core.defaults.rollback.max_retries", "3")
|
||||
set("core.defaults.rollback.health_threshold", "3")
|
||||
set("core.defaults.rollback.cooldown_period", "30s")
|
||||
set("core.defaults.rollback.auto_rollback", "true")
|
||||
set("core.defaults.resource.cpu", "2")
|
||||
set("core.defaults.resource.memory", "2g")
|
||||
set("core.defaults.resource.disk", "10g")
|
||||
set("core.defaults.resource.network", "true")
|
||||
set("core.agent.max_tool_turns", "10")
|
||||
set("core.agent.max_context_size", "30")
|
||||
set("core.agent.distill_interval", "30m")
|
||||
|
||||
@ -4,8 +4,6 @@ import (
|
||||
"path/filepath"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"gitcode.com/JianFeeeee/HomeAgent/pkg/types"
|
||||
)
|
||||
|
||||
func TestRegistryBasic(t *testing.T) {
|
||||
@ -154,70 +152,36 @@ func TestPluginConfig(t *testing.T) {
|
||||
r.Close()
|
||||
}
|
||||
|
||||
func TestSeedFromToConfig(t *testing.T) {
|
||||
func TestSeedDefaultsToConfig(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
path := filepath.Join(dir, "config.db")
|
||||
|
||||
cfg := &types.Config{
|
||||
Daemon: types.DaemonConfig{
|
||||
ListenAddr: ":9090",
|
||||
DataDir: "/tmp/test",
|
||||
HeartbeatInterval: 10 * time.Second,
|
||||
CheckInterval: 20 * time.Second,
|
||||
LogLevel: "debug",
|
||||
},
|
||||
LLM: types.LLMConfig{
|
||||
Provider: "deepseek",
|
||||
Model: "deepseek-v4-flash",
|
||||
BaseURL: "https://api.deepseek.com",
|
||||
Adapter: "deepseek",
|
||||
Temperature: 0.5,
|
||||
MaxTokens: 2048,
|
||||
Sources: []types.LLMSource{
|
||||
{Name: "deepseek", BaseURL: "https://api.deepseek.com", Model: "deepseek-v4-flash", Adapter: "deepseek", AdapterPath: "adapters/deepseek.lua"},
|
||||
{Name: "openai", BaseURL: "https://api.openai.com/v1", Model: "gpt-4o", Adapter: "openai", AdapterPath: "adapters/openai.lua"},
|
||||
},
|
||||
},
|
||||
Defaults: types.AgentConfig{
|
||||
Image: "test-image",
|
||||
OpenClawEnabled: true,
|
||||
},
|
||||
}
|
||||
|
||||
r := NewConfigRegistry(path)
|
||||
r.SeedFrom(cfg)
|
||||
r.SeedDefaults(dir)
|
||||
|
||||
// Verify DB was seeded
|
||||
if len(r.List("")) == 0 {
|
||||
t.Fatal("SeedFrom produced empty DB")
|
||||
// Verify DB was seeded with expected number of keys
|
||||
keys := r.List("")
|
||||
if len(keys) == 0 {
|
||||
t.Fatal("SeedDefaults produced empty DB")
|
||||
}
|
||||
|
||||
// Reconstruct config from DB
|
||||
cfg2 := r.ToConfig()
|
||||
|
||||
if cfg2.Daemon.ListenAddr != ":9090" {
|
||||
t.Fatalf("expected :9090, got %s", cfg2.Daemon.ListenAddr)
|
||||
}
|
||||
if cfg2.Daemon.LogLevel != "debug" {
|
||||
t.Fatalf("expected debug, got %s", cfg2.Daemon.LogLevel)
|
||||
if cfg2.Daemon.ListenAddr != ":8080" {
|
||||
t.Fatalf("expected :8080, got %s", cfg2.Daemon.ListenAddr)
|
||||
}
|
||||
if cfg2.LLM.Provider != "deepseek" {
|
||||
t.Fatalf("expected deepseek, got %s", cfg2.LLM.Provider)
|
||||
}
|
||||
if cfg2.LLM.MaxTokens != 2048 {
|
||||
t.Fatalf("expected 2048, got %d", cfg2.LLM.MaxTokens)
|
||||
}
|
||||
if len(cfg2.LLM.Sources) != 2 {
|
||||
t.Fatalf("expected 2 sources, got %d", len(cfg2.LLM.Sources))
|
||||
}
|
||||
if cfg2.LLM.Sources[0].AdapterPath != "adapters/deepseek.lua" {
|
||||
t.Fatalf("expected adapters/deepseek.lua, got %s", cfg2.LLM.Sources[0].AdapterPath)
|
||||
if len(cfg2.LLM.Sources) == 0 {
|
||||
t.Fatal("expected at least 1 LLM source")
|
||||
}
|
||||
|
||||
// Second SeedFrom should be no-op (DB already has data)
|
||||
r.SeedFrom(cfg)
|
||||
if len(r.List("")) != len(r.List("")) {
|
||||
t.Fatal("second SeedFrom changed DB count")
|
||||
// Second SeedDefaults should be no-op (DB already has data)
|
||||
r.SeedDefaults(dir)
|
||||
if len(r.List("")) != len(keys) {
|
||||
t.Fatal("second SeedDefaults changed DB count")
|
||||
}
|
||||
|
||||
r.Close()
|
||||
|
||||
Reference in New Issue
Block a user