Where Codex compacts a long conversation reached the gateway's /models (provider.CodexListed sets catalog.Model.Compact) and Claude Code (claude.go calls provider.CompactSet), but not the list magpie writes for Codex on disk: magpieModels left Compact unset, so codexcat fell back to the threshold for every model. A threshold the user set on a model or on its provider did nothing while Codex read that list — the case where Codex is not signed in to ChatGPT and model_catalog_json is what it reads. magpieModels now carries it, as the gateway's list and Claude Code already do. provider.CompactSetIn is compactSet for a caller holding the settings and the group finder already, as EffectivePriceIn is for prices: this loop runs for hundreds of models at magpie's start. TestCodexCatalogCompactAtReachesDisk fails without the change (204800, want 100000) and passes with it: relay's "*" and then relay/glm-4.6's own threshold reach the file, with the model's window kept as the maximum, and the whole window comes back when they are cleared. Co-authored-by: TryWorld2026 <tryworld@users.noreply.github.com>
This commit is contained in:
1 parent
fff33ba55b
commit
116ca957cc
3 files changed
+98
No files matched your search
@@ -0,0 +1,86 @@
|
||||
package agent
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
"github.com/yetone/magpie/internal/catalog"
|
||||
"github.com/yetone/magpie/internal/provider"
|
||||
)
|
||||
|
||||
// Codex is told where to compact a long conversation (#876) both from the
|
||||
// gateway's /models (provider.CodexListed, which sets catalog.Model.Compact)
|
||||
// and from the list magpie writes for it on disk (magpie-models.json,
|
||||
// codex.go:593 -> codexcat.Catalog(magpieModels("codex"))).
|
||||
//
|
||||
// magpieModels left Compact unset, so codexcat fell back to the one for
|
||||
// every model: a threshold the user set on a model or on its provider
|
||||
// reached the gateway's list but not the one Codex reads from disk.
|
||||
//
|
||||
// syncHome gives relay serving glm-4.6, whose models.dev window is 204800.
|
||||
func TestCodexCatalogCompactAtReachesDisk(t *testing.T) {
|
||||
home := syncHome(t)
|
||||
// a threshold changed on a provider rewrites the agents' lists
|
||||
catalog.Changed = SyncCatalog
|
||||
t.Cleanup(func() { catalog.Changed = nil })
|
||||
if err := provider.SetModelCompacts("relay", map[string]int{"*": 100000}); err != nil {
|
||||
t.Fatalf("SetModelCompacts: %v", err)
|
||||
}
|
||||
// connect Codex to magpie on a magpie model, as the app does: it writes
|
||||
// the catalog it reads from disk
|
||||
cx := codex(home)
|
||||
if err := cx.Fields[0].Set("relay/glm-4.6"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
contextOf := func() (window, max int) {
|
||||
t.Helper()
|
||||
var got struct {
|
||||
Models []struct {
|
||||
Slug string `json:"slug"`
|
||||
ContextWindow int `json:"context_window"`
|
||||
MaxContext int `json:"max_context_window"`
|
||||
} `json:"models"`
|
||||
}
|
||||
raw := readFile(filepath.Join(home, ".codex", "magpie-models.json"))
|
||||
if err := json.Unmarshal([]byte(raw), &got); err != nil {
|
||||
t.Fatalf("%v: %s", err, raw)
|
||||
}
|
||||
for _, m := range got.Models {
|
||||
if m.Slug == "relay/glm-4.6" {
|
||||
return m.ContextWindow, m.MaxContext
|
||||
}
|
||||
}
|
||||
slugs := make([]string, 0, len(got.Models))
|
||||
for _, m := range got.Models {
|
||||
slugs = append(slugs, m.Slug)
|
||||
}
|
||||
t.Fatalf("relay/glm-4.6 is not in the on-disk catalog; slugs: %v", slugs)
|
||||
return 0, 0
|
||||
}
|
||||
|
||||
// relay's own "*" threshold, below the model's window: the window it is
|
||||
// told is the threshold, and the model's own window is kept as the
|
||||
// maximum so Codex still knows how much the model really takes
|
||||
if window, max := contextOf(); window != 100000 || max != 204800 {
|
||||
t.Fatalf("with relay's Compact at 100000: context_window = %d, max_context_window = %d; want 100000 and 204800", window, max)
|
||||
}
|
||||
|
||||
// the model's own threshold comes before its provider's
|
||||
if err := provider.SetModelCompacts("relay", map[string]int{"*": 100000, "glm-4.6": 150000}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if window, max := contextOf(); window != 150000 || max != 204800 {
|
||||
t.Fatalf("with relay/glm-4.6's own Compact at 150000: context_window = %d, max_context_window = %d; want 150000 and 204800", window, max)
|
||||
}
|
||||
|
||||
// taken away, the one for every model answers again: the whole window,
|
||||
// as the default threshold sits above this model's
|
||||
if err := provider.SetModelCompacts("relay", nil); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if window, max := contextOf(); window != 204800 || max != 0 {
|
||||
t.Fatalf("with no threshold set: context_window = %d, max_context_window = %d; want the window and no maximum", window, max)
|
||||
}
|
||||
}
|
||||
@@ -105,6 +105,10 @@ func magpieModels(agent string) []catalog.Model {
|
||||
st, find := settings.Load(), provider.GroupFinder()
|
||||
for i, e := range shown {
|
||||
m := catalog.Model{ID: e.ID, Name: labels[i], Provider: firstOf(e.Provider.Catalogs()), Efforts: e.Efforts, Images: e.Images || seen, ImageInput: e.ImageInput, Context: e.Context, Output: e.Output, AgentsV2: e.AgentsV2, Reasoning: e.Reasoning}
|
||||
// where Codex and Claude Code compact it (#876): a threshold the
|
||||
// user set on the model or on its provider, else the one for every
|
||||
// model, which codexcat answers from the settings it is given
|
||||
m.Compact = provider.CompactSetIn(st, e.ID, find)
|
||||
// what a call costs the user (Pi's cost, #781)
|
||||
if pr, ok := entryPrice(st, find, e); ok {
|
||||
m.Price = &pr
|
||||
|
||||
@@ -30,6 +30,14 @@ func CompactSet(id string) int {
|
||||
return compactSet(settings.Load(), id, GroupFinder())
|
||||
}
|
||||
|
||||
// CompactSetIn is CompactSet for a caller that already holds the settings
|
||||
// and the group finder: an agent's list is built for hundreds of models at
|
||||
// magpie's start, and reading both again for each is what EffectivePriceIn
|
||||
// saves the same loop.
|
||||
func CompactSetIn(s settings.Settings, id string, find func(string) (Group, []Member, bool)) int {
|
||||
return compactSet(s, id, find)
|
||||
}
|
||||
|
||||
func compactSet(s settings.Settings, id string, find func(string) (Group, []Member, bool)) int {
|
||||
if len(s.ModelCompacts) == 0 {
|
||||
return 0
|
||||
|
||||
Reference in new issue
Block a user