Merge pull request SciSharp#1365 from adenchen123/model-upgrade-adapting-revert

yileicn · web-flow · commit bfe188412ba6 · 2026-06-17T17:02:51.000+08:00
Revert model upgrade adapting
diff --git a/src/Infrastructure/BotSharp.Abstraction/Settings/ISettingService.cs b/src/Infrastructure/BotSharp.Abstraction/Settings/ISettingService.cs
@@ -10,6 +10,4 @@ public interface ISettingService
     T Bind<T>(string path) where T : new();
 
     Task<object> GetDetail(string settingName, bool mask = false);
-
-    string GetUpgradeModel(string oldModelName);
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Settings/ModelUpgradeMapSettings.cs b/src/Infrastructure/BotSharp.Abstraction/Settings/ModelUpgradeMapSettings.cs
diff --git a/src/Infrastructure/BotSharp.Core.Realtime/Services/RealtimeHub.cs b/src/Infrastructure/BotSharp.Core.Realtime/Services/RealtimeHub.cs
@@ -201,7 +201,7 @@ public RealtimeHubConnection SetHubConnection(string conversationId)
         }
 
         provider = _settings.Provider;
-        model = settingService.GetUpgradeModel(_settings.Model);
+        model = _settings.Model;
 
         if (!string.IsNullOrEmpty(provider) && !string.IsNullOrEmpty(model))
         {
diff --git a/src/Infrastructure/BotSharp.Core/Agents/AgentPlugin.cs b/src/Infrastructure/BotSharp.Core/Agents/AgentPlugin.cs
@@ -48,16 +48,6 @@ public void RegisterDI(IServiceCollection services, IConfiguration config)
             render.RegisterType(typeof(AgentSettings));
             return settingService.Bind<AgentSettings>("Agent");
         });
-
-        services.AddScoped(provider =>
-        {
-            var settingService = provider.GetRequiredService<ISettingService>();
-            var config = provider.GetRequiredService<IConfiguration>();
-            var settings = new ModelUpgradeMapSettings();
-            config.Bind(ModelUpgradeMapSettings.Key, settings.ModelUpgradeMap);
-            return settings;
-        });
-
     }
 
     public bool AttachMenu(List<PluginMenuDef> menu)
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.Summary.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.Summary.cs
@@ -63,7 +63,7 @@ private async Task<string> Summarize(Agent agent, string prompt)
         var providerService = _services.GetRequiredService<ILlmProviderService>();
         var settingService = _services.GetRequiredService<ISettingService>();
         var modelSettings = providerService.GetProviderModels(provider);
-        var defaultModel = settingService.GetUpgradeModel(Gpt4xModelConstants.GPT_4o);
+        var defaultModel = Gpt4xModelConstants.GPT_4o;
         var modelSetting = modelSettings.FirstOrDefault(x => x.Name.IsEqualTo(defaultModel));
 
         if (modelSetting != null)
