feat(dao): add shared ResolveModelContentLength helper (#18106)

Add a shared `dao.ResolveModelContentLength` that resolves a chat model's context window (`content_length`) from a `tenant_model` UUID or a composite `model@provider` reference, with an optional `driver + modelName` catalog fallback for the no-database path.
This commit is contained in:
jay77721
2026-08-12 13:04:40 +08:00
committed by GitHub
parent fb08a6c5ee
commit a9123368c5
2 changed files with 233 additions and 0 deletions

View File

@@ -0,0 +1,80 @@
//
// Copyright 2026 The InfiniFlow Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
package dao
import (
"context"
"strings"
"gorm.io/gorm"
)
// ResolveModelContentLength returns the chat model's context window
// (content_length) in tokens for modelRef — a tenant_model UUID or a
// composite "model@provider" / "model@instance@provider" reference — or 0
// when it cannot be resolved. driver and modelName are an optional provider
// catalog fallback used when modelRef is not a resolvable tenant id (for
// example when no database is available); pass empty strings to skip it.
//
// This is the shared implementation behind the agent LLM component, the
// ingestion Extractor, and service.ModelProviderService — those packages
// cannot import each other (import cycles), so the lookup lives here.
func ResolveModelContentLength(ctx context.Context, db *gorm.DB, modelRef, driver, modelName string) int {
// 1. Composite "model@provider" / "model@instance@provider" reference:
// look up the provider catalog directly. A composite reference cannot
// be a tenant-model UUID, so resolve it before touching the database.
if pureName, _, providerName, ok := splitCompositeModelRef(modelRef); ok {
if mdl, err := GetModelProviderManager().GetModelByName(providerName, pureName); err == nil && mdl.ContentLength != nil {
return *mdl.ContentLength
}
}
if db == nil {
db = DB
}
// 2. Tenant model UUID: read content_length from its provider catalog row.
if db != nil && modelRef != "" {
if obj, err := NewTenantModelDAO().GetByID(ctx, db, modelRef); err == nil && obj != nil && obj.Status == "active" {
if provider, err := NewTenantModelProviderDAO().GetByID(ctx, db, obj.ProviderID); err == nil && provider != nil {
if mdl, err := GetModelProviderManager().GetModelByName(provider.ProviderName, obj.ModelName); err == nil && mdl.ContentLength != nil {
return *mdl.ContentLength
}
}
}
}
// 3. Resolved driver + bare model name: fallback when modelRef is a
// tenant id that could not be resolved without a database.
if driver != "" && modelName != "" {
if mdl, err := GetModelProviderManager().GetModelByName(driver, modelName); err == nil && mdl.ContentLength != nil {
return *mdl.ContentLength
}
}
return 0
}
// splitCompositeModelRef splits a composite "model@provider" or
// "model@instance@provider" reference into its parts. The instance defaults
// to "default" for the two-part form.
func splitCompositeModelRef(ref string) (modelName, instanceName, providerName string, ok bool) {
parts := strings.Split(ref, "@")
switch len(parts) {
case 2:
return parts[0], "default", parts[1], true
case 3:
return parts[0], parts[1], parts[2], true
}
return "", "", "", false
}

View File

@@ -0,0 +1,153 @@
//
// Copyright 2026 The InfiniFlow Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
package dao
import (
"testing"
"github.com/glebarez/sqlite"
"gorm.io/gorm"
"ragflow/internal/entity"
)
// TestResolveModelContentLength_CompositeReference resolves content_length
// for a composite "model@provider" reference from the provider catalog.
func TestResolveModelContentLength_CompositeReference(t *testing.T) {
if got := ResolveModelContentLength(t.Context(), nil, "gpt-4o@openai", "", ""); got != 128000 {
t.Fatalf("ResolveModelContentLength(gpt-4o@openai) = %d, want 128000", got)
}
}
// TestResolveModelContentLength_CompositeReferenceThreePart resolves
// content_length for a composite "model@instance@provider" reference — the
// instance-bearing form used by tenant model instances — from the provider
// catalog.
func TestResolveModelContentLength_CompositeReferenceThreePart(t *testing.T) {
if got := ResolveModelContentLength(t.Context(), nil, "gpt-4o@default@openai", "", ""); got != 128000 {
t.Fatalf("ResolveModelContentLength(gpt-4o@default@openai) = %d, want 128000", got)
}
}
// TestResolveModelContentLength_TooManyParts documents that a reference with
// more than two "@" separators is not treated as a composite ref: it falls
// through to the driver+modelName fallback, and to 0 when no fallback is
// supplied. A known catalog model with an extra separator is used for the
// no-fallback assertion so a parser regression (accepting excessive
// separators) fails loudly instead of resolving to 0 by coincidence.
func TestResolveModelContentLength_TooManyParts(t *testing.T) {
if got := ResolveModelContentLength(t.Context(), nil, "a@b@c@d", "openai", "gpt-4o"); got != 128000 {
t.Fatalf("ResolveModelContentLength(a@b@c@d, openai, gpt-4o) = %d, want 128000 (driver fallback)", got)
}
if got := ResolveModelContentLength(t.Context(), nil, "gpt-4o@default@openai@extra", "", ""); got != 0 {
t.Fatalf("ResolveModelContentLength(gpt-4o@default@openai@extra) = %d, want 0", got)
}
if _, _, _, ok := splitCompositeModelRef("a@b@c@d"); ok {
t.Fatal("splitCompositeModelRef(a@b@c@d) accepted an excessive-separator reference")
}
}
// TestResolveModelContentLength_DriverModelFallback resolves content_length
// from the resolved driver + bare model name, which needs no database.
func TestResolveModelContentLength_DriverModelFallback(t *testing.T) {
if got := ResolveModelContentLength(t.Context(), nil, "", "openai", "gpt-4o"); got != 128000 {
t.Fatalf("ResolveModelContentLength(openai/gpt-4o) = %d, want 128000", got)
}
}
// TestResolveModelContentLength_Unknown returns 0 for unknown references.
func TestResolveModelContentLength_Unknown(t *testing.T) {
if got := ResolveModelContentLength(t.Context(), nil, "no-such-model@no-such-provider", "", ""); got != 0 {
t.Fatalf("unknown model = %d, want 0", got)
}
if got := ResolveModelContentLength(t.Context(), nil, "", "", ""); got != 0 {
t.Fatalf("empty reference = %d, want 0", got)
}
}
// TestResolveModelContentLength_TenantModelUUID resolves content_length for a
// tenant_model UUID row through the provider catalog.
func TestResolveModelContentLength_TenantModelUUID(t *testing.T) {
db := openModelContextTestDB(t)
pushDB(t, db)
ctx := t.Context()
if err := db.Create(&entity.TenantModelProvider{
ID: "provider-openai",
ProviderName: "OpenAI",
TenantID: "tenant-1",
}).Error; err != nil {
t.Fatalf("create provider: %v", err)
}
if err := db.Create(&entity.TenantModel{
ID: "0123456789abcdef0123456789abcdef",
ProviderID: "provider-openai",
InstanceID: "instance-1",
ModelName: "gpt-4o",
ModelType: int(entity.ModelTypeChat),
Status: "active",
}).Error; err != nil {
t.Fatalf("create model: %v", err)
}
if got := ResolveModelContentLength(ctx, db, "0123456789abcdef0123456789abcdef", "", ""); got != 128000 {
t.Fatalf("ResolveModelContentLength(uuid) = %d, want 128000", got)
}
}
// TestResolveModelContentLength_InactiveTenantModel falls through to the
// composite/catalog paths when the tenant model row is not active.
func TestResolveModelContentLength_InactiveTenantModel(t *testing.T) {
db := openModelContextTestDB(t)
pushDB(t, db)
ctx := t.Context()
if err := db.Create(&entity.TenantModelProvider{
ID: "provider-openai",
ProviderName: "OpenAI",
TenantID: "tenant-1",
}).Error; err != nil {
t.Fatalf("create provider: %v", err)
}
if err := db.Create(&entity.TenantModel{
ID: "0123456789abcdef0123456789abcdef",
ProviderID: "provider-openai",
InstanceID: "instance-1",
ModelName: "gpt-4o",
ModelType: int(entity.ModelTypeChat),
Status: "inactive",
}).Error; err != nil {
t.Fatalf("create model: %v", err)
}
// The UUID is not a composite ref, so an inactive row yields 0.
if got := ResolveModelContentLength(ctx, db, "0123456789abcdef0123456789abcdef", "", ""); got != 0 {
t.Fatalf("inactive tenant model = %d, want 0", got)
}
}
func openModelContextTestDB(t *testing.T) *gorm.DB {
t.Helper()
db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{TranslateError: true})
if err != nil {
t.Fatalf("open sqlite: %v", err)
}
if err := db.AutoMigrate(&entity.TenantModelProvider{}, &entity.TenantModel{}); err != nil {
t.Fatalf("migrate: %v", err)
}
return db
}