Skip to content

Every agent's model. One place. Codex on DeepSeek, Claude Code on Kimi, from the menu bar.

provider: a group member at an effort is looked up among the providers once a request, not at each expansion (XcodeFish, #2502)

yetoneaa821d8d6ba6
diff --git a/internal/provider/groupeffort.go b/internal/provider/groupeffort.go
index ba28a4b48..1ef8c2286 100644
--- a/internal/provider/groupeffort.go
+++ b/internal/provider/groupeffort.go
@@ -23,6 +23,7 @@ import (
"fmt"
"slices"
"strings"
+ "sync/atomic"
"github.com/yetone/magpie/internal/catalog"
)
@@ -63,6 +64,20 @@ func isModel(entries []Entry, id string) bool {
if slices.ContainsFunc(entries, func(e Entry) bool { return e.ID == id || e.Model == id }) {
return true
}
+ // what the providers have, looked at once while a request holds them
+ // (XcodeFish, #2502): a group's members are expanded several times a
+ // request, and each member at an effort found every provider again
+ // (Find) and read its whole model list (Available), a third of
+ // /v1/models' CPU
+ return heldOf("has-model\x00"+id, func() bool { return providersHave(id) })
+}
+
+// providersLooked counts providersHave's looks, for tests.
+var providersLooked atomic.Int64
+
+// providersHave is isModel's look at the providers, past the catalog.
+func providersHave(id string) bool {
+ providersLooked.Add(1)
pid, model, ok := strings.Cut(id, "/")
var ps []Provider
if ok {
diff --git a/internal/provider/groupeffort_test.go b/internal/provider/groupeffort_test.go
index 948014ab9..7dc1a5d9e 100644
--- a/internal/provider/groupeffort_test.go
+++ b/internal/provider/groupeffort_test.go
@@ -146,3 +146,35 @@ func TestGroupLevelsWithFixedMembers(t *testing.T) {
}
}
}
+
+// While a request holds the providers, whether a member at an effort is a
+// model's own id is looked up among them once, not at each of the
+// group's expansions (XcodeFish, #2502: a third of /v1/models' CPU was
+// Find and Available again for every such member); a provider saved
+// meanwhile is looked at anew, and with nothing held every look is fresh.
+func TestMemberEffortLooksOncePerHold(t *testing.T) {
+ effortHome(t)
+ looks := func(id string, n int) int64 {
+ was := providersLooked.Load()
+ for range n {
+ if m, e := MemberEffort(id); m+":"+e != id {
+ t.Fatalf("MemberEffort(%q) = %q %q", id, m, e)
+ }
+ }
+ return providersLooked.Load() - was
+ }
+ release := Hold()
+ if got := looks("a/m:low", 5); got != 1 {
+ t.Fatalf("held: looked %d times, want 1", got)
+ }
+ if err := Save(Provider{ID: "a", Name: "A", Key: "k", Chat: "http://127.0.0.1:1/v1", Models: []string{"m", "m:low"}}); err != nil {
+ t.Fatal(err)
+ }
+ if m, e := MemberEffort("a/m:low"); m != "a/m:low" || e != "" {
+ t.Fatalf("saved while held: %q %q, want the model's own id", m, e)
+ }
+ release()
+ if got := looks("a/n:high", 3); got != 3 {
+ t.Fatalf("not held: looked %d times, want 3", got)
+ }
+}