xinyin025/new-api
1
0
Fork 0
mirror of https://github.com/linux-do/new-api.git synced 2025-09-18 00:16:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'Calcium-Ion:main' into main

Browse Source
This commit is contained in:
Bubu 2024-05-16 08:26:49 +08:00 committed by GitHub
commit 63d68ce7bf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
controller/model.go
View File

@ -108,8 +108,8 @@ func init() {
}) })
} }
openAIModelsMap = make(map[string]dto.OpenAIModels) openAIModelsMap = make(map[string]dto.OpenAIModels)
for _, model := range openAIModels { for _, aiModel := range openAIModels {
openAIModelsMap[model.Id] = model openAIModelsMap[aiModel.Id] = aiModel
} }
channelId2Models = make(map[int][]string) channelId2Models = make(map[int][]string)
for i := 1; i <= common.ChannelTypeDummy; i++ { for i := 1; i <= common.ChannelTypeDummy; i++ {
@ -174,8 +174,8 @@ func DashboardListModels(c *gin.Context) {
func RetrieveModel(c *gin.Context) { func RetrieveModel(c *gin.Context) {
modelId := c.Param("model") modelId := c.Param("model")
if model, ok := openAIModelsMap[modelId]; ok { if aiModel, ok := openAIModelsMap[modelId]; ok {
c.JSON(200, model) c.JSON(200, aiModel)
} else { } else {
openAIError := dto.OpenAIError{ openAIError := dto.OpenAIError{
Message: fmt.Sprintf("The model '%s' does not exist", modelId), Message: fmt.Sprintf("The model '%s' does not exist", modelId),
@ -191,12 +191,12 @@ func RetrieveModel(c *gin.Context) {
func GetPricing(c *gin.Context) { func GetPricing(c *gin.Context) {
userId := c.GetInt("id") userId := c.GetInt("id")
user, _ := model.GetUserById(userId, true) group, err := model.CacheGetUserGroup(userId)
groupRatio := common.GetGroupRatio("default") groupRatio := common.GetGroupRatio("default")
if user != nil { if err != nil {
groupRatio = common.GetGroupRatio(user.Group) groupRatio = common.GetGroupRatio(group)
} }
pricing := model.GetPricing(user, openAIModels) pricing := model.GetPricing(group)
c.JSON(200, gin.H{ c.JSON(200, gin.H{
"success": true, "success": true,
"data": pricing, "data": pricing,

10
model/pricing.go
View File

@ -13,16 +13,16 @@ var (
updatePricingLock sync.Mutex updatePricingLock sync.Mutex
) )
func GetPricing(user *User, openAIModels []dto.OpenAIModels) []dto.ModelPricing { func GetPricing(group string) []dto.ModelPricing {
updatePricingLock.Lock() updatePricingLock.Lock()
defer updatePricingLock.Unlock() defer updatePricingLock.Unlock()
if time.Since(lastGetPricingTime) > time.Minute*1 || len(pricingMap) == 0 { if time.Since(lastGetPricingTime) > time.Minute*1 || len(pricingMap) == 0 {
updatePricing(openAIModels) updatePricing()
} }
if user != nil { if group != "" {
userPricingMap := make([]dto.ModelPricing, 0) userPricingMap := make([]dto.ModelPricing, 0)
models := GetGroupModels(user.Group) models := GetGroupModels(group)
for _, pricing := range pricingMap { for _, pricing := range pricingMap {
if !common.StringsContains(models, pricing.ModelName) { if !common.StringsContains(models, pricing.ModelName) {
pricing.Available = false pricing.Available = false
@ -34,7 +34,7 @@ func GetPricing(user *User, openAIModels []dto.OpenAIModels) []dto.ModelPricing
return pricingMap return pricingMap
} }
func updatePricing(openAIModels []dto.OpenAIModels) { func updatePricing() {
//modelRatios := common.GetModelRatios() //modelRatios := common.GetModelRatios()
enabledModels := GetEnabledModels() enabledModels := GetEnabledModels()
allModels := make(map[string]int) allModels := make(map[string]int)

2
router/api-router.go
View File

@ -20,7 +20,7 @@ func SetApiRouter(router *gin.Engine) {
apiRouter.GET("/about", controller.GetAbout) apiRouter.GET("/about", controller.GetAbout)
//apiRouter.GET("/midjourney", controller.GetMidjourney) //apiRouter.GET("/midjourney", controller.GetMidjourney)
apiRouter.GET("/home_page_content", controller.GetHomePageContent) apiRouter.GET("/home_page_content", controller.GetHomePageContent)
apiRouter.GET("/pricing", middleware.CriticalRateLimit(), middleware.TryUserAuth(), controller.GetPricing) apiRouter.GET("/pricing", middleware.TryUserAuth(), controller.GetPricing)
apiRouter.GET("/verification", middleware.CriticalRateLimit(), middleware.TurnstileCheck(), controller.SendEmailVerification) apiRouter.GET("/verification", middleware.CriticalRateLimit(), middleware.TurnstileCheck(), controller.SendEmailVerification)
apiRouter.GET("/reset_password", middleware.CriticalRateLimit(), middleware.TurnstileCheck(), controller.SendPasswordResetEmail) apiRouter.GET("/reset_password", middleware.CriticalRateLimit(), middleware.TurnstileCheck(), controller.SendPasswordResetEmail)
apiRouter.POST("/user/reset", middleware.CriticalRateLimit(), controller.ResetPassword) apiRouter.POST("/user/reset", middleware.CriticalRateLimit(), controller.ResetPassword)