Merge remote-tracking branch 'origin/main' into groupchatresume

jayralencar · May 10, 2024 · 8f70930 · 8f70930
2 parents 8bfcb2b + 6dd2b59
commit 8f70930
Show file tree

Hide file tree

Showing 43 changed files with 978 additions and 314 deletions.
diff --git a/autogen/graph_utils.py b/autogen/graph_utils.py
@@ -1,5 +1,5 @@
 import logging
-from typing import Dict, List
+from typing import Dict, List, Optional
 
 from autogen.agentchat import Agent
 
@@ -110,7 +110,9 @@ def invert_disallowed_to_allowed(disallowed_speaker_transitions_dict: dict, agen
     return allowed_speaker_transitions_dict
 
 
-def visualize_speaker_transitions_dict(speaker_transitions_dict: dict, agents: List[Agent]):
+def visualize_speaker_transitions_dict(
+    speaker_transitions_dict: dict, agents: List[Agent], export_path: Optional[str] = None
+):
     """
     Visualize the speaker_transitions_dict using networkx.
     """
@@ -133,4 +135,8 @@ def visualize_speaker_transitions_dict(speaker_transitions_dict: dict, agents: L
 
     # Visualize
     nx.draw(G, with_labels=True, font_weight="bold")
-    plt.show()
+
+    if export_path is not None:
+        plt.savefig(export_path)
+    else:
+        plt.show()
diff --git a/dotnet/AutoGen.sln b/dotnet/AutoGen.sln
@@ -29,9 +29,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoGen.Core", "src\AutoGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoGen.OpenAI", "src\AutoGen.OpenAI\AutoGen.OpenAI.csproj", "{63445BB7-DBB9-4AEF-9D6F-98BBE75EE1EC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoGen.Mistral", "src\AutoGen.Mistral\AutoGen.Mistral.csproj", "{6585D1A4-3D97-4D76-A688-1933B61AEB19}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoGen.Mistral", "src\AutoGen.Mistral\AutoGen.Mistral.csproj", "{6585D1A4-3D97-4D76-A688-1933B61AEB19}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoGen.Mistral.Tests", "test\AutoGen.Mistral.Tests\AutoGen.Mistral.Tests.csproj", "{15441693-3659-4868-B6C1-B106F52FF3BA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoGen.Mistral.Tests", "test\AutoGen.Mistral.Tests\AutoGen.Mistral.Tests.csproj", "{15441693-3659-4868-B6C1-B106F52FF3BA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoGen.SemanticKernel.Tests", "test\AutoGen.SemanticKernel.Tests\AutoGen.SemanticKernel.Tests.csproj", "{1DFABC4A-8458-4875-8DCB-59F3802DAC65}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -87,6 +89,10 @@ Global
 		{15441693-3659-4868-B6C1-B106F52FF3BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{15441693-3659-4868-B6C1-B106F52FF3BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{15441693-3659-4868-B6C1-B106F52FF3BA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1DFABC4A-8458-4875-8DCB-59F3802DAC65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1DFABC4A-8458-4875-8DCB-59F3802DAC65}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1DFABC4A-8458-4875-8DCB-59F3802DAC65}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1DFABC4A-8458-4875-8DCB-59F3802DAC65}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -104,6 +110,7 @@ Global
 		{63445BB7-DBB9-4AEF-9D6F-98BBE75EE1EC} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
 		{6585D1A4-3D97-4D76-A688-1933B61AEB19} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
 		{15441693-3659-4868-B6C1-B106F52FF3BA} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64}
+		{1DFABC4A-8458-4875-8DCB-59F3802DAC65} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {93384647-528D-46C8-922C-8DB36A382F0B}

diff --git a/dotnet/eng/MetaInfo.props b/dotnet/eng/MetaInfo.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <VersionPrefix>0.0.12</VersionPrefix>
+        <VersionPrefix>0.0.13</VersionPrefix>
         <Authors>AutoGen</Authors>
         <PackageProjectUrl>https://microsoft.github.io/autogen-for-net/</PackageProjectUrl>
         <RepositoryUrl>https://github.com/microsoft/autogen</RepositoryUrl>

diff --git a/dotnet/eng/Version.props b/dotnet/eng/Version.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <AzureOpenAIVersion>1.0.0-beta.15</AzureOpenAIVersion>
-        <SemanticKernelVersion>1.7.1</SemanticKernelVersion>
-        <SemanticKernelExperimentalVersion>1.7.1-alpha</SemanticKernelExperimentalVersion>
+        <AzureOpenAIVersion>1.0.0-beta.17</AzureOpenAIVersion>
+        <SemanticKernelVersion>1.10.0</SemanticKernelVersion>
+        <SemanticKernelExperimentalVersion>1.10.0-alpha</SemanticKernelExperimentalVersion>
         <SystemCodeDomVersion>5.0.0</SystemCodeDomVersion>
         <MicrosoftCodeAnalysisVersion>4.3.0</MicrosoftCodeAnalysisVersion>
         <ApprovalTestVersion>6.0.0</ApprovalTestVersion>

diff --git a/dotnet/sample/AutoGen.BasicSamples/AutoGen.BasicSample.csproj b/dotnet/sample/AutoGen.BasicSamples/AutoGen.BasicSample.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <NoWarn>$(NoWarn);CS8981;CS8600;CS8602;CS8604;CS8618;CS0219;SKEXP0054;SKEXP0050</NoWarn>
+    <NoWarn>$(NoWarn);CS8981;CS8600;CS8602;CS8604;CS8618;CS0219;SKEXP0054;SKEXP0050;SKEXP0110</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/dotnet/sample/AutoGen.BasicSamples/CodeSnippet/MiddlewareAgentCodeSnippet.cs b/dotnet/sample/AutoGen.BasicSamples/CodeSnippet/MiddlewareAgentCodeSnippet.cs
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // MiddlewareAgentCodeSnippet.cs
 
-using AutoGen.Core;
 using System.Text.Json;
+using AutoGen.Core;
 using AutoGen.OpenAI;
 using FluentAssertions;
 

diff --git a/dotnet/sample/AutoGen.BasicSamples/CodeSnippet/MistralAICodeSnippet.cs b/dotnet/sample/AutoGen.BasicSamples/CodeSnippet/MistralAICodeSnippet.cs
@@ -2,8 +2,8 @@
 // MistralAICodeSnippet.cs
 
 #region using_statement
-using AutoGen.Mistral;
 using AutoGen.Core;
+using AutoGen.Mistral;
 using AutoGen.Mistral.Extension;
 using FluentAssertions;
 #endregion using_statement
@@ -83,4 +83,4 @@ public async Task MistralAIChatAgentGetWeatherToolUsageAsync()
         reply.GetContent().Should().Be("The weather in Seattle is sunny.");
         #endregion send_message_with_function_call
     }
-}
+}
diff --git a/dotnet/sample/AutoGen.BasicSamples/CodeSnippet/SemanticKernelCodeSnippet.cs b/dotnet/sample/AutoGen.BasicSamples/CodeSnippet/SemanticKernelCodeSnippet.cs
@@ -98,5 +98,4 @@ public async Task SemanticKernelChatMessageContentConnector()
         }
         #endregion register_semantic_kernel_chat_message_content_connector
     }
