mirror of
https://github.com/songquanpeng/one-api.git
synced 2025-11-09 10:13:42 +08:00
fix: models api return models in deactivate channels
- Enhance logging functionality by adding context support and improving debugging options. - Standardize function naming conventions across middleware to ensure consistency. - Optimize data retrieval and handling in the model controller, including caching and error management. - Simplify the bug report template to streamline the issue reporting process.
This commit is contained in:
@@ -4,11 +4,13 @@ import (
|
||||
"context"
|
||||
"sort"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"gorm.io/gorm"
|
||||
|
||||
gutils "github.com/Laisky/go-utils/v5"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/songquanpeng/one-api/common"
|
||||
"github.com/songquanpeng/one-api/common/utils"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type Ability struct {
|
||||
@@ -110,3 +112,44 @@ func GetGroupModels(ctx context.Context, group string) ([]string, error) {
|
||||
sort.Strings(models)
|
||||
return models, err
|
||||
}
|
||||
|
||||
var getGroupModelsV2Cache = gutils.NewExpCache[[]EnabledAbility](context.Background(), time.Second*10)
|
||||
|
||||
type EnabledAbility struct {
|
||||
Model string `json:"model" gorm:"model"`
|
||||
ChannelType int `json:"channel_type" gorm:"channel_type"`
|
||||
}
|
||||
|
||||
// GetGroupModelsV2 returns all enabled models for this group with their channel names.
|
||||
func GetGroupModelsV2(ctx context.Context, group string) ([]EnabledAbility, error) {
|
||||
// get from cache first
|
||||
if models, ok := getGroupModelsV2Cache.Load(group); ok {
|
||||
return models, nil
|
||||
}
|
||||
|
||||
// prepare query based on database type
|
||||
groupCol := "`group`"
|
||||
trueVal := "1"
|
||||
if common.UsingPostgreSQL {
|
||||
groupCol = `"group"`
|
||||
trueVal = "true"
|
||||
}
|
||||
|
||||
// query with JOIN to get model and channel name in a single query
|
||||
var models []EnabledAbility
|
||||
query := DB.Model(&Ability{}).
|
||||
Select("abilities.model AS model, channels.type AS channel_type").
|
||||
Joins("JOIN channels ON abilities.channel_id = channels.id").
|
||||
Where("abilities."+groupCol+" = ? AND abilities.enabled = "+trueVal, group).
|
||||
Order("abilities.priority DESC")
|
||||
|
||||
err := query.Find(&models).Error
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "get group models")
|
||||
}
|
||||
|
||||
// store in cache
|
||||
getGroupModelsV2Cache.Store(group, models)
|
||||
|
||||
return models, nil
|
||||
}
|
||||
|
||||
@@ -4,17 +4,18 @@ import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/songquanpeng/one-api/common"
|
||||
"github.com/songquanpeng/one-api/common/config"
|
||||
"github.com/songquanpeng/one-api/common/logger"
|
||||
"github.com/songquanpeng/one-api/common/random"
|
||||
"math/rand"
|
||||
"sort"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
"github.com/songquanpeng/one-api/common"
|
||||
"github.com/songquanpeng/one-api/common/config"
|
||||
"github.com/songquanpeng/one-api/common/logger"
|
||||
"github.com/songquanpeng/one-api/common/random"
|
||||
)
|
||||
|
||||
var (
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package model
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"os"
|
||||
@@ -118,6 +119,11 @@ func InitDB() {
|
||||
return
|
||||
}
|
||||
|
||||
if config.DebugSQLEnabled {
|
||||
logger.Debug(context.TODO(), "debug sql enabled")
|
||||
DB = DB.Debug()
|
||||
}
|
||||
|
||||
sqlDB := setDBConns(DB)
|
||||
|
||||
if !config.IsMasterNode {
|
||||
@@ -203,10 +209,6 @@ func migrateLOGDB() error {
|
||||
}
|
||||
|
||||
func setDBConns(db *gorm.DB) *sql.DB {
|
||||
if config.DebugSQLEnabled {
|
||||
db = db.Debug()
|
||||
}
|
||||
|
||||
sqlDB, err := db.DB()
|
||||
if err != nil {
|
||||
logger.FatalLog("failed to connect database: " + err.Error())
|
||||
|
||||
Reference in New Issue
Block a user