zlei6/ragflow
1
0
Fork 0
mirror of https://github.com/infiniflow/ragflow.git synced 2026-08-14 20:54:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor[Go Model Provider]: refactor baseURL and modelConfig (#15627)

Browse Source 
### What problem does this PR solve?

As Title

### Type of change

- [x] Refactoring
This commit is contained in:
Haruko386
2026-06-04 17:50:22 +08:00
committed by GitHub
parent 04dc3bb19c
commit baeb0c0431
65 changed files with 2834 additions and 4410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
internal/entity/models/google.go
View File

@@ -70,20 +70,21 @@ var googleListModels = func(ctx context.Context, config *genai.ClientConfig) ([]
// GoogleModel implements ModelDriver for Google AI
type GoogleModel struct {
BaseURL map[string]string
URLSuffix URLSuffix
baseModel BaseModel
}
// NewGoogleModel creates a new Google AI model instance
func NewGoogleModel(baseURL map[string]string, urlSuffix URLSuffix) *GoogleModel {
return &GoogleModel{
BaseURL: baseURL,
URLSuffix: urlSuffix,
baseModel: BaseModel{
BaseURL: baseURL,
URLSuffix: urlSuffix,
},
}
}
func (g *GoogleModel) NewInstance(baseURL map[string]string) ModelDriver {
return NewGoogleModel(baseURL, g.URLSuffix)
return NewGoogleModel(baseURL, g.baseModel.URLSuffix)
}
func (g *GoogleModel) Name() string {
@@ -95,17 +96,23 @@ func (g *GoogleModel) clientConfig(apiKey string, apiConfig *APIConfig) *genai.C
}
func (g *GoogleModel) baseURL(apiConfig *APIConfig) string {
if apiConfig != nil && apiConfig.Region != nil {
if baseURL := strings.TrimSpace(g.BaseURL[*apiConfig.Region]); baseURL != "" {
return baseURL
baseURL, err := g.baseModel.GetBaseURL(apiConfig)
if err != nil {
defaultConfig := &APIConfig{}
if apiConfig != nil {
defaultConfig.BaseURL = apiConfig.BaseURL
}
baseURL, err = g.baseModel.GetBaseURL(defaultConfig)
if err != nil {
return ""
}
}
return strings.TrimSpace(g.BaseURL["default"])
return strings.TrimSpace(baseURL)
}
func (g *GoogleModel) ChatWithMessages(modelName string, messages []Message, apiConfig *APIConfig, chatModelConfig *ChatConfig) (*ChatResponse, error) {
if apiConfig == nil || apiConfig.ApiKey == nil || strings.TrimSpace(*apiConfig.ApiKey) == "" {
return nil, fmt.Errorf("api key is nil or empty")
if err := g.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
if strings.TrimSpace(modelName) == "" {
return nil, fmt.Errorf("model name is empty")
@@ -178,12 +185,13 @@ func (g *GoogleModel) ChatWithMessages(modelName string, messages []Message, api
// ChatStreamlyWithSender sends messages and streams response via sender function (best performance, no channel)
func (g *GoogleModel) ChatStreamlyWithSender(modelName string, messages []Message, apiConfig *APIConfig, chatModelConfig *ChatConfig, sender func(*string, *string) error) error {
if err := g.baseModel.APIConfigCheck(apiConfig); err != nil {
return err
}
if len(messages) == 0 {
return fmt.Errorf("messages is empty")
}
if apiConfig == nil || apiConfig.ApiKey == nil || strings.TrimSpace(*apiConfig.ApiKey) == "" {
return fmt.Errorf("api key is nil or empty")
}
if strings.TrimSpace(modelName) == "" {
return fmt.Errorf("model name is empty")
}
@@ -278,8 +286,8 @@ func (g *GoogleModel) ChatStreamlyWithSender(modelName string, messages []Messag
// Embed generates embeddings for a batch of texts using the Gemini embeddings API.
// The SDK routes to batchEmbedContents internally, so all texts are sent in one request.
func (g *GoogleModel) Embed(modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig) ([]EmbeddingData, error) {
if apiConfig == nil || apiConfig.ApiKey == nil || strings.TrimSpace(*apiConfig.ApiKey) == "" {
return nil, fmt.Errorf("api key is required")
if err := g.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
if modelName == nil || *modelName == "" {
return nil, fmt.Errorf("model name is required")
@@ -332,8 +340,8 @@ func (g *GoogleModel) Embed(modelName *string, texts []string, apiConfig *APICon
}
func (g *GoogleModel) ListModels(apiConfig *APIConfig) ([]string, error) {
if apiConfig == nil || apiConfig.ApiKey == nil || strings.TrimSpace(*apiConfig.ApiKey) == "" {
return nil, fmt.Errorf("api key is required")
if err := g.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
return googleListModels(context.Background(), g.clientConfig(strings.TrimSpace(*apiConfig.ApiKey), apiConfig))