diff --git a/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.Image.cs b/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.Image.cs
@@ -16,7 +16,7 @@ public async Task<string> ReadImages(string text, IEnumerable<InstructFileModel>
         var instruction = await RenderAgentTemplate(innerAgentId, options?.TemplateName, options?.Data);
         text = RenderText(text, options?.Data);
 
-        var completion = CompletionProvider.GetChatCompletion(_services, provider: options?.Provider ?? "openai", model: options?.Model ?? settingService.GetUpgradeModel(Gpt4xModelConstants.GPT_4o), multiModal: true);
+        var completion = CompletionProvider.GetChatCompletion(_services, provider: options?.Provider ?? "openai", model: options?.Model ?? Gpt4xModelConstants.GPT_4o, multiModal: true);
         var message = await completion.GetChatCompletions(new Agent()
         {
             Id = innerAgentId,
diff --git a/src/Infrastructure/BotSharp.Core/Infrastructures/CompletionProvider.cs b/src/Infrastructure/BotSharp.Core/Infrastructures/CompletionProvider.cs
@@ -152,7 +152,7 @@ public static IAudioTranscription GetAudioTranscriber(
             return default!;
         }
 
-        completer.SetModelName(model ?? settingService.GetUpgradeModel(Gpt4xModelConstants.GPT_4o_Mini_Transcribe));
+        completer.SetModelName(model ?? Gpt4xModelConstants.GPT_4o_Mini_Transcribe);
         return completer;
     }
 
@@ -171,7 +171,7 @@ public static IAudioSynthesis GetAudioSynthesizer(
             return default!;
         }
 
-        completer.SetModelName(model ?? settingService.GetUpgradeModel(Gpt4xModelConstants.GPT_4o_Mini_Tts));
+        completer.SetModelName(model ?? Gpt4xModelConstants.GPT_4o_Mini_Tts);
         return completer;
     }
 
diff --git a/src/Infrastructure/BotSharp.Core/Infrastructures/SettingService.cs b/src/Infrastructure/BotSharp.Core/Infrastructures/SettingService.cs
@@ -50,17 +50,4 @@ public static string Mask(string value)
         return value.Substring(0, keepLength) 
             + string.Join("", Enumerable.Repeat("*", value.Length - keepLength));
     }
-
-    public string GetUpgradeModel(string oldModelName)
-    {
-        var modelUpgradeMapSettings = _services.GetRequiredService<ModelUpgradeMapSettings>();
-        var mapping = modelUpgradeMapSettings.ModelUpgradeMap.FirstOrDefault(x => x.OldModel.Equals(oldModelName, StringComparison.OrdinalIgnoreCase));
-        
-        if(mapping == null || !mapping.Enable)
-        {
-            return oldModelName;
-        }
-
-        return mapping.NewModel;
-    }
 }
diff --git a/src/Infrastructure/BotSharp.Core/Instructs/Services/InstructService.Instruct.cs b/src/Infrastructure/BotSharp.Core/Instructs/Services/InstructService.Instruct.cs
@@ -97,7 +97,7 @@ private async Task<RoleDialogModel> GetAiResponse(string text, Agent agent, Inst
         var settingService = _services.GetRequiredService<ISettingService>();
         var dialogs = await BuildDialogs(text, options);
         var provider = options?.Provider ?? agent?.LlmConfig?.Provider ?? "openai";
-        var model = options?.Model ?? agent?.LlmConfig?.Model ?? settingService.GetUpgradeModel(Gpt4xModelConstants.GPT_4o);
+        var model = options?.Model ?? agent?.LlmConfig?.Model ?? Gpt4xModelConstants.GPT_4o;
         var completion = CompletionProvider.GetChatCompletion(_services, provider: provider, model: model);
         return await completion.GetChatCompletions(agent, dialogs);
     }
diff --git a/src/Infrastructure/BotSharp.Core/Shared/JsonRepairService.cs b/src/Infrastructure/BotSharp.Core/Shared/JsonRepairService.cs
@@ -101,7 +101,7 @@ private async Task<string> RepairByLLMAsync(string malformedJson, JsonRepairOpti
         {
             var completion = CompletionProvider.GetChatCompletion(_services,
                         provider: options?.Provider ?? agent?.LlmConfig?.Provider ?? "openai",
-                        model: options?.Model ?? agent?.LlmConfig?.Model ?? settingService.GetUpgradeModel(Gpt4xModelConstants.GPT_4o_Mini));
+                        model: options?.Model ?? agent?.LlmConfig?.Model ?? Gpt4xModelConstants.GPT_4o_Mini);
 
             var innerAgent = new Agent
             {
diff --git a/src/Infrastructure/BotSharp.Core/WebSearch/Functions/WebIntelligentSearchFn.cs b/src/Infrastructure/BotSharp.Core/WebSearch/Functions/WebIntelligentSearchFn.cs
@@ -83,7 +83,7 @@ private async Task<string> GetChatCompletion(Agent agent, List<RoleDialogModel>
         }
 
         provider = "openai";
-        model = settingService.GetUpgradeModel(Gpt4xModelConstants.GPT_4o_Mini_Search_Preview);
+        model = Gpt4xModelConstants.GPT_4o_Mini_Search_Preview;
 
         var models = llmProviderService.GetProviderModels(provider);
         var foundModel = models.FirstOrDefault(x => x.WebSearch?.IsDefault == true)
diff --git a/src/Plugins/BotSharp.Plugin.AudioHandler/Functions/ReadAudioFn.cs b/src/Plugins/BotSharp.Plugin.AudioHandler/Functions/ReadAudioFn.cs
@@ -168,7 +168,7 @@ private bool VerifyAudioFileType(string fileName)
         }
 
         provider = "openai";
-        model = settingService.GetUpgradeModel(Gpt4xModelConstants.GPT_4o_Mini_Transcribe);
+        model = Gpt4xModelConstants.GPT_4o_Mini_Transcribe;
 
         return (provider, model);
     }
