Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions internal/adapter/hedge.go
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,8 @@ func (g *outputGate) emitter(attempt *generationAttempt, onEvent func(gemini.Eve
}
}

// yieldingRelease 返回请求结束时的释放函数与首个内容事件到达时的通知函数:等待首事件超过 slotYieldAfter 时提前让出请求槽,让其他请求可以使用该账号
func yieldingRelease(client *gemini.Client, release func()) (func(), func()) {
// yieldingRelease 返回请求结束时的释放函数、首个内容事件到达时的通知函数与后台轮询的让出协调器:等待首事件超过 slotYieldAfter 时提前让出请求槽,让其他请求可以使用该账号
func yieldingRelease(client *gemini.Client, release func()) (func(), func(), gemini.SlotYieldController) {
var mu sync.Mutex
var endYield func()
released := false
Expand Down Expand Up @@ -258,7 +258,25 @@ func yieldingRelease(client *gemini.Client, release func()) (func(), func()) {
release()
}
}
return finish, func() { timer.Stop() }
suspend := func() (func(), bool) {
timer.Stop()
mu.Lock()
defer mu.Unlock()
if released {
if endYield != nil {
endYield()
endYield = nil
}
return func() {}, true
}
released = true
return func() {
mu.Lock()
defer mu.Unlock()
released = false
}, false
}
return finish, func() { timer.Stop() }, suspend
}

// startAttempt 在后台以 client 执行一次生成,结束时释放请求槽并按结果报告账号状态,被另一方取代或 panic 的尝试不报告
Expand All @@ -269,7 +287,8 @@ func startAttempt(ctx context.Context, pool *balancer.AccountPool, gate *outputG
claimed: make(chan struct{}), done: make(chan struct{}),
}
emit := gate.emitter(attempt, onEvent)
finish, firstContent := yieldingRelease(client, release)
finish, firstContent, suspend := yieldingRelease(client, release)
attemptCtx = gemini.WithSlotYieldController(attemptCtx, suspend)
go func() {
defer close(attempt.done)
defer cancel()
Expand Down
11 changes: 11 additions & 0 deletions internal/gemini/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,17 @@ func (c *Client) CachedUsage() *UsageInfo {
return c.usage.Load()
}

// slotYieldContextKey 是 context 中请求槽让出协调器的键
type slotYieldContextKey struct{}

// SlotYieldController 协调外层超时让出与内部后台轮询让出,防止同一请求重复释放请求槽
type SlotYieldController func() (restore func(), alreadyReleased bool)

// WithSlotYieldController 将槽位让出协调器绑定到 context
func WithSlotYieldController(ctx context.Context, ctrl SlotYieldController) context.Context {
return context.WithValue(ctx, slotYieldContextKey{}, ctrl)
}

// AcquireRequest 占用账号的一个请求槽直到完整上游请求链结束,后台生成的轮询阶段让出
func (c *Client) AcquireRequest(ctx context.Context) (func(), error) {
c.busy.Add(1)
Expand Down
22 changes: 14 additions & 8 deletions internal/gemini/research.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,23 @@ func (r *researchThoughts) progress(candidate []any) error {
return nil
}

// awaitTurn 在调用方持有账号请求槽时调用,轮询期间让出请求槽,以 hNvQHb 轮询会话中本轮回答,完成后重新占用请求槽并按生成流解析该回答,连续 turnMissingPolls 次读不到本轮回答时返回可重试错误;decoder 为已输出部分回答的生成流解码器,为 nil 时从头输出;progress 接收进行中的候选,researchConfirm 非空时写入该回答计划卡片的确认按钮文字
// awaitTurn 以 hNvQHb 轮询会话中本轮回答,读到后按生成流解析该回答:调用方仍持有账号请求槽时轮询期间让出、返回前重新占用并调用让出协调器的恢复函数,请求槽已被首事件等待让出时保持让出;连续 turnMissingPolls 次读不到本轮回答时返回可重试错误;decoder 为已输出部分回答的生成流解码器,为 nil 时从头输出;progress 接收进行中的候选,researchConfirm 非空时写入该回答计划卡片的确认按钮文字
func (c *Client) awaitTurn(ctx context.Context, state *ConversationState, decoder *FrameDecoder, model Model, level ThinkingLevel, progress func([]any) error, researchConfirm *string, emit func(Event) error) error {
trace := logging.FromContext(ctx)
trace.Background(model.ID)
c.requestSlot.Release(1)
c.busy.Add(-1)
c.notifyRelease()
defer func() {
c.busy.Add(1)
c.requestSlot.Acquire(context.Background(), 1)
}()
alreadyReleased := false
restore := func() {}
if ctrl, ok := ctx.Value(slotYieldContextKey{}).(SlotYieldController); ok {
restore, alreadyReleased = ctrl()
}
if !alreadyReleased {
c.releaseRequest()
defer func() {
c.busy.Add(1)
_ = c.requestSlot.Acquire(context.Background(), 1)
restore()
}()
}
session := state.Snapshot()
request, err := json.Marshal([]any{session.CID, 10, nil, 1, []any{0}, []any{4}, nil, 1})
if err != nil {
Expand Down
64 changes: 64 additions & 0 deletions internal/gemini/research_slot_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
package gemini

import (
"context"
"testing"
)

// TestAwaitTurnAfterSlotYield 验证请求槽已被首事件等待让出时轮询不再释放,账号仍只有一个请求槽
func TestAwaitTurnAfterSlotYield(t *testing.T) {
client, err := NewClient(AccountSource{Concurrency: 1}, "", false)
if err != nil {
t.Fatalf("NewClient failed: %v", err)
}
release, err := client.AcquireRequest(context.Background())
if err != nil {
t.Fatalf("AcquireRequest failed: %v", err)
}
release()

ctx, cancel := context.WithCancel(context.Background())
cancel()
ctx = WithSlotYieldController(ctx, func() (func(), bool) {
return func() {}, true
})
if err := client.awaitTurn(ctx, NewConversationState(), nil, Model{ID: "gemini-video"}, 0, nil, nil, func(Event) error { return nil }); err == nil {
t.Fatal("expected context canceled error")
}
if _, ok := client.TryAcquireRequest(); !ok {
t.Fatal("the yielded request slot should be free for other requests")
}
if _, ok := client.TryAcquireRequest(); ok {
t.Fatal("the account should still have exactly one request slot")
}
}

// TestAwaitTurnKeepsHeldSlot 验证调用方持有请求槽时轮询返回前重新占用并调用恢复函数,请求结束后请求槽空闲
func TestAwaitTurnKeepsHeldSlot(t *testing.T) {
client, err := NewClient(AccountSource{Concurrency: 1}, "", false)
if err != nil {
t.Fatalf("NewClient failed: %v", err)
}
release, err := client.AcquireRequest(context.Background())
if err != nil {
t.Fatalf("AcquireRequest failed: %v", err)
}

ctx, cancel := context.WithCancel(context.Background())
cancel()
restored := false
ctx = WithSlotYieldController(ctx, func() (func(), bool) {
return func() { restored = true }, false
})
_ = client.awaitTurn(ctx, NewConversationState(), nil, Model{ID: "gemini-video"}, 0, nil, nil, func(Event) error { return nil })
if !restored {
t.Fatal("the yield controller should be restored so the request releases its slot when it ends")
}
if _, ok := client.TryAcquireRequest(); ok {
t.Fatal("the request should hold its slot again after polling")
}
release()
if _, ok := client.TryAcquireRequest(); !ok {
t.Fatal("the slot should be free after the request ends")
}
}