-
 }
diff --git a/dotnet/sample/AutoGen.BasicSamples/Example01_AssistantAgent.cs b/dotnet/sample/AutoGen.BasicSamples/Example01_AssistantAgent.cs
@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Example01_AssistantAgent.cs
 
-using AutoGen.Core;
 using AutoGen;
 using AutoGen.BasicSample;
+using AutoGen.Core;
 using FluentAssertions;
 
 /// <summary>

diff --git a/dotnet/sample/AutoGen.BasicSamples/Example02_TwoAgent_MathChat.cs b/dotnet/sample/AutoGen.BasicSamples/Example02_TwoAgent_MathChat.cs
@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Example02_TwoAgent_MathChat.cs
 
-using AutoGen.Core;
 using AutoGen;
 using AutoGen.BasicSample;
+using AutoGen.Core;
 using FluentAssertions;
 public static class Example02_TwoAgent_MathChat
 {

diff --git a/dotnet/sample/AutoGen.BasicSamples/Example03_Agent_FunctionCall.cs b/dotnet/sample/AutoGen.BasicSamples/Example03_Agent_FunctionCall.cs
@@ -2,8 +2,8 @@
 // Example03_Agent_FunctionCall.cs
 
 using AutoGen;
-using AutoGen.Core;
 using AutoGen.BasicSample;
+using AutoGen.Core;
 using FluentAssertions;
 
 /// <summary>

diff --git a/dotnet/sample/AutoGen.BasicSamples/Example04_Dynamic_GroupChat_Coding_Task.cs b/dotnet/sample/AutoGen.BasicSamples/Example04_Dynamic_GroupChat_Coding_Task.cs
@@ -2,8 +2,8 @@
 // Example04_Dynamic_GroupChat_Coding_Task.cs
 
 using AutoGen;
-using AutoGen.Core;
 using AutoGen.BasicSample;
+using AutoGen.Core;
 using AutoGen.DotnetInteractive;
 using AutoGen.OpenAI;
 using FluentAssertions;

diff --git a/dotnet/sample/AutoGen.BasicSamples/Example07_Dynamic_GroupChat_Calculate_Fibonacci.cs b/dotnet/sample/AutoGen.BasicSamples/Example07_Dynamic_GroupChat_Calculate_Fibonacci.cs
@@ -5,8 +5,8 @@
 using System.Text.Json;
 using AutoGen;
 using AutoGen.BasicSample;
-using AutoGen.DotnetInteractive;
 using AutoGen.Core;
+using AutoGen.DotnetInteractive;
 using AutoGen.OpenAI;
 using FluentAssertions;
 

diff --git a/dotnet/sample/AutoGen.BasicSamples/Example14_MistralClientAgent_TokenCount.cs b/dotnet/sample/AutoGen.BasicSamples/Example14_MistralClientAgent_TokenCount.cs
@@ -62,4 +62,4 @@ public static async Task RunAsync()
         tokenCounterMiddleware.GetCompletionTokenCount().Should().BeGreaterThan(0);
         #endregion chat_with_agent
     }
-}
+}
diff --git a/dotnet/sample/AutoGen.BasicSamples/Example15_GPT4V_BinaryDataImageMessage.cs b/dotnet/sample/AutoGen.BasicSamples/Example15_GPT4V_BinaryDataImageMessage.cs
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Example15_ImageMessage.cs
+// Example15_GPT4V_BinaryDataImageMessage.cs
 
 using AutoGen.Core;
 using AutoGen.OpenAI;

diff --git a/dotnet/sample/AutoGen.BasicSamples/Example16_OpenAIChatAgent_ConnectToThirdPartyBackend.cs b/dotnet/sample/AutoGen.BasicSamples/Example16_OpenAIChatAgent_ConnectToThirdPartyBackend.cs
@@ -0,0 +1,62 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Example16_OpenAIChatAgent_ConnectToThirdPartyBackend.cs
+#region using_statement
+using AutoGen.Core;
+using AutoGen.OpenAI;
+using AutoGen.OpenAI.Extension;
+using Azure.AI.OpenAI;
+using Azure.Core.Pipeline;
+#endregion using_statement
+
+namespace AutoGen.BasicSample;
+
+#region CustomHttpClientHandler
+public sealed class CustomHttpClientHandler : HttpClientHandler
+{
+    private string _modelServiceUrl;
+
+    public CustomHttpClientHandler(string modelServiceUrl)
+    {
+        _modelServiceUrl = modelServiceUrl;
+    }
+
+    protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+    {
+        request.RequestUri = new Uri($"{_modelServiceUrl}{request.RequestUri.PathAndQuery}");
+
+        return base.SendAsync(request, cancellationToken);
+    }
+}
+#endregion CustomHttpClientHandler
+
+public class Example16_OpenAIChatAgent_ConnectToThirdPartyBackend
+{
+    public static async Task RunAsync()
+    {
+        #region create_agent
+        using var client = new HttpClient(new CustomHttpClientHandler("http://localhost:11434"));
+        var option = new OpenAIClientOptions(OpenAIClientOptions.ServiceVersion.V2024_04_01_Preview)
+        {
+            Transport = new HttpClientTransport(client),
+        };
+
+        // api-key is not required for local server
+        // so you can use any string here
+        var openAIClient = new OpenAIClient("api-key", option);
+        var model = "llama3";
+
+        var agent = new OpenAIChatAgent(
+            openAIClient: openAIClient,
+            name: "assistant",
+            modelName: model,
+            systemMessage: "You are a helpful assistant designed to output JSON.",
+            seed: 0)
+            .RegisterMessageConnector()
+            .RegisterPrintMessage();
+        #endregion create_agent
+
+        #region send_message
+        await agent.SendAsync("Can you write a piece of C# code to calculate 100th of fibonacci?");
+        #endregion send_message
+    }
+}
diff --git a/dotnet/sample/AutoGen.BasicSamples/Program.cs b/dotnet/sample/AutoGen.BasicSamples/Program.cs
@@ -1,4 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Program.cs
 
-await Example02_TwoAgent_MathChat.RunAsync();
+using AutoGen.BasicSample;
+Console.ReadLine();
+await Example16_OpenAIChatAgent_ConnectToThirdPartyBackend.RunAsync();
diff --git a/dotnet/src/AutoGen.LMStudio/LMStudioAgent.cs b/dotnet/src/AutoGen.LMStudio/LMStudioAgent.cs
@@ -3,11 +3,12 @@
 
 using System;
 using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using AutoGen.OpenAI;
 using Azure.AI.OpenAI;
 using Azure.Core.Pipeline;
-using Azure.Core;
 
 namespace AutoGen.LMStudio;
 
@@ -56,25 +57,32 @@ private OpenAIClient ConfigOpenAIClientForLMStudio(LMStudioConfig config)
     {
         // create uri from host and port
         var uri = config.Uri;
-        var accessToken = new AccessToken(string.Empty, DateTimeOffset.Now.AddDays(180));
-        var tokenCredential = DelegatedTokenCredential.Create((_, _) => accessToken);
-        var openAIClient = new OpenAIClient(uri, tokenCredential);
+        var handler = new CustomHttpClientHandler(uri);
+        var httpClient = new HttpClient(handler);
+        var option = new OpenAIClientOptions(OpenAIClientOptions.ServiceVersion.V2022_12_01)
+        {
+            Transport = new HttpClientTransport(httpClient),
+        };
 
-        // remove authenication header from pipeline
-        var pipeline = HttpPipelineBuilder.Build(
-            new OpenAIClientOptions(OpenAIClientOptions.ServiceVersion.V2022_12_01),
-            Array.Empty<HttpPipelinePolicy>(),
-            [],
-            new ResponseClassifier());
+        return new OpenAIClient("api-key", option);
+    }
 
-        // use reflection to override _pipeline field
-        var field = typeof(OpenAIClient).GetField("_pipeline", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
-        field.SetValue(openAIClient, pipeline);
+    private sealed class CustomHttpClientHandler : HttpClientHandler
+    {
+        private Uri _modelServiceUrl;
 
-        // use reflection to set _isConfiguredForAzureOpenAI to false
-        var isConfiguredForAzureOpenAIField = typeof(OpenAIClient).GetField("_isConfiguredForAzureOpenAI", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
-        isConfiguredForAzureOpenAIField.SetValue(openAIClient, false);
+        public CustomHttpClientHandler(Uri modelServiceUrl)
+        {
+            _modelServiceUrl = modelServiceUrl;
+        }
 
-        return openAIClient;
+        protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+            // request.RequestUri = new Uri($"{_modelServiceUrl}{request.RequestUri.PathAndQuery}");
+            var uriBuilder = new UriBuilder(_modelServiceUrl);
+            uriBuilder.Path = request.RequestUri.PathAndQuery;
+            request.RequestUri = uriBuilder.Uri;
+            return base.SendAsync(request, cancellationToken);
+        }
     }
 }
diff --git a/dotnet/src/AutoGen.LMStudio/LMStudioConfig.cs b/dotnet/src/AutoGen.LMStudio/LMStudioConfig.cs
@@ -8,27 +8,23 @@
 /// </summary>
 public class LMStudioConfig : ILLMConfig
 {
-    public LMStudioConfig(string host, int port, int version = 1)
+    public LMStudioConfig(string host, int port)
     {
         this.Host = host;
         this.Port = port;
-        this.Version = version;
-        this.Uri = new Uri($"http://{host}:{port}/v{version}");
+        this.Uri = new Uri($"http://{host}:{port}");
     }
 
     public LMStudioConfig(Uri uri)
     {
         this.Uri = uri;
         this.Host = uri.Host;
         this.Port = uri.Port;
-        this.Version = int.Parse(uri.Segments[1].TrimStart('v'));
     }
 
     public string Host { get; }
 
     public int Port { get; }
 
-    public int Version { get; }
-
     public Uri Uri { get; }
 }
diff --git a/dotnet/src/AutoGen.Mistral/DTOs/ChatCompletionResponse.cs b/dotnet/src/AutoGen.Mistral/DTOs/ChatCompletionResponse.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // ChatCompletionResponse.cs
 
 using System.Collections.Generic;

diff --git a/dotnet/src/AutoGen.Mistral/DTOs/Error.cs b/dotnet/src/AutoGen.Mistral/DTOs/Error.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Error.cs
 
 using System.Text.Json.Serialization;

diff --git a/dotnet/src/AutoGen.Mistral/DTOs/Model.cs b/dotnet/src/AutoGen.Mistral/DTOs/Model.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Model.cs
 
 using System;

diff --git a/dotnet/src/AutoGen.SemanticKernel/AutoGen.SemanticKernel.csproj b/dotnet/src/AutoGen.SemanticKernel/AutoGen.SemanticKernel.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>AutoGen.SemanticKernel</RootNamespace>
+    <NoWarn>$(NoWarn);SKEXP0110</NoWarn>
   </PropertyGroup>
 
   <Import Project="$(RepoRoot)/nuget/nuget-package.props" />
@@ -18,6 +19,7 @@
   <ItemGroup>
     <PackageReference Include="Azure.AI.OpenAI" Version="$(AzureOpenAIVersion)" />
     <PackageReference Include="Microsoft.SemanticKernel" Version="$(SemanticKernelVersion)" />
+    <PackageReference Include="Microsoft.SemanticKernel.Agents.Core" Version="$(SemanticKernelExperimentalVersion)" />
   </ItemGroup>
 
   <ItemGroup>