An endpoint advertises every name a client may address it by — the model's own and all of its aliases — because that is what the router matches a request against. The picker took those strings as they came, so one model appeared as several: "coder", "coder-7b" and "qwen2.5-coder-7b-instruct" were three choices, and choosing between them is a question with no answer. Each name is now resolved through the catalog and the model listed once, under its catalog name — the one that also appears in the model list, the usage table and the logs. /v1/models still lists the aliases separately, which is deliberate: there a client is discovering which ids it may send, and every alias is one. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
81 lines
2.4 KiB
Go
81 lines
2.4 KiB
Go
package router
|
|
|
|
import (
|
|
"net/http/httptest"
|
|
"path/filepath"
|
|
"testing"
|
|
"time"
|
|
|
|
"gitea.mynodes.xyz/ilker/llmgw/internal/config"
|
|
"gitea.mynodes.xyz/ilker/llmgw/internal/control/catalog"
|
|
"gitea.mynodes.xyz/ilker/llmgw/internal/store"
|
|
)
|
|
|
|
// chatRouter mirrors what the control plane publishes: an endpoint advertises
|
|
// every name a client may address it by, which is the model's own name and all
|
|
// of its aliases.
|
|
func chatRouter(t *testing.T, engineURL string) (*Router, store.User) {
|
|
t.Helper()
|
|
|
|
cfg := baseConfig(config.Endpoint{
|
|
ID: "a", URL: engineURL,
|
|
Models: []string{"qwen2.5-coder-7b-instruct", "coder-7b", "coder"},
|
|
})
|
|
cfg.Models = []catalog.Model{{
|
|
Name: "qwen2.5-coder-7b-instruct", Aliases: []string{"coder-7b", "coder"},
|
|
}}
|
|
cfg.Auth.Enabled = true
|
|
cfg.Auth.Store = filepath.Join(t.TempDir(), "store.db")
|
|
rt := newTestRouter(t, cfg)
|
|
|
|
org, err := rt.store.CreateOrg(t.Context(), "acme")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
team, err := rt.store.CreateTeam(t.Context(), org, "platform")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
project, err := rt.store.CreateProject(t.Context(), team, "gateway")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
return rt, store.User{ID: "usr-1", ProjectID: project}
|
|
}
|
|
|
|
func TestTheChatPickerOffersAModelOnceRatherThanOncePerAlias(t *testing.T) {
|
|
// An endpoint advertises the model's name and every alias, because that is
|
|
// what the router matches a request against. Listing those strings as they
|
|
// came gave the picker "coder", "coder-7b" and the full name as three
|
|
// separate choices for one model.
|
|
e := newFakeEngine(t, "qwen2.5-coder-7b-instruct")
|
|
rt, user := chatRouter(t, e.srv.URL)
|
|
waitForEndpoint(t, rt)
|
|
|
|
got := rt.modelsFor(httptest.NewRequest("GET", "/chat", nil), user)
|
|
if len(got) != 1 {
|
|
names := make([]string, len(got))
|
|
for i, m := range got {
|
|
names[i] = m.Name
|
|
}
|
|
t.Fatalf("the picker offers %d entries for one model: %v", len(got), names)
|
|
}
|
|
// The catalog name, not whichever alias happened to be listed first: it is
|
|
// the one that appears in the model list, the usage table and the logs.
|
|
if got[0].Name != "qwen2.5-coder-7b-instruct" {
|
|
t.Errorf("offered as %q, expected the catalog name", got[0].Name)
|
|
}
|
|
}
|
|
|
|
func waitForEndpoint(t *testing.T, rt *Router) {
|
|
t.Helper()
|
|
deadline := time.Now().Add(3 * time.Second)
|
|
for time.Now().Before(deadline) {
|
|
if len(rt.reg.Snapshots("")) > 0 {
|
|
return
|
|
}
|
|
time.Sleep(20 * time.Millisecond)
|
|
}
|
|
t.Fatal("no endpoint became available")
|
|
}
|