RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.
Go agent-harnessagent-native-databaseagentic-aiagentic-retrievalagentic-searchaiai-agentscontext-enginecontext-engineeringcontext-managementharness-engineeringknowledge-compilationragretrieval-augmented-generationretrieval-harnesssearch-harness
refa: migrate provider model calls (#20355)
buua436710b9eb48e3a
diff --git a/cmd/ragflow_server.go b/cmd/ragflow_server.goindex 9460a16099..2f1f8ad409 100644--- a/cmd/ragflow_server.go+++ b/cmd/ragflow_server.go@@ -1122,6 +1122,7 @@ func startServer(ctx context.Context, serverName string, arguments *serverArgs)memoryService := service.NewMemoryService()mcpService := service.NewMCPService()modelProviderService := service.NewModelProviderService()+ modelCallService := service.NewModelCallServiceWithProviderService(modelProviderService)modelSolver := service.NewModelSolver()// Wire the real MemorySaver so the Message component can persist@@ -1195,7 +1196,7 @@ func startServer(ctx context.Context, serverName string, arguments *serverArgs)// external AI clients via JSON-RPC over HTTP.mcpServerHandler := handler.NewMCPServerHandler(datasetsService, chatService)skillSearchHandler := handler.NewSkillSearchHandler(docEngine, documentService)- providerHandler := handler.NewProviderHandler(userService, modelProviderService)+ providerHandler := handler.NewProviderHandler(userService, modelProviderService, modelCallService)// Install the agent service's Kvrocks-backed run infrastructure// (CheckPointStore / StateSerializer / RunTracker). When Redis// is unreachable (degraded boot, stand-alone mode, no-redis CI)@@ -1226,7 +1227,7 @@ func startServer(ctx context.Context, serverName string, arguments *serverArgs)// provider is unconfigured, the synthesizer falls back to a// no-op echo (the audio package contract), so this is always// safe to call.- configureTTSSynthesizer(modelProviderService)+ configureTTSSynthesizer(modelCallService)searchBotHandler := handler.NewSearchBotHandler(searchService,tenantService,@@ -1538,14 +1539,14 @@ func buildAgentRunOptions() agentRunOptions {// ModelName from req.Engine). When the model provider is// unconfigured (nil dispatcher) the helper returns nil, which// reverts the audio package to its default stub.-func configureTTSSynthesizer(modelProviderService *service.ModelProviderService) {- if modelProviderService == nil {- common.Info("agent: model provider service not initialised; TTS in no-op echo mode")+func configureTTSSynthesizer(modelCallService *service.ModelCallService) {+ if modelCallService == nil {+ common.Info("agent: model call service not initialised; TTS in no-op echo mode")audio.SetModelProviderSynthesizer(nil)return}- audio.SetModelProviderSynthesizer(audio.NewTTSDispatchFunc(modelProviderService))- common.Info("agent: TTS model-provider dispatch installed (audio.Synthesize → ModelProviderService.AudioSpeech)")+ audio.SetModelProviderSynthesizer(audio.NewTTSDispatchFunc(modelCallService))+ common.Info("agent: TTS model-call dispatch installed (audio.Synthesize → ModelCallService.AudioSpeech)")}// inferenceTotalCores returns the CPU budget the DeepDoc inference config isdiff --git a/internal/agent/audio/tts_dispatch.go b/internal/agent/audio/tts_dispatch.goindex 6646795d7b..c77892d9d4 100644--- a/internal/agent/audio/tts_dispatch.go+++ b/internal/agent/audio/tts_dispatch.go@@ -24,15 +24,14 @@// internal/service. The interface is the minimum surface the audio// package needs://-// - Synthesize: a single method that the model's audio driver+// - AudioSpeechForTenant: a tenant-aware method that the model's audio driver// actually exposes (see internal/entity/models/types.go:32-33// BaseModel.AudioSpeech); everything else (provider lookup,// tenant resolution, fallback model selection) is the model's// own internal responsibility.//// The audio package does not import internal/service directly; it-// takes a TTSDispatcher (typically the *service.ModelProviderService-// instance installed at boot). The function returns a non-nil+// takes a TTSDispatcher implemented by the model-call service installed at boot. The function returns a non-nil// SynthesizeResponse on success and a non-nil error on every// failure path; the audio package's caller (modelProviderSynthesizer)// maps nil-error-with-empty-audio to ErrSynthesizeEmpty and nil-@@ -49,24 +48,14 @@ import ()// TTSDispatcher is the minimum interface the audio package needs-// from the project's model provider service. It mirrors the-// *service.ModelProviderService.AudioSpeech method shape so the-// production wiring is a one-line cast. Tests can substitute a-// stub without spinning up a real model driver.-//-// The signature matches the real AudioSpeech exactly (including-// the common.ErrorCode return) so no adapter wrapper is needed-// at the call site. A non-CodeSuccess return is treated as an-// error; the audio package propagates the error to the SSE-// consumer.+// from the project's model-call service. Tests can substitute a stub+// without spinning up a real model driver.type TTSDispatcher interface {- AudioSpeech(+ AudioSpeechForTenant(ctx context.Context,- providerName, instanceName, modelName, modelID *string,- userID string,+ modelRef, tenantID string,audioContent *string,- apiConfig *modelModule.APIConfig,- modelConfig *modelModule.TTSConfig,+ config *modelModule.TTSConfig,) (*modelModule.TTSResponse, common.ErrorCode, error)}@@ -96,25 +85,16 @@ func NewTTSDispatchFunc(d TTSDispatcher) ModelProviderFunc {return nil}return func(ctx context.Context, req ModelProviderRequest) (*SynthesizeResponse, error) {- // ModelName carries the audio engine id ("gtts" / "edge-tts")- // when auto_play is the boolean UI toggle — those are built-in- // engine selectors, not tenant model names. Leave modelName nil- // for them (and for an empty hint) so the dispatcher falls back- // to the tenant's default TTS model, mirroring Python's canvas- // auto_play. Only an explicit model name is passed through to- // the by-name lookup.- var modelName *string+ // Built-in engine selectors are not tenant model references. An+ // empty modelRef lets the model-call service resolve the tenant's+ // default TTS model.+ modelRef := ""switch Engine(req.ModelName) {case EngineEmpty, EngineGTTS, EngineEdge, EngineCustom:default:- mn := req.ModelName- modelName = &mn+ modelRef = req.ModelName}- // We don't have a per-request APIConfig; leave nil so- // the model's default credentials / base URL take effect.- var apiConfig *modelModule.APIConfig-// Build a TTSConfig from the request's voice + lang so// the model driver can select a voice variant when the// provider supports it (e.g. OpenAI's alloy/echo fable,@@ -132,15 +112,11 @@ func NewTTSDispatchFunc(d TTSDispatcher) ModelProviderFunc {}text := req.Text- resp, code, err := d.AudioSpeech(+ resp, code, err := d.AudioSpeechForTenant(ctx,- nil, // providerName — let the dispatcher resolve by name- nil, // instanceName — same- modelName,- nil, // modelID — look up by (provider, instance, model)+ modelRef,req.TenantID,&text,- apiConfig,ttsConfig,)if err != nil {diff --git a/internal/agent/audio/tts_dispatch_test.go b/internal/agent/audio/tts_dispatch_test.goindex 440e1febeb..6fc77a8ae7 100644--- a/internal/agent/audio/tts_dispatch_test.go+++ b/internal/agent/audio/tts_dispatch_test.go@@ -16,7 +16,7 @@// tts_dispatch_test.go — verifies that NewTTSDispatchFunc translates// an audio.Synthesize request into the correct-// ModelProviderService.AudioSpeech call shape and surfaces the+// tenant-aware model-call dispatch shape and surfaces the// model's audio bytes back to the audio package as a// SynthesizeResponse.@@ -31,7 +31,7 @@ import (modelModule "ragflow/internal/entity/models")-// fakeTTSDispatcher records every AudioSpeech invocation and+// fakeTTSDispatcher records every tenant-aware audio speech invocation and// returns canned responses. Lives only in the test file.type fakeTTSDispatcher struct {// Canned return values.@@ -40,32 +40,22 @@ type fakeTTSDispatcher struct {err error// Recorded inputs.- gotProviderName *string- gotInstanceName *string- gotModelName *string- gotModelID *string+ gotModelRef stringgotUserID stringgotAudioContent *string- gotAPIConfig *modelModule.APIConfiggotTTSConfig *modelModule.TTSConfig}-func (f *fakeTTSDispatcher) AudioSpeech(+func (f *fakeTTSDispatcher) AudioSpeechForTenant(ctx context.Context,- providerName, instanceName, modelName, modelID *string,- userID string,+ modelRef, tenantID string,audioContent *string,- apiConfig *modelModule.APIConfig,- modelConfig *modelModule.TTSConfig,+ config *modelModule.TTSConfig,) (*modelModule.TTSResponse, common.ErrorCode, error) {- f.gotProviderName = providerName- f.gotInstanceName = instanceName- f.gotModelName = modelName- f.gotModelID = modelID- f.gotUserID = userID+ f.gotModelRef = modelRef+ f.gotUserID = tenantIDf.gotAudioContent = audioContent- f.gotAPIConfig = apiConfig- f.gotTTSConfig = modelConfig+ f.gotTTSConfig = configreturn f.resp, f.code, f.err}@@ -103,20 +93,8 @@ func TestNewTTSDispatchFunc_HappyPath(t *testing.T) {if fake.gotAudioContent == nil || *fake.gotAudioContent != "hello world" {t.Errorf("audioContent = %v, want pointer to %q", fake.gotAudioContent, "hello world")}- if fake.gotModelName == nil || *fake.gotModelName != "tts-fish" {- t.Errorf("modelName = %v, want pointer to %q", fake.gotModelName, "tts-fish")- }- if fake.gotProviderName != nil {- t.Errorf("providerName = %v, want nil (resolved by name)", fake.gotProviderName)- }- if fake.gotInstanceName != nil {- t.Errorf("instanceName = %v, want nil (resolved by name)", fake.gotInstanceName)- }- if fake.gotModelID != nil {- t.Errorf("modelID = %v, want nil (looked up by name)", fake.gotModelID)- }- if fake.gotAPIConfig != nil {- t.Errorf("apiConfig = %v, want nil (no per-request config)", fake.gotAPIConfig)+ if fake.gotModelRef != "tts-fish" {+ t.Errorf("modelRef = %q, want %q", fake.gotModelRef, "tts-fish")}if fake.gotTTSConfig == nil || fake.gotTTSConfig.Params["voice"] != "en-US-Aria" {t.Errorf("ttsConfig.Params[voice] = %v, want %q", fake.gotTTSConfig, "en-US-Aria")@@ -140,8 +118,8 @@ func TestNewTTSDispatchFunc_EmptyModelName(t *testing.T) {if err != nil {t.Fatalf("dispatch: %v", err)}- if fake.gotModelName != nil {- t.Errorf("modelName = %v, want nil for empty ModelName (let the dispatcher default)", fake.gotModelName)+ if fake.gotModelRef != "" {+ t.Errorf("modelRef = %q, want empty for default selection", fake.gotModelRef)}}@@ -166,8 +144,8 @@ func TestNewTTSDispatchFunc_PseudoEngineFallsBackToDefault(t *testing.T) {if err != nil {t.Fatalf("dispatch: %v", err)}- if fake.gotModelName != nil {- t.Errorf("modelName = %q, want nil for built-in engine %q", *fake.gotModelName, engine)+ if fake.gotModelRef != "" {+ t.Errorf("modelRef = %q, want empty for built-in engine %q", fake.gotModelRef, engine)}if fake.gotTTSConfig == nil || fake.gotTTSConfig.Format != "mp3" {t.Errorf("ttsConfig = %+v, want Format mp3", fake.gotTTSConfig)diff --git a/internal/handler/providers.go b/internal/handler/providers.goindex e1af43f0b0..1ea79af4f9 100644--- a/internal/handler/providers.go+++ b/internal/handler/providers.go@@ -59,14 +59,16 @@ func filterUnsupportedProviders(providers []map[string]interface{}) []map[stringtype ProviderHandler struct {userService *service.UserServicemodelProviderService *service.ModelProviderService+ modelCallService *service.ModelCallServiceuserTenantDAO *dao.UserTenantDAO}// NewProviderHandler create provider handler-func NewProviderHandler(userService *service.UserService, modelProviderService *service.ModelProviderService) *ProviderHandler {+func NewProviderHandler(userService *service.UserService, modelProviderService *service.ModelProviderService, modelCallService *service.ModelCallService) *ProviderHandler {return &ProviderHandler{userService: userService,modelProviderService: modelProviderService,+ modelCallService: modelCallService,userTenantDAO: dao.NewUserTenantDAO(),}}@@ -1013,17 +1015,18 @@ func (h *ProviderHandler) ChatToModel(c *gin.Context) {return}}+ modelRef := ""+ if req.ModelID != nil {+ modelRef = *req.ModelID+ } else {+ modelRef = fmt.Sprintf("%s@%s@%s", *req.ModelName, *req.InstanceName, *req.ProviderName)+ }if !req.Thinking {req.Effort = nilreq.Verbosity = nil}- apiConfig := models.APIConfig{- ApiKey: nil,- Region: nil,- }-chatConfig := models.ChatConfig{Thinking: &req.Thinking,Stream: &req.Stream,@@ -1040,12 +1043,16 @@ func (h *ProviderHandler) ChatToModel(c *gin.Context) {userID := c.GetString("user_id")email := c.GetString("email")modelUsage := common.ModelUsage{- UserID: userID,- UserEmail: email,- ProviderName: *req.ProviderName,- ModelName: *req.ModelName,- Type: "chat",- StartAt: time.Now(),+ UserID: userID,+ UserEmail: email,+ Type: "chat",+ StartAt: time.Now(),+ }+ if req.ProviderName != nil {+ modelUsage.ProviderName = *req.ProviderName+ }+ if req.ModelName != nil {+ modelUsage.ModelName = *req.ModelName}// Check if it's a stream requestif req.Stream {@@ -1089,15 +1096,11 @@ func (h *ProviderHandler) ChatToModel(c *gin.Context) {}// Stream response using sender function (the best performance, no channel)- errorCode, err := h.modelProviderService.ChatToModelStreamWithSender(+ errorCode, err := h.modelCallService.ChatToModelStreamWithSender(ctx,- req.ProviderName,- req.InstanceName,- req.ModelName,- req.ModelID,+ modelRef,userID,messages,- &apiConfig,&chatConfig,&modelUsage,sender,@@ -1120,15 +1123,11 @@ func (h *ProviderHandler) ChatToModel(c *gin.Context) {content := msg["content"]messages[i] = models.Message{Role: role, Content: content}}- response, errorCode, err = h.modelProviderService.ChatToModelWithMessages(+ response, errorCode, err = h.modelCallService.ChatToModelWithMessages(ctx,- req.ProviderName,- req.InstanceName,- req.ModelName,- req.ModelID,+ modelRef,userID,messages,- &apiConfig,&chatConfig,&modelUsage,)@@ -1187,10 +1186,11 @@ func (h *ProviderHandler) EmbedText(c *gin.Context) {}userID := c.GetString("user_id")-- apiConfig := models.APIConfig{- ApiKey: nil,- Region: nil,+ modelRef := ""+ if req.ModelID != nil {+ modelRef = *req.ModelID+ } else {+ modelRef = fmt.Sprintf("%s@%s@%s", *req.ModelName, *req.InstanceName, *req.ProviderName)}embeddingConfig := models.EmbeddingConfig{@@ -1202,7 +1202,7 @@ func (h *ProviderHandler) EmbedText(c *gin.Context) {var errorCode common.ErrorCodevar err error- response, errorCode, err = h.modelProviderService.EmbedText(ctx, req.ProviderName, req.InstanceName, req.ModelName, req.ModelID, userID, req.Texts, &apiConfig, &embeddingConfig)+ response, errorCode, err = h.modelCallService.EmbedText(ctx, modelRef, userID, req.Texts, &embeddingConfig)if err != nil {common.ErrorWithCode(c, errorCode, err.Error())return@@ -1253,10 +1253,11 @@ func (h *ProviderHandler) RerankDocument(c *gin.Context) {}userID := c.GetString("user_id")-- apiConfig := models.APIConfig{- ApiKey: nil,- Region: nil,+ modelRef := ""+ if req.ModelID != nil {+ modelRef = *req.ModelID+ } else {+ modelRef = fmt.Sprintf("%s@%s@%s", *req.ModelName, *req.InstanceName, *req.ProviderName)}rerankConfig := models.RerankConfig{@@ -1268,7 +1269,7 @@ func (h *ProviderHandler) RerankDocument(c *gin.Context) {var errorCode common.ErrorCodevar err error- response, errorCode, err = h.modelProviderService.RerankDocument(ctx, req.ProviderName, req.InstanceName, req.ModelName, req.ModelID, userID, req.Query, req.Documents, &apiConfig, &rerankConfig)+ response, errorCode, err = h.modelCallService.RerankDocument(ctx, modelRef, userID, req.Query, req.Documents, &rerankConfig)if err != nil {common.ErrorWithCode(c, errorCode, err.Error())return@@ -1320,10 +1321,11 @@ func (h *ProviderHandler) TranscribeAudio(c *gin.Context) {}userID := c.GetString("user_id")-- apiConfig := models.APIConfig{- ApiKey: nil,- Region: nil,+ modelRef := ""+ if req.ModelID != nil {+ modelRef = *req.ModelID+ } else {+ modelRef = fmt.Sprintf("%s@%s@%s", *req.ModelName, *req.InstanceName, *req.ProviderName)}asrConfig := models.ASRConfig{}@@ -1365,7 +1367,7 @@ func (h *ProviderHandler) TranscribeAudio(c *gin.Context) {}// Stream response using sender function ( the best performance, no channel)- errorCode, err := h.modelProviderService.TranscribeAudioStream(ctx, req.ProviderName, req.InstanceName, req.ModelName, req.ModelID, userID, req.File, &apiConfig, &asrConfig, sender)+ errorCode, err := h.modelCallService.TranscribeAudioStream(ctx, modelRef, userID, req.File, &asrConfig, sender)if errorCode != common.CodeSuccess {c.SSEvent("error", err.Error())}@@ -1377,7 +1379,7 @@ func (h *ProviderHandler) TranscribeAudio(c *gin.Context) {var errorCode common.ErrorCodevar err error- response, errorCode, err = h.modelProviderService.TranscribeAudio(ctx, req.ProviderName, req.InstanceName, req.ModelName, req.ModelID, userID, req.File, &apiConfig, &asrConfig)+ response, errorCode, err = h.modelCallService.TranscribeAudio(ctx, modelRef, userID, req.File, &asrConfig)if err != nil {common.ErrorWithCode(c, errorCode, err.Error())return@@ -1428,10 +1430,11 @@ func (h *ProviderHandler) AudioSpeech(c *gin.Context) {}userID := c.GetString("user_id")-- apiConfig := models.APIConfig{- ApiKey: nil,- Region: nil,+ modelRef := ""+ if req.ModelID != nil {+ modelRef = *req.ModelID+ } else {+ modelRef = fmt.Sprintf("%s@%s@%s", *req.ModelName, *req.InstanceName, *req.ProviderName)}ttsConfig := models.TTSConfig{}@@ -1473,7 +1476,7 @@ func (h *ProviderHandler) AudioSpeech(c *gin.Context) {}// Stream response using sender function ( the best performance, no channel)- errorCode, err := h.modelProviderService.AudioSpeechStream(ctx, req.ProviderName, req.InstanceName, req.ModelName, req.ModelID, userID, req.Text, &apiConfig, &ttsConfig, sender)+ errorCode, err := h.modelCallService.AudioSpeechStream(ctx, modelRef, userID, req.Text, &ttsConfig, sender)if errorCode != common.CodeSuccess {c.SSEvent("error", err.Error())}@@ -1485,7 +1488,7 @@ func (h *ProviderHandler) AudioSpeech(c *gin.Context) {var errorCode common.ErrorCodevar err error- response, errorCode, err = h.modelProviderService.AudioSpeech(ctx, req.ProviderName, req.InstanceName, req.ModelName, req.ModelID, userID, req.Text, &apiConfig, &ttsConfig)+ response, errorCode, err = h.modelCallService.AudioSpeech(ctx, modelRef, userID, req.Text, &ttsConfig)if err != nil {common.ErrorWithCode(c, errorCode, err.Error())return@@ -1536,9 +1539,11 @@ func (h *ProviderHandler) OCRFile(c *gin.Context) {userID := c.GetString("user_id")- apiConfig := models.APIConfig{- ApiKey: nil,- Region: nil,+ modelRef := ""+ if req.ModelID != nil {+ modelRef = *req.ModelID+ } else {+ modelRef = fmt.Sprintf("%s@%s@%s", *req.ModelName, *req.InstanceName, *req.ProviderName)}OCRConfig := models.OCRConfig{}@@ -1548,7 +1553,7 @@ func (h *ProviderHandler) OCRFile(c *gin.Context) {var errorCode common.ErrorCodevar err error- response, errorCode, err = h.modelProviderService.OCRFile(ctx, req.ProviderName, req.InstanceName, req.ModelName, req.ModelID, userID, req.Content, req.URL, &apiConfig, &OCRConfig)+ response, errorCode, err = h.modelCallService.OCRFile(ctx, modelRef, userID, req.Content, req.URL, &OCRConfig)if err != nil {common.ErrorWithCode(c, errorCode, err.Error())return@@ -1599,9 +1604,11 @@ func (h *ProviderHandler) ParseFile(c *gin.Context) {userID := c.GetString("user_id")- apiConfig := models.APIConfig{- ApiKey: nil,- Region: nil,+ modelRef := ""+ if req.ModelID != nil {+ modelRef = *req.ModelID+ } else {+ modelRef = fmt.Sprintf("%s@%s@%s", *req.ModelName, *req.InstanceName, *req.ProviderName)}parseFileConfig := models.ParseFileConfig{}@@ -1611,7 +1618,7 @@ func (h *ProviderHandler) ParseFile(c *gin.Context) {var errorCode common.ErrorCodevar err error- response, errorCode, err = h.modelProviderService.ParseFile(ctx, req.ProviderName, req.InstanceName, req.ModelName, req.ModelID, userID, req.Content, req.URL, &apiConfig, &parseFileConfig)+ response, errorCode, err = h.modelCallService.ParseFile(ctx, modelRef, userID, req.Content, req.URL, &parseFileConfig)if err != nil {common.ErrorWithCode(c, errorCode, err.Error())returndiff --git a/internal/handler/providers_test.go b/internal/handler/providers_test.goindex 0bbff94125..b4821f6a3e 100644--- a/internal/handler/providers_test.go+++ b/internal/handler/providers_test.go@@ -237,7 +237,7 @@ func TestProviderHandlerCreateProviderInstanceRejectsInvalidInstanceName(t *testgin.Param{Key: "provider_id_or_name", Value: "OpenAI"},)- NewProviderHandler(nil, service.NewModelProviderService()).CreateProviderInstance(ctx)+ NewProviderHandler(nil, service.NewModelProviderService(), service.NewModelCallService()).CreateProviderInstance(ctx)body := decodeProviderHandlerResponse(t, recorder)if common.ErrorCode(body["code"].(float64)) != common.CodeBadRequest {@@ -253,7 +253,7 @@ func TestProviderHandlerAlterModelRejectsMissingModelSelector(t *testing.T) {gin.Param{Key: "instance_id_or_name", Value: "default"},)- NewProviderHandler(nil, service.NewModelProviderService()).AlterModel(ctx)+ NewProviderHandler(nil, service.NewModelProviderService(), service.NewModelCallService()).AlterModel(ctx)if recorder.Code != http.StatusBadRequest {t.Fatalf("status = %d, want %d; body=%s", recorder.Code, http.StatusBadRequest, recorder.Body.String())@@ -273,7 +273,7 @@ func TestProviderHandlerAlterModelRejectsInvalidStatus(t *testing.T) {gin.Param{Key: "model_name", Value: "gpt-test"},)- NewProviderHandler(nil, service.NewModelProviderService()).AlterModel(ctx)+ NewProviderHandler(nil, service.NewModelProviderService(), service.NewModelCallService()).AlterModel(ctx)if recorder.Code != http.StatusBadRequest {t.Fatalf("status = %d, want %d; body=%s", recorder.Code, http.StatusBadRequest, recorder.Body.String())@@ -297,7 +297,7 @@ func TestProviderHandlerAlterModelUpdatesStatus(t *testing.T) {gin.Param{Key: "model_name", Value: "gpt-test"},)- NewProviderHandler(nil, service.NewModelProviderService()).AlterModel(ctx)+ NewProviderHandler(nil, service.NewModelProviderService(), service.NewModelCallService()).AlterModel(ctx)if recorder.Code != http.StatusOK {t.Fatalf("status = %d, want %d; body=%s", recorder.Code, http.StatusOK, recorder.Body.String())diff --git a/internal/service/model_call.go b/internal/service/model_call.goindex cc53925b3b..b8d8822499 100644--- a/internal/service/model_call.go+++ b/internal/service/model_call.go@@ -45,7 +45,15 @@ type ModelCallService struct {// NewModelCallService creates a model-call service with the standard model// provider and model resolver.func NewModelCallService() *ModelCallService {- providerService := NewModelProviderService()+ return NewModelCallServiceWithProviderService(NewModelProviderService())+}++// NewModelCallServiceWithProviderService creates a model-call service using+// an existing provider service and its DAO configuration.+func NewModelCallServiceWithProviderService(providerService *ModelProviderService) *ModelCallService {+ if providerService == nil {+ providerService = NewModelProviderService()+ }return &ModelCallService{providerService: providerService,modelSolver: &ModelSolver{service: providerService},@@ -196,7 +204,57 @@ func (s *ModelCallService) TranscribeAudioStream(ctx context.Context, modelRef,// AudioSpeech converts audioContent to speech with the model selected by// modelRef.func (s *ModelCallService) AudioSpeech(ctx context.Context, modelRef, userID string, audioContent *string, config *modelModule.TTSConfig) (*modelModule.TTSResponse, common.ErrorCode, error) {- target, _, code, err := s.resolveTarget(ctx, modelRef, userID, entity.ModelTypeTTS)+ var target *ModelTarget+ var code common.ErrorCode+ var err error+ if strings.TrimSpace(modelRef) == "" {+ tenantID, tenantErr := s.ownerTenantID(ctx, userID)+ if tenantErr != nil {+ // Audio synthesis supplies the tenant ID directly, while HTTP+ // model calls supply a user ID. Fall back to the former when no+ // owner tenant can be resolved from the latter.+ tenantID = userID+ }+ code = common.CodeNotFound+ target, err = s.modelSolver.ResolveDefaultModelConfig(ctx, tenantID, entity.ModelTypeTTS)+ if err == nil {+ code = common.CodeSuccess+ }+ } else {+ target, _, code, err = s.resolveTarget(ctx, modelRef, userID, entity.ModelTypeTTS)+ }+ if err != nil {+ return nil, code, err+ }+ if config == nil {+ config = &modelModule.TTSConfig{}+ }++ modelName := target.ModelName+ response, err := target.Driver.AudioSpeech(ctx, &modelName, audioContent, target.APIConfig, config, nil)+ if err != nil {+ return nil, common.CodeServerError, err+ }+ if response == nil {+ return nil, common.CodeServerError, errors.New("empty audio speech response")+ }+ return response, common.CodeSuccess, nil+}++// AudioSpeechForTenant synthesizes audio using a tenant ID supplied by the audio dispatcher.+func (s *ModelCallService) AudioSpeechForTenant(ctx context.Context, modelRef, tenantID string, audioContent *string, config *modelModule.TTSConfig) (*modelModule.TTSResponse, common.ErrorCode, error) {+ var target *ModelTarget+ var code common.ErrorCode+ var err error+ if strings.TrimSpace(modelRef) == "" {+ code = common.CodeNotFound+ target, err = s.modelSolver.ResolveDefaultModelConfig(ctx, tenantID, entity.ModelTypeTTS)+ if err == nil {+ code = common.CodeSuccess+ }+ } else {+ target, code, err = s.resolveTargetByTenant(ctx, modelRef, tenantID, entity.ModelTypeTTS)+ }if err != nil {return nil, code, err}@@ -305,6 +363,17 @@ func (s *ModelCallService) ParseFile(ctx context.Context, modelRef, userID strinreturn response, common.CodeSuccess, nil}+func (s *ModelCallService) resolveTargetByTenant(ctx context.Context, modelRef, tenantID string, modelType entity.ModelType) (*ModelTarget, common.ErrorCode, error) {+ if s == nil || s.providerService == nil || s.modelSolver == nil {+ return nil, common.CodeServerError, errors.New("model call service is not initialized")+ }+ target, err := s.modelSolver.ResolveModelConfig(ctx, tenantID, modelType, modelRef)+ if err != nil {+ return nil, common.CodeNotFound, err+ }+ return target, common.CodeSuccess, nil+}+func (s *ModelCallService) resolveTarget(ctx context.Context, modelRef, userID string, modelType entity.ModelType) (*ModelTarget, string, common.ErrorCode, error) {if s == nil || s.providerService == nil || s.modelSolver == nil {return nil, "", common.CodeServerError, errors.New("model call service is not initialized")@@ -344,6 +413,7 @@ func populateModelUsage(usage *common.ModelUsage, target *ModelTarget, tenantID,usage.UserID = userIDusage.TenantID = tenantIDusage.ProviderName = target.ProviderName+ usage.InstanceID = target.InstanceIDusage.ModelName = target.ModelNameif target.APIConfig != nil && target.APIConfig.ApiKey != nil {usage.APIKey = *target.APIConfig.ApiKeydiff --git a/internal/service/model_service.go b/internal/service/model_service.goindex 516c29b341..6a56f482e9 100644--- a/internal/service/model_service.go+++ b/internal/service/model_service.go@@ -2389,140 +2389,6 @@ func (m *ModelProviderService) getModelInstanceAndProviderByID(ctx context.Contereturn result, nil}-// ChatToModelWithMessages sends messages to the model with messages array-func (m *ModelProviderService) ChatToModelWithMessages(ctx context.Context, providerName, instanceName, modelName, modelID *string, userID string, messages []modelModule.Message, apiConfig *modelModule.APIConfig, modelConfig *modelModule.ChatConfig, modelUsage *common.ModelUsage) (*modelModule.ChatResponse, common.ErrorCode, error) {-- var err error- var info *ModelInstanceAndProviderInfo-- if modelID != nil {- info, err = m.getModelInstanceAndProviderByID(ctx, modelID, userID, apiConfig)- if err != nil || info == nil {- return nil, common.CodeNotFound, err- }- } else {- info, err = m.getModelInstanceAndProviderByName(ctx, providerName, instanceName, modelName, userID, apiConfig)- if err != nil || info == nil {- return nil, common.CodeNotFound, err- }- }-- if modelConfig == nil {- modelConfig = &modelModule.ChatConfig{}- }- modelConfig.ModelClass = info.ModelInfo.Class- if modelConfig.Thinking == nil && info.ModelInfo.Thinking != nil {- thinking := info.ModelInfo.Thinking.DefaultValue- modelConfig.Thinking = &thinking- }- resolvedModelName := info.ModelInfo.Name- if info.ModelEntity != nil && info.ModelEntity.ModelName != "" {- resolvedModelName = info.ModelEntity.ModelName- }- resolvedProviderName := info.ProviderEntity.ProviderName-- var response *modelModule.ChatResponse- var modelDriver modelModule.ModelDriver-- if info.ModelEntity == nil {- if !info.ModelInfo.ModelTypeMap["chat"] && !info.ModelInfo.ModelTypeMap["vision"] {- return nil, common.CodeNotFound, errors.New(fmt.Sprintf("expect model %s@%s is a chat or multimodal model", resolvedModelName, resolvedProviderName))- }- modelDriver = info.ProviderInfo.ModelDriver- } else {- // model entity exists- if info.ModelEntity.Status == "active" {- if !entity.ModelType(info.ModelEntity.ModelType).Has(entity.ModelTypeChat) && !entity.ModelType(info.ModelEntity.ModelType).Has(entity.ModelTypeImage2Text) {- return nil, common.CodeNotFound, errors.New(fmt.Sprintf("expect model %s@%s is a chat or multimodal model", resolvedModelName, resolvedProviderName))- }-- modelDriver, err = newModelDriverForBaseURL(info.ProviderInfo.ModelDriver, resolvedProviderName, *info.APIConfig.Region, *info.APIConfig.BaseURL)- if err != nil {- return nil, common.CodeServerError, err- }- } else {- return nil, common.CodeServerError, errors.New("model is inactive")- }- }-- modelUsage.TenantID = info.ProviderEntity.TenantID- modelUsage.InstanceID = info.InstanceEntity.ID- modelUsage.APIKey = info.InstanceEntity.APIKey-- response, err = modelDriver.ChatWithMessages(ctx, resolvedModelName, messages, info.APIConfig, modelConfig, modelUsage)- if err != nil {- return nil, common.CodeServerError, err- }- if response == nil {- return nil, common.CodeServerError, errors.New("empty chat response")- }-- return response, common.CodeSuccess, nil-}--// ChatToModelStreamWithSender streams chat response directly via sender function ( the best performance, no channel)-func (m *ModelProviderService) ChatToModelStreamWithSender(ctx context.Context, providerName, instanceName, modelName, modelID *string, userID string, messages []modelModule.Message, apiConfig *modelModule.APIConfig, modelConfig *modelModule.ChatConfig, modelUsage *common.ModelUsage, sender func(*string, *string) error) (common.ErrorCode, error) {-- var err error- var info *ModelInstanceAndProviderInfo-- if modelID != nil {- info, err = m.getModelInstanceAndProviderByID(ctx, modelID, userID, apiConfig)- if err != nil || info == nil {- return common.CodeNotFound, err- }- } else {- info, err = m.getModelInstanceAndProviderByName(ctx, providerName, instanceName, modelName, userID, apiConfig)- if err != nil || info == nil {- return common.CodeNotFound, err- }- }-- if modelConfig == nil {- modelConfig = &modelModule.ChatConfig{}- }- modelConfig.ModelClass = info.ModelInfo.Class- if modelConfig.Thinking == nil && info.ModelInfo.Thinking != nil {- thinking := info.ModelInfo.Thinking.DefaultValue- modelConfig.Thinking = &thinking- }- resolvedModelName := info.ModelInfo.Name- if info.ModelEntity != nil && info.ModelEntity.ModelName != "" {- resolvedModelName = info.ModelEntity.ModelName- }- resolvedProviderName := info.ProviderEntity.ProviderName-- var modelDriver modelModule.ModelDriver-- if info.ModelEntity == nil {- modelDriver = info.ProviderInfo.ModelDriver- } else {- // model entity exists- if info.ModelEntity.Status == "active" {- if !entity.ModelType(info.ModelEntity.ModelType).Has(entity.ModelTypeChat) && !entity.ModelType(info.ModelEntity.ModelType).Has(entity.ModelTypeImage2Text) {- return common.CodeNotFound, errors.New(fmt.Sprintf("expect model %s@%s is a chat or multimodal model", resolvedModelName, resolvedProviderName))- }-- modelDriver, err = newModelDriverForBaseURL(info.ProviderInfo.ModelDriver, resolvedProviderName, *info.APIConfig.Region, *info.APIConfig.BaseURL)- if err != nil {- return common.CodeServerError, err- }- } else {- return common.CodeServerError, errors.New("model is inactive")- }- }-- modelUsage.TenantID = info.ProviderEntity.TenantID- modelUsage.InstanceID = info.InstanceEntity.ID- modelUsage.APIKey = info.InstanceEntity.APIKey-- err = modelDriver.ChatStreamlyWithSender(ctx, resolvedModelName, messages, info.APIConfig, modelConfig, modelUsage, sender)- if err != nil {- return common.CodeServerError, err- }- return common.CodeSuccess, nil-}-func validateEmbeddingModel(model *modelModule.Model, requestedDimension, requestedBatchSize int) error {if model == nil {return fmt.Errorf("embedding model is nil")@@ -2573,489 +2439,6 @@ func validateEmbeddingModel(model *modelModule.Model, requestedDimension, requesreturn nil}-// EmbedText sends texts to the embedding model-func (m *ModelProviderService) EmbedText(ctx context.Context, providerName, instanceName, modelName, modelID *string, userID string, texts []string, apiConfig *modelModule.APIConfig, modelConfig *modelModule.EmbeddingConfig) ([]modelModule.EmbeddingData, common.ErrorCode, error) {-- var err error- var info *ModelInstanceAndProviderInfo-- if modelID != nil {- info, err = m.getModelInstanceAndProviderByID(ctx, modelID, userID, apiConfig)- if err != nil || info == nil {- return nil, common.CodeNotFound, err- }- } else {- info, err = m.getModelInstanceAndProviderByName(ctx, providerName, instanceName, modelName, userID, apiConfig)- if err != nil || info == nil {- return nil, common.CodeNotFound, err- }- }-- if modelConfig == nil {- modelConfig = &modelModule.EmbeddingConfig{}- }- resolvedModelName := info.ModelInfo.Name- if info.ModelEntity != nil && info.ModelEntity.ModelName != "" {- resolvedModelName = info.ModelEntity.ModelName- }- resolvedProviderName := info.ProviderEntity.ProviderName-- var modelDriver modelModule.ModelDriver-- if info.ModelEntity == nil {- if !info.ModelInfo.ModelTypeMap["embedding"] {- return nil, common.CodeNotFound, errors.New(fmt.Sprintf("expect model %s@%s is an embedding model", resolvedModelName, resolvedProviderName))- }- modelDriver = info.ProviderInfo.ModelDriver- } else {- // model entity exists- if info.ModelEntity.Status == "active" {- if !entity.ModelType(info.ModelEntity.ModelType).Has(entity.ModelTypeEmbedding) {- return nil, common.CodeNotFound, errors.New(fmt.Sprintf("expect model %s@%s is an embedding model", resolvedModelName, resolvedProviderName))- }-- modelDriver, err = newModelDriverForBaseURL(info.ProviderInfo.ModelDriver, resolvedProviderName, *info.APIConfig.Region, *info.APIConfig.BaseURL)- if err != nil {- return nil, common.CodeServerError, err- }- } else {- return nil, common.CodeServerError, errors.New("model is inactive")- }- }-- if err = validateEmbeddingModel(info.ModelInfo, modelConfig.Dimension, len(texts)); err != nil {- return nil, common.CodeBadRequest, err- }-- var response []modelModule.EmbeddingData- response, err = modelDriver.Embed(ctx, &resolvedModelName, modelModule.EmbedRequest{Texts: texts}, info.APIConfig, modelConfig, nil)- if err != nil {- return nil, common.CodeServerError, err- }- if response == nil || len(response) == 0 {- return nil, common.CodeServerError, errors.New("empty embed response")- }-- return response, common.CodeSuccess, nil-}--// RerankDocument sends texts to the embedding model-func (m *ModelProviderService) RerankDocument(ctx context.Context, providerName, instanceName, modelName, modelID *string, userID, query string, documents []string, apiConfig *modelModule.APIConfig, modelConfig *modelModule.RerankConfig) (*modelModule.RerankResponse, common.ErrorCode, error) {-- var err error- var info *ModelInstanceAndProviderInfo-- if modelID != nil {- info, err = m.getModelInstanceAndProviderByID(ctx, modelID, userID, apiConfig)- if err != nil || info == nil {- return nil, common.CodeNotFound, err- }- } else {- info, err = m.getModelInstanceAndProviderByName(ctx, providerName, instanceName, modelName, userID, apiConfig)- if err != nil || info == nil {- return nil, common.CodeNotFound, err- }- }-- if modelConfig == nil {- modelConfig = &modelModule.RerankConfig{}- }- resolvedModelName := info.ModelInfo.Name- if info.ModelEntity != nil && info.ModelEntity.ModelName != "" {- resolvedModelName = info.ModelEntity.ModelName- }- resolvedProviderName := info.ProviderEntity.ProviderName-- var modelDriver modelModule.ModelDriver-- if info.ModelEntity == nil {- if !info.ModelInfo.ModelTypeMap["rerank"] {- return nil, common.CodeNotFound, errors.New(fmt.Sprintf("expect model %s@%s is a rerank model", resolvedModelName, resolvedProviderName))- }- modelDriver = info.ProviderInfo.ModelDriver- } else {- // model entity exists- if info.ModelEntity.Status == "active" {- if !entity.ModelType(info.ModelEntity.ModelType).Has(entity.ModelTypeRerank) {- return nil, common.CodeNotFound, errors.New(fmt.Sprintf("expect model %s@%s is a rerank model", resolvedModelName, resolvedProviderName))- }-- modelDriver, err = newModelDriverForBaseURL(info.ProviderInfo.ModelDriver, resolvedProviderName, *info.APIConfig.Region, *info.APIConfig.BaseURL)- if err != nil {- return nil, common.CodeServerError, err- }- } else {- return nil, common.CodeServerError, errors.New("model is inactive")- }- }-- rerankRequest := modelModule.RerankRequest{- Query: query,- Documents: documents,- }-- var response *modelModule.RerankResponse- rerankModel := modelModule.NewRerankModel(modelDriver, &resolvedModelName, info.APIConfig, maxTokensFromModelInfo(info.ModelInfo, entity.ModelTypeRerank))- response, err = rerankModel.Rerank(ctx, rerankRequest, info.APIConfig, modelConfig, nil)- if err != nil {- return nil, common.CodeServerError, err- }-- return response, common.CodeSuccess, nil-}--// TranscribeAudio transcribe audio file to text-func (m *ModelProviderService) TranscribeAudio(ctx context.Context, providerName, instanceName, modelName, modelID *string, userID string, audioFile *string, apiConfig *modelModule.APIConfig, modelConfig *modelModule.ASRConfig) (*modelModule.ASRResponse, common.ErrorCode, error) {-- var err error- var info *ModelInstanceAndProviderInfo-- if modelID != nil {- info, err = m.getModelInstanceAndProviderByID(ctx, modelID, userID, apiConfig)- if err != nil || info == nil {- return nil, common.CodeNotFound, err- }- } else {- info, err = m.getModelInstanceAndProviderByName(ctx, providerName, instanceName, modelName, userID, apiConfig)- if err != nil || info == nil {- return nil, common.CodeNotFound, err- }- }-- if modelConfig == nil {- modelConfig = &modelModule.ASRConfig{}- }-- var modelDriver modelModule.ModelDriver-- if info.ModelEntity == nil {- if !info.ModelInfo.ModelTypeMap["asr"] {- return nil, common.CodeNotFound, errors.New(fmt.Sprintf("expect model %s@%s is an ASR model", *modelName, *providerName))- }- modelDriver = info.ProviderInfo.ModelDriver- } else {- // model entity exists- if info.ModelEntity.Status == "active" {- if !entity.ModelType(info.ModelEntity.ModelType).Has(entity.ModelTypeSpeech2Text) {- return nil, common.CodeNotFound, errors.New(fmt.Sprintf("expect model %s@%s is an ASR model", *modelName, *providerName))- }-- modelDriver, err = newModelDriverForBaseURL(info.ProviderInfo.ModelDriver, *providerName, *info.APIConfig.Region, *info.APIConfig.BaseURL)- if err != nil {- return nil, common.CodeServerError, err- }- } else {- return nil, common.CodeServerError, errors.New("model is inactive")- }- }-- var response *modelModule.ASRResponse- response, err = modelDriver.TranscribeAudio(ctx, modelName, audioFile, apiConfig, modelConfig, nil)- if err != nil {- return nil, common.CodeServerError, err- }- if response == nil {- return nil, common.CodeServerError, errors.New("empty chat response")- }-- return response, common.CodeSuccess, nil-}--// TranscribeAudioStream transcribe audio file to text stream directly via sender function ( the best performance, no channel)-func (m *ModelProviderService) TranscribeAudioStream(ctx context.Context, providerName, instanceName, modelName, modelID *string, userID string, audioFile *string, apiConfig *modelModule.APIConfig, modelConfig *modelModule.ASRConfig, sender func(*string, *string) error) (common.ErrorCode, error) {-- var err error- var info *ModelInstanceAndProviderInfo-- if modelID != nil {- info, err = m.getModelInstanceAndProviderByID(ctx, modelID, userID, apiConfig)- if err != nil || info == nil {- return common.CodeNotFound, err- }- } else {- info, err = m.getModelInstanceAndProviderByName(ctx, providerName, instanceName, modelName, userID, apiConfig)- if err != nil || info == nil {- return common.CodeNotFound, err- }- }-- if modelConfig == nil {- modelConfig = &modelModule.ASRConfig{}- }-- var modelDriver modelModule.ModelDriver-- if info.ModelEntity == nil {- if !info.ModelInfo.ModelTypeMap["asr"] {- return common.CodeNotFound, errors.New(fmt.Sprintf("expect model %s@%s is an ASR model", *modelName, *providerName))- }- modelDriver = info.ProviderInfo.ModelDriver- } else {- // model entity exists- if info.ModelEntity.Status == "active" {- if !entity.ModelType(info.ModelEntity.ModelType).Has(entity.ModelTypeSpeech2Text) {- return common.CodeNotFound, errors.New(fmt.Sprintf("expect model %s@%s is an ASR model", *modelName, *providerName))- }-- modelDriver, err = newModelDriverForBaseURL(info.ProviderInfo.ModelDriver, *providerName, *info.APIConfig.Region, *info.APIConfig.BaseURL)- if err != nil {- return common.CodeServerError, err- }- } else {- return common.CodeServerError, errors.New("model is inactive")- }- }-- err = modelDriver.TranscribeAudioWithSender(ctx, modelName, audioFile, apiConfig, modelConfig, nil, sender)- if err != nil {- return common.CodeServerError, err- }-- return common.CodeSuccess, nil-}--// AudioSpeech convert audio to speech-func (m *ModelProviderService) AudioSpeech(ctx context.Context, providerName, instanceName, modelName, modelID *string, userID string, audioContent *string, apiConfig *modelModule.APIConfig, modelConfig *modelModule.TTSConfig) (*modelModule.TTSResponse, common.ErrorCode, error) {-- var err error- var info *ModelInstanceAndProviderInfo-- if modelID != nil {- info, err = m.getModelInstanceAndProviderByID(ctx, modelID, userID, apiConfig)- if err != nil || info == nil {- return nil, common.CodeNotFound, err- }- } else if providerName == nil && instanceName == nil && modelName == nil {- // No explicit model selection: synthesize through the tenant's- // default TTS model, mirroring Python's canvas auto_play which- // always resolves get_tenant_default_model_by_type(LLMType.TTS).- // A missing default surfaces as a typed error ("no default tts- // model is set") instead of a nil-pointer panic.- target, derr := m.modelSolver().ResolveDefaultModelConfig(ctx, userID, entity.ModelTypeTTS)- if derr != nil {- return nil, common.CodeNotFound, derr- }- if modelConfig == nil {- modelConfig = &modelModule.TTSConfig{}- }- var response *modelModule.TTSResponse- response, derr = target.Driver.AudioSpeech(ctx, &target.ModelName, audioContent, target.APIConfig, modelConfig, nil)- if derr != nil {- return nil, common.CodeServerError, derr- }- if response == nil {- return nil, common.CodeServerError, errors.New("empty chat response")- }- return response, common.CodeSuccess, nil- } else {- info, err = m.getModelInstanceAndProviderByName(ctx, providerName, instanceName, modelName, userID, apiConfig)- if err != nil || info == nil {- return nil, common.CodeNotFound, err- }- }-- if modelConfig == nil {- modelConfig = &modelModule.TTSConfig{}- }-- var modelDriver modelModule.ModelDriver-- if info.ModelEntity == nil {- if !info.ModelInfo.ModelTypeMap["tts"] {- return nil, common.CodeNotFound, errors.New(fmt.Sprintf("expect model %s@%s is a TTS model", *modelName, *providerName))- }- modelDriver = info.ProviderInfo.ModelDriver- } else {- // model entity exists- if info.ModelEntity.Status == "active" {- if !entity.ModelType(info.ModelEntity.ModelType).Has(entity.ModelTypeTTS) {- return nil, common.CodeNotFound, errors.New(fmt.Sprintf("expect model %s@%s is a TTS model", *modelName, *providerName))- }-- modelDriver, err = newModelDriverForBaseURL(info.ProviderInfo.ModelDriver, *providerName, *info.APIConfig.Region, *info.APIConfig.BaseURL)- if err != nil {- return nil, common.CodeServerError, err- }- } else {- return nil, common.CodeServerError, errors.New("model is inactive")- }- }-- var response *modelModule.TTSResponse- response, err = modelDriver.AudioSpeech(ctx, modelName, audioContent, apiConfig, modelConfig, nil)- if err != nil {- return nil, common.CodeServerError, err- }- if response == nil {- return nil, common.CodeServerError, errors.New("empty chat response")- }-- return response, common.CodeSuccess, nil-}--func (m *ModelProviderService) AudioSpeechStream(ctx context.Context, providerName, instanceName, modelName, modelID *string, userID string, audioContent *string, apiConfig *modelModule.APIConfig, modelConfig *modelModule.TTSConfig, sender func(*string, *string) error) (common.ErrorCode, error) {-- var err error- var info *ModelInstanceAndProviderInfo-- if modelID != nil {- info, err = m.getModelInstanceAndProviderByID(ctx, modelID, userID, apiConfig)- if err != nil || info == nil {- return common.CodeNotFound, err- }- } else {- info, err = m.getModelInstanceAndProviderByName(ctx, providerName, instanceName, modelName, userID, apiConfig)- if err != nil || info == nil {- return common.CodeNotFound, err- }- }-- if modelConfig == nil {- modelConfig = &modelModule.TTSConfig{}- }-- var modelDriver modelModule.ModelDriver-- if info.ModelEntity == nil {- if !info.ModelInfo.ModelTypeMap["tts"] {- return common.CodeNotFound, errors.New(fmt.Sprintf("expect model %s@%s is a TTS model", *modelName, *providerName))- }- modelDriver = info.ProviderInfo.ModelDriver- } else {- // model entity exists- if info.ModelEntity.Status == "active" {- if !entity.ModelType(info.ModelEntity.ModelType).Has(entity.ModelTypeTTS) {- return common.CodeNotFound, errors.New(fmt.Sprintf("expect model %s@%s is a TTS model", *modelName, *providerName))- }-- modelDriver, err = newModelDriverForBaseURL(info.ProviderInfo.ModelDriver, *providerName, *info.APIConfig.Region, *info.APIConfig.BaseURL)- if err != nil {- return common.CodeServerError, err- }- } else {- return common.CodeServerError, errors.New("model is inactive")- }- }-- err = modelDriver.AudioSpeechWithSender(ctx, modelName, audioContent, apiConfig, modelConfig, nil, sender)- if err != nil {- return common.CodeServerError, err- }-- return common.CodeSuccess, nil-}--func (m *ModelProviderService) OCRFile(ctx context.Context, providerName, instanceName, modelName, modelID *string, userID string, content []byte, url *string, apiConfig *modelModule.APIConfig, modelConfig *modelModule.OCRConfig) (*modelModule.OCRFileResponse, common.ErrorCode, error) {-- var err error- var info *ModelInstanceAndProviderInfo-- if modelID != nil {- info, err = m.getModelInstanceAndProviderByID(ctx, modelID, userID, apiConfig)- if err != nil || info == nil {- return nil, common.CodeNotFound, err- }- } else {- info, err = m.getModelInstanceAndProviderByName(ctx, providerName, instanceName, modelName, userID, apiConfig)- if err != nil || info == nil {- return nil, common.CodeNotFound, err- }- }-- if modelConfig == nil {- modelConfig = &modelModule.OCRConfig{}- }-- var modelDriver modelModule.ModelDriver-- if info.ModelEntity == nil {- if !info.ModelInfo.ModelTypeMap["ocr"] {- return nil, common.CodeNotFound, errors.New(fmt.Sprintf("expect model %s@%s is an OCR model", *modelName, *providerName))- }- modelDriver = info.ProviderInfo.ModelDriver- } else {- // model entity exists- if info.ModelEntity.Status == "active" {- if !entity.ModelType(info.ModelEntity.ModelType).Has(entity.ModelTypeOCR) {- return nil, common.CodeNotFound, errors.New(fmt.Sprintf("expect model %s@%s is an OCR model", *modelName, *providerName))- }-- modelDriver, err = newModelDriverForBaseURL(info.ProviderInfo.ModelDriver, *providerName, *info.APIConfig.Region, *info.APIConfig.BaseURL)- if err != nil {- return nil, common.CodeServerError, err- }- } else {- return nil, common.CodeServerError, errors.New("model is inactive")- }- }-- var response *modelModule.OCRFileResponse- response, err = modelDriver.OCRFile(ctx, modelName, content, url, apiConfig, modelConfig, nil)- if err != nil {- return nil, common.CodeServerError, err- }- if response == nil {- return nil, common.CodeServerError, errors.New("empty chat response")- }-- return response, common.CodeSuccess, nil-}--func (m *ModelProviderService) ParseFile(ctx context.Context, providerName, instanceName, modelName, modelID *string, userID string, content []byte, url *string, apiConfig *modelModule.APIConfig, modelConfig *modelModule.ParseFileConfig) (*modelModule.ParseFileResponse, common.ErrorCode, error) {-- var err error- var info *ModelInstanceAndProviderInfo-- if modelID != nil {- info, err = m.getModelInstanceAndProviderByID(ctx, modelID, userID, apiConfig)- if err != nil || info == nil {- return nil, common.CodeNotFound, err- }- } else {- info, err = m.getModelInstanceAndProviderByName(ctx, providerName, instanceName, modelName, userID, apiConfig)- if err != nil || info == nil {- return nil, common.CodeNotFound, err- }- }-- if modelConfig == nil {- modelConfig = &modelModule.ParseFileConfig{}- }-- var modelDriver modelModule.ModelDriver-- if info.ModelEntity == nil {- if !info.ModelInfo.ModelTypeMap["doc_parse"] {- return nil, common.CodeNotFound, errors.New(fmt.Sprintf("expect model %s@%s is a ParseFile model", *modelName, *providerName))- }- modelDriver = info.ProviderInfo.ModelDriver- } else {- // model entity exists- if info.ModelEntity.Status == "active" {- // Note: ParseFile model type is not in the ModelType enum; skip entity-type check- // and rely on the factory ModelTypeMap check in the nil-entity branch.-- modelDriver, err = newModelDriverForBaseURL(info.ProviderInfo.ModelDriver, *providerName, *info.APIConfig.Region, *info.APIConfig.BaseURL)- if err != nil {- return nil, common.CodeServerError, err- }- } else {- return nil, common.CodeServerError, errors.New("model is inactive")- }- }-- var response *modelModule.ParseFileResponse- response, err = modelDriver.ParseFile(ctx, modelName, content, url, apiConfig, modelConfig, nil)- if err != nil {- return nil, common.CodeServerError, err- }- if response == nil {- return nil, common.CodeServerError, errors.New("empty chat response")- }-- return response, common.CodeSuccess, nil-}-type AddModelRequest struct {ProviderName string `json:"provider_name"`InstanceName string `json:"instance_name"`diff --git a/internal/service/model_service_tts_test.go b/internal/service/model_service_tts_test.goindex 96eebc0c38..9f7a2526ae 100644--- a/internal/service/model_service_tts_test.go+++ b/internal/service/model_service_tts_test.go@@ -53,9 +53,9 @@ func TestAudioSpeech_NoSelectionNoDefaultTTS(t *testing.T) {pushServiceDB(t, testDB)insertTTSTestTenant(t, "tenant-1", nil)- svc := NewModelProviderService()+ svc := NewModelCallService()text := "hello"- resp, code, err := svc.AudioSpeech(t.Context(), nil, nil, nil, nil, "tenant-1", &text, nil, nil)+ resp, code, err := svc.AudioSpeech(t.Context(), "", "tenant-1", &text, nil)if err == nil {t.Fatalf("expected error for missing default TTS model, got resp=%v", resp)}@@ -70,29 +70,6 @@ func TestAudioSpeech_NoSelectionNoDefaultTTS(t *testing.T) {}}-// TestAudioSpeech_PartialNamesRejected verifies the by-name lookup guard:-// a modelName without provider/instance names (the shape the auto_play-// dispatch used to send, e.g. "gtts") returns a clear error instead of-// panicking.-func TestAudioSpeech_PartialNamesRejected(t *testing.T) {- testDB := setupServiceTestDB(t)- pushServiceDB(t, testDB)-- svc := NewModelProviderService()- text := "hello"- badModel := "gtts"- resp, code, err := svc.AudioSpeech(t.Context(), nil, nil, &badModel, nil, "tenant-1", &text, nil, nil)- if err == nil {- t.Fatalf("expected error for partial model names, got resp=%v", resp)- }- if !strings.Contains(err.Error(), "provider name, instance name and model name are required") {- t.Fatalf("err = %v, want it to mention the required-name guard", err)- }- if code != common.CodeNotFound {- t.Errorf("code = %d, want %d", code, common.CodeNotFound)- }-}-// TestResolveDefaultModelConfig_NilTTSPointer verifies the tenant// default-model resolution is nil-safe when the tts_id column is NULL// (the reporter's configuration: every default set except TTS).diff --git a/internal/service/model_solver.go b/internal/service/model_solver.goindex c04e958fcc..9e539d51cc 100644--- a/internal/service/model_solver.go+++ b/internal/service/model_solver.go@@ -40,6 +40,7 @@ type ModelTarget struct {ModelName stringModelType entity.ModelTypeProviderName string+ InstanceID stringInstanceName stringDriver modelModule.ModelDriverAPIConfig *modelModule.APIConfig@@ -317,6 +318,7 @@ func (s *ModelSolver) ResolveModelConfig(ctx context.Context, tenantID string, mModelName: model.modelName,ModelType: modelType,ProviderName: model.providerEntity.ProviderName,+ InstanceID: model.instanceID,InstanceName: model.instanceName,Driver: model.driver,APIConfig: model.apiConfig,@@ -457,6 +459,7 @@ type resolvedModel struct {modelType entity.ModelTypemodelID stringmodelName string+ instanceID stringinstanceName stringdriver modelModule.ModelDriverapiConfig *modelModule.APIConfig@@ -676,6 +679,7 @@ func (s *ModelSolver) resolveTenantModel(ctx context.Context, tenantID string, mmodelType: modelType,modelID: modelEntity.ID,modelName: modelEntity.ModelName,+ instanceID: instanceEntity.ID,instanceName: instanceEntity.InstanceName,driver: driver,apiConfig: &modelModule.APIConfig{ApiKey: &apiKey, Region: ®ion, BaseURL: &baseURL},@@ -793,7 +797,7 @@ func (s *ModelSolver) resolveProviderInstanceModel(ctx context.Context, tenantIDif err != nil {return nil, fmt.Errorf("%w: read model limits: %v", errModelConfigUnavailable, err)}- return &resolvedModel{modelEntity: modelEntity, providerEntity: provider, modelInfo: modelInfo, modelType: modelType, modelID: modelEntity.ID, modelName: modelEntity.ModelName, instanceName: instanceName, driver: driver, apiConfig: &modelModule.APIConfig{ApiKey: &apiKey, Region: ®ion, BaseURL: &baseURL}, maxTokens: maxTokens}, nil+ return &resolvedModel{modelEntity: modelEntity, providerEntity: provider, modelInfo: modelInfo, modelType: modelType, modelID: modelEntity.ID, modelName: modelEntity.ModelName, instanceID: instance.ID, instanceName: instanceName, driver: driver, apiConfig: &modelModule.APIConfig{ApiKey: &apiKey, Region: ®ion, BaseURL: &baseURL}, maxTokens: maxTokens}, nil}if providerInfo == nil {return nil, fmt.Errorf("%w: model provider config not found: %s", errModelConfigUnavailable, providerName)@@ -820,7 +824,7 @@ func (s *ModelSolver) resolveProviderInstanceModel(ctx context.Context, tenantIDif err != nil {return nil, fmt.Errorf("%w: create model driver: %v", errModelConfigUnavailable, err)}- return &resolvedModel{providerEntity: provider, modelInfo: modelInfo, modelType: modelType, modelName: modelInfo.Name, instanceName: instanceName, driver: driver, apiConfig: &modelModule.APIConfig{ApiKey: &apiKey, Region: ®ion, BaseURL: &baseURL}, maxTokens: maxTokensFromModelInfo(modelInfo, modelType)}, nil+ return &resolvedModel{providerEntity: provider, modelInfo: modelInfo, modelType: modelType, modelName: modelInfo.Name, instanceID: instance.ID, instanceName: instanceName, driver: driver, apiConfig: &modelModule.APIConfig{ApiKey: &apiKey, Region: ®ion, BaseURL: &baseURL}, maxTokens: maxTokensFromModelInfo(modelInfo, modelType)}, nil}func (s *ModelSolver) resolveCompositeModelType(ctx context.Context, tenantID, modelRef string) (entity.ModelType, error) {