Revert "add a display name param for now. Should a structure be used …

…here?"

This reverts commit 1070419.

core/backend/soundgeneration.go

@@ -19,7 +19,6 @@ func SoundGeneration(
 	doSample *bool,
 	sourceFile *string,
 	sourceDivisor *int32,
-	displayModelName string,
 	loader *model.ModelLoader,
 	appConfig *config.ApplicationConfig,
 	backendConfig config.BackendConfig,
@@ -40,16 +39,12 @@ func SoundGeneration(
 		return "", nil, fmt.Errorf("failed creating audio directory: %s", err)
 	}
 
-	if displayModelName == "" {
-		displayModelName = backendConfig.Model
-	}
-
 	fileName := utils.GenerateUniqueFileName(appConfig.AudioDir, "sound_generation", ".wav")
 	filePath := filepath.Join(appConfig.AudioDir, fileName)
 
 	res, err := soundGenModel.SoundGeneration(context.Background(), &proto.SoundGenerationRequest{
 		Text:        text,
-		Model:       displayModelName,
+		Model:       backendConfig.Model,
 		Dst:         filePath,
 		Sample:      doSample,
 		Duration:    duration,

core/backend/tts.go

@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 
 	"github.com/mudler/LocalAI/core/config"
+	"github.com/rs/zerolog/log"
 
 	"github.com/mudler/LocalAI/pkg/grpc/proto"
 	"github.com/mudler/LocalAI/pkg/model"
@@ -17,7 +18,6 @@ func ModelTTS(
 	text,
 	voice,
 	language string,
-	displayModelName string,
 	loader *model.ModelLoader,
 	appConfig *config.ApplicationConfig,
 	backendConfig config.BackendConfig,
@@ -38,16 +38,14 @@ func ModelTTS(
 		return "", nil, fmt.Errorf("failed creating audio directory: %s", err)
 	}
 
-	if displayModelName == "" {
-		displayModelName = backendConfig.Model
-	}
+	log.Warn().Str("config.Model", backendConfig.Model).Str("config.Backend", backendConfig.Backend).Msg("ModelTTS before call to backend (ttsModel.TTS)")
 
 	fileName := utils.GenerateUniqueFileName(appConfig.AudioDir, "tts", ".wav")
 	filePath := filepath.Join(appConfig.AudioDir, fileName)
 
 	res, err := ttsModel.TTS(context.Background(), &proto.TTSRequest{
 		Text:     text,
-		Model:    displayModelName,
+		Model:    backendConfig.Model,
 		Voice:    voice,
 		Dst:      filePath,
 		Language: &language,

core/cli/soundgeneration.go

@@ -95,7 +95,7 @@ func (t *SoundGenerationCMD) Run(ctx *cliContext.Context) error {
 
 	filePath, _, err := backend.SoundGeneration(text,
 		parseToFloat32Ptr(t.Duration), parseToFloat32Ptr(t.Temperature), &t.DoSample,
-		inputFile, parseToInt32Ptr(t.InputFileSampleDivisor), "", ml, opts, options)
+		inputFile, parseToInt32Ptr(t.InputFileSampleDivisor), ml, opts, options)
 
 	if err != nil {
 		return err

core/cli/tts.go

@@ -55,7 +55,7 @@ func (t *TTSCMD) Run(ctx *cliContext.Context) error {
 	options.Backend = t.Backend
 	options.Model = t.Model
 
-	filePath, _, err := backend.ModelTTS(text, t.Voice, t.Language, "", ml, opts, options)
+	filePath, _, err := backend.ModelTTS(text, t.Voice, t.Language, ml, opts, options)
 	if err != nil {
 		return err
 	}

core/http/endpoints/elevenlabs/soundgeneration.go

@@ -31,7 +31,7 @@ func SoundGenerationEndpoint(cl *config.BackendConfigLoader, ml *model.ModelLoad
 		log.Debug().Str("modelFile", "modelFile").Str("backend", cfg.Backend).Msg("Sound Generation Request about to be sent to backend")
 
 		// TODO: Support uploading files?
-		filePath, _, err := backend.SoundGeneration(input.Text, input.Duration, input.Temperature, input.DoSample, nil, nil, input.ModelID, ml, appConfig, *cfg)
+		filePath, _, err := backend.SoundGeneration(input.Text, input.Duration, input.Temperature, input.DoSample, nil, nil, ml, appConfig, *cfg)
 		if err != nil {
 			return err
 		}

core/http/endpoints/elevenlabs/tts.go

@@ -34,7 +34,7 @@ func TTSEndpoint(cl *config.BackendConfigLoader, ml *model.ModelLoader, appConfi
 
 		log.Debug().Str("modelName", input.ModelID).Msg("elevenlabs TTS request recieved")
 
-		filePath, _, err := backend.ModelTTS(input.Text, voiceID, input.LanguageCode, input.ModelID, ml, appConfig, *cfg)
+		filePath, _, err := backend.ModelTTS(input.Text, voiceID, input.LanguageCode, ml, appConfig, *cfg)
 		if err != nil {
 			return err
 		}

core/http/endpoints/localai/tts.go

@@ -51,7 +51,7 @@ func TTSEndpoint(cl *config.BackendConfigLoader, ml *model.ModelLoader, appConfi
 			cfg.Voice = input.Voice
 		}
 
-		filePath, _, err := backend.ModelTTS(input.Input, cfg.Voice, cfg.Language, input.Model, ml, appConfig, *cfg)
+		filePath, _, err := backend.ModelTTS(input.Input, cfg.Voice, cfg.Language, ml, appConfig, *cfg)
 		if err != nil {
 			return err
 		}