diff --git a/src/Plugins/BotSharp.Plugin.EmailHandler/Functions/HandleEmailReaderFn.cs b/src/Plugins/BotSharp.Plugin.EmailHandler/Functions/HandleEmailReaderFn.cs
@@ -70,7 +70,7 @@ public async Task<bool> Execute(RoleDialogModel message)
                     var llmProviderService = _services.GetRequiredService<ILlmProviderService>();
                     var settingService = _services.GetRequiredService<ISettingService>();
                     var provider = llmProviderService.GetProviders().FirstOrDefault(x => x == "openai");
-                    var model = llmProviderService.GetProviderModel(provider: provider ?? "openai", id: settingService.GetUpgradeModel(Gpt4xModelConstants.GPT_4o));
+                    var model = llmProviderService.GetProviderModel(provider: provider ?? "openai", id: Gpt4xModelConstants.GPT_4o);
                     var completion = CompletionProvider.GetChatCompletion(_services, provider: provider, model: model?.Name);
                     var convService = _services.GetRequiredService<IConversationService>();
                     var conversationId = convService.ConversationId;
diff --git a/src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Realtime/RealTimeCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Realtime/RealTimeCompletionProvider.cs
@@ -90,7 +90,7 @@ public async Task Connect(
         var realtimeModelSettings = _services.GetRequiredService<RealtimeModelSettings>();
         var settingService = _services.GetRequiredService<ISettingService>();
 
-        _model ??= settingService.GetUpgradeModel(realtimeModelSettings.Model);
+        _model ??= realtimeModelSettings.Model;
         var modelSettings = settingsService.GetSetting(Provider, _model);
 
         Reset();
diff --git a/src/Plugins/BotSharp.Plugin.ImageHandler/Helpers/AiResponseHelper.cs b/src/Plugins/BotSharp.Plugin.ImageHandler/Helpers/AiResponseHelper.cs
@@ -11,7 +11,7 @@ internal static async Task<string> GetImageGenerationResponse(IServiceProvider s
 
         var settingService = services.GetRequiredService<ISettingService>();
         var provider = agent?.LlmConfig?.Provider ?? "openai";
-        var model = agent?.LlmConfig?.Model ?? settingService.GetUpgradeModel(Gpt4xModelConstants.GPT_4o_Mini);
+        var model = agent?.LlmConfig?.Model ?? Gpt4xModelConstants.GPT_4o_Mini;
         var completion = CompletionProvider.GetChatCompletion(services, provider: provider, model: model);
         var response = await completion.GetChatCompletions(agent, [new RoleDialogModel(AgentRole.User, text)]);
         return response.Content.IfNullOrEmptyAs(GetDefaultResponse(files)) ?? string.Empty;
diff --git a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Realtime/RealTimeCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Realtime/RealTimeCompletionProvider.cs
@@ -43,7 +43,6 @@ public RealTimeCompletionProvider(
         _botsharpOptions = botsharpOptions;
 
         var settingService = _services.GetRequiredService<ISettingService>();
-        _model = settingService.GetUpgradeModel(_model);
     }
 
     public async Task Connect(
@@ -72,7 +71,7 @@ public async Task Connect(
         var realtimeSettings = _services.GetRequiredService<RealtimeModelSettings>();
         var settingService = _services.GetRequiredService<ISettingService>();
 
-        _model ??= settingService.GetUpgradeModel(realtimeSettings.Model);
+        _model ??= realtimeSettings.Model;
         _session = new LlmRealtimeSession(_services, new ChatSessionOptions
         {
             Provider = Provider,
@@ -388,7 +387,7 @@ public async Task<string> UpdateSession(RealtimeHubConnection conn, bool isInit
 
             sessionUpdate.session.Audio.Input.Transcription = new InputAudioTranscription
             {
-                Model = settingService.GetUpgradeModel(realtimeModelSettings.InputAudioTranscription.Model),
+                Model = realtimeModelSettings.InputAudioTranscription.Model,
                 Language = realtimeModelSettings.InputAudioTranscription.Language,
                 Prompt = string.Join(", ", words.Select(x => x.ToLower().Trim()).Distinct()).SubstringMax(1024)
             };
diff --git a/src/Plugins/BotSharp.Plugin.Planner/Sequential/SequentialPlanner.cs b/src/Plugins/BotSharp.Plugin.Planner/Sequential/SequentialPlanner.cs
@@ -170,7 +170,7 @@ public async Task<DecomposedStep> GetDecomposedStepAsync(Agent router, string me
 
         var llmProviderService = _services.GetRequiredService<ILlmProviderService>();
         var settingService = _services.GetRequiredService<ISettingService>();
-        var model = llmProviderService.GetProviderModel("openai", settingService.GetUpgradeModel(Gpt4xModelConstants.GPT_4o));
+        var model = llmProviderService.GetProviderModel("openai", Gpt4xModelConstants.GPT_4o);
 
         // chat completion
         var completion = CompletionProvider.GetChatCompletion(_services,
diff --git a/src/Plugins/BotSharp.Plugin.SqlDriver/Functions/SqlValidateFn.cs b/src/Plugins/BotSharp.Plugin.SqlDriver/Functions/SqlValidateFn.cs
@@ -64,7 +64,7 @@ public async Task<bool> Execute(RoleDialogModel message)
                 new InstructOptions
                 {
                     Provider = "openai",
-                    Model = settingService.GetUpgradeModel(Gpt4xModelConstants.GPT_4o),
+                    Model = Gpt4xModelConstants.GPT_4o,
                     AgentId = BuiltInAgentId.SqlDriver,
                     TemplateName = "sql_statement_correctness",
                     Data = new Dictionary<string, object>
diff --git a/src/Plugins/BotSharp.Plugin.SqlDriver/Services/DbKnowledgeService.cs b/src/Plugins/BotSharp.Plugin.SqlDriver/Services/DbKnowledgeService.cs
@@ -27,7 +27,7 @@ public async Task<bool> Import(ImportDbKnowledgeRequest request)
                           .FirstOrDefault(x => x.KnowledgeType.IsEqualTo(KnowledgeBaseType.QuestionAnswer));
         
         var provider = request.Provider ?? "openai";
-        var model = request.Model ?? settingService.GetUpgradeModel(Gpt4xModelConstants.GPT_4o);
+        var model = request.Model ?? Gpt4xModelConstants.GPT_4o;
         var schema = request.Schema;
         var collectionName = request.KnowledgebaseCollection;
 

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,4 @@ public interface ISettingService`
`10`	`10`	`T Bind<T>(string path) where T : new();`
`11`	`11`
`12`	`12`	`Task<object> GetDetail(string settingName, bool mask = false);`
`13`		`-`
`14`		`- string GetUpgradeModel(string oldModelName);`
`15`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ public RealtimeHubConnection SetHubConnection(string conversationId)`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`provider = _settings.Provider;`
`204`		`- model = settingService.GetUpgradeModel(_settings.Model);`
	`204`	`+ model = _settings.Model;`
`205`	`205`
`206`	`206`	`if (!string.IsNullOrEmpty(provider) && !string.IsNullOrEmpty(model))`
`207`	`207`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public async Task<string> ReadImages(string text, IEnumerable<InstructFileModel>`
`16`	`16`	`var instruction = await RenderAgentTemplate(innerAgentId, options?.TemplateName, options?.Data);`
`17`	`17`	`text = RenderText(text, options?.Data);`
`18`	`18`
`19`		`- var completion = CompletionProvider.GetChatCompletion(_services, provider: options?.Provider ?? "openai", model: options?.Model ?? settingService.GetUpgradeModel(Gpt4xModelConstants.GPT_4o), multiModal: true);`
	`19`	`+ var completion = CompletionProvider.GetChatCompletion(_services, provider: options?.Provider ?? "openai", model: options?.Model ?? Gpt4xModelConstants.GPT_4o, multiModal: true);`
`20`	`20`	`var message = await completion.GetChatCompletions(new Agent()`
`21`	`21`	`{`
`22`	`22`	`Id = innerAgentId,`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ public static IAudioTranscription GetAudioTranscriber(`
`152`	`152`	`return default!;`
`153`	`153`	`}`
`154`	`154`
`155`		`- completer.SetModelName(model ?? settingService.GetUpgradeModel(Gpt4xModelConstants.GPT_4o_Mini_Transcribe));`
	`155`	`+ completer.SetModelName(model ?? Gpt4xModelConstants.GPT_4o_Mini_Transcribe);`
`156`	`156`	`return completer;`
`157`	`157`	`}`
`158`	`158`
`@@ -171,7 +171,7 @@ public static IAudioSynthesis GetAudioSynthesizer(`
`171`	`171`	`return default!;`
`172`	`172`	`}`
`173`	`173`
`174`		`- completer.SetModelName(model ?? settingService.GetUpgradeModel(Gpt4xModelConstants.GPT_4o_Mini_Tts));`
	`174`	`+ completer.SetModelName(model ?? Gpt4xModelConstants.GPT_4o_Mini_Tts);`
`175`	`175`	`return completer;`
`176`	`176`	`}`
`177`	`177`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ private async Task<RoleDialogModel> GetAiResponse(string text, Agent agent, Inst`
`97`	`97`	`var settingService = _services.GetRequiredService<ISettingService>();`
`98`	`98`	`var dialogs = await BuildDialogs(text, options);`
`99`	`99`	`var provider = options?.Provider ?? agent?.LlmConfig?.Provider ?? "openai";`
`100`		`- var model = options?.Model ?? agent?.LlmConfig?.Model ?? settingService.GetUpgradeModel(Gpt4xModelConstants.GPT_4o);`
	`100`	`+ var model = options?.Model ?? agent?.LlmConfig?.Model ?? Gpt4xModelConstants.GPT_4o;`
`101`	`101`	`var completion = CompletionProvider.GetChatCompletion(_services, provider: provider, model: model);`
`102`	`102`	`return await completion.GetChatCompletions(agent, dialogs);`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ private async Task<string> RepairByLLMAsync(string malformedJson, JsonRepairOpti`
`101`	`101`	`{`
`102`	`102`	`var completion = CompletionProvider.GetChatCompletion(_services,`
`103`	`103`	`provider: options?.Provider ?? agent?.LlmConfig?.Provider ?? "openai",`
`104`		`- model: options?.Model ?? agent?.LlmConfig?.Model ?? settingService.GetUpgradeModel(Gpt4xModelConstants.GPT_4o_Mini));`
	`104`	`+ model: options?.Model ?? agent?.LlmConfig?.Model ?? Gpt4xModelConstants.GPT_4o_Mini);`
`105`	`105`
`106`	`106`	`var innerAgent = new Agent`
`107`	`107`	`{`