diff --git a/model/token.go b/model/token.go index 4193d94..08909cb 100644 --- a/model/token.go +++ b/model/token.go @@ -10,19 +10,20 @@ import ( ) type Token struct { - Id int `json:"id"` - UserId int `json:"user_id"` - Key string `json:"key" gorm:"type:char(48);uniqueIndex"` - Status int `json:"status" gorm:"default:1"` - Name string `json:"name" gorm:"index" ` - CreatedTime int64 `json:"created_time" gorm:"bigint"` - AccessedTime int64 `json:"accessed_time" gorm:"bigint"` - ExpiredTime int64 `json:"expired_time" gorm:"bigint;default:-1"` // -1 means never expired - RemainQuota int `json:"remain_quota" gorm:"default:0"` - UnlimitedQuota bool `json:"unlimited_quota" gorm:"default:false"` - ModelLimitsEnabled bool `json:"model_limits_enabled" gorm:"default:false"` - ModelLimits string `json:"model_limits" gorm:"type:varchar(1024);default:''"` - UsedQuota int `json:"used_quota" gorm:"default:0"` // used quota + Id int `json:"id"` + UserId int `json:"user_id"` + Key string `json:"key" gorm:"type:char(48);uniqueIndex"` + Status int `json:"status" gorm:"default:1"` + Name string `json:"name" gorm:"index" ` + CreatedTime int64 `json:"created_time" gorm:"bigint"` + AccessedTime int64 `json:"accessed_time" gorm:"bigint"` + ExpiredTime int64 `json:"expired_time" gorm:"bigint;default:-1"` // -1 means never expired + RemainQuota int `json:"remain_quota" gorm:"default:0"` + UnlimitedQuota bool `json:"unlimited_quota" gorm:"default:false"` + ModelLimitsEnabled bool `json:"model_limits_enabled" gorm:"default:false"` + ModelLimits string `json:"model_limits" gorm:"type:varchar(1024);default:''"` + UsedQuota int `json:"used_quota" gorm:"default:0"` // used quota + DeletedAt gorm.DeletedAt `gorm:"index"` } func GetAllUserTokens(userId int, startIdx int, num int) ([]*Token, error) { diff --git a/relay/channel/ali/dto.go b/relay/channel/ali/dto.go index 556256d..fd1f07a 100644 --- a/relay/channel/ali/dto.go +++ b/relay/channel/ali/dto.go @@ -6,8 +6,9 @@ type AliMessage struct { } type AliInput struct { - Prompt string `json:"prompt"` - History []AliMessage `json:"history"` + Prompt string `json:"prompt,omitempty"` + //History []AliMessage `json:"history,omitempty"` + Messages []AliMessage `json:"messages"` } type AliParameters struct { @@ -20,7 +21,7 @@ type AliParameters struct { type AliChatRequest struct { Model string `json:"model"` - Input AliInput `json:"input"` + Input AliInput `json:"input,omitempty"` Parameters AliParameters `json:"parameters,omitempty"` } diff --git a/relay/channel/ali/relay-ali.go b/relay/channel/ali/relay-ali.go index 36e8d9e..e087eea 100644 --- a/relay/channel/ali/relay-ali.go +++ b/relay/channel/ali/relay-ali.go @@ -18,7 +18,7 @@ const EnableSearchModelSuffix = "-internet" func requestOpenAI2Ali(request dto.GeneralOpenAIRequest) *AliChatRequest { messages := make([]AliMessage, 0, len(request.Messages)) - prompt := "" + //prompt := "" for i := 0; i < len(request.Messages); i++ { message := request.Messages[i] messages = append(messages, AliMessage{ @@ -35,8 +35,8 @@ func requestOpenAI2Ali(request dto.GeneralOpenAIRequest) *AliChatRequest { return &AliChatRequest{ Model: request.Model, Input: AliInput{ - Prompt: prompt, - History: messages, + //Prompt: prompt, + Messages: messages, }, Parameters: AliParameters{ IncrementalOutput: request.Stream,