Merge pull request #147 from hchen2020/master

Rename  PackageVersion to BotSharpVersion;

Author: Oceania2018

Directory.Build.props

@@ -2,7 +2,7 @@
  <PropertyGroup>
    <LangVersion>10.0</LangVersion>
    <OutputPath>..\..\..\packages</OutputPath>
-   <PackageVersion>0.12.3</PackageVersion>
+   <BotSharpVersion>0.13.0</BotSharpVersion>
    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
  </PropertyGroup>
 </Project>

src/Infrastructure/BotSharp.Abstraction/BotSharp.Abstraction.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <Nullable>enable</Nullable>
 	  <LangVersion>$(LangVersion)</LangVersion>
-    <VersionPrefix>$(PackageVersion)</VersionPrefix>
+    <VersionPrefix>$(BotSharpVersion)</VersionPrefix>
     <PackageIcon>Icon.png</PackageIcon>
     <GeneratePackageOnBuild>$(GeneratePackageOnBuild)</GeneratePackageOnBuild>
   </PropertyGroup>

src/Infrastructure/BotSharp.Abstraction/MLTasks/IChatCompletion.cs

@@ -2,11 +2,23 @@ namespace BotSharp.Abstraction.MLTasks;
 
 public interface IChatCompletion
 {
+    /// <summary>
+    /// The LLM provider like Microsoft Azure, OpenAI, ClaudAI
+    /// </summary>
     string Provider { get; }
+
+    /// <summary>
+    /// Set model name, one provider can consume different model or version(s)
+    /// </summary>
+    /// <param name="model"></param>
+    void SetModelName(string model);
+
     Task<bool> GetChatCompletionsAsync(Agent agent, 
         List<RoleDialogModel> conversations, 
         Func<RoleDialogModel, Task> onMessageReceived,
         Func<RoleDialogModel, Task> onFunctionExecuting);
 
-    Task<bool> GetChatCompletionsStreamingAsync(Agent agent, List<RoleDialogModel> conversations, Func<RoleDialogModel, Task> onMessageReceived);
+    Task<bool> GetChatCompletionsStreamingAsync(Agent agent, 
+        List<RoleDialogModel> conversations, 
+        Func<RoleDialogModel, Task> onMessageReceived);
 }

src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <LangVersion>$(LangVersion)</LangVersion>
-    <VersionPrefix>$(PackageVersion)</VersionPrefix>
+    <VersionPrefix>$(BotSharpVersion)</VersionPrefix>
     <GeneratePackageOnBuild>$(GeneratePackageOnBuild)</GeneratePackageOnBuild>
   </PropertyGroup>
 

src/Infrastructure/BotSharp.Core/Infrastructures/CompletionProvider.cs

@@ -4,16 +4,31 @@ namespace BotSharp.Core.Infrastructures;
 
 public class CompletionProvider
 {
-    public static IChatCompletion GetChatCompletion(IServiceProvider services, string? provider = null)
+    public static IChatCompletion GetChatCompletion(IServiceProvider services, string? provider = null, string? model = null)
     {
         var completions = services.GetServices<IChatCompletion>();
 
         var state = services.GetRequiredService<IConversationStateService>();
+
         if (provider == null)
         {
-            provider = state.GetState("provider", "azure-gpt-3.5");
+            provider = state.GetState("provider", "azure-openai");
         }
-        
-        return completions.FirstOrDefault(x => x.Provider == provider);
+
+        if (model == null)
+        {
+            model = state.GetState("model", "gpt-3.5-turbo");
+        }
+
+        var completer = completions.FirstOrDefault(x => x.Provider == provider);
+        if (completer == null)
+        {
+            var logger = services.GetRequiredService<ILogger<CompletionProvider>>();
+            logger.LogError($"Can't resolve completion provider by {provider}");
+        }
+
+        completer.SetModelName(model);
+
+        return completer;
     }
 }

src/Infrastructure/BotSharp.OpenAPI/BotSharp.OpenAPI.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>$(LangVersion)</LangVersion>
-    <VersionPrefix>$(PackageVersion)</VersionPrefix>
+    <VersionPrefix>$(BotSharpVersion)</VersionPrefix>
     <GeneratePackageOnBuild>$(GeneratePackageOnBuild)</GeneratePackageOnBuild>
   </PropertyGroup>
 

src/Plugins/BotSharp.Plugin.AzureOpenAI/AzureOpenAiPlugin.cs

@@ -23,6 +23,5 @@ public void RegisterDI(IServiceCollection services, IConfiguration config)
 
         services.AddScoped<ITextCompletion, TextCompletionProvider>();
         services.AddScoped<IChatCompletion, ChatCompletionProvider>();
-        services.AddScoped<IChatCompletion, GPT4CompletionProvider>();
     }
 }

src/Plugins/BotSharp.Plugin.AzureOpenAI/BotSharp.Plugin.AzureOpenAI.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>$(LangVersion)</LangVersion>
-    <VersionPrefix>$(PackageVersion)</VersionPrefix>
+    <VersionPrefix>$(BotSharpVersion)</VersionPrefix>
     <GeneratePackageOnBuild>$(GeneratePackageOnBuild)</GeneratePackageOnBuild>
   </PropertyGroup>
 

src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/ChatCompletionProvider.cs

@@ -20,11 +20,12 @@ namespace BotSharp.Plugin.AzureOpenAI.Providers;
 
 public class ChatCompletionProvider : IChatCompletion
 {
-    protected readonly AzureOpenAiSettings _settings;
-    protected readonly IServiceProvider _services;
-    protected readonly ILogger _logger;
+    private readonly AzureOpenAiSettings _settings;
+    private readonly IServiceProvider _services;
+    private readonly ILogger _logger;
+    private string _model;
 
-    public virtual string Provider => "azure-gpt-3.5";
+    public virtual string Provider => "azure-openai";
 
     public ChatCompletionProvider(AzureOpenAiSettings settings, 
         ILogger<ChatCompletionProvider> logger,
@@ -37,8 +38,16 @@ public ChatCompletionProvider(AzureOpenAiSettings settings,
 
     protected virtual (OpenAIClient, string) GetClient()
     {
-        var client = new OpenAIClient(new Uri(_settings.Endpoint), new AzureKeyCredential(_settings.ApiKey));
-        return (client, _settings.DeploymentModel.ChatCompletionModel);
+        if (_model == "gpt-4")
+        {
+            var client = new OpenAIClient(new Uri(_settings.GPT4.Endpoint), new AzureKeyCredential(_settings.GPT4.ApiKey));
+            return (client, _settings.GPT4.DeploymentModel);
+        }
+        else
+        {
+            var client = new OpenAIClient(new Uri(_settings.Endpoint), new AzureKeyCredential(_settings.ApiKey));
+            return (client, _settings.DeploymentModel.ChatCompletionModel);
+        }
     }
 
     public List<RoleDialogModel> GetChatSamples(string sampleText)
@@ -243,4 +252,9 @@ protected ChatCompletionsOptions PrepareOptions(Agent agent, List<RoleDialogMode
 
         return chatCompletionsOptions;
     }
+
+    public void SetModelName(string model)
+    {
+        _model = model;
+    }
 }