mirror of
https://github.com/RuoJi6/ARTEX.git
synced 2026-11-02 18:53:50 +08:00
Merge pull request #45 from RuoJi6/feat/multi-model-workers
feat: 多模型 Worker 池(按 LLM 配置分配并发会话)
This commit is contained in:
12 files changed
+1023
-35
No files matched your search
@@ -3,6 +3,7 @@ package db
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"sort"
|
||||
)
|
||||
|
||||
// Settings is a tiny key-value store for global app config the UI toggles at
|
||||
@@ -33,6 +34,32 @@ ON CONFLICT (key) DO UPDATE SET value = EXCLUDED.value, updated_at = now()`, key
|
||||
return err
|
||||
}
|
||||
|
||||
// SetSettingsAtomic upserts several settings in one transaction. Keys are
|
||||
// sorted so concurrent callers acquire row locks in a deterministic order.
|
||||
func (d *DB) SetSettingsAtomic(ctx context.Context, values map[string]string) error {
|
||||
if len(values) == 0 {
|
||||
return nil
|
||||
}
|
||||
tx, err := d.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer tx.Rollback() //nolint:errcheck // commit makes this a no-op
|
||||
keys := make([]string, 0, len(values))
|
||||
for key := range values {
|
||||
keys = append(keys, key)
|
||||
}
|
||||
sort.Strings(keys)
|
||||
for _, key := range keys {
|
||||
if _, err := tx.ExecContext(ctx, `
|
||||
INSERT INTO settings(key, value) VALUES ($1, $2)
|
||||
ON CONFLICT (key) DO UPDATE SET value = EXCLUDED.value, updated_at = now()`, key, values[key]); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return tx.Commit()
|
||||
}
|
||||
|
||||
// InsertSettingIfAbsent 只在 key 尚未存在时写入,已存在则原样保留并返回 inserted=false。
|
||||
// 给 auth.password_hash 这类"只允许首次设置"的键用:判定落在数据库的主键约束上,
|
||||
// 调用方先 GetSetting 再写的那种检查就只是快速失败路径——读出错或并发撞车时,
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
package db
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestSetSettingsAtomic(t *testing.T) {
|
||||
d, err := Open(testDSN(t))
|
||||
if err != nil {
|
||||
t.Skipf("postgres unavailable (%v)", err)
|
||||
}
|
||||
defer d.Close()
|
||||
prefix := fmt.Sprintf("test.atomic_settings.%d", time.Now().UnixNano())
|
||||
defer func() { _, _ = d.Exec(`DELETE FROM settings WHERE key LIKE $1`, prefix+".%") }()
|
||||
values := map[string]string{prefix + ".worker_pools": "[]", prefix + ".workers": "3"}
|
||||
if err := d.SetSettingsAtomic(context.Background(), values); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for key, want := range values {
|
||||
got, ok, err := d.GetSetting(key)
|
||||
if err != nil || !ok || got != want {
|
||||
t.Fatalf("key %q: value=%q ok=%v err=%v, want %q", key, got, ok, err, want)
|
||||
}
|
||||
}
|
||||
}
|
||||
+114
-11
@@ -148,11 +148,19 @@ type Engine struct {
|
||||
// (for example an exhausted failover chain) — there is no global-pair fallback.
|
||||
resolve func(t *Task) (*agent.Planner, *agent.Worker)
|
||||
resolveAuthoritative bool
|
||||
workerResolve func(t *Task, slot WorkerSlot) (*agent.Worker, error)
|
||||
slotState sync.Map // task/slot -> slotAvailability
|
||||
slotPlans sync.Map // task -> map[slot name]profile ID; immutable for a run
|
||||
// readiness reports whether a global LLM provider is configured — the signal behind
|
||||
// Ready()/the llm_configured indicator. Wired once at startup; nil → not ready.
|
||||
readiness func() bool
|
||||
}
|
||||
|
||||
type slotAvailability struct {
|
||||
available bool
|
||||
lastEmit time.Time
|
||||
}
|
||||
|
||||
type taskRuntime struct {
|
||||
ctx context.Context
|
||||
cancel context.CancelFunc
|
||||
@@ -285,6 +293,14 @@ func (e *Engine) StopTask(taskID string) {
|
||||
e.stamped.Delete(taskID)
|
||||
e.inflight.Delete(taskID)
|
||||
e.coordStarted.Delete(taskID)
|
||||
e.slotPlans.Delete(taskID)
|
||||
e.slotState.Range(func(key, _ any) bool {
|
||||
keyText, ok := key.(string)
|
||||
if ok && strings.HasPrefix(keyText, taskID+"/") {
|
||||
e.slotState.Delete(key)
|
||||
}
|
||||
return true
|
||||
})
|
||||
e.deleteMu.Lock()
|
||||
e.deleting.Delete(taskID)
|
||||
e.deleteMu.Unlock()
|
||||
@@ -715,6 +731,37 @@ func (e *Engine) SetAuthoritativeAgentResolver(fn func(t *Task) (*agent.Planner,
|
||||
e.resolveAuthoritative = true
|
||||
}
|
||||
|
||||
func (e *Engine) SetWorkerResolver(fn func(t *Task, slot WorkerSlot) (*agent.Worker, error)) {
|
||||
e.workerResolve = fn
|
||||
}
|
||||
|
||||
func (e *Engine) reportSlotAvailability(t *Task, slot WorkerSlot, err error) {
|
||||
key := t.ID + "/" + slot.Name
|
||||
now := time.Now()
|
||||
value, loaded := e.slotState.LoadOrStore(key, slotAvailability{available: err == nil, lastEmit: now})
|
||||
state := value.(slotAvailability)
|
||||
if err == nil {
|
||||
if loaded && !state.available {
|
||||
e.slotState.Store(key, slotAvailability{available: true, lastEmit: now})
|
||||
e.emitActivity(t, db.Activity{Worker: "system", Kind: "text", Summary: fmt.Sprintf("%s 绑定的 LLM 配置 #%d 已恢复,可以继续领取任务", slot.Name, slot.ProfileID)})
|
||||
}
|
||||
return
|
||||
}
|
||||
if loaded && state.available {
|
||||
state.available = false
|
||||
state.lastEmit = now
|
||||
e.slotState.Store(key, state)
|
||||
} else if loaded && now.Sub(state.lastEmit) < 5*time.Minute {
|
||||
return
|
||||
} else {
|
||||
state = slotAvailability{available: false, lastEmit: now}
|
||||
e.slotState.Store(key, state)
|
||||
}
|
||||
summary := fmt.Sprintf("%s 绑定的 LLM 配置 #%d 不可用(已删除或配置无效),该会话暂停领取任务,不会回退到默认模型", slot.Name, slot.ProfileID)
|
||||
e.emitActivity(t, db.Activity{Worker: "system", Kind: "text", IsError: true, Summary: summary, Detail: err.Error()})
|
||||
log.Printf("[worker %s] task %s pinned profile #%d unavailable: %v", slot.Name, t.ID, slot.ProfileID, err)
|
||||
}
|
||||
|
||||
// snapshotFor returns the planner/worker a task should run on, from the task-router
|
||||
// resolver. nil,nil means the task is deliberately unavailable (e.g. an exhausted
|
||||
// failover chain); there is no global-pair fallback.
|
||||
@@ -746,7 +793,11 @@ func (e *Engine) ReadyFor(t *Task) bool {
|
||||
// but no-op until an LLM is configured (so a task created while idle picks up
|
||||
// automatically once LLM is set from the UI).
|
||||
func (e *Engine) Run(ctx context.Context, t *Task) {
|
||||
workers := workerCountForTask(t, e.m.Workers())
|
||||
slots, err := workerSlotsForTask(t, e.m.WorkerPools(), e.m.Workers())
|
||||
if err != nil {
|
||||
log.Printf("[engine] task %s worker pool invalid, using legacy workers: %v", t.ID, err)
|
||||
slots, _ = ExpandWorkerSlots(nil, workerCountForTask(t, e.m.Workers()))
|
||||
}
|
||||
e.deleteMu.RLock()
|
||||
if e.IsDeleting(t.ID) {
|
||||
e.deleteMu.RUnlock()
|
||||
@@ -757,13 +808,18 @@ func (e *Engine) Run(ctx context.Context, t *Task) {
|
||||
t.Notify() // already running — just nudge a planning round
|
||||
return
|
||||
}
|
||||
rt := e.registerTaskRoutines(ctx, t.ID, 1+workers)
|
||||
rt := e.registerTaskRoutines(ctx, t.ID, 1+len(slots))
|
||||
plan := make(map[string]int64, len(slots))
|
||||
for _, slot := range slots {
|
||||
plan[slot.Name] = slot.ProfileID
|
||||
}
|
||||
e.slotPlans.Store(t.ID, plan)
|
||||
e.deleteMu.RUnlock()
|
||||
e.touch(t.ID)
|
||||
runTaskRoutine(rt, func(loopCtx context.Context) { e.plannerLoop(loopCtx, t) })
|
||||
for i := 0; i < workers; i++ {
|
||||
name := fmt.Sprintf("work#%d", i+1)
|
||||
runTaskRoutine(rt, func(loopCtx context.Context) { e.workerLoop(loopCtx, t, name) })
|
||||
for _, slot := range slots {
|
||||
slot := slot
|
||||
runTaskRoutine(rt, func(loopCtx context.Context) { e.workerLoop(loopCtx, t, slot) })
|
||||
}
|
||||
e.startDeadlineCoordinator(ctx, t) // 任务级超时定时器(仅 timeout>0;去重)
|
||||
// 仅在「完全没有活动意图(open+running)」时才 kick 首轮规划。带种子意图的任务:种子已
|
||||
@@ -776,6 +832,15 @@ func (e *Engine) Run(ctx context.Context, t *Task) {
|
||||
}
|
||||
}
|
||||
|
||||
// workerSlotsForTask preserves an explicit task concurrency override. Tasks
|
||||
// using the global default inherit its model pools and their pinned profiles.
|
||||
func workerSlotsForTask(t *Task, pools []WorkerPool, global int) ([]WorkerSlot, error) {
|
||||
if t != nil && t.WorkerCount > 0 {
|
||||
return ExpandWorkerSlots(nil, workerCountForTask(t, global))
|
||||
}
|
||||
return ExpandWorkerSlots(pools, global)
|
||||
}
|
||||
|
||||
func workerCountForTask(t *Task, global int) int {
|
||||
if t != nil && t.WorkerCount > 0 {
|
||||
// Direct database edits can bypass validation; cap those values so the
|
||||
@@ -925,14 +990,32 @@ func (e *Engine) plannerLoop(ctx context.Context, t *Task) {
|
||||
}
|
||||
}
|
||||
|
||||
func (e *Engine) workerLoop(ctx context.Context, t *Task, name string) {
|
||||
func (e *Engine) workerLoop(ctx context.Context, t *Task, slot WorkerSlot) {
|
||||
name := slot.Name
|
||||
for {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return
|
||||
default:
|
||||
}
|
||||
_, worker := e.snapshotFor(t)
|
||||
var worker *agent.Worker
|
||||
var resolveErr error
|
||||
if slot.ProfileID > 0 {
|
||||
if e.workerResolve == nil {
|
||||
resolveErr = errors.New("pinned worker resolver unavailable")
|
||||
} else {
|
||||
worker, resolveErr = e.workerResolve(t, slot)
|
||||
if worker == nil && resolveErr == nil {
|
||||
resolveErr = errors.New("pinned worker resolver returned no worker")
|
||||
}
|
||||
}
|
||||
e.reportSlotAvailability(t, slot, resolveErr)
|
||||
if resolveErr != nil {
|
||||
worker = nil
|
||||
}
|
||||
} else {
|
||||
_, worker = e.snapshotFor(t)
|
||||
}
|
||||
if worker == nil {
|
||||
if sleepCtx(ctx, 1500*time.Millisecond) {
|
||||
return
|
||||
@@ -1190,10 +1273,6 @@ func (e *Engine) runDetachedIntent(ctx context.Context, t *Task, intentID int64,
|
||||
e.decInflight(t.ID)
|
||||
}
|
||||
}()
|
||||
_, worker := e.snapshotFor(t)
|
||||
if worker == nil {
|
||||
return fmt.Errorf("worker 尚未就绪")
|
||||
}
|
||||
node, err := t.Store.GetNode(intentID)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -1201,6 +1280,30 @@ func (e *Engine) runDetachedIntent(ctx context.Context, t *Task, intentID int64,
|
||||
if node == nil || node.Kind != db.KindIntent {
|
||||
return fmt.Errorf("intent not found")
|
||||
}
|
||||
owner := node.Owner
|
||||
var worker *agent.Worker
|
||||
if value, ok := e.slotPlans.Load(t.ID); ok {
|
||||
if plan, ok := value.(map[string]int64); ok {
|
||||
if profileID, pinned := plan[owner]; pinned && profileID > 0 {
|
||||
if e.workerResolve == nil {
|
||||
return fmt.Errorf("意图所属的 LLM 配置 #%d 不可用:pinned worker resolver unavailable", profileID)
|
||||
}
|
||||
worker, err = e.workerResolve(t, WorkerSlot{Name: owner, ProfileID: profileID})
|
||||
if err != nil || worker == nil {
|
||||
if err == nil {
|
||||
err = errors.New("worker resolver returned no worker")
|
||||
}
|
||||
return fmt.Errorf("意图所属的 LLM 配置 #%d 不可用:%w", profileID, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if worker == nil {
|
||||
_, worker = e.snapshotFor(t)
|
||||
if worker == nil {
|
||||
return fmt.Errorf("worker 尚未就绪")
|
||||
}
|
||||
}
|
||||
changed, err := t.Store.CompareAndSetIntentState(intentID, "paused", "running")
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/Autumn-27/artex/db"
|
||||
@@ -20,3 +21,39 @@ func TestWorkerCountForTaskUsesOverrideOrGlobalDefault(t *testing.T) {
|
||||
t.Fatalf("oversized override = %d, want capped %d", got, db.MaxTaskWorkerCount)
|
||||
}
|
||||
}
|
||||
|
||||
func TestWorkerSlotsForTaskCombinesOverridesAndModelPools(t *testing.T) {
|
||||
pools := []WorkerPool{{ProfileID: 7, Workers: 2}, {ProfileID: 12, Workers: 1}}
|
||||
for _, tc := range []struct {
|
||||
name string
|
||||
task *Task
|
||||
pools []WorkerPool
|
||||
global int
|
||||
profiles []int64
|
||||
}{
|
||||
{"task inherits model pools", &Task{}, pools, 9, []int64{7, 7, 12}},
|
||||
{"task override replaces global pools", &Task{WorkerCount: 2}, pools, 9, []int64{0, 0}},
|
||||
{"task inherits legacy count", &Task{}, nil, 4, []int64{0, 0, 0, 0}},
|
||||
{"task override without pools", &Task{WorkerCount: 1}, nil, 4, []int64{0}},
|
||||
{"invalid task value uses pools", &Task{WorkerCount: -1}, pools, 9, []int64{7, 7, 12}},
|
||||
} {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
slots, err := workerSlotsForTask(tc.task, tc.pools, tc.global)
|
||||
if err != nil || len(slots) != len(tc.profiles) {
|
||||
t.Fatalf("slots=%+v err=%v, want profiles %v", slots, err, tc.profiles)
|
||||
}
|
||||
for i, profile := range tc.profiles {
|
||||
if slots[i].ProfileID != profile || slots[i].Name != fmt.Sprintf("work#%d", i+1) {
|
||||
t.Fatalf("slot[%d]=%+v, want profile %d", i, slots[i], profile)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
slots, err := workerSlotsForTask(&Task{WorkerCount: db.MaxTaskWorkerCount + 1}, pools, 3)
|
||||
if err != nil || len(slots) != db.MaxTaskWorkerCount {
|
||||
t.Fatalf("oversized task override: slots=%d err=%v", len(slots), err)
|
||||
}
|
||||
if _, err := workerSlotsForTask(&Task{}, []WorkerPool{{ProfileID: 0, Workers: 1}}, 3); err == nil {
|
||||
t.Fatal("invalid inherited pool accepted")
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
@@ -266,6 +267,7 @@ const (
|
||||
// only routes the search backend) and the per-profile LLM proxy.
|
||||
settingGlobalProxy = "global_proxy"
|
||||
settingWorkers = "workers"
|
||||
settingWorkerPools = "worker_pools"
|
||||
settingLLMRecord = "llm_record"
|
||||
// LLM 轮询(故障转移)。默认关闭——开启后走「全局激活配置」的 agent 在当前配置
|
||||
// 不可用(余额不足/key 失效/限流/服务异常)时自动切到下一个配置。
|
||||
@@ -292,6 +294,102 @@ const (
|
||||
defaultConcurrencyLimit = 5
|
||||
)
|
||||
|
||||
// WorkerPool binds a number of worker slots to one LLM profile. Profile IDs are
|
||||
// encoded as JSON strings to match the frontend LLMProfile API.
|
||||
type WorkerPool struct {
|
||||
ProfileID int64 `json:"profile_id,string"`
|
||||
Workers int `json:"workers"`
|
||||
}
|
||||
|
||||
func (p *WorkerPool) UnmarshalJSON(data []byte) error {
|
||||
var raw struct {
|
||||
ProfileID json.RawMessage `json:"profile_id"`
|
||||
Workers int `json:"workers"`
|
||||
}
|
||||
if err := json.Unmarshal(data, &raw); err != nil {
|
||||
return err
|
||||
}
|
||||
var id int64
|
||||
if err := json.Unmarshal(raw.ProfileID, &id); err != nil {
|
||||
var text string
|
||||
if err := json.Unmarshal(raw.ProfileID, &text); err != nil {
|
||||
return fmt.Errorf("profile_id 必须是整数或数字字符串")
|
||||
}
|
||||
parsed, err := strconv.ParseInt(strings.TrimSpace(text), 10, 64)
|
||||
if err != nil {
|
||||
return fmt.Errorf("profile_id 必须是整数或数字字符串")
|
||||
}
|
||||
id = parsed
|
||||
}
|
||||
p.ProfileID, p.Workers = id, raw.Workers
|
||||
return nil
|
||||
}
|
||||
|
||||
// WorkerSlot is the concrete routing plan for one task run.
|
||||
type WorkerSlot struct {
|
||||
Name string
|
||||
ProfileID int64 // zero means legacy task-router resolution
|
||||
}
|
||||
|
||||
// ValidateWorkerPools validates pool shape without requiring a database. Pool
|
||||
// entries with duplicate profile IDs are rejected so each profile has one
|
||||
// unambiguous slot group in the saved order.
|
||||
func ValidateWorkerPools(pools []WorkerPool) error {
|
||||
if len(pools) == 0 {
|
||||
return nil
|
||||
}
|
||||
seen := make(map[int64]bool, len(pools))
|
||||
total := 0
|
||||
for _, pool := range pools {
|
||||
if pool.ProfileID <= 0 {
|
||||
return fmt.Errorf("worker_pools 中 profile_id 必须大于 0")
|
||||
}
|
||||
if pool.Workers <= 0 {
|
||||
return fmt.Errorf("worker_pools 中 workers 必须大于 0")
|
||||
}
|
||||
if seen[pool.ProfileID] {
|
||||
return fmt.Errorf("worker_pools 中 profile_id %d 重复", pool.ProfileID)
|
||||
}
|
||||
seen[pool.ProfileID] = true
|
||||
if total > 50-pool.Workers {
|
||||
return fmt.Errorf("worker_pools 的 Worker 总数必须在 1 到 50 之间")
|
||||
}
|
||||
total += pool.Workers
|
||||
}
|
||||
if total < 1 || total > 50 {
|
||||
return fmt.Errorf("worker_pools 的 Worker 总数必须在 1 到 50 之间")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// ExpandWorkerSlots expands pools in their saved order; invalid or empty legacy
|
||||
// settings use the historical worker count (default 3).
|
||||
func ExpandWorkerSlots(pools []WorkerPool, legacy int) ([]WorkerSlot, error) {
|
||||
if err := ValidateWorkerPools(pools); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if len(pools) == 0 {
|
||||
if legacy <= 0 {
|
||||
legacy = defaultWorkers
|
||||
}
|
||||
slots := make([]WorkerSlot, legacy)
|
||||
for i := range slots {
|
||||
slots[i] = WorkerSlot{Name: fmt.Sprintf("work#%d", i+1)}
|
||||
}
|
||||
return slots, nil
|
||||
}
|
||||
slots := make([]WorkerSlot, 0)
|
||||
for _, pool := range pools {
|
||||
for i := 0; i < pool.Workers; i++ {
|
||||
slots = append(slots, WorkerSlot{ProfileID: pool.ProfileID})
|
||||
}
|
||||
}
|
||||
for i := range slots {
|
||||
slots[i].Name = fmt.Sprintf("work#%d", i+1)
|
||||
}
|
||||
return slots, nil
|
||||
}
|
||||
|
||||
// ConcurrencyLimit returns whether the simultaneous-running-task cap is enabled and
|
||||
// its limit (default 5 when enabled but unset). limit is always >=1 when enabled.
|
||||
func (m *Manager) ConcurrencyLimit() (enabled bool, limit int) {
|
||||
@@ -333,6 +431,64 @@ func (m *Manager) Workers() int {
|
||||
return n
|
||||
}
|
||||
|
||||
func (m *Manager) WorkerPools() []WorkerPool {
|
||||
v, ok, err := m.pg.GetSetting(settingWorkerPools)
|
||||
if err != nil || !ok || strings.TrimSpace(v) == "" {
|
||||
return []WorkerPool{}
|
||||
}
|
||||
var pools []WorkerPool
|
||||
if json.Unmarshal([]byte(v), &pools) != nil || ValidateWorkerPools(pools) != nil {
|
||||
return []WorkerPool{}
|
||||
}
|
||||
if pools == nil {
|
||||
return []WorkerPool{}
|
||||
}
|
||||
return pools
|
||||
}
|
||||
|
||||
// SetWorkerPools validates profile references at save time and atomically
|
||||
// synchronizes the legacy workers setting with the pool total. An empty slice
|
||||
// restores legacy mode; an optional legacy count is used when clearing pools.
|
||||
func (m *Manager) SetWorkerPools(pools []WorkerPool, legacyWorkers ...int) error {
|
||||
if pools == nil {
|
||||
pools = []WorkerPool{}
|
||||
}
|
||||
if err := ValidateWorkerPools(pools); err != nil {
|
||||
return err
|
||||
}
|
||||
if len(pools) > 0 {
|
||||
for _, pool := range pools {
|
||||
profile, err := m.pg.ProfileByID(pool.ProfileID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if profile == nil {
|
||||
return fmt.Errorf("worker_pools 中 profile_id %d 不存在", pool.ProfileID)
|
||||
}
|
||||
}
|
||||
}
|
||||
b, err := json.Marshal(pools)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
workerCount := m.Workers()
|
||||
if len(pools) > 0 {
|
||||
workerCount = 0
|
||||
for _, pool := range pools {
|
||||
workerCount += pool.Workers
|
||||
}
|
||||
} else if len(legacyWorkers) > 0 {
|
||||
if legacyWorkers[0] <= 0 {
|
||||
return fmt.Errorf("workers 必须 >0")
|
||||
}
|
||||
workerCount = legacyWorkers[0]
|
||||
}
|
||||
return m.pg.SetSettingsAtomic(context.Background(), map[string]string{
|
||||
settingWorkerPools: string(b),
|
||||
settingWorkers: strconv.Itoa(workerCount),
|
||||
})
|
||||
}
|
||||
|
||||
// SetWorkers persists the concurrent work-agent count. Values <=0 are rejected.
|
||||
func (m *Manager) SetWorkers(n int) error {
|
||||
if n <= 0 {
|
||||
|
||||
+38
-11
@@ -177,6 +177,9 @@ func New(ctx context.Context, m *Manager, skillDir string, dataDir string, keyDi
|
||||
b := s.agentsForTask(t)
|
||||
return b.pl, b.wk
|
||||
})
|
||||
s.engine.SetWorkerResolver(func(t *Task, slot WorkerSlot) (*agent.Worker, error) {
|
||||
return s.workerForTaskSlot(t, slot)
|
||||
})
|
||||
// Global readiness (Ready()/llm_configured): a global active LLM provider is
|
||||
// installed. Task-level runnability is separate (ReadyFor → the resolver above).
|
||||
s.engine.SetReadiness(func() bool {
|
||||
@@ -575,7 +578,8 @@ func (s *Server) chatUnavailableReason() string {
|
||||
|
||||
// providerForProfile returns a cached provider+cfg for a profile id, so every agent
|
||||
// bound/pinned to the same profile shares one provider instance (one rate limiter).
|
||||
// ok=false when the profile is missing/invalid → caller falls back to the global pair.
|
||||
// ok=false when the profile is missing/invalid; pinned callers surface that error
|
||||
// while legacy callers retain their existing fallback behavior.
|
||||
func (s *Server) providerForProfile(id int64) (llm.Provider, agent.Config, bool) {
|
||||
s.provCacheMu.Lock()
|
||||
if e := s.provByProfile[id]; e != nil {
|
||||
@@ -3450,6 +3454,7 @@ func (s *Server) settingsPayload() map[string]any {
|
||||
"global_proxy": s.m.GlobalProxy(), // 全局出口代理(http/https/socks5),所有目标流量走它,空=直连
|
||||
"python_interpreter": strings.TrimSpace(pyStored), // 用户/自动设的值(空=用运行时检测)
|
||||
"workers": s.m.Workers(), // 并发工作 agent 数(默认3);对之后启动的任务生效
|
||||
"worker_pools": s.m.WorkerPools(), // 非空时按池顺序绑定 worker 会话
|
||||
"task_concurrency_enabled": concOn, // 任务并发上限开关(默认关)
|
||||
"task_concurrency_limit": concLimit, // 同时运行任务上限(开启后默认5)
|
||||
// LLM 轮询(故障转移)。默认关;开启后走全局激活配置的 agent 在当前配置不可用时
|
||||
@@ -3517,14 +3522,15 @@ func (s *Server) putSettings(w http.ResponseWriter, r *http.Request) {
|
||||
LLMRecord *bool `json:"llm_record"` // LLM 录制开关(默认关);即时生效,无需重建 agent
|
||||
// Web search. WebSearchEnabled/Backend toggle the tool + backend; BraveKey/TavilyKey
|
||||
// are optional — omit (null) to leave a stored key untouched, send "" to clear.
|
||||
WebSearchEnabled *bool `json:"web_search_enabled"`
|
||||
WebSearchBackend *string `json:"web_search_backend"`
|
||||
BraveKey *string `json:"brave_search_api_key"`
|
||||
TavilyKey *string `json:"tavily_search_api_key"`
|
||||
WebSearchProxy *string `json:"web_search_proxy"` // 独立出口代理(http/https/socks5);null=不改,""=清空
|
||||
GlobalProxy *string `json:"global_proxy"` // 全局出口代理(http/https/socks5);null=不改,""=清空(直连)
|
||||
PythonInterp *string `json:"python_interpreter"` // 自定义脚本工具的 python 解释器路径
|
||||
Workers *int `json:"workers"` // 并发工作 agent 数(>0);对之后启动的任务生效
|
||||
WebSearchEnabled *bool `json:"web_search_enabled"`
|
||||
WebSearchBackend *string `json:"web_search_backend"`
|
||||
BraveKey *string `json:"brave_search_api_key"`
|
||||
TavilyKey *string `json:"tavily_search_api_key"`
|
||||
WebSearchProxy *string `json:"web_search_proxy"` // 独立出口代理(http/https/socks5);null=不改,""=清空
|
||||
GlobalProxy *string `json:"global_proxy"` // 全局出口代理(http/https/socks5);null=不改,""=清空(直连)
|
||||
PythonInterp *string `json:"python_interpreter"` // 自定义脚本工具的 python 解释器路径
|
||||
Workers *int `json:"workers"` // 并发工作 agent 数(>0);对之后启动的任务生效
|
||||
WorkerPools *[]WorkerPool `json:"worker_pools"`
|
||||
// 任务并发上限:同时「运行中」的任务数上限。关闭=不限;开启后新建任务超限则排队,有空位自动启动。
|
||||
ConcurrencyEnabled *bool `json:"task_concurrency_enabled"`
|
||||
ConcurrencyLimit *int `json:"task_concurrency_limit"`
|
||||
@@ -3597,11 +3603,32 @@ func (s *Server) putSettings(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
}
|
||||
if req.Workers != nil {
|
||||
if err := s.m.SetWorkers(*req.Workers); err != nil {
|
||||
// A non-empty pool list takes precedence when both fields are present and
|
||||
// synchronizes workers to its total. An empty list clears pools; when workers
|
||||
// is also present it sets the legacy count for the newly restored legacy mode.
|
||||
if req.WorkerPools != nil {
|
||||
if len(*req.WorkerPools) == 0 && req.Workers != nil && *req.Workers <= 0 {
|
||||
writeErr(w, 400, "workers 必须 >0")
|
||||
return
|
||||
}
|
||||
legacyWorkers := []int(nil)
|
||||
if req.Workers != nil {
|
||||
legacyWorkers = []int{*req.Workers}
|
||||
}
|
||||
if err := s.m.SetWorkerPools(*req.WorkerPools, legacyWorkers...); err != nil {
|
||||
writeErr(w, 400, err.Error())
|
||||
return
|
||||
}
|
||||
} else if req.Workers != nil {
|
||||
// An omitted worker_pools field leaves the saved mode unchanged. If a
|
||||
// non-empty pool configuration is already saved, its total remains the
|
||||
// authoritative concurrency and workers is deliberately ignored.
|
||||
if len(s.m.WorkerPools()) == 0 {
|
||||
if err := s.m.SetWorkers(*req.Workers); err != nil {
|
||||
writeErr(w, 400, err.Error())
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
if req.ConcurrencyEnabled != nil || req.ConcurrencyLimit != nil {
|
||||
// 部分 PUT:未给的字段用当前值兜底,避免只改一个把另一个重置。
|
||||
|
||||
+71
-6
@@ -27,6 +27,7 @@ type taskAgentBundle struct {
|
||||
pl *agent.Planner
|
||||
wk *agent.Worker
|
||||
main *agent.MainAgent
|
||||
pinnedWorkers map[int64]*agent.Worker
|
||||
}
|
||||
|
||||
type llmAuditProfile struct {
|
||||
@@ -48,9 +49,10 @@ type llmActivityMetadata struct {
|
||||
}
|
||||
|
||||
type taskLLMRuntime struct {
|
||||
s *Server
|
||||
taskID string
|
||||
agentKey string
|
||||
s *Server
|
||||
taskID string
|
||||
agentKey string
|
||||
pinProfileID *int64
|
||||
}
|
||||
|
||||
type taskLLMError struct {
|
||||
@@ -101,13 +103,24 @@ type taskLLMStreamHooks struct {
|
||||
transition func(taskLLMSelection, db.TaskLLMTransition, error)
|
||||
}
|
||||
|
||||
// current resolves the provider this role runs on, by precedence:
|
||||
// Agent 绑定 → 任务 LLM 配置链 → 全局/环境配置。
|
||||
// current resolves the provider this role runs on. Pinned workers use only their
|
||||
// assigned profile; legacy task agents use Agent 绑定 → 任务 LLM 配置链 → 全局/环境配置.
|
||||
// 绑定优先于任务链:某个角色被显式指定了模型,就一直跑在那个模型上;绑定不存在或
|
||||
// 构建失败时才降级到任务链,任务链为空时再降级到全局配置。
|
||||
// 返回的 profile id 只有走任务链时才非零 —— streamTaskLLM 以此判断额度错误是否
|
||||
// 应该推进任务的故障转移状态(绑定/全局路径不改任务链状态,沿用既有语义)。
|
||||
func (r *taskLLMRuntime) current() (taskLLMSelection, error) {
|
||||
if r.pinProfileID != nil {
|
||||
// Pinned worker runtimes are exclusive: resolve their profile before
|
||||
// touching bindings or the task failover state. A missing or invalid
|
||||
// profile is an error, never an invitation to use another model.
|
||||
prov, cfg, ok := r.s.providerForProfile(*r.pinProfileID)
|
||||
if !ok {
|
||||
return taskLLMSelection{}, fmt.Errorf("LLM profile #%d is missing or invalid", *r.pinProfileID)
|
||||
}
|
||||
t, _ := r.s.m.Task(r.taskID)
|
||||
return taskLLMSelection{task: t, provider: prov, retry: cfg.Retry}, nil
|
||||
}
|
||||
taskNum, err := parseTaskID(r.taskID)
|
||||
if err != nil {
|
||||
return taskLLMSelection{}, err
|
||||
@@ -152,6 +165,10 @@ func (r *taskLLMRuntime) current() (taskLLMSelection, error) {
|
||||
// the caller. If failover switches profiles, the change takes effect on the next
|
||||
// agent run (a fresh Session is built per run in captureRun).
|
||||
func (r *taskLLMRuntime) activeCfg() (agent.Config, bool) {
|
||||
if r.pinProfileID != nil {
|
||||
_, cfg, ok := r.s.providerForProfile(*r.pinProfileID)
|
||||
return cfg, ok
|
||||
}
|
||||
taskNum, err := parseTaskID(r.taskID)
|
||||
if err != nil {
|
||||
return agent.Config{}, false
|
||||
@@ -454,6 +471,12 @@ func isRetryableStreamError(err error) bool {
|
||||
// CompactionWindow mirrors current()'s precedence so the context window always
|
||||
// matches the provider the role will actually stream on.
|
||||
func (r *taskLLMRuntime) CompactionWindow() int {
|
||||
if r.pinProfileID != nil {
|
||||
if _, cfg, ok := r.s.providerForProfile(*r.pinProfileID); ok {
|
||||
return cfg.CompactionWindow()
|
||||
}
|
||||
return (agent.Config{}).CompactionWindow()
|
||||
}
|
||||
if _, cfg, ok := r.s.agentBindingProvider(r.agentKey); ok {
|
||||
return cfg.CompactionWindow()
|
||||
}
|
||||
@@ -597,12 +620,54 @@ func (s *Server) agentsForTask(t *Task) *taskAgentBundle {
|
||||
main.SetSteerWork(s.engine.SteerWork) // steer_work:人对运行中 work 实时纠偏
|
||||
bundle := &taskAgentBundle{
|
||||
runtime: goalRuntime, plannerRuntime: plannerRuntime, workerRuntime: workerRuntime,
|
||||
mainRuntime: mainRuntime, pl: pl, wk: wk, main: main,
|
||||
mainRuntime: mainRuntime, pl: pl, wk: wk, main: main, pinnedWorkers: map[int64]*agent.Worker{},
|
||||
}
|
||||
s.taskAgents[t.ID] = bundle
|
||||
return bundle
|
||||
}
|
||||
|
||||
func (s *Server) workerForTaskSlot(t *Task, slot WorkerSlot) (*agent.Worker, error) {
|
||||
if slot.ProfileID <= 0 {
|
||||
return nil, errors.New("worker slot is not pinned")
|
||||
}
|
||||
_, cfg, ok := s.providerForProfile(slot.ProfileID)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("LLM profile #%d is missing or invalid", slot.ProfileID)
|
||||
}
|
||||
s.taskAgentMu.Lock()
|
||||
bundle := s.taskAgents[t.ID]
|
||||
s.taskAgentMu.Unlock()
|
||||
if bundle == nil {
|
||||
bundle = s.agentsForTask(t)
|
||||
}
|
||||
s.taskAgentMu.Lock()
|
||||
defer s.taskAgentMu.Unlock()
|
||||
if current := s.taskAgents[t.ID]; current != nil {
|
||||
bundle = current
|
||||
}
|
||||
if bundle.pinnedWorkers == nil {
|
||||
bundle.pinnedWorkers = make(map[int64]*agent.Worker)
|
||||
}
|
||||
if worker := bundle.pinnedWorkers[slot.ProfileID]; worker != nil {
|
||||
return worker, nil
|
||||
}
|
||||
id := slot.ProfileID
|
||||
runtime := &taskLLMRuntime{s: s, taskID: t.ID, agentKey: "worker", pinProfileID: &id}
|
||||
tx := transcript.NewStore(filepath.Join(s.m.dir, "transcripts"))
|
||||
worker := agent.NewWorker(runtime, cfg.Model, s.m.dir, tx, runtime.CompactionWindow(), s.agentMaxTurns("worker"))
|
||||
worker.SetFindingRecorder(s.evidenceStore())
|
||||
worker.SetCompactionWindowResolver(runtime.CompactionWindow)
|
||||
worker.SetNonStreaming(runtime.nonStreaming)
|
||||
worker.SetMaxTokens(runtime.maxTokens)
|
||||
worker.SetNoaEnabled(s.m.NoaCompactionEnabled)
|
||||
worker.SetRunTimeout(time.Duration(s.agentRunSeconds("worker")) * time.Second)
|
||||
worker.SetProxy(s.m.ProxyAddr(), s.m.ProxyCACert())
|
||||
worker.SetWebSearch(s.webSearchFor("worker"))
|
||||
worker.SetConstraintInject(s.constraintInjectWorker)
|
||||
bundle.pinnedWorkers[id] = worker
|
||||
return worker, nil
|
||||
}
|
||||
|
||||
func (s *Server) syncTaskLLMState(pt *db.Task) {
|
||||
if pt == nil {
|
||||
return
|
||||
|
||||
@@ -0,0 +1,393 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync/atomic"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/Autumn-27/artex/agent"
|
||||
"github.com/Autumn-27/artex/db"
|
||||
"github.com/Autumn-27/norma/llm"
|
||||
)
|
||||
|
||||
func TestExpandWorkerSlotsLegacy(t *testing.T) {
|
||||
for _, tc := range []struct {
|
||||
name string
|
||||
count int
|
||||
want int
|
||||
}{
|
||||
{"configured", 2, 2},
|
||||
{"zero defaults", 0, 3},
|
||||
{"negative defaults", -1, 3},
|
||||
} {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
slots, err := ExpandWorkerSlots(nil, tc.count)
|
||||
if err != nil || len(slots) != tc.want {
|
||||
t.Fatalf("slots=%v err=%v, want %d", slots, err, tc.want)
|
||||
}
|
||||
for i, slot := range slots {
|
||||
if slot.Name != "work#"+strconv.Itoa(i+1) || slot.ProfileID != 0 {
|
||||
t.Fatalf("slot[%d]=%+v", i, slot)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestExpandWorkerSlotsPoolOrder(t *testing.T) {
|
||||
slots, err := ExpandWorkerSlots([]WorkerPool{{ProfileID: 7, Workers: 2}, {ProfileID: 12, Workers: 3}}, 99)
|
||||
if err != nil || len(slots) != 5 {
|
||||
t.Fatalf("slots=%v err=%v", slots, err)
|
||||
}
|
||||
for i, slot := range slots {
|
||||
want := int64(7)
|
||||
if i >= 2 {
|
||||
want = 12
|
||||
}
|
||||
if slot.Name != "work#"+strconv.Itoa(i+1) || slot.ProfileID != want {
|
||||
t.Fatalf("slot[%d]=%+v want profile %d", i, slot, want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestValidateWorkerPools(t *testing.T) {
|
||||
for _, tc := range []struct {
|
||||
name string
|
||||
pools []WorkerPool
|
||||
valid bool
|
||||
}{
|
||||
{"empty", nil, true},
|
||||
{"bad profile", []WorkerPool{{ProfileID: 0, Workers: 1}}, false},
|
||||
{"bad workers", []WorkerPool{{ProfileID: 1, Workers: 0}}, false},
|
||||
{"duplicate", []WorkerPool{{ProfileID: 1, Workers: 1}, {ProfileID: 1, Workers: 1}}, false},
|
||||
{"too many", []WorkerPool{{ProfileID: 1, Workers: 51}}, false},
|
||||
{"valid", []WorkerPool{{ProfileID: 1, Workers: 1}}, true},
|
||||
} {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
if got := ValidateWorkerPools(tc.pools) == nil; got != tc.valid {
|
||||
t.Fatalf("valid=%v want %v", got, tc.valid)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestWorkerPoolSettingsRoundTrip(t *testing.T) {
|
||||
m, err := NewManager(t.TempDir(), "")
|
||||
if err != nil {
|
||||
t.Skipf("postgres unavailable: %v", err)
|
||||
}
|
||||
defer m.Close()
|
||||
pID, err := m.pg.SaveProfile(&db.LLMProfile{Name: "pool-test", Format: "openai", Model: "pool-test", APIKey: "pool-test-key"})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer m.pg.DeleteProfile(pID)
|
||||
oldPools, _, _ := m.pg.GetSetting(settingWorkerPools)
|
||||
oldWorkers, workersSet, _ := m.pg.GetSetting(settingWorkers)
|
||||
defer func() {
|
||||
if workersSet {
|
||||
_ = m.pg.SetSetting(settingWorkers, oldWorkers)
|
||||
} else {
|
||||
_, _ = m.pg.Exec("DELETE FROM settings WHERE key=$1", settingWorkers)
|
||||
}
|
||||
if oldPools != "" {
|
||||
_ = m.pg.SetSetting(settingWorkerPools, oldPools)
|
||||
} else {
|
||||
_, _ = m.pg.Exec("DELETE FROM settings WHERE key=$1", settingWorkerPools)
|
||||
}
|
||||
}()
|
||||
if err := m.SetWorkerPools([]WorkerPool{{ProfileID: 9223372036854775807, Workers: 1}}); err == nil {
|
||||
t.Fatal("nonexistent profile accepted")
|
||||
}
|
||||
if err := m.SetWorkerPools([]WorkerPool{{ProfileID: pID, Workers: 2}}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
got := m.WorkerPools()
|
||||
if len(got) != 1 || got[0].ProfileID != pID || got[0].Workers != 2 || m.Workers() != 2 {
|
||||
t.Fatalf("round trip pools=%+v workers=%d", got, m.Workers())
|
||||
}
|
||||
if err := m.SetWorkerPools(nil); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if got := m.WorkerPools(); got == nil || len(got) != 0 {
|
||||
t.Fatalf("cleared pools=%+v", got)
|
||||
}
|
||||
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
defer cancel()
|
||||
s := New(ctx, m, t.TempDir(), t.TempDir(), t.TempDir())
|
||||
if _, err := m.pg.Exec("DELETE FROM settings WHERE key=$1", settingWorkerPools); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
res := httptest.NewRecorder()
|
||||
s.getSettings(res, httptest.NewRequest(http.MethodGet, "/api/settings", nil))
|
||||
var unset map[string]any
|
||||
if err := json.Unmarshal(res.Body.Bytes(), &unset); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if pools, ok := unset["worker_pools"].([]any); !ok || pools == nil || len(pools) != 0 {
|
||||
t.Fatalf("GET unset worker_pools=%#v, want empty array", unset["worker_pools"])
|
||||
}
|
||||
put := httptest.NewRequest(http.MethodPut, "/api/settings", strings.NewReader(`{"workers":2,"worker_pools":[{"profile_id":"`+strconv.FormatInt(pID, 10)+`","workers":2}]}`))
|
||||
putResult := httptest.NewRecorder()
|
||||
s.putSettings(putResult, put)
|
||||
if putResult.Code != http.StatusOK {
|
||||
t.Fatalf("PUT worker pools status=%d body=%s", putResult.Code, putResult.Body.String())
|
||||
}
|
||||
if m.Workers() != 2 || len(m.WorkerPools()) != 1 {
|
||||
t.Fatalf("PUT worker pools did not sync settings: workers=%d pools=%+v", m.Workers(), m.WorkerPools())
|
||||
}
|
||||
workersOnly := httptest.NewRequest(http.MethodPut, "/api/settings", strings.NewReader(`{"workers":9}`))
|
||||
workersOnlyResult := httptest.NewRecorder()
|
||||
s.putSettings(workersOnlyResult, workersOnly)
|
||||
if workersOnlyResult.Code != http.StatusOK || m.Workers() != 2 {
|
||||
t.Fatalf("workers-only PUT changed pool total: status=%d workers=%d", workersOnlyResult.Code, m.Workers())
|
||||
}
|
||||
req := httptest.NewRequest(http.MethodGet, "/api/settings", nil)
|
||||
res = httptest.NewRecorder()
|
||||
s.getSettings(res, req)
|
||||
if res.Code != http.StatusOK {
|
||||
t.Fatalf("GET settings status=%d", res.Code)
|
||||
}
|
||||
var payload map[string]any
|
||||
if err := json.Unmarshal(res.Body.Bytes(), &payload); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
pools, ok := payload["worker_pools"].([]any)
|
||||
if !ok || len(pools) != 1 || pools[0].(map[string]any)["profile_id"] != strconv.FormatInt(pID, 10) {
|
||||
t.Fatalf("GET worker_pools=%#v, want string profile id", payload["worker_pools"])
|
||||
}
|
||||
clear := httptest.NewRequest(http.MethodPut, "/api/settings", strings.NewReader(`{"workers":4,"worker_pools":[]}`))
|
||||
clearResult := httptest.NewRecorder()
|
||||
s.putSettings(clearResult, clear)
|
||||
if clearResult.Code != http.StatusOK || m.Workers() != 4 || len(m.WorkerPools()) != 0 {
|
||||
t.Fatalf("PUT legacy clear status=%d body=%s workers=%d pools=%+v", clearResult.Code, clearResult.Body.String(), m.Workers(), m.WorkerPools())
|
||||
}
|
||||
res = httptest.NewRecorder()
|
||||
s.getSettings(res, httptest.NewRequest(http.MethodGet, "/api/settings", nil))
|
||||
var cleared map[string]any
|
||||
if err := json.Unmarshal(res.Body.Bytes(), &cleared); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if pools, ok := cleared["worker_pools"].([]any); !ok || pools == nil || len(pools) != 0 {
|
||||
t.Fatalf("GET cleared worker_pools=%#v, want empty array", cleared["worker_pools"])
|
||||
}
|
||||
}
|
||||
|
||||
func TestPinnedRuntimeMissingProfileDoesNotFallback(t *testing.T) {
|
||||
m, err := NewManager(t.TempDir(), "")
|
||||
if err != nil {
|
||||
t.Skipf("postgres unavailable: %v", err)
|
||||
}
|
||||
defer m.Close()
|
||||
task, err := m.CreateTask("pinned runtime test", "test", nil, 0, 0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer m.DeleteTask(task.ID, DeleteTaskOptions{})
|
||||
fallback, err := m.pg.SaveProfile(&db.LLMProfile{Name: "pinned-fallback", Format: "openai", Model: "fallback", APIKey: "fallback-key"})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer m.pg.DeleteProfile(fallback)
|
||||
if _, err := m.ReplaceTaskLLMProfiles(task.ID, []int64{fallback}, fallback); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
missing := int64(9223372036854775807)
|
||||
s := &Server{m: m, llmOn: true, llmProv: &scriptedLLMProvider{}}
|
||||
runtime := &taskLLMRuntime{s: s, taskID: task.ID, agentKey: "worker", pinProfileID: &missing}
|
||||
if _, err := runtime.current(); err == nil {
|
||||
t.Fatal("missing pinned profile silently fell back")
|
||||
}
|
||||
if _, ok := runtime.activeCfg(); ok || runtime.nonStreaming() || runtime.maxTokens() != 0 {
|
||||
t.Fatal("missing pinned profile exposed fallback runtime settings")
|
||||
}
|
||||
}
|
||||
|
||||
func TestPinnedRuntimeQuotaDoesNotAdvanceTaskFailover(t *testing.T) {
|
||||
m, err := NewManager(t.TempDir(), "")
|
||||
if err != nil {
|
||||
t.Skipf("postgres unavailable: %v", err)
|
||||
}
|
||||
defer m.Close()
|
||||
task, err := m.CreateTask("pinned quota", "test", nil, 0, 0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer m.DeleteTask(task.ID, DeleteTaskOptions{})
|
||||
profileID, err := m.pg.SaveProfile(&db.LLMProfile{Name: "pinned-quota", Format: "openai", Model: "pinned", APIKey: "key"})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer m.pg.DeleteProfile(profileID)
|
||||
if _, err := m.ReplaceTaskLLMProfiles(task.ID, []int64{profileID}, profileID); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
before, err := m.pg.GetTask(taskIDInt(t, task.ID))
|
||||
if err != nil || before == nil || before.ActiveLLMProfileID == nil {
|
||||
t.Fatalf("load task failover state: task=%+v err=%v", before, err)
|
||||
}
|
||||
provider := &scriptedLLMProvider{err: errors.New("insufficient_quota")}
|
||||
s := &Server{m: m, provByProfile: map[int64]*provEntry{profileID: {prov: provider, cfg: agent.Config{}}}}
|
||||
id := profileID
|
||||
runtime := &taskLLMRuntime{s: s, taskID: task.ID, agentKey: "worker", pinProfileID: &id}
|
||||
if _, _, _, err := runtime.Complete(context.Background(), llm.CompletionRequest{}); err == nil {
|
||||
t.Fatal("pinned quota error unexpectedly succeeded")
|
||||
}
|
||||
after, err := m.pg.GetTask(taskIDInt(t, task.ID))
|
||||
if err != nil || after == nil || after.LLMChainRevision != before.LLMChainRevision || after.ActiveLLMProfileID == nil || *after.ActiveLLMProfileID != *before.ActiveLLMProfileID {
|
||||
t.Fatalf("pinned quota changed task failover state: before=%+v after=%+v err=%v", before, after, err)
|
||||
}
|
||||
}
|
||||
|
||||
func taskIDInt(t *testing.T, id string) int64 {
|
||||
t.Helper()
|
||||
n, err := strconv.ParseInt(id, 10, 64)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
return n
|
||||
}
|
||||
|
||||
func TestPinnedWorkerLoopDoesNotConsultTaskRouterAndReportsFailureOnce(t *testing.T) {
|
||||
m, err := NewManager(t.TempDir(), "")
|
||||
if err != nil {
|
||||
t.Skipf("postgres unavailable: %v", err)
|
||||
}
|
||||
defer m.Close()
|
||||
task, err := m.CreateTask("pinned worker loop", "test", nil, 0, 0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer m.DeleteTask(task.ID, DeleteTaskOptions{})
|
||||
|
||||
e := NewEngine(m)
|
||||
var routerCalls atomic.Int32
|
||||
e.SetAuthoritativeAgentResolver(func(*Task) (*agent.Planner, *agent.Worker) {
|
||||
routerCalls.Add(1)
|
||||
return nil, nil
|
||||
})
|
||||
e.SetWorkerResolver(func(*Task, WorkerSlot) (*agent.Worker, error) {
|
||||
return nil, errors.New("profile unavailable")
|
||||
})
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
done := make(chan struct{})
|
||||
go func() {
|
||||
e.workerLoop(ctx, task, WorkerSlot{Name: "work#4", ProfileID: 12})
|
||||
close(done)
|
||||
}()
|
||||
time.Sleep(100 * time.Millisecond)
|
||||
cancel()
|
||||
select {
|
||||
case <-done:
|
||||
case <-time.After(time.Second):
|
||||
t.Fatal("worker loop did not stop")
|
||||
}
|
||||
if routerCalls.Load() != 0 {
|
||||
t.Fatalf("pinned worker consulted task router %d times", routerCalls.Load())
|
||||
}
|
||||
activities, _, err := task.Store.ActivityList(nil, 0, 20)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var failures int
|
||||
for _, activity := range activities {
|
||||
if activity.Worker == "system" && activity.IsError {
|
||||
failures++
|
||||
}
|
||||
}
|
||||
if failures != 1 {
|
||||
t.Fatalf("pinned failure activities=%d, want one throttled entry: %+v", failures, activities)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPinnedWorkerAvailabilityRecoveryUsesSystemSession(t *testing.T) {
|
||||
m, err := NewManager(t.TempDir(), "")
|
||||
if err != nil {
|
||||
t.Skipf("postgres unavailable: %v", err)
|
||||
}
|
||||
defer m.Close()
|
||||
task, err := m.CreateTask("pinned availability", "test", nil, 0, 0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer m.DeleteTask(task.ID, DeleteTaskOptions{})
|
||||
e := NewEngine(m)
|
||||
slot := WorkerSlot{Name: "work#4", ProfileID: 12}
|
||||
e.reportSlotAvailability(task, slot, errors.New("profile unavailable"))
|
||||
e.reportSlotAvailability(task, slot, nil)
|
||||
activities, _, err := task.Store.ActivityList(nil, 0, 20)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var failure, recovery int
|
||||
for _, activity := range activities {
|
||||
if activity.Worker != "system" {
|
||||
continue
|
||||
}
|
||||
if activity.IsError && strings.Contains(activity.Summary, "work#4") && strings.Contains(activity.Summary, "#12") {
|
||||
failure++
|
||||
}
|
||||
if !activity.IsError && strings.Contains(activity.Summary, "work#4") && strings.Contains(activity.Summary, "#12") {
|
||||
recovery++
|
||||
}
|
||||
}
|
||||
if failure != 1 || recovery != 1 {
|
||||
t.Fatalf("system availability activities failure=%d recovery=%d: %+v", failure, recovery, activities)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDetachedIntentPinnedOwnerUsesPinnedResolver(t *testing.T) {
|
||||
m, err := NewManager(t.TempDir(), "")
|
||||
if err != nil {
|
||||
t.Skipf("postgres unavailable: %v", err)
|
||||
}
|
||||
defer m.Close()
|
||||
task, err := m.CreateTask("detached pinned owner", "test", nil, 0, 0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer m.DeleteTask(task.ID, DeleteTaskOptions{})
|
||||
intentID, err := task.Store.AddIntent(map[string]any{"text": "continue"}, 0, nil, "test")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if ok, err := task.Store.ClaimIntent(intentID, "work#4"); err != nil || !ok {
|
||||
t.Fatalf("claim intent: ok=%v err=%v", ok, err)
|
||||
}
|
||||
if changed, err := task.Store.CompareAndSetIntentState(intentID, "running", "paused"); err != nil || !changed {
|
||||
t.Fatalf("pause intent: changed=%v err=%v", changed, err)
|
||||
}
|
||||
e := NewEngine(m)
|
||||
e.slotPlans.Store(task.ID, map[string]int64{"work#4": 12})
|
||||
var pinnedCalls, snapshotCalls atomic.Int32
|
||||
e.SetWorkerResolver(func(_ *Task, slot WorkerSlot) (*agent.Worker, error) {
|
||||
pinnedCalls.Add(1)
|
||||
if slot.Name != "work#4" || slot.ProfileID != 12 {
|
||||
t.Fatalf("unexpected pinned slot: %+v", slot)
|
||||
}
|
||||
return nil, errors.New("profile unavailable")
|
||||
})
|
||||
e.SetAuthoritativeAgentResolver(func(*Task) (*agent.Planner, *agent.Worker) {
|
||||
snapshotCalls.Add(1)
|
||||
return nil, nil
|
||||
})
|
||||
err = e.runDetachedIntent(context.Background(), task, intentID, "request", "human", "agent")
|
||||
if err == nil || !strings.Contains(err.Error(), "LLM 配置 #12 不可用") {
|
||||
t.Fatalf("runDetachedIntent err=%v", err)
|
||||
}
|
||||
if pinnedCalls.Load() != 1 || snapshotCalls.Load() != 0 {
|
||||
t.Fatalf("pinned calls=%d snapshot calls=%d", pinnedCalls.Load(), snapshotCalls.Load())
|
||||
}
|
||||
node, err := task.Store.GetNode(intentID)
|
||||
if err != nil || node == nil || node.State != "paused" {
|
||||
t.Fatalf("intent changed after unavailable resolver: node=%+v err=%v", node, err)
|
||||
}
|
||||
}
|
||||
@@ -14,7 +14,7 @@ import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@
|
||||
import { Switch } from "@/components/ui/switch";
|
||||
import { api } from "@/lib/api";
|
||||
import { CHAT_SEND_MODE_OPTIONS, type ChatSendMode, setChatSendMode, useChatSendMode } from "@/lib/chat-send-mode";
|
||||
import type { Settings } from "@/lib/types";
|
||||
import type { LLMProfile, Settings, WorkerPool } from "@/lib/types";
|
||||
|
||||
import { BasicAuthCard } from "./_components/basic-auth-card";
|
||||
import { UpdateCard } from "./_components/update-card";
|
||||
@@ -40,11 +40,14 @@ export default function SystemSettingsPage() {
|
||||
const [savingGlobalProxy, setSavingGlobalProxy] = React.useState(false);
|
||||
const [testing, setTesting] = React.useState(false);
|
||||
const [loaded, setLoaded] = React.useState(false);
|
||||
const [settingsLoaded, setSettingsLoaded] = React.useState(false);
|
||||
const [saving, setSaving] = React.useState(false);
|
||||
const [savingKey, setSavingKey] = React.useState(false);
|
||||
const [pyInterp, setPyInterp] = React.useState("");
|
||||
const [workers, setWorkers] = React.useState("3");
|
||||
const [savingWorkers, setSavingWorkers] = React.useState(false);
|
||||
const [workerPools, setWorkerPools] = React.useState<WorkerPool[]>([]);
|
||||
const [llmProfiles, setLlmProfiles] = React.useState<LLMProfile[]>([]);
|
||||
// 操作约束注入范围(默认都开)。
|
||||
const [injectPlanner, setInjectPlanner] = React.useState(true);
|
||||
const [injectWorker, setInjectWorker] = React.useState(true);
|
||||
@@ -67,20 +70,58 @@ export default function SystemSettingsPage() {
|
||||
setGlobalProxyInput(s.global_proxy ?? "");
|
||||
setPyInterp(s.python_interpreter ?? "");
|
||||
setWorkers(String(s.workers ?? 3));
|
||||
setWorkerPools(s.worker_pools ?? []);
|
||||
setInjectPlanner(s.constraints_inject_planner !== false);
|
||||
setInjectWorker(s.constraints_inject_worker !== false);
|
||||
setNoaCompaction(!!s.noa_compaction);
|
||||
}, []);
|
||||
|
||||
const saveWorkers = () => {
|
||||
if (!settingsLoaded) {
|
||||
toast.error("设置加载失败,请刷新后再保存 Worker 配置");
|
||||
return;
|
||||
}
|
||||
const n = Number(workers);
|
||||
if (workerPools.length > 0) {
|
||||
const total = workerPools.reduce((sum, pool) => sum + Number(pool.workers), 0);
|
||||
if (workerPools.some((pool) => !pool.profile_id)) {
|
||||
toast.error("请选择每个模型池的 LLM 配置");
|
||||
return;
|
||||
}
|
||||
if (workerPools.some((pool) => !Number.isInteger(Number(pool.workers)) || Number(pool.workers) <= 0)) {
|
||||
toast.error("每个模型池的 Worker 数必须是大于 0 的整数");
|
||||
return;
|
||||
}
|
||||
if (total > 50) {
|
||||
toast.error("Worker 总数不能超过 50");
|
||||
return;
|
||||
}
|
||||
const ids = workerPools.map((pool) => pool.profile_id);
|
||||
if (new Set(ids).size !== ids.length) {
|
||||
toast.error("不能重复选择同一个 LLM 配置");
|
||||
return;
|
||||
}
|
||||
setSavingWorkers(true);
|
||||
api
|
||||
.setSettings({
|
||||
workers: total,
|
||||
worker_pools: workerPools.map((pool) => ({ ...pool, workers: Number(pool.workers) })),
|
||||
})
|
||||
.then((s) => {
|
||||
apply(s);
|
||||
toast.success("已保存多模型 Worker 池(对之后启动的任务生效)");
|
||||
})
|
||||
.catch((e) => toast.error(`保存失败:${(e as Error).message}`))
|
||||
.finally(() => setSavingWorkers(false));
|
||||
return;
|
||||
}
|
||||
if (!Number.isInteger(n) || n <= 0) {
|
||||
toast.error("并发数必须是大于 0 的整数");
|
||||
return;
|
||||
}
|
||||
setSavingWorkers(true);
|
||||
api
|
||||
.setSettings({ workers: n })
|
||||
.setSettings({ workers: n, worker_pools: [] })
|
||||
.then((s) => {
|
||||
apply(s);
|
||||
toast.success("已保存并发工作 agent 数(对之后启动的任务生效)");
|
||||
@@ -89,6 +130,8 @@ export default function SystemSettingsPage() {
|
||||
.finally(() => setSavingWorkers(false));
|
||||
};
|
||||
|
||||
const addWorkerPool = () => setWorkerPools((pools) => [...pools, { profile_id: "", workers: 1 }]);
|
||||
|
||||
const savePython = () => {
|
||||
setSaving(true);
|
||||
api
|
||||
@@ -112,11 +155,24 @@ export default function SystemSettingsPage() {
|
||||
React.useEffect(() => {
|
||||
api
|
||||
.settings()
|
||||
.then(apply)
|
||||
.catch(() => undefined)
|
||||
.then((s) => {
|
||||
apply(s);
|
||||
setSettingsLoaded(true);
|
||||
})
|
||||
.catch(() => {
|
||||
setSettingsLoaded(false);
|
||||
toast.error("设置加载失败,Worker 配置已锁定,避免覆盖服务器上的模型池");
|
||||
})
|
||||
.finally(() => setLoaded(true));
|
||||
}, [apply]);
|
||||
|
||||
React.useEffect(() => {
|
||||
api
|
||||
.llmProfiles()
|
||||
.then(setLlmProfiles)
|
||||
.catch(() => setLlmProfiles([]));
|
||||
}, []);
|
||||
|
||||
const toggleTraffic = (v: boolean) => {
|
||||
setTrafficCapture(v); // optimistic
|
||||
setSaving(true);
|
||||
@@ -756,6 +812,81 @@ export default function SystemSettingsPage() {
|
||||
</CardDescription>
|
||||
</CardHeader>
|
||||
<CardContent className="flex flex-col gap-3">
|
||||
<div className="flex flex-col gap-2 rounded-md border p-3">
|
||||
<div className="flex items-center justify-between">
|
||||
<Label className="text-sm">多模型 Worker 池</Label>
|
||||
<Button
|
||||
variant="outline"
|
||||
size="sm"
|
||||
onClick={addWorkerPool}
|
||||
disabled={!loaded || !settingsLoaded || savingWorkers}
|
||||
>
|
||||
添加模型池
|
||||
</Button>
|
||||
</div>
|
||||
{workerPools.map((pool, index) => {
|
||||
const selected = llmProfiles.find((profile) => profile.id === pool.profile_id);
|
||||
const placeholder =
|
||||
selected?.name || (pool.profile_id ? `配置 #${pool.profile_id} 已删除/不可用` : "选择 LLM 配置");
|
||||
return (
|
||||
// biome-ignore lint/suspicious/noArrayIndexKey: pool rows are edited in place and only deleted.
|
||||
<div className="flex items-center gap-2" key={`${pool.profile_id}-${index}`}>
|
||||
<Select
|
||||
value={pool.profile_id || undefined}
|
||||
disabled={!settingsLoaded || savingWorkers}
|
||||
onValueChange={(value) =>
|
||||
setWorkerPools((current) =>
|
||||
current.map((item, itemIndex) =>
|
||||
itemIndex === index ? { ...item, profile_id: value } : item,
|
||||
),
|
||||
)
|
||||
}
|
||||
>
|
||||
<SelectTrigger className="min-w-0 flex-1">
|
||||
<SelectValue placeholder={placeholder} />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
{!selected && pool.profile_id ? (
|
||||
<SelectItem value={pool.profile_id}>配置 #{pool.profile_id} 已删除/不可用</SelectItem>
|
||||
) : null}
|
||||
{llmProfiles.map((profile) => (
|
||||
<SelectItem key={profile.id} value={profile.id}>
|
||||
{profile.name} · {profile.model}
|
||||
</SelectItem>
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
<Input
|
||||
type="number"
|
||||
min={1}
|
||||
className="w-24 font-mono text-sm"
|
||||
value={pool.workers}
|
||||
disabled={!settingsLoaded || savingWorkers}
|
||||
onChange={(event) =>
|
||||
setWorkerPools((current) =>
|
||||
current.map((item, itemIndex) =>
|
||||
itemIndex === index ? { ...item, workers: Number(event.target.value) } : item,
|
||||
),
|
||||
)
|
||||
}
|
||||
/>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
disabled={!settingsLoaded || savingWorkers}
|
||||
onClick={() => setWorkerPools((current) => current.filter((_, itemIndex) => itemIndex !== index))}
|
||||
>
|
||||
删除
|
||||
</Button>
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
{workerPools.length > 0 ? (
|
||||
<div className="text-muted-foreground text-sm">
|
||||
当前合计:{workerPools.reduce((sum, pool) => sum + (Number(pool.workers) || 0), 0)} 个 Worker 会话
|
||||
</div>
|
||||
) : null}
|
||||
</div>
|
||||
<div className="flex items-center gap-2">
|
||||
<Input
|
||||
type="number"
|
||||
@@ -763,13 +894,19 @@ export default function SystemSettingsPage() {
|
||||
className="w-32 font-mono text-sm"
|
||||
placeholder="3"
|
||||
value={workers}
|
||||
disabled={!loaded || savingWorkers}
|
||||
disabled={!loaded || !settingsLoaded || savingWorkers || workerPools.length > 0}
|
||||
onChange={(e) => setWorkers(e.target.value)}
|
||||
/>
|
||||
<Button onClick={saveWorkers} disabled={!loaded || savingWorkers}>
|
||||
{workerPools.length > 0 ? (
|
||||
<span className="text-muted-foreground text-xs">已配置模型池时由各池数量决定并发。</span>
|
||||
) : null}
|
||||
<Button onClick={saveWorkers} disabled={!loaded || !settingsLoaded || savingWorkers}>
|
||||
保存
|
||||
</Button>
|
||||
</div>
|
||||
{!settingsLoaded && loaded ? (
|
||||
<p className="text-destructive text-xs">设置加载失败,Worker 配置已锁定;刷新成功后才能编辑或保存。</p>
|
||||
) : null}
|
||||
</CardContent>
|
||||
</Card>
|
||||
|
||||
|
||||
@@ -3338,6 +3338,7 @@ export const settings: Settings = {
|
||||
global_proxy: "",
|
||||
python_interpreter: "/usr/bin/python3",
|
||||
workers: 3,
|
||||
worker_pools: [],
|
||||
llm_pool_enabled: true,
|
||||
llm_pool_bind_fallback: false,
|
||||
noa_compaction: false,
|
||||
|
||||
@@ -2361,7 +2361,15 @@ function route(m: string, path: string, seg: string[], q: URLSearchParams, b: Re
|
||||
if (path === "/traffic") return D.traffic;
|
||||
if (path === "/traffic/exchange") return D.trafficDetail;
|
||||
if (path === "/settings" && m === "GET") return D.settings;
|
||||
if (path === "/settings" && m === "PUT") return { ...D.settings, ...b };
|
||||
if (path === "/settings" && m === "PUT") {
|
||||
const next = { ...D.settings, ...b };
|
||||
if (!Array.isArray(next.worker_pools)) next.worker_pools = D.settings.worker_pools;
|
||||
if (next.worker_pools.length > 0) {
|
||||
next.workers = next.worker_pools.reduce((sum, pool) => sum + Number(pool.workers), 0);
|
||||
}
|
||||
Object.assign(D.settings, next);
|
||||
return next;
|
||||
}
|
||||
if (path === "/settings/basic-auth" && m === "GET") return { enabled: false, username: "", password_set: false };
|
||||
if (path === "/settings/basic-auth" && m === "PUT")
|
||||
throw new Error("演示模式不支持修改 HTTP Basic Auth,请在实际部署中配置");
|
||||
|
||||
@@ -987,6 +987,7 @@ export interface Settings {
|
||||
global_proxy?: string;
|
||||
python_interpreter?: string; // 自定义脚本工具的 python 解释器路径(空=运行时检测)
|
||||
workers?: number; // 并发工作 agent 数(默认3);对之后启动的任务生效
|
||||
worker_pools: WorkerPool[];
|
||||
// 任务并发上限:同时「运行中」的任务数上限。关闭=不限;开启后新建任务超限则排队,有空位自动启动。
|
||||
task_concurrency_enabled?: boolean; // 默认 false
|
||||
task_concurrency_limit?: number; // 开启后默认 5
|
||||
@@ -1008,6 +1009,11 @@ export interface Settings {
|
||||
notify_digest_interval_min?: number; // 汇总模式周期(分钟),默认 30
|
||||
}
|
||||
|
||||
export interface WorkerPool {
|
||||
profile_id: string;
|
||||
workers: number;
|
||||
}
|
||||
|
||||
// ---- 漏洞 IM 推送 ----
|
||||
|
||||
// NotificationFilter 是渠道的过滤条件,字段全部可选,缺省即不过滤。
|
||||
|
||||
Reference in new issue
Block a user