Docs update for PR #1 on Promptless/autogen-test

.github/workflows/docs.yml

@@ -35,7 +35,6 @@ jobs:
             { ref: "v0.4.0.dev0", dest-dir: "0.4.0.dev0" },
             { ref: "v0.4.0.dev1", dest-dir: "0.4.0.dev1" },
             { ref: "v0.4.0.dev2", dest-dir: "0.4.0.dev2" },
-            { ref: "v0.4.0.dev3", dest-dir: "0.4.0.dev3" },
           ]
     steps:
       - name: Checkout

README.md

@@ -101,33 +101,37 @@ We look forward to your contributions!
 First install the packages:
 
 ```bash
-pip install 'autogen-agentchat==0.4.0.dev3' 'autogen-ext[docker]==0.4.0.dev3'
+pip install autogen-agentchat==0.4.0.dev2 autogen-ext==0.4.0.dev2
 ```
 
 The following code uses code execution, you need to have [Docker installed](https://docs.docker.com/engine/install/)
 and running on your machine.
 
 ```python
 import asyncio
+import logging
+from autogen_agentchat import EVENT_LOGGER_NAME
+from autogen_agentchat.agents import CodeExecutorAgent, CodingAssistantAgent
+from autogen_agentchat.logging import ConsoleLogHandler
+from autogen_agentchat.teams import RoundRobinGroupChat, StopMessageTermination
 from autogen_ext.code_executor.docker_executor import DockerCommandLineCodeExecutor
 from autogen_ext.models import OpenAIChatCompletionClient
-from autogen_agentchat.agents import CodeExecutorAgent, CodingAssistantAgent
-from autogen_agentchat.teams import RoundRobinGroupChat
-from autogen_agentchat.task import TextMentionTermination
+
+logger = logging.getLogger(EVENT_LOGGER_NAME)
+logger.addHandler(ConsoleLogHandler())
+logger.setLevel(logging.INFO)
 
 async def main() -> None:
     async with DockerCommandLineCodeExecutor(work_dir="coding") as code_executor:
         code_executor_agent = CodeExecutorAgent("code_executor", code_executor=code_executor)
         coding_assistant_agent = CodingAssistantAgent(
             "coding_assistant", model_client=OpenAIChatCompletionClient(model="gpt-4o", api_key="YOUR_API_KEY")
         )
-        termination = TextMentionTermination("TERMINATE")
-        group_chat = RoundRobinGroupChat([coding_assistant_agent, code_executor_agent], termination_condition=termination)
-        stream = group_chat.run_stream(
-            "Create a plot of NVDIA and TSLA stock returns YTD from 2024-01-01 and save it to 'nvidia_tesla_2024_ytd.png'."
+        group_chat = RoundRobinGroupChat([coding_assistant_agent, code_executor_agent])
+        result = await group_chat.run(
+            task="Create a plot of NVDIA and TSLA stock returns YTD from 2024-01-01 and save it to 'nvidia_tesla_2024_ytd.png'.",
+            termination_condition=StopMessageTermination(),
         )
-        async for message in stream:
-            print(message)
 
 asyncio.run(main())
 ```

docs/switcher.json

@@ -21,12 +21,7 @@
     {
         "name": "0.4.0.dev2",
         "version": "0.4.0.dev2",
-        "url": "/autogen/0.4.0.dev2/"
-    },
-    {
-        "name": "0.4.0.dev3",
-        "version": "0.4.0.dev3",
-        "url": "/autogen/0.4.0.dev3/",
+        "url": "/autogen/0.4.0.dev2/",
         "preferred": true
     }
 ]

dotnet/.gitignore

@@ -37,6 +37,9 @@ bld/
 # vs code cache
 .vscode/
 
+# Properties
+Properties/
+
 artifacts/
 output/
 
@@ -53,6 +56,8 @@ bld/
 [Ll]og/
 [Ll]ogs/
 
+appsettings.json
+
 # Visual Studio 2015/2017 cache/options directory
 .vs/
 # Uncomment if you have tasks that create the project's static files in wwwroot

dotnet/AutoGen.sln

@@ -68,13 +68,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{243E768F-EA7D-4AF1-B625-0398440BB1AB}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
-		.gitattributes = .gitattributes
-		.gitignore = .gitignore
-		Directory.Build.props = Directory.Build.props
-		Directory.Build.targets = Directory.Build.targets
-		Directory.Packages.props = Directory.Packages.props
-		global.json = global.json
-		NuGet.config = NuGet.config
 		spelling.dic = spelling.dic
 	EndProjectSection
 EndProject
@@ -130,7 +123,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloAgent", "samples\Hello
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIModelClientHostingExtensions", "src\Microsoft.AutoGen\Extensions\AIModelClientHostingExtensions\AIModelClientHostingExtensions.csproj", "{97550E87-48C6-4EBF-85E1-413ABAE9DBFD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Agents.Tests", "Microsoft.AutoGen.Agents.Tests\Microsoft.AutoGen.Agents.Tests.csproj", "{CF4C92BD-28AE-4B8F-B173-601004AEC9BF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Agents.Tests", "Microsoft.AutoGen.Agents.Tests\Microsoft.AutoGen.Agents.Tests.csproj", "{CF4C92BD-28AE-4B8F-B173-601004AEC9BF}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{686480D7-8FEC-4ED3-9C5D-CEBE1057A7ED}"
 EndProject

dotnet/Directory.Build.props

@@ -13,7 +13,6 @@
     <CSNoWarn>CS1998;CS1591;CS8002;</CSNoWarn>
     <SKEXPNoWarn>SKEXP0001;SKEXP0010;SKEXP0020</SKEXPNoWarn>
     <NoWarn>$(NoWarn);$(CSNoWarn);$(SKEXPNoWarn);NU5104</NoWarn>
-
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsPackable>false</IsPackable>
@@ -33,6 +32,10 @@
     <NoWarn>$(NoWarn);CA1829</NoWarn>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="System.Text.Json" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(IsTestProject)' == 'true'">
     <PackageReference Include="ApprovalTests" />
     <PackageReference Include="FluentAssertions" />

dotnet/Directory.Packages.props

@@ -3,7 +3,7 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <MicrosoftSemanticKernelVersion>1.22.0</MicrosoftSemanticKernelVersion>
     <MicrosoftSemanticKernelExperimentalVersion>1.22.0-alpha</MicrosoftSemanticKernelExperimentalVersion>
-    <MicrosoftExtensionsAIVersion>9.0.0-preview.9.24525.1</MicrosoftExtensionsAIVersion>
+    <MicrosoftExtensionsAIVersion>9.0.0-preview.9.24507.7</MicrosoftExtensionsAIVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Aspire.Hosting" Version="9.0.0-rc.1.24511.1" />
@@ -111,5 +111,6 @@
     <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.4.5" />
     <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.10" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.0-rc.2.24473.5" />
   </ItemGroup>
-</Project>
+</Project>

dotnet/samples/AutoGen.BasicSamples/AutoGen.BasicSample.csproj

@@ -15,6 +15,5 @@
     <ProjectReference Include="..\..\src\AutoGen\AutoGen.csproj" />
     <PackageReference Include="FluentAssertions" />
     <PackageReference Include="Microsoft.SemanticKernel.Plugins.Web" />
-    <PackageReference Include="Microsoft.Extensions.AI" />
   </ItemGroup>
 </Project>

dotnet/samples/AutoGen.BasicSamples/Example03_Agent_FunctionCall.cs

@@ -6,7 +6,6 @@
 using AutoGen.OpenAI;
 using AutoGen.OpenAI.Extension;
 using FluentAssertions;
-using Microsoft.Extensions.AI;
 
 /// <summary>
 /// This example shows how to add type-safe function call to an agent.
@@ -38,20 +37,13 @@ public async Task<string> ConcatString(string[] strings)
     /// </summary>
     /// <param name="price">price, should be an integer</param>
     /// <param name="taxRate">tax rate, should be in range (0, 1)</param>
-    [Function]
+    [FunctionAttribute]
     public async Task<string> CalculateTax(int price, float taxRate)
     {
         return $"tax is {price * taxRate}";
     }
 
-    /// <summary>
-    /// This example shows how to add type-safe function call using AutoGen.SourceGenerator.
-    /// The SourceGenerator will automatically generate FunctionDefinition and FunctionCallWrapper during compiling time.
-    ///
-    /// For adding type-safe function call from M.E.A.I tools, please refer to <see cref="ToolCallWithMEAITools"/>.
-    /// </summary>
-    /// <returns></returns>
-    public static async Task ToolCallWithSourceGenerator()
+    public static async Task RunAsync()
     {
         var instance = new Example03_Agent_FunctionCall();
         var gpt4o = LLMConfiguration.GetOpenAIGPT4o_mini();
@@ -109,60 +101,4 @@ public static async Task ToolCallWithSourceGenerator()
         // send aggregate message back to llm to get the final result
         var finalResult = await agent.SendAsync(calculateTaxes);
     }
-
-    /// <summary>
-    /// This example shows how to add type-safe function call from M.E.A.I tools.
-    ///
-    /// For adding type-safe function call from source generator, please refer to <see cref="ToolCallWithSourceGenerator"/>.
-    /// </summary>
-    public static async Task ToolCallWithMEAITools()
-    {
-        var gpt4o = LLMConfiguration.GetOpenAIGPT4o_mini();
-        var instance = new Example03_Agent_FunctionCall();
-
-        AIFunction[] tools = [
-            AIFunctionFactory.Create(instance.UpperCase),
-            AIFunctionFactory.Create(instance.ConcatString),
-            AIFunctionFactory.Create(instance.CalculateTax),
-        ];
-
-        var toolCallMiddleware = new FunctionCallMiddleware(tools);
-
-        var agent = new OpenAIChatAgent(
-            chatClient: gpt4o,
-            name: "agent",
-            systemMessage: "You are a helpful AI assistant")
-            .RegisterMessageConnector()
-            .RegisterStreamingMiddleware(toolCallMiddleware)
-            .RegisterPrintMessage();
-
-        // talk to the assistant agent
-        var upperCase = await agent.SendAsync("convert to upper case: hello world");
-        upperCase.GetContent()?.Should().Be("HELLO WORLD");
-        upperCase.Should().BeOfType<ToolCallAggregateMessage>();
-        upperCase.GetToolCalls().Should().HaveCount(1);
-        upperCase.GetToolCalls().First().FunctionName.Should().Be(nameof(UpperCase));
-
-        var concatString = await agent.SendAsync("concatenate strings: a, b, c, d, e");
-        concatString.GetContent()?.Should().Be("a b c d e");
-        concatString.Should().BeOfType<ToolCallAggregateMessage>();
-        concatString.GetToolCalls().Should().HaveCount(1);
-        concatString.GetToolCalls().First().FunctionName.Should().Be(nameof(ConcatString));
-
-        var calculateTax = await agent.SendAsync("calculate tax: 100, 0.1");
-        calculateTax.GetContent().Should().Be("tax is 10");
-        calculateTax.Should().BeOfType<ToolCallAggregateMessage>();
-        calculateTax.GetToolCalls().Should().HaveCount(1);
-        calculateTax.GetToolCalls().First().FunctionName.Should().Be(nameof(CalculateTax));
-
-        // parallel function calls
-        var calculateTaxes = await agent.SendAsync("calculate tax: 100, 0.1; calculate tax: 200, 0.2");
-        calculateTaxes.GetContent().Should().Be("tax is 10\ntax is 40"); // "tax is 10\n tax is 40
-        calculateTaxes.Should().BeOfType<ToolCallAggregateMessage>();
-        calculateTaxes.GetToolCalls().Should().HaveCount(2);
-        calculateTaxes.GetToolCalls().First().FunctionName.Should().Be(nameof(CalculateTax));
-
-        // send aggregate message back to llm to get the final result
-        var finalResult = await agent.SendAsync(calculateTaxes);
-    }
 }

dotnet/samples/AutoGen.BasicSamples/Program.cs

@@ -11,8 +11,7 @@
     // When a new sample is created please add them to the allSamples collection
     ("Assistant Agent", Example01_AssistantAgent.RunAsync),
     ("Two-agent Math Chat", Example02_TwoAgent_MathChat.RunAsync),
-    ("Agent Function Call With Source Generator", Example03_Agent_FunctionCall.ToolCallWithSourceGenerator),
-    ("Agent Function Call With M.E.A.I AI Functions", Example03_Agent_FunctionCall.ToolCallWithMEAITools),
+    ("Agent Function Call", Example03_Agent_FunctionCall.RunAsync),
     ("Dynamic Group Chat Coding Task", Example04_Dynamic_GroupChat_Coding_Task.RunAsync),
     ("DALL-E and GPT4v", Example05_Dalle_And_GPT4V.RunAsync),
     ("User Proxy Agent", Example06_UserProxyAgent.RunAsync),

dotnet/samples/Hello/Backend/Backend.csproj

@@ -1,16 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
+<Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Microsoft.AutoGen\Runtime\Microsoft.AutoGen.Runtime.csproj" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting" />
   </ItemGroup>
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
 </Project>

dotnet/samples/Hello/Backend/Program.cs

@@ -1,5 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Program.cs
 
+using Microsoft.Extensions.Hosting;
+
 var app = await Microsoft.AutoGen.Runtime.Host.StartAsync(local: true);
 await app.WaitForShutdownAsync();

dotnet/samples/Hello/Hello.AppHost/Hello.AppHost.csproj

@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
@@ -9,12 +10,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Hosting.AppHost" />
-    <PackageReference Include="Aspire.Hosting" />
+    <PackageReference Include="Aspire.Hosting.AppHost"/>
+    <PackageReference Include="Aspire.Hosting"/>
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Backend\Backend.csproj" />
     <ProjectReference Include="..\HelloAgent\HelloAgent.csproj" />
   </ItemGroup>
+
 </Project>

dotnet/samples/Hello/HelloAIAgents/HelloAIAgent.cs

@@ -4,6 +4,7 @@
 using Microsoft.AutoGen.Abstractions;
 using Microsoft.AutoGen.Agents;
 using Microsoft.Extensions.AI;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Hello;
 [TopicSubscription("HelloAgents")]