feat(models): add kind and models_meta snapshot

This commit is contained in:
zenfun
2025-12-17 23:15:12 +08:00
parent 2b0ed3d3d5
commit 96e1fe41a5
6 changed files with 272 additions and 13 deletions

View File

@@ -2,7 +2,10 @@ package service
import (
"context"
"crypto/sha256"
"encoding/hex"
"fmt"
"sort"
"strings"
"time"
@@ -119,6 +122,7 @@ func (s *SyncService) SyncModel(m *model.Model) error {
ctx := context.Background()
snap := modelSnapshot{
Name: m.Name,
Kind: normalizeModelKind(m.Kind),
ContextWindow: m.ContextWindow,
CostPerToken: m.CostPerToken,
SupportsVision: m.SupportsVision,
@@ -127,7 +131,13 @@ func (s *SyncService) SyncModel(m *model.Model) error {
SupportsFIM: m.SupportsFIM,
MaxOutputTokens: m.MaxOutputTokens,
}
return s.hsetJSON(ctx, "meta:models", snap.Name, snap)
if err := s.hsetJSON(ctx, "meta:models", snap.Name, snap); err != nil {
return err
}
if err := s.refreshModelsMetaFromRedis(ctx, "db"); err != nil {
return err
}
return nil
}
type providerSnapshot struct {
@@ -151,6 +161,7 @@ type providerSnapshot struct {
type modelSnapshot struct {
Name string `json:"name"`
Kind string `json:"kind"`
ContextWindow int `json:"context_window"`
CostPerToken float64 `json:"cost_per_token"`
SupportsVision bool `json:"supports_vision"`
@@ -190,7 +201,7 @@ func (s *SyncService) SyncAll(db *gorm.DB) error {
}
pipe := s.rdb.TxPipeline()
pipe.Del(ctx, "config:providers", "config:keys", "meta:models", "config:bindings", "meta:bindings_meta")
pipe.Del(ctx, "config:providers", "config:keys", "meta:models", "meta:models_meta", "config:bindings", "meta:bindings_meta")
// Also clear master keys
var masterKeys []string
iter := s.rdb.Scan(ctx, 0, "auth:master:*", 0).Iterator()
@@ -283,6 +294,7 @@ func (s *SyncService) SyncAll(db *gorm.DB) error {
for _, m := range models {
snap := modelSnapshot{
Name: m.Name,
Kind: normalizeModelKind(m.Kind),
ContextWindow: m.ContextWindow,
CostPerToken: m.CostPerToken,
SupportsVision: m.SupportsVision,
@@ -298,6 +310,15 @@ func (s *SyncService) SyncAll(db *gorm.DB) error {
pipe.HSet(ctx, "meta:models", snap.Name, payload)
}
if err := writeModelsMeta(ctx, pipe, modelsMetaInput{
Source: "db",
Version: fmt.Sprintf("%d", time.Now().Unix()),
UpdatedAtSec: time.Now().Unix(),
Models: models,
}); err != nil {
return err
}
if err := s.writeBindingsSnapshot(ctx, pipe, bindings, providers); err != nil {
return err
}
@@ -447,3 +468,97 @@ func normalizeStatus(status string) string {
return st
}
}
func normalizeModelKind(kind string) string {
k := strings.ToLower(strings.TrimSpace(kind))
if k == "" {
return "chat"
}
switch k {
case "chat", "embedding", "rerank", "other":
return k
default:
return "other"
}
}
func checksumModelPayloads(payloads map[string]string) string {
keys := make([]string, 0, len(payloads))
for k := range payloads {
keys = append(keys, k)
}
sort.Strings(keys)
h := sha256.New()
for _, k := range keys {
_, _ = h.Write([]byte(k))
_, _ = h.Write([]byte{'\n'})
_, _ = h.Write([]byte(payloads[k]))
_, _ = h.Write([]byte{'\n'})
}
return hex.EncodeToString(h.Sum(nil))
}
func (s *SyncService) refreshModelsMetaFromRedis(ctx context.Context, source string) error {
raw, err := s.rdb.HGetAll(ctx, "meta:models").Result()
if err != nil {
return fmt.Errorf("read meta:models: %w", err)
}
now := time.Now().Unix()
meta := map[string]interface{}{
"version": fmt.Sprintf("%d", now),
"updated_at": fmt.Sprintf("%d", now),
"source": source,
"checksum": checksumModelPayloads(raw),
}
if err := s.rdb.HSet(ctx, "meta:models_meta", meta).Err(); err != nil {
return fmt.Errorf("write meta:models_meta: %w", err)
}
return nil
}
type modelsMetaInput struct {
Source string
Version string
UpdatedAtSec int64
Models []model.Model
}
func writeModelsMeta(ctx context.Context, pipe redis.Pipeliner, in modelsMetaInput) error {
payloads := make(map[string]string, len(in.Models))
for _, m := range in.Models {
snap := modelSnapshot{
Name: m.Name,
Kind: normalizeModelKind(m.Kind),
ContextWindow: m.ContextWindow,
CostPerToken: m.CostPerToken,
SupportsVision: m.SupportsVision,
SupportsFunction: m.SupportsFunctions,
SupportsToolChoice: m.SupportsToolChoice,
SupportsFIM: m.SupportsFIM,
MaxOutputTokens: m.MaxOutputTokens,
}
b, err := jsoncodec.Marshal(snap)
if err != nil {
return fmt.Errorf("marshal model %s for meta: %w", m.Name, err)
}
payloads[snap.Name] = string(b)
}
meta := map[string]string{
"version": strings.TrimSpace(in.Version),
"updated_at": fmt.Sprintf("%d", in.UpdatedAtSec),
"source": strings.TrimSpace(in.Source),
"checksum": checksumModelPayloads(payloads),
}
if strings.TrimSpace(meta["version"]) == "" {
meta["version"] = fmt.Sprintf("%d", time.Now().Unix())
}
if strings.TrimSpace(meta["source"]) == "" {
meta["source"] = "db"
}
if err := pipe.HSet(ctx, "meta:models_meta", meta).Err(); err != nil {
return fmt.Errorf("write meta:models_meta: %w", err)
}
return nil
}