Skip to content

A programming framework for agentic AI

refactoring the dotnet folder and namespace structure for better long term maintenance and clarity #3809 (#3810)

Ryan Sweet460a6817ea4b
diff --git a/README.md b/README.md
index 706fca24d..966b34333 100644
--- a/README.md
+++ b/README.md
@@ -148,14 +148,14 @@ git switch staging-dev
# Build the project
cd dotnet && dotnet build AutoGen.sln
# In your source code, add AutoGen to your project
-dotnet add <your.csproj> reference <path to your checkout of autogen>/dotnet/src/Microsoft.AutoGen.Agents/Client/Microsoft.AutoGen.Agents.Client.csproj
+dotnet add <your.csproj> reference <path to your checkout of autogen>/dotnet/src/Microsoft.AutoGen/Agents/Microsoft.AutoGen.Agents.csproj
```
Then, define and run your first agent:
```csharp
-using Microsoft.AutoGen.Agents.Abstractions;
-using Microsoft.AutoGen.Agents.Client;
+using Microsoft.AutoGen.Abstractions;
+using Microsoft.AutoGen.Agents;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
diff --git a/dotnet/AutoGen.sln b/dotnet/AutoGen.sln
index 6b3038b61..317fc82ff 100644
--- a/dotnet/AutoGen.sln
+++ b/dotnet/AutoGen.sln
@@ -103,19 +103,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hello", "samples\Hello\Hello.csproj", "{6C9135E6-9D15-4D86-B3F4-9666DB87060A}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.ServiceDefaults", "src\Microsoft.AutoGen.ServiceDefaults\Microsoft.AutoGen.ServiceDefaults.csproj", "{F70C6FD7-9615-4EDD-8D55-5460FCC5A46D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Agents", "src\Microsoft.AutoGen\Agents\Microsoft.AutoGen.Agents.csproj", "{FD87BD33-4616-460B-AC85-A412BA08BB78}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.AutoGen.Agents", "Microsoft.AutoGen.Agents", "{143BF45F-1091-458C-A772-DAD5C57B72FA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Abstractions", "src\Microsoft.AutoGen\Abstractions\Microsoft.AutoGen.Abstractions.csproj", "{E0C991D9-0DB8-471C-ADC9-5FB16E2A0106}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Agents.Runtime", "src\Microsoft.AutoGen.Agents\Runtime\Microsoft.AutoGen.Agents.Runtime.csproj", "{32AF1495-4068-4048-A34A-FCA1E110F02E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Extensions.SemanticKernel", "src\Microsoft.AutoGen\Extensions\SemanticKernel\Microsoft.AutoGen.Extensions.SemanticKernel.csproj", "{952827D4-8D4C-4327-AE4D-E8D25811EF35}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Agents.Extensions.SemanticKernel", "src\Microsoft.AutoGen.Agents\Extensions\SemanticKernel\Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj", "{2B1701A5-BEA2-4844-863B-0275ECCCD11D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Extensions.CloudEvents", "src\Microsoft.AutoGen\Extensions\CloudEvents\Microsoft.AutoGen.Extensions.CloudEvents.csproj", "{21C9EC49-E848-4EAE-932F-0862D44F7A80}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Agents.Extensions.CloudEvents", "src\Microsoft.AutoGen.Agents\Extensions\CloudEvents\Microsoft.AutoGen.Agents.Extensions.CloudEvents.csproj", "{FDD6787A-EE6A-4A8E-872F-CDA97A824D08}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Runtime", "src\Microsoft.AutoGen\Runtime\Microsoft.AutoGen.Runtime.csproj", "{A905E29A-7110-497F-ADC5-2CE2A148FEA0}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Agents.Client", "src\Microsoft.AutoGen.Agents\Client\Microsoft.AutoGen.Agents.Client.csproj", "{CEEC175F-8752-4040-9226-8F5FEC7563B8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Agents.Abstractions", "src\Microsoft.AutoGen.Agents\Abstractions\Microsoft.AutoGen.Agents.Abstractions.csproj", "{8960A02A-A139-4E54-BF98-B8F9C4A0FFE8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.ServiceDefaults", "src\Microsoft.AutoGen\ServiceDefaults\Microsoft.AutoGen.ServiceDefaults.csproj", "{D7E9D90B-5595-4E72-A90A-6DE20D9AB7AE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -287,30 +285,30 @@ Global
{6C9135E6-9D15-4D86-B3F4-9666DB87060A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6C9135E6-9D15-4D86-B3F4-9666DB87060A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6C9135E6-9D15-4D86-B3F4-9666DB87060A}.Release|Any CPU.Build.0 = Release|Any CPU
- {F70C6FD7-9615-4EDD-8D55-5460FCC5A46D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F70C6FD7-9615-4EDD-8D55-5460FCC5A46D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F70C6FD7-9615-4EDD-8D55-5460FCC5A46D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F70C6FD7-9615-4EDD-8D55-5460FCC5A46D}.Release|Any CPU.Build.0 = Release|Any CPU
- {32AF1495-4068-4048-A34A-FCA1E110F02E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {32AF1495-4068-4048-A34A-FCA1E110F02E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {32AF1495-4068-4048-A34A-FCA1E110F02E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {32AF1495-4068-4048-A34A-FCA1E110F02E}.Release|Any CPU.Build.0 = Release|Any CPU
- {2B1701A5-BEA2-4844-863B-0275ECCCD11D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2B1701A5-BEA2-4844-863B-0275ECCCD11D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2B1701A5-BEA2-4844-863B-0275ECCCD11D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2B1701A5-BEA2-4844-863B-0275ECCCD11D}.Release|Any CPU.Build.0 = Release|Any CPU
- {FDD6787A-EE6A-4A8E-872F-CDA97A824D08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FDD6787A-EE6A-4A8E-872F-CDA97A824D08}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FDD6787A-EE6A-4A8E-872F-CDA97A824D08}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {FDD6787A-EE6A-4A8E-872F-CDA97A824D08}.Release|Any CPU.Build.0 = Release|Any CPU
- {CEEC175F-8752-4040-9226-8F5FEC7563B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {CEEC175F-8752-4040-9226-8F5FEC7563B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {CEEC175F-8752-4040-9226-8F5FEC7563B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {CEEC175F-8752-4040-9226-8F5FEC7563B8}.Release|Any CPU.Build.0 = Release|Any CPU
- {8960A02A-A139-4E54-BF98-B8F9C4A0FFE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8960A02A-A139-4E54-BF98-B8F9C4A0FFE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8960A02A-A139-4E54-BF98-B8F9C4A0FFE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8960A02A-A139-4E54-BF98-B8F9C4A0FFE8}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FD87BD33-4616-460B-AC85-A412BA08BB78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FD87BD33-4616-460B-AC85-A412BA08BB78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FD87BD33-4616-460B-AC85-A412BA08BB78}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FD87BD33-4616-460B-AC85-A412BA08BB78}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E0C991D9-0DB8-471C-ADC9-5FB16E2A0106}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E0C991D9-0DB8-471C-ADC9-5FB16E2A0106}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E0C991D9-0DB8-471C-ADC9-5FB16E2A0106}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E0C991D9-0DB8-471C-ADC9-5FB16E2A0106}.Release|Any CPU.Build.0 = Release|Any CPU
+ {952827D4-8D4C-4327-AE4D-E8D25811EF35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {952827D4-8D4C-4327-AE4D-E8D25811EF35}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {952827D4-8D4C-4327-AE4D-E8D25811EF35}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {952827D4-8D4C-4327-AE4D-E8D25811EF35}.Release|Any CPU.Build.0 = Release|Any CPU
+ {21C9EC49-E848-4EAE-932F-0862D44F7A80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {21C9EC49-E848-4EAE-932F-0862D44F7A80}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {21C9EC49-E848-4EAE-932F-0862D44F7A80}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {21C9EC49-E848-4EAE-932F-0862D44F7A80}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A905E29A-7110-497F-ADC5-2CE2A148FEA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A905E29A-7110-497F-ADC5-2CE2A148FEA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A905E29A-7110-497F-ADC5-2CE2A148FEA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A905E29A-7110-497F-ADC5-2CE2A148FEA0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D7E9D90B-5595-4E72-A90A-6DE20D9AB7AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D7E9D90B-5595-4E72-A90A-6DE20D9AB7AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D7E9D90B-5595-4E72-A90A-6DE20D9AB7AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D7E9D90B-5595-4E72-A90A-6DE20D9AB7AE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -360,13 +358,12 @@ Global
{D826D5E4-31F4-4AB5-AC86-F7B4AD79314B} = {616F30DF-1F41-4047-BAA4-64BA03BF5AEA}
{D9F65DFD-368B-47DB-8BB5-0C74DED7F439} = {616F30DF-1F41-4047-BAA4-64BA03BF5AEA}
{6C9135E6-9D15-4D86-B3F4-9666DB87060A} = {FBFEAD1F-29EB-4D99-A672-0CD8473E10B9}
- {F70C6FD7-9615-4EDD-8D55-5460FCC5A46D} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
- {143BF45F-1091-458C-A772-DAD5C57B72FA} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
- {32AF1495-4068-4048-A34A-FCA1E110F02E} = {143BF45F-1091-458C-A772-DAD5C57B72FA}
- {2B1701A5-BEA2-4844-863B-0275ECCCD11D} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
- {FDD6787A-EE6A-4A8E-872F-CDA97A824D08} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
- {CEEC175F-8752-4040-9226-8F5FEC7563B8} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
- {8960A02A-A139-4E54-BF98-B8F9C4A0FFE8} = {143BF45F-1091-458C-A772-DAD5C57B72FA}
+ {FD87BD33-4616-460B-AC85-A412BA08BB78} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
+ {E0C991D9-0DB8-471C-ADC9-5FB16E2A0106} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
+ {952827D4-8D4C-4327-AE4D-E8D25811EF35} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
+ {21C9EC49-E848-4EAE-932F-0862D44F7A80} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
+ {A905E29A-7110-497F-ADC5-2CE2A148FEA0} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
+ {D7E9D90B-5595-4E72-A90A-6DE20D9AB7AE} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {93384647-528D-46C8-922C-8DB36A382F0B}
diff --git a/dotnet/samples/Hello/Hello.csproj b/dotnet/samples/Hello/Hello.csproj
index 2c9715293..bfd5d1a5c 100644
--- a/dotnet/samples/Hello/Hello.csproj
+++ b/dotnet/samples/Hello/Hello.csproj
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
- <ProjectReference Include="..\..\src\Microsoft.AutoGen.Agents\Client\Microsoft.AutoGen.Agents.Client.csproj" />
- <ProjectReference Include="..\..\src\Microsoft.AutoGen.Agents\Runtime\Microsoft.AutoGen.Agents.Runtime.csproj" />
+ <ProjectReference Include="..\..\src\Microsoft.AutoGen\Agents\Microsoft.AutoGen.Agents.csproj" />
+ <ProjectReference Include="..\..\src\Microsoft.AutoGen\Runtime\Microsoft.AutoGen.Runtime.csproj" />
</ItemGroup>
<ItemGroup>
diff --git a/dotnet/samples/Hello/Program.cs b/dotnet/samples/Hello/Program.cs
index 26df86295..3335ff96c 100644
--- a/dotnet/samples/Hello/Program.cs
+++ b/dotnet/samples/Hello/Program.cs
@@ -1,5 +1,5 @@
-using Microsoft.AutoGen.Agents.Abstractions;
-using Microsoft.AutoGen.Agents.Client;
+using Microsoft.AutoGen.Abstractions;
+using Microsoft.AutoGen.Agents;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
diff --git a/dotnet/samples/Hello/README.md b/dotnet/samples/Hello/README.md
index 388b6343d..795eed072 100644
--- a/dotnet/samples/Hello/README.md
+++ b/dotnet/samples/Hello/README.md
@@ -38,7 +38,7 @@ graph LR;
The heart of an autogen application are the event handlers. Agents select a ```TopicSubscription``` to listen for events on a specific topic. When an event is received, the agent's event handler is called with the event data.
-Within that event handler you may optionally *emit* new events, which are then sent to the event bus for other agents to process. The EventTypes are declared gRPC ProtoBuf messages that are used to define the schema of the event. The default protos are available via the ```Microsoft.AutoGen.Agents.Abstractions;``` namespace and are defined in [autogen/protos](/autogen/protos). The EventTypes are registered in the agent's constructor using the ```IHandle``` interface.
+Within that event handler you may optionally *emit* new events, which are then sent to the event bus for other agents to process. The EventTypes are declared gRPC ProtoBuf messages that are used to define the schema of the event. The default protos are available via the ```Microsoft.AutoGen.Abstractions;``` namespace and are defined in [autogen/protos](/autogen/protos). The EventTypes are registered in the agent's constructor using the ```IHandle``` interface.
```csharp
TopicSubscription("HelloAgents")]
@@ -74,7 +74,7 @@ This sample also illustrates inheritance in AutoGen. The `HelloAgent` class inhe
### Starting the Application Runtime
-AuotoGen provides a flexible runtime ```Microsoft.AutoGen.Agents.Client.App``` that can be started in a variety of ways. The `Program.cs` file demonstrates how to start the runtime locally and send a message to the agent all in one go using the ```App.PublishMessageAsync``` method.
+AuotoGen provides a flexible runtime ```Microsoft.AutoGen.Agents.App``` that can be started in a variety of ways. The `Program.cs` file demonstrates how to start the runtime locally and send a message to the agent all in one go using the ```App.PublishMessageAsync``` method.
```csharp
// send a message to the agent
@@ -118,4 +118,4 @@ message ReadmeRequested {
</ItemGroup>
```
-You can send messages using the [```Microsoft.AutoGen.Agents.Client.AgentClient``` class](autogen/dotnet/src/Microsoft.AutoGen.Agents/Client/AgentClient.cs). Messages are wrapped in [the CloudEvents specification](https://cloudevents.io) and sent to the event bus.
+You can send messages using the [```Microsoft.AutoGen.Agents.AgentClient``` class](autogen/dotnet/src/Microsoft.AutoGen/Agents/AgentClient.cs). Messages are wrapped in [the CloudEvents specification](https://cloudevents.io) and sent to the event bus.
diff --git a/dotnet/samples/dev-team/DevTeam.AgentHost/DevTeam.AgentHost.csproj b/dotnet/samples/dev-team/DevTeam.AgentHost/DevTeam.AgentHost.csproj
index 96ee09c57..69705e466 100644
--- a/dotnet/samples/dev-team/DevTeam.AgentHost/DevTeam.AgentHost.csproj
+++ b/dotnet/samples/dev-team/DevTeam.AgentHost/DevTeam.AgentHost.csproj
@@ -9,8 +9,8 @@
</PropertyGroup>
<ItemGroup>
- <ProjectReference Include="../../../src/Microsoft.AutoGen.Agents/Runtime/Microsoft.AutoGen.Agents.Runtime.csproj" />
- <ProjectReference Include="../../../src/Microsoft.AutoGen.ServiceDefaults/Microsoft.AutoGen.ServiceDefaults.csproj" />
+ <ProjectReference Include="../../../src/Microsoft.AutoGen/Runtime/Microsoft.AutoGen.Runtime.csproj" />
+ <ProjectReference Include="../../../src/Microsoft.AutoGen/ServiceDefaults/Microsoft.AutoGen.ServiceDefaults.csproj" />
</ItemGroup>
</Project>
diff --git a/dotnet/samples/dev-team/DevTeam.AgentHost/Program.cs b/dotnet/samples/dev-team/DevTeam.AgentHost/Program.cs
index 06985965e..d5c129c3b 100644
--- a/dotnet/samples/dev-team/DevTeam.AgentHost/Program.cs
+++ b/dotnet/samples/dev-team/DevTeam.AgentHost/Program.cs
@@ -1,4 +1,4 @@
-using Microsoft.AutoGen.Agents.Runtime;
+using Microsoft.AutoGen.Runtime;
var builder = WebApplication.CreateBuilder(args);
builder.AddServiceDefaults();
diff --git a/dotnet/samples/dev-team/DevTeam.Agents/DevTeam.Agents.csproj b/dotnet/samples/dev-team/DevTeam.Agents/DevTeam.Agents.csproj
index 0cff3b834..d7dbd1688 100644
--- a/dotnet/samples/dev-team/DevTeam.Agents/DevTeam.Agents.csproj
+++ b/dotnet/samples/dev-team/DevTeam.Agents/DevTeam.Agents.csproj
@@ -8,11 +8,11 @@
<ItemGroup>
- <ProjectReference Include="../../../src/Microsoft.AutoGen.Agents/Client/Microsoft.AutoGen.Agents.Client.csproj" />
+ <ProjectReference Include="../../../src/Microsoft.AutoGen/Agents/Microsoft.AutoGen.Agents.csproj" />
- <ProjectReference Include="../../../src/Microsoft.AutoGen.ServiceDefaults/Microsoft.AutoGen.ServiceDefaults.csproj" />
+ <ProjectReference Include="../../../src/Microsoft.AutoGen/ServiceDefaults/Microsoft.AutoGen.ServiceDefaults.csproj" />
<ProjectReference Include="..\DevTeam.Shared\DevTeam.Shared.csproj" />
- <ProjectReference Include="..\..\..\src\Microsoft.AutoGen.Agents\Extensions\SemanticKernel\Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj" />
+ <ProjectReference Include="..\..\..\src\Microsoft.AutoGen\Extensions\SemanticKernel\Microsoft.AutoGen.Extensions.SemanticKernel.csproj" />
</ItemGroup>
</Project>
diff --git a/dotnet/samples/dev-team/DevTeam.Agents/Developer/Developer.cs b/dotnet/samples/dev-team/DevTeam.Agents/Developer/Developer.cs
index 756f9f8f7..47a389ad7 100644
--- a/dotnet/samples/dev-team/DevTeam.Agents/Developer/Developer.cs
+++ b/dotnet/samples/dev-team/DevTeam.Agents/Developer/Developer.cs
@@ -1,6 +1,6 @@
using DevTeam.Shared;
-using Microsoft.AutoGen.Agents.Abstractions;
-using Microsoft.AutoGen.Agents.Client;
+using Microsoft.AutoGen.Abstractions;
+using Microsoft.AutoGen.Agents;
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Memory;
diff --git a/dotnet/samples/dev-team/DevTeam.Agents/DeveloperLead/DeveloperLead.cs b/dotnet/samples/dev-team/DevTeam.Agents/DeveloperLead/DeveloperLead.cs
index 23ba209b1..c3e5e2fea 100644
--- a/dotnet/samples/dev-team/DevTeam.Agents/DeveloperLead/DeveloperLead.cs
+++ b/dotnet/samples/dev-team/DevTeam.Agents/DeveloperLead/DeveloperLead.cs
@@ -1,6 +1,6 @@
using DevTeam.Shared;
-using Microsoft.AutoGen.Agents.Abstractions;
-using Microsoft.AutoGen.Agents.Client;
+using Microsoft.AutoGen.Abstractions;
+using Microsoft.AutoGen.Agents;
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Connectors.OpenAI;
using Microsoft.SemanticKernel.Memory;
diff --git a/dotnet/samples/dev-team/DevTeam.Agents/ProductManager/ProductManager.cs b/dotnet/samples/dev-team/DevTeam.Agents/ProductManager/ProductManager.cs
index 99a576558..36bb34c3a 100644
--- a/dotnet/samples/dev-team/DevTeam.Agents/ProductManager/ProductManager.cs
+++ b/dotnet/samples/dev-team/DevTeam.Agents/ProductManager/ProductManager.cs
@@ -1,6 +1,6 @@
using DevTeam.Shared;
-using Microsoft.AutoGen.Agents.Abstractions;
-using Microsoft.AutoGen.Agents.Client;
+using Microsoft.AutoGen.Abstractions;
+using Microsoft.AutoGen.Agents;
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Memory;
diff --git a/dotnet/samples/dev-team/DevTeam.Agents/Program.cs b/dotnet/samples/dev-team/DevTeam.Agents/Program.cs
index 9362836a5..965c23cc9 100644
--- a/dotnet/samples/dev-team/DevTeam.Agents/Program.cs
+++ b/dotnet/samples/dev-team/DevTeam.Agents/Program.cs
@@ -1,6 +1,6 @@
using DevTeam.Agents;
-using Microsoft.AutoGen.Agents.Client;
-using Microsoft.AutoGen.Agents.Extensions.SemanticKernel;
+using Microsoft.AutoGen.Agents;
+using Microsoft.AutoGen.Extensions.SemanticKernel;
var builder = WebApplication.CreateBuilder(args);
diff --git a/dotnet/samples/dev-team/DevTeam.Backend/Agents/AzureGenie.cs b/dotnet/samples/dev-team/DevTeam.Backend/Agents/AzureGenie.cs
index 81cdc1fa6..0c9aabe9b 100644
--- a/dotnet/samples/dev-team/DevTeam.Backend/Agents/AzureGenie.cs
+++ b/dotnet/samples/dev-team/DevTeam.Backend/Agents/AzureGenie.cs
@@ -1,7 +1,7 @@
using DevTeam.Backend;
using DevTeam.Shared;
-using Microsoft.AutoGen.Agents.Abstractions;
-using Microsoft.AutoGen.Agents.Client;
+using Microsoft.AutoGen.Abstractions;
+using Microsoft.AutoGen.Agents;
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Memory;
namespace Microsoft.AI.DevTeam;
diff --git a/dotnet/samples/dev-team/DevTeam.Backend/Agents/Hubber.cs b/dotnet/samples/dev-team/DevTeam.Backend/Agents/Hubber.cs
index 39f424ce3..e0107c2ea 100644
--- a/dotnet/samples/dev-team/DevTeam.Backend/Agents/Hubber.cs
+++ b/dotnet/samples/dev-team/DevTeam.Backend/Agents/Hubber.cs
@@ -2,8 +2,8 @@ using System.Text.Json;
using DevTeam;
using DevTeam.Backend;
using DevTeam.Shared;
-using Microsoft.AutoGen.Agents.Abstractions;
-using Microsoft.AutoGen.Agents.Client;
+using Microsoft.AutoGen.Abstractions;
+using Microsoft.AutoGen.Agents;
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Memory;
diff --git a/dotnet/samples/dev-team/DevTeam.Backend/Agents/Sandbox.cs b/dotnet/samples/dev-team/DevTeam.Backend/Agents/Sandbox.cs
index a778433de..1d13c7bd2 100644
--- a/dotnet/samples/dev-team/DevTeam.Backend/Agents/Sandbox.cs
+++ b/dotnet/samples/dev-team/DevTeam.Backend/Agents/Sandbox.cs
@@ -1,7 +1,7 @@
// TODO: Reimplement using ACA Sessions
// using DevTeam.Events;
-// using Microsoft.AutoGen.Agents.Abstractions;
-// using Microsoft.AutoGen.Agents.Client;
+// using Microsoft.AutoGen.Abstractions;
+// using Microsoft.AutoGen.Agents;
// namespace DevTeam.Backend;
diff --git a/dotnet/samples/dev-team/DevTeam.Backend/DevTeam.Backend.csproj b/dotnet/samples/dev-team/DevTeam.Backend/DevTeam.Backend.csproj
index 0fbce0eaf..419298430 100644
--- a/dotnet/samples/dev-team/DevTeam.Backend/DevTeam.Backend.csproj
+++ b/dotnet/samples/dev-team/DevTeam.Backend/DevTeam.Backend.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<ItemGroup>
- <ProjectReference Include="../../../src/Microsoft.AutoGen.Agents/Client/Microsoft.AutoGen.Agents.Client.csproj" />
+ <ProjectReference Include="../../../src/Microsoft.AutoGen/Agents/Microsoft.AutoGen.Agents.csproj" />
</ItemGroup>
<PropertyGroup>
@@ -29,9 +29,9 @@
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="../../../src/Microsoft.AutoGen.ServiceDefaults/Microsoft.AutoGen.ServiceDefaults.csproj" />
+ <ProjectReference Include="../../../src/Microsoft.AutoGen/ServiceDefaults/Microsoft.AutoGen.ServiceDefaults.csproj" />
<ProjectReference Include="..\DevTeam.Shared\DevTeam.Shared.csproj" />
- <ProjectReference Include="..\..\..\src\Microsoft.AutoGen.Agents\Extensions\SemanticKernel\Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj" />
+ <ProjectReference Include="..\..\..\src\Microsoft.AutoGen\Extensions\SemanticKernel\Microsoft.AutoGen.Extensions.SemanticKernel.csproj" />
</ItemGroup>
</Project>
diff --git a/dotnet/samples/dev-team/DevTeam.Backend/Program.cs b/dotnet/samples/dev-team/DevTeam.Backend/Program.cs
index ed77a0bdc..d860f4050 100644
--- a/dotnet/samples/dev-team/DevTeam.Backend/Program.cs
+++ b/dotnet/samples/dev-team/DevTeam.Backend/Program.cs
@@ -2,8 +2,8 @@ using Azure.Identity;
using DevTeam.Backend;
using DevTeam.Options;
using Microsoft.AI.DevTeam;
-using Microsoft.AutoGen.Agents.Client;
-using Microsoft.AutoGen.Agents.Extensions.SemanticKernel;
+using Microsoft.AutoGen.Agents;
+using Microsoft.AutoGen.Extensions.SemanticKernel;
using Microsoft.Extensions.Azure;
using Microsoft.Extensions.Options;
using Octokit.Webhooks;
diff --git a/dotnet/samples/dev-team/DevTeam.Backend/Services/GithubWebHookProcessor.cs b/dotnet/samples/dev-team/DevTeam.Backend/Services/GithubWebHookProcessor.cs
index 7a643f938..85b407c4e 100644
--- a/dotnet/samples/dev-team/DevTeam.Backend/Services/GithubWebHookProcessor.cs
+++ b/dotnet/samples/dev-team/DevTeam.Backend/Services/GithubWebHookProcessor.cs
@@ -1,7 +1,7 @@
using System.Globalization;
using DevTeam.Shared;
-using Microsoft.AutoGen.Agents.Abstractions;
-using Microsoft.AutoGen.Agents.Client;
+using Microsoft.AutoGen.Abstractions;
+using Microsoft.AutoGen.Agents;
using Octokit.Webhooks;
using Octokit.Webhooks.Events;
using Octokit.Webhooks.Events.IssueComment;
diff --git a/dotnet/samples/dev-team/DevTeam.Shared/DevTeam.Shared.csproj b/dotnet/samples/dev-team/DevTeam.Shared/DevTeam.Shared.csproj
index 103248897..bc739135d 100644
--- a/dotnet/samples/dev-team/DevTeam.Shared/DevTeam.Shared.csproj
+++ b/dotnet/samples/dev-team/DevTeam.Shared/DevTeam.Shared.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
- <ProjectReference Include="../../../src/Microsoft.AutoGen.Agents/Client/Microsoft.AutoGen.Agents.Client.csproj" />
+ <ProjectReference Include="../../../src/Microsoft.AutoGen/Agents/Microsoft.AutoGen.Agents.csproj" />
</ItemGroup>
<PropertyGroup>
diff --git a/dotnet/samples/dev-team/DevTeam.Shared/EventExtensions.cs b/dotnet/samples/dev-team/DevTeam.Shared/EventExtensions.cs
index a5734d971..f276d294f 100644
--- a/dotnet/samples/dev-team/DevTeam.Shared/EventExtensions.cs
+++ b/dotnet/samples/dev-team/DevTeam.Shared/EventExtensions.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.
using System.Globalization;
-using Microsoft.AutoGen.Agents.Abstractions;
+using Microsoft.AutoGen.Abstractions;
namespace DevTeam;
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Abstractions/AgentState.cs b/dotnet/src/Microsoft.AutoGen/Abstractions/AgentState.cs
similarity index 76%
rename from dotnet/src/Microsoft.AutoGen.Agents/Abstractions/AgentState.cs
rename to dotnet/src/Microsoft.AutoGen/Abstractions/AgentState.cs
index c0a758797..53093bc9b 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Abstractions/AgentState.cs
+++ b/dotnet/src/Microsoft.AutoGen/Abstractions/AgentState.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.AutoGen.Agents.Abstractions;
+namespace Microsoft.AutoGen.Abstractions;
public class AgentState<T> where T : class, new()
{
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Abstractions/ChatHistoryItem.cs b/dotnet/src/Microsoft.AutoGen/Abstractions/ChatHistoryItem.cs
similarity index 78%
rename from dotnet/src/Microsoft.AutoGen.Agents/Abstractions/ChatHistoryItem.cs
rename to dotnet/src/Microsoft.AutoGen/Abstractions/ChatHistoryItem.cs
index 23f6f5a1c..911c13f24 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Abstractions/ChatHistoryItem.cs
+++ b/dotnet/src/Microsoft.AutoGen/Abstractions/ChatHistoryItem.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.AutoGen.Agents.Abstractions;
+namespace Microsoft.AutoGen.Abstractions;
[Serializable]
public class ChatHistoryItem
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Abstractions/ChatUserType.cs b/dotnet/src/Microsoft.AutoGen/Abstractions/ChatUserType.cs
similarity index 55%
rename from dotnet/src/Microsoft.AutoGen.Agents/Abstractions/ChatUserType.cs
rename to dotnet/src/Microsoft.AutoGen/Abstractions/ChatUserType.cs
index d33220241..74743fbff 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Abstractions/ChatUserType.cs
+++ b/dotnet/src/Microsoft.AutoGen/Abstractions/ChatUserType.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.AutoGen.Agents.Abstractions;
+namespace Microsoft.AutoGen.Abstractions;
public enum ChatUserType
{
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Abstractions/IAgent.cs b/dotnet/src/Microsoft.AutoGen/Abstractions/IAgent.cs
similarity index 68%
rename from dotnet/src/Microsoft.AutoGen.Agents/Abstractions/IAgent.cs
rename to dotnet/src/Microsoft.AutoGen/Abstractions/IAgent.cs
index 86d87a808..834e5678a 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Abstractions/IAgent.cs
+++ b/dotnet/src/Microsoft.AutoGen/Abstractions/IAgent.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.AutoGen.Agents.Abstractions;
+namespace Microsoft.AutoGen.Abstractions;
public interface IAgent
{
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Abstractions/IAiAgent.cs b/dotnet/src/Microsoft.AutoGen/Abstractions/IAiAgent.cs
similarity index 90%
rename from dotnet/src/Microsoft.AutoGen.Agents/Abstractions/IAiAgent.cs
rename to dotnet/src/Microsoft.AutoGen/Abstractions/IAiAgent.cs
index b9a721fe5..47105eaca 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Abstractions/IAiAgent.cs
+++ b/dotnet/src/Microsoft.AutoGen/Abstractions/IAiAgent.cs
@@ -2,7 +2,7 @@
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Connectors.OpenAI;
-namespace Microsoft.AutoGen.Agents.Abstractions;
+namespace Microsoft.AutoGen.Abstractions;
public interface IAiAgent : IAgent
{
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Abstractions/IHandle.cs b/dotnet/src/Microsoft.AutoGen/Abstractions/IHandle.cs
similarity index 54%
rename from dotnet/src/Microsoft.AutoGen.Agents/Abstractions/IHandle.cs
rename to dotnet/src/Microsoft.AutoGen/Abstractions/IHandle.cs
index f91a32736..4465d8889 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Abstractions/IHandle.cs
+++ b/dotnet/src/Microsoft.AutoGen/Abstractions/IHandle.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.AutoGen.Agents.Abstractions;
+namespace Microsoft.AutoGen.Abstractions;
public interface IHandle<T>
{
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Abstractions/MessageExtensions.cs b/dotnet/src/Microsoft.AutoGen/Abstractions/MessageExtensions.cs
similarity index 92%
rename from dotnet/src/Microsoft.AutoGen.Agents/Abstractions/MessageExtensions.cs
rename to dotnet/src/Microsoft.AutoGen/Abstractions/MessageExtensions.cs
index ca002abe2..724a706b1 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Abstractions/MessageExtensions.cs
+++ b/dotnet/src/Microsoft.AutoGen/Abstractions/MessageExtensions.cs
@@ -1,7 +1,7 @@
using Google.Protobuf;
using Google.Protobuf.WellKnownTypes;
-namespace Microsoft.AutoGen.Agents.Abstractions;
+namespace Microsoft.AutoGen.Abstractions;
public static class MessageExtensions
{
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Abstractions/Microsoft.AutoGen.Agents.Abstractions.csproj b/dotnet/src/Microsoft.AutoGen/Abstractions/Microsoft.AutoGen.Abstractions.csproj
similarity index 100%
rename from dotnet/src/Microsoft.AutoGen.Agents/Abstractions/Microsoft.AutoGen.Agents.Abstractions.csproj
rename to dotnet/src/Microsoft.AutoGen/Abstractions/Microsoft.AutoGen.Abstractions.csproj
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Abstractions/TopicSubscriptionAttribute.cs b/dotnet/src/Microsoft.AutoGen/Abstractions/TopicSubscriptionAttribute.cs
similarity index 75%
rename from dotnet/src/Microsoft.AutoGen.Agents/Abstractions/TopicSubscriptionAttribute.cs
rename to dotnet/src/Microsoft.AutoGen/Abstractions/TopicSubscriptionAttribute.cs
index 00365ab5f..7651c78ca 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Abstractions/TopicSubscriptionAttribute.cs
+++ b/dotnet/src/Microsoft.AutoGen/Abstractions/TopicSubscriptionAttribute.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.AutoGen.Agents.Abstractions;
+namespace Microsoft.AutoGen.Abstractions;
[AttributeUsage(AttributeTargets.All)]
public class TopicSubscriptionAttribute(string topic) : Attribute
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Client/AgentBase.cs b/dotnet/src/Microsoft.AutoGen/Agents/AgentBase.cs
similarity index 98%
rename from dotnet/src/Microsoft.AutoGen.Agents/Client/AgentBase.cs
rename to dotnet/src/Microsoft.AutoGen/Agents/AgentBase.cs
index 9171b548b..6307988a4 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Client/AgentBase.cs
+++ b/dotnet/src/Microsoft.AutoGen/Agents/AgentBase.cs
@@ -3,10 +3,10 @@ using System.Text;
using System.Text.Json;
using System.Threading.Channels;
using Google.Protobuf;
-using Microsoft.AutoGen.Agents.Abstractions;
+using Microsoft.AutoGen.Abstractions;
using Microsoft.Extensions.Logging;
-namespace Microsoft.AutoGen.Agents.Client;
+namespace Microsoft.AutoGen.Agents;
public abstract class AgentBase
{
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Client/AgentBaseExtensions.cs b/dotnet/src/Microsoft.AutoGen/Agents/AgentBaseExtensions.cs
similarity index 99%
rename from dotnet/src/Microsoft.AutoGen.Agents/Client/AgentBaseExtensions.cs
rename to dotnet/src/Microsoft.AutoGen/Agents/AgentBaseExtensions.cs
index 126b02df1..19352ea69 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Client/AgentBaseExtensions.cs
+++ b/dotnet/src/Microsoft.AutoGen/Agents/AgentBaseExtensions.cs
@@ -1,6 +1,6 @@
using System.Diagnostics;
-namespace Microsoft.AutoGen.Agents.Client;
+namespace Microsoft.AutoGen.Agents;
public static class AgentBaseExtensions
{
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Client/AgentClient.cs b/dotnet/src/Microsoft.AutoGen/Agents/AgentClient.cs
similarity index 95%
rename from dotnet/src/Microsoft.AutoGen.Agents/Client/AgentClient.cs
rename to dotnet/src/Microsoft.AutoGen/Agents/AgentClient.cs
index 00518d3ce..9611a5038 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Client/AgentClient.cs
+++ b/dotnet/src/Microsoft.AutoGen/Agents/AgentClient.cs
@@ -1,10 +1,10 @@
using System.Diagnostics;
using Google.Protobuf;
-using Microsoft.AutoGen.Agents.Abstractions;
+using Microsoft.AutoGen.Abstractions;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-namespace Microsoft.AutoGen.Agents.Client;
+namespace Microsoft.AutoGen.Agents;
public sealed class AgentClient(ILogger<AgentClient> logger, AgentWorkerRuntime runtime, DistributedContextPropagator distributedContextPropagator,
[FromKeyedServices("EventTypes")] EventTypes eventTypes)
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Client/AgentContext.cs b/dotnet/src/Microsoft.AutoGen/Agents/AgentContext.cs
similarity index 92%
rename from dotnet/src/Microsoft.AutoGen.Agents/Client/AgentContext.cs
rename to dotnet/src/Microsoft.AutoGen/Agents/AgentContext.cs
index 0d28cf37d..43d1137c8 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Client/AgentContext.cs
+++ b/dotnet/src/Microsoft.AutoGen/Agents/AgentContext.cs
@@ -1,8 +1,8 @@
using System.Diagnostics;
-using Microsoft.AutoGen.Agents.Abstractions;
+using Microsoft.AutoGen.Abstractions;
using Microsoft.Extensions.Logging;
-namespace Microsoft.AutoGen.Agents.Client;
+namespace Microsoft.AutoGen.Agents;
internal sealed class AgentContext(AgentId agentId, AgentWorkerRuntime runtime, ILogger<AgentBase> logger, DistributedContextPropagator distributedContextPropagator) : IAgentContext
{
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Client/AgentId.cs b/dotnet/src/Microsoft.AutoGen/Agents/AgentId.cs
similarity index 77%
rename from dotnet/src/Microsoft.AutoGen.Agents/Client/AgentId.cs
rename to dotnet/src/Microsoft.AutoGen/Agents/AgentId.cs
index 7059196ac..da771c47d 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Client/AgentId.cs
+++ b/dotnet/src/Microsoft.AutoGen/Agents/AgentId.cs
@@ -1,6 +1,6 @@
-using RpcAgentId = Microsoft.AutoGen.Agents.Abstractions.AgentId;
+using RpcAgentId = Microsoft.AutoGen.Abstractions.AgentId;
-namespace Microsoft.AutoGen.Agents.Client;
+namespace Microsoft.AutoGen.Agents;
public sealed record class AgentId(string Type, string Key)
{
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Client/AgentWorkerRuntime.cs b/dotnet/src/Microsoft.AutoGen/Agents/AgentWorkerRuntime.cs
similarity index 99%
rename from dotnet/src/Microsoft.AutoGen.Agents/Client/AgentWorkerRuntime.cs
rename to dotnet/src/Microsoft.AutoGen/Agents/AgentWorkerRuntime.cs
index 8fe2d8b1c..cefadf7b5 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Client/AgentWorkerRuntime.cs
+++ b/dotnet/src/Microsoft.AutoGen/Agents/AgentWorkerRuntime.cs
@@ -3,12 +3,12 @@ using System.Diagnostics;
using System.Reflection;
using System.Threading.Channels;
using Grpc.Core;
-using Microsoft.AutoGen.Agents.Abstractions;
+using Microsoft.AutoGen.Abstractions;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
-namespace Microsoft.AutoGen.Agents.Client;
+namespace Microsoft.AutoGen.Agents;
public sealed class AgentWorkerRuntime : IHostedService, IDisposable, IAgentWorkerRuntime
{
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/AIAgent/AiAgent.cs b/dotnet/src/Microsoft.AutoGen/Agents/Agents/AIAgent/AiAgent.cs
similarity index 98%
rename from dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/AIAgent/AiAgent.cs
rename to dotnet/src/Microsoft.AutoGen/Agents/Agents/AIAgent/AiAgent.cs
index 42ce97458..d5b4675e8 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/AIAgent/AiAgent.cs
+++ b/dotnet/src/Microsoft.AutoGen/Agents/Agents/AIAgent/AiAgent.cs
@@ -6,7 +6,7 @@ using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Connectors.OpenAI;
using Microsoft.SemanticKernel.Memory;
-namespace Microsoft.AutoGen.Agents.Client;
+namespace Microsoft.AutoGen.Agents;
public abstract class AiAgent<T> : AgentBase where T : class, new()
{
protected AgentState<T> _state;
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/IOAgent/ConsoleAgent/ConsoleAgent.cs b/dotnet/src/Microsoft.AutoGen/Agents/Agents/IOAgent/ConsoleAgent/ConsoleAgent.cs
similarity index 94%
rename from dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/IOAgent/ConsoleAgent/ConsoleAgent.cs
rename to dotnet/src/Microsoft.AutoGen/Agents/Agents/IOAgent/ConsoleAgent/ConsoleAgent.cs
index 5ebefba8b..c6e9f4392 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/IOAgent/ConsoleAgent/ConsoleAgent.cs
+++ b/dotnet/src/Microsoft.AutoGen/Agents/Agents/IOAgent/ConsoleAgent/ConsoleAgent.cs
@@ -1,7 +1,7 @@
-using Microsoft.AutoGen.Agents.Abstractions;
+using Microsoft.AutoGen.Abstractions;
using Microsoft.Extensions.DependencyInjection;
-namespace Microsoft.AutoGen.Agents.Client;
+namespace Microsoft.AutoGen.Agents;
public abstract class ConsoleAgent : IOAgent<AgentState>,
IUseConsole,
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/IOAgent/FileAgent/FileAgent.cs b/dotnet/src/Microsoft.AutoGen/Agents/Agents/IOAgent/FileAgent/FileAgent.cs
similarity index 95%
rename from dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/IOAgent/FileAgent/FileAgent.cs
rename to dotnet/src/Microsoft.AutoGen/Agents/Agents/IOAgent/FileAgent/FileAgent.cs
index 12965b432..f8bf46304 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/IOAgent/FileAgent/FileAgent.cs
+++ b/dotnet/src/Microsoft.AutoGen/Agents/Agents/IOAgent/FileAgent/FileAgent.cs
@@ -1,8 +1,8 @@
-using Microsoft.AutoGen.Agents.Abstractions;
+using Microsoft.AutoGen.Abstractions;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-namespace Microsoft.AutoGen.Agents.Client;
+namespace Microsoft.AutoGen.Agents;
[TopicSubscription("FileIO")]
public abstract class FileAgent(
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/IOAgent/IOAgent.cs b/dotnet/src/Microsoft.AutoGen/Agents/Agents/IOAgent/IOAgent.cs
similarity index 90%
rename from dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/IOAgent/IOAgent.cs
rename to dotnet/src/Microsoft.AutoGen/Agents/Agents/IOAgent/IOAgent.cs
index a49082bf1..7d1438720 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/IOAgent/IOAgent.cs
+++ b/dotnet/src/Microsoft.AutoGen/Agents/Agents/IOAgent/IOAgent.cs
@@ -1,6 +1,6 @@
-using Microsoft.AutoGen.Agents.Abstractions;
+using Microsoft.AutoGen.Abstractions;
-namespace Microsoft.AutoGen.Agents.Client;
+namespace Microsoft.AutoGen.Agents;
public abstract class IOAgent<T> : AgentBase where T : class, new()
{
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/IOAgent/WebAPIAgent/WebAPIAgent.cs b/dotnet/src/Microsoft.AutoGen/Agents/Agents/IOAgent/WebAPIAgent/WebAPIAgent.cs
similarity index 96%
rename from dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/IOAgent/WebAPIAgent/WebAPIAgent.cs
rename to dotnet/src/Microsoft.AutoGen/Agents/Agents/IOAgent/WebAPIAgent/WebAPIAgent.cs
index 49babfdf5..47d107d63 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/IOAgent/WebAPIAgent/WebAPIAgent.cs
+++ b/dotnet/src/Microsoft.AutoGen/Agents/Agents/IOAgent/WebAPIAgent/WebAPIAgent.cs
@@ -1,10 +1,10 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http;
-using Microsoft.AutoGen.Agents.Abstractions;
+using Microsoft.AutoGen.Abstractions;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-namespace Microsoft.AutoGen.Agents.Client;
+namespace Microsoft.AutoGen.Agents;
public abstract class WebAPIAgent : IOAgent<AgentState>,
IUseWebAPI,
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Client/App.cs b/dotnet/src/Microsoft.AutoGen/Agents/App.cs
similarity index 97%
rename from dotnet/src/Microsoft.AutoGen.Agents/Client/App.cs
rename to dotnet/src/Microsoft.AutoGen/Agents/App.cs
index cb25863d6..4a246f5dd 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Client/App.cs
+++ b/dotnet/src/Microsoft.AutoGen/Agents/App.cs
@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
-namespace Microsoft.AutoGen.Agents.Client;
+namespace Microsoft.AutoGen.Agents;
public static class App
{
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Client/HostBuilderExtensions.cs b/dotnet/src/Microsoft.AutoGen/Agents/HostBuilderExtensions.cs
similarity index 98%
rename from dotnet/src/Microsoft.AutoGen.Agents/Client/HostBuilderExtensions.cs
rename to dotnet/src/Microsoft.AutoGen/Agents/HostBuilderExtensions.cs
index 76c10b577..0e29195bf 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Client/HostBuilderExtensions.cs
+++ b/dotnet/src/Microsoft.AutoGen/Agents/HostBuilderExtensions.cs
@@ -5,12 +5,12 @@ using Google.Protobuf;
using Google.Protobuf.Reflection;
using Grpc.Core;
using Grpc.Net.Client.Configuration;
-using Microsoft.AutoGen.Agents.Abstractions;
+using Microsoft.AutoGen.Abstractions;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Hosting;
-namespace Microsoft.AutoGen.Agents.Client;
+namespace Microsoft.AutoGen.Agents;
public static class HostBuilderExtensions
{
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Client/IAgentContext.cs b/dotnet/src/Microsoft.AutoGen/Agents/IAgentContext.cs
similarity index 84%
rename from dotnet/src/Microsoft.AutoGen.Agents/Client/IAgentContext.cs
rename to dotnet/src/Microsoft.AutoGen/Agents/IAgentContext.cs
index fc9093aec..a7911e37e 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Client/IAgentContext.cs
+++ b/dotnet/src/Microsoft.AutoGen/Agents/IAgentContext.cs
@@ -1,8 +1,8 @@
using System.Diagnostics;
-using Microsoft.AutoGen.Agents.Abstractions;
+using Microsoft.AutoGen.Abstractions;
using Microsoft.Extensions.Logging;
-namespace Microsoft.AutoGen.Agents.Client;
+namespace Microsoft.AutoGen.Agents;
public interface IAgentContext
{
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Client/IAgentWorkerRuntime.cs b/dotnet/src/Microsoft.AutoGen/Agents/IAgentWorkerRuntime.cs
similarity index 72%
rename from dotnet/src/Microsoft.AutoGen.Agents/Client/IAgentWorkerRuntime.cs
rename to dotnet/src/Microsoft.AutoGen/Agents/IAgentWorkerRuntime.cs
index 40213ebc7..ee1f6e4e2 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Client/IAgentWorkerRuntime.cs
+++ b/dotnet/src/Microsoft.AutoGen/Agents/IAgentWorkerRuntime.cs
@@ -1,8 +1,8 @@
// Copyright (c) Microsoft. All rights reserved.
-using Microsoft.AutoGen.Agents.Abstractions;
+using Microsoft.AutoGen.Abstractions;
-namespace Microsoft.AutoGen.Agents.Client;
+namespace Microsoft.AutoGen.Agents;
public interface IAgentWorkerRuntime
{
ValueTask PublishEvent(CloudEvent evt);
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Client/Microsoft.AutoGen.Agents.Client.csproj b/dotnet/src/Microsoft.AutoGen/Agents/Microsoft.AutoGen.Agents.csproj
similarity index 86%
rename from dotnet/src/Microsoft.AutoGen.Agents/Client/Microsoft.AutoGen.Agents.Client.csproj
rename to dotnet/src/Microsoft.AutoGen/Agents/Microsoft.AutoGen.Agents.csproj
index 3ea992e00..60b0bd4a9 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Client/Microsoft.AutoGen.Agents.Client.csproj
+++ b/dotnet/src/Microsoft.AutoGen/Agents/Microsoft.AutoGen.Agents.csproj
@@ -12,8 +12,8 @@
</PropertyGroup>
<ItemGroup>
- <ProjectReference Include="../Abstractions/Microsoft.AutoGen.Agents.Abstractions.csproj" />
- <ProjectReference Include="..\Runtime\Microsoft.AutoGen.Agents.Runtime.csproj" />
+ <ProjectReference Include="../Abstractions/Microsoft.AutoGen.Abstractions.csproj" />
+ <ProjectReference Include="..\Runtime\Microsoft.AutoGen.Runtime.csproj" />
</ItemGroup>
<ItemGroup>
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Extensions/CloudEvents/CloudEventExtensions.cs b/dotnet/src/Microsoft.AutoGen/Extensions/CloudEvents/CloudEventExtensions.cs
similarity index 86%
rename from dotnet/src/Microsoft.AutoGen.Agents/Extensions/CloudEvents/CloudEventExtensions.cs
rename to dotnet/src/Microsoft.AutoGen/Extensions/CloudEvents/CloudEventExtensions.cs
index e90d9b09c..313a0f50f 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Extensions/CloudEvents/CloudEventExtensions.cs
+++ b/dotnet/src/Microsoft.AutoGen/Extensions/CloudEvents/CloudEventExtensions.cs
@@ -1,8 +1,8 @@
using Google.Protobuf;
using Google.Protobuf.WellKnownTypes;
-using Microsoft.AutoGen.Agents.Abstractions;
+using Microsoft.AutoGen.Abstractions;
-namespace Microsoft.AutoGen.Agents.Runtime;
+namespace Microsoft.AutoGen.Runtime;
public static class CloudEventExtensions
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Extensions/CloudEvents/Microsoft.AutoGen.Agents.Extensions.CloudEvents.csproj b/dotnet/src/Microsoft.AutoGen/Extensions/CloudEvents/Microsoft.AutoGen.Extensions.CloudEvents.csproj
similarity index 73%
rename from dotnet/src/Microsoft.AutoGen.Agents/Extensions/CloudEvents/Microsoft.AutoGen.Agents.Extensions.CloudEvents.csproj
rename to dotnet/src/Microsoft.AutoGen/Extensions/CloudEvents/Microsoft.AutoGen.Extensions.CloudEvents.csproj
index 89fcc1b77..45186a670 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Extensions/CloudEvents/Microsoft.AutoGen.Agents.Extensions.CloudEvents.csproj
+++ b/dotnet/src/Microsoft.AutoGen/Extensions/CloudEvents/Microsoft.AutoGen.Extensions.CloudEvents.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
- <ProjectReference Include="../../../Microsoft.AutoGen.Agents/Client/Microsoft.AutoGen.Agents.Client.csproj" />
+ <ProjectReference Include="../../Agents/Microsoft.AutoGen.Agents.csproj" />
</ItemGroup>
<PropertyGroup>
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Extensions/CloudEvents/Protos/states.proto b/dotnet/src/Microsoft.AutoGen/Extensions/CloudEvents/Protos/states.proto
similarity index 54%
rename from dotnet/src/Microsoft.AutoGen.Agents/Extensions/CloudEvents/Protos/states.proto
rename to dotnet/src/Microsoft.AutoGen/Extensions/CloudEvents/Protos/states.proto
index 8e0981396..315a9c614 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Extensions/CloudEvents/Protos/states.proto
+++ b/dotnet/src/Microsoft.AutoGen/Extensions/CloudEvents/Protos/states.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
package devteam;
-option csharp_namespace = "Microsoft.AutoGen.Agents.Extensions.CloudEvents";
+option csharp_namespace = "Microsoft.AutoGen.Extensions.CloudEvents";
message CloudEventsState {
string cloudevent = 1;
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj b/dotnet/src/Microsoft.AutoGen/Extensions/SemanticKernel/Microsoft.AutoGen.Extensions.SemanticKernel.csproj
similarity index 82%
rename from dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj
rename to dotnet/src/Microsoft.AutoGen/Extensions/SemanticKernel/Microsoft.AutoGen.Extensions.SemanticKernel.csproj
index 03f5602fe..9f3f44230 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj
+++ b/dotnet/src/Microsoft.AutoGen/Extensions/SemanticKernel/Microsoft.AutoGen.Extensions.SemanticKernel.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
- <ProjectReference Include="../../../Microsoft.AutoGen.Agents/Client/Microsoft.AutoGen.Agents.Client.csproj" />
+ <ProjectReference Include="../../Agents/Microsoft.AutoGen.Agents.csproj" />
</ItemGroup>
<PropertyGroup>
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/Options/OpenAIOptions.cs b/dotnet/src/Microsoft.AutoGen/Extensions/SemanticKernel/Options/OpenAIOptions.cs
similarity index 93%
rename from dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/Options/OpenAIOptions.cs
rename to dotnet/src/Microsoft.AutoGen/Extensions/SemanticKernel/Options/OpenAIOptions.cs
index a2ac92c3b..2db5cb14b 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/Options/OpenAIOptions.cs
+++ b/dotnet/src/Microsoft.AutoGen/Extensions/SemanticKernel/Options/OpenAIOptions.cs
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
-namespace Microsoft.AutoGen.Agents.Extensions.SemanticKernel;
+namespace Microsoft.AutoGen.Extensions.SemanticKernel;
public class OpenAIOptions
{
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/Options/QdrantOptions.cs b/dotnet/src/Microsoft.AutoGen/Extensions/SemanticKernel/Options/QdrantOptions.cs
similarity index 80%
rename from dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/Options/QdrantOptions.cs
rename to dotnet/src/Microsoft.AutoGen/Extensions/SemanticKernel/Options/QdrantOptions.cs
index 6149aa423..b5f61657f 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/Options/QdrantOptions.cs
+++ b/dotnet/src/Microsoft.AutoGen/Extensions/SemanticKernel/Options/QdrantOptions.cs
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
-namespace Microsoft.AutoGen.Agents.Extensions.SemanticKernel;
+namespace Microsoft.AutoGen.Extensions.SemanticKernel;
public class QdrantOptions
{
[Required]
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/SemanticKernelHostingExtensions.cs b/dotnet/src/Microsoft.AutoGen/Extensions/SemanticKernel/SemanticKernelHostingExtensions.cs
similarity index 98%
rename from dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/SemanticKernelHostingExtensions.cs
rename to dotnet/src/Microsoft.AutoGen/Extensions/SemanticKernel/SemanticKernelHostingExtensions.cs
index 9b83acf1f..f9e1db0de 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/SemanticKernelHostingExtensions.cs
+++ b/dotnet/src/Microsoft.AutoGen/Extensions/SemanticKernel/SemanticKernelHostingExtensions.cs
@@ -12,7 +12,7 @@ using Microsoft.SemanticKernel.Connectors.OpenAI;
using Microsoft.SemanticKernel.Connectors.Qdrant;
using Microsoft.SemanticKernel.Memory;
-namespace Microsoft.AutoGen.Agents.Extensions.SemanticKernel;
+namespace Microsoft.AutoGen.Extensions.SemanticKernel;
public static class SemanticKernelHostingExtensions
{
public static IHostApplicationBuilder ConfigureSemanticKernel(this IHostApplicationBuilder builder)
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Runtime/AgentStateGrain.cs b/dotnet/src/Microsoft.AutoGen/Runtime/AgentStateGrain.cs
similarity index 93%
rename from dotnet/src/Microsoft.AutoGen.Agents/Runtime/AgentStateGrain.cs
rename to dotnet/src/Microsoft.AutoGen/Runtime/AgentStateGrain.cs
index c21e26e2b..d717e26f4 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Runtime/AgentStateGrain.cs
+++ b/dotnet/src/Microsoft.AutoGen/Runtime/AgentStateGrain.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.AutoGen.Agents.Runtime;
+namespace Microsoft.AutoGen.Runtime;
internal sealed class AgentStateGrain([PersistentState("state", "agent-state")] IPersistentState<Dictionary<string, object>> state) : Grain, IAgentStateGrain
{
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Runtime/AgentWorkerHostingExtensions.cs b/dotnet/src/Microsoft.AutoGen/Runtime/AgentWorkerHostingExtensions.cs
similarity index 97%
rename from dotnet/src/Microsoft.AutoGen.Agents/Runtime/AgentWorkerHostingExtensions.cs
rename to dotnet/src/Microsoft.AutoGen/Runtime/AgentWorkerHostingExtensions.cs
index 3e92e43d7..48e911f35 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Runtime/AgentWorkerHostingExtensions.cs
+++ b/dotnet/src/Microsoft.AutoGen/Runtime/AgentWorkerHostingExtensions.cs
@@ -7,7 +7,7 @@ using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Hosting;
using Orleans.Serialization;
-namespace Microsoft.AutoGen.Agents.Runtime;
+namespace Microsoft.AutoGen.Runtime;
public static class AgentWorkerHostingExtensions
{
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Runtime/AgentWorkerRegistryGrain.cs b/dotnet/src/Microsoft.AutoGen/Runtime/AgentWorkerRegistryGrain.cs
similarity index 98%
rename from dotnet/src/Microsoft.AutoGen.Agents/Runtime/AgentWorkerRegistryGrain.cs
rename to dotnet/src/Microsoft.AutoGen/Runtime/AgentWorkerRegistryGrain.cs
index 5b65b3595..c9b51813b 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Runtime/AgentWorkerRegistryGrain.cs
+++ b/dotnet/src/Microsoft.AutoGen/Runtime/AgentWorkerRegistryGrain.cs
@@ -1,6 +1,6 @@
-using Microsoft.AutoGen.Agents.Abstractions;
+using Microsoft.AutoGen.Abstractions;
-namespace Microsoft.AutoGen.Agents.Runtime;
+namespace Microsoft.AutoGen.Runtime;
public sealed class AgentWorkerRegistryGrain : Grain, IAgentWorkerRegistryGrain
{
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Runtime/Host.cs b/dotnet/src/Microsoft.AutoGen/Runtime/Host.cs
similarity index 92%
rename from dotnet/src/Microsoft.AutoGen.Agents/Runtime/Host.cs
rename to dotnet/src/Microsoft.AutoGen/Runtime/Host.cs
index f80f79aec..b5faf367d 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Runtime/Host.cs
+++ b/dotnet/src/Microsoft.AutoGen/Runtime/Host.cs
@@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.Hosting;
-namespace Microsoft.AutoGen.Agents.Runtime;
+namespace Microsoft.AutoGen.Runtime;
public static class Host
{
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Runtime/IAgentStateGrain.cs b/dotnet/src/Microsoft.AutoGen/Runtime/IAgentStateGrain.cs
similarity index 83%
rename from dotnet/src/Microsoft.AutoGen.Agents/Runtime/IAgentStateGrain.cs
rename to dotnet/src/Microsoft.AutoGen/Runtime/IAgentStateGrain.cs
index d8a11c236..b5ece3ad6 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Runtime/IAgentStateGrain.cs
+++ b/dotnet/src/Microsoft.AutoGen/Runtime/IAgentStateGrain.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.AutoGen.Agents.Runtime;
+namespace Microsoft.AutoGen.Runtime;
internal interface IAgentStateGrain : IGrainWithStringKey
{
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Runtime/IAgentWorkerRegistryGrain.cs b/dotnet/src/Microsoft.AutoGen/Runtime/IAgentWorkerRegistryGrain.cs
similarity index 81%
rename from dotnet/src/Microsoft.AutoGen.Agents/Runtime/IAgentWorkerRegistryGrain.cs
rename to dotnet/src/Microsoft.AutoGen/Runtime/IAgentWorkerRegistryGrain.cs
index 72ff23e18..94d99dcaa 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Runtime/IAgentWorkerRegistryGrain.cs
+++ b/dotnet/src/Microsoft.AutoGen/Runtime/IAgentWorkerRegistryGrain.cs
@@ -1,6 +1,6 @@
-using Microsoft.AutoGen.Agents.Abstractions;
+using Microsoft.AutoGen.Abstractions;
-namespace Microsoft.AutoGen.Agents.Runtime;
+namespace Microsoft.AutoGen.Runtime;
public interface IAgentWorkerRegistryGrain : IGrainWithIntegerKey
{
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Runtime/IWorkerGateway.cs b/dotnet/src/Microsoft.AutoGen/Runtime/IWorkerGateway.cs
similarity index 64%
rename from dotnet/src/Microsoft.AutoGen.Agents/Runtime/IWorkerGateway.cs
rename to dotnet/src/Microsoft.AutoGen/Runtime/IWorkerGateway.cs
index 5483ad735..c48c0fa8a 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Runtime/IWorkerGateway.cs
+++ b/dotnet/src/Microsoft.AutoGen/Runtime/IWorkerGateway.cs
@@ -1,7 +1,7 @@
-using Microsoft.AutoGen.Agents.Abstractions;
+using Microsoft.AutoGen.Abstractions;
-namespace Microsoft.AutoGen.Agents.Runtime;
+namespace Microsoft.AutoGen.Runtime;
public interface IWorkerGateway : IGrainObserver
{
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Runtime/Microsoft.AutoGen.Agents.Runtime.csproj b/dotnet/src/Microsoft.AutoGen/Runtime/Microsoft.AutoGen.Runtime.csproj
similarity index 84%
rename from dotnet/src/Microsoft.AutoGen.Agents/Runtime/Microsoft.AutoGen.Agents.Runtime.csproj
rename to dotnet/src/Microsoft.AutoGen/Runtime/Microsoft.AutoGen.Runtime.csproj
index 1d2400522..37e1bd292 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Runtime/Microsoft.AutoGen.Agents.Runtime.csproj
+++ b/dotnet/src/Microsoft.AutoGen/Runtime/Microsoft.AutoGen.Runtime.csproj
@@ -13,8 +13,8 @@
</PropertyGroup>
<ItemGroup>
- <ProjectReference Include="..\Abstractions\Microsoft.AutoGen.Agents.Abstractions.csproj" />
- <ProjectReference Include="..\..\Microsoft.AutoGen.ServiceDefaults\Microsoft.AutoGen.ServiceDefaults.csproj" />
+ <ProjectReference Include="..\Abstractions\Microsoft.AutoGen.Abstractions.csproj" />
+ <ProjectReference Include="..\ServiceDefaults\Microsoft.AutoGen.ServiceDefaults.csproj" />
</ItemGroup>
<ItemGroup>
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Runtime/WorkerGateway.cs b/dotnet/src/Microsoft.AutoGen/Runtime/WorkerGateway.cs
similarity index 99%
rename from dotnet/src/Microsoft.AutoGen.Agents/Runtime/WorkerGateway.cs
rename to dotnet/src/Microsoft.AutoGen/Runtime/WorkerGateway.cs
index 1d3af9f5a..6cb26bc1c 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Runtime/WorkerGateway.cs
+++ b/dotnet/src/Microsoft.AutoGen/Runtime/WorkerGateway.cs
@@ -1,10 +1,10 @@
using System.Collections.Concurrent;
using Grpc.Core;
-using Microsoft.AutoGen.Agents.Abstractions;
+using Microsoft.AutoGen.Abstractions;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
-namespace Microsoft.AutoGen.Agents.Runtime;
+namespace Microsoft.AutoGen.Runtime;
internal sealed class WorkerGateway : BackgroundService, IWorkerGateway
{
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Runtime/WorkerGatewayService.cs b/dotnet/src/Microsoft.AutoGen/Runtime/WorkerGatewayService.cs
similarity index 83%
rename from dotnet/src/Microsoft.AutoGen.Agents/Runtime/WorkerGatewayService.cs
rename to dotnet/src/Microsoft.AutoGen/Runtime/WorkerGatewayService.cs
index c0fb13078..19560b836 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Runtime/WorkerGatewayService.cs
+++ b/dotnet/src/Microsoft.AutoGen/Runtime/WorkerGatewayService.cs
@@ -1,7 +1,7 @@
using Grpc.Core;
-using Microsoft.AutoGen.Agents.Abstractions;
+using Microsoft.AutoGen.Abstractions;
-namespace Microsoft.AutoGen.Agents.Runtime;
+namespace Microsoft.AutoGen.Runtime;
// gRPC service which handles communication between the agent worker and the cluster.
internal sealed class WorkerGatewayService(WorkerGateway agentWorker) : AgentRpc.AgentRpcBase
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Runtime/WorkerProcessConnection.cs b/dotnet/src/Microsoft.AutoGen/Runtime/WorkerProcessConnection.cs
similarity index 97%
rename from dotnet/src/Microsoft.AutoGen.Agents/Runtime/WorkerProcessConnection.cs
rename to dotnet/src/Microsoft.AutoGen/Runtime/WorkerProcessConnection.cs
index 23febaaa4..bd69c7905 100644
--- a/dotnet/src/Microsoft.AutoGen.Agents/Runtime/WorkerProcessConnection.cs
+++ b/dotnet/src/Microsoft.AutoGen/Runtime/WorkerProcessConnection.cs
@@ -1,8 +1,8 @@
using System.Threading.Channels;
using Grpc.Core;
-using Microsoft.AutoGen.Agents.Abstractions;
+using Microsoft.AutoGen.Abstractions;
-namespace Microsoft.AutoGen.Agents.Runtime;
+namespace Microsoft.AutoGen.Runtime;
internal sealed class WorkerProcessConnection : IAsyncDisposable
{
diff --git a/dotnet/src/Microsoft.AutoGen.ServiceDefaults/Extensions.cs b/dotnet/src/Microsoft.AutoGen/ServiceDefaults/Extensions.cs
similarity index 100%
rename from dotnet/src/Microsoft.AutoGen.ServiceDefaults/Extensions.cs
rename to dotnet/src/Microsoft.AutoGen/ServiceDefaults/Extensions.cs
diff --git a/dotnet/src/Microsoft.AutoGen.ServiceDefaults/Microsoft.AutoGen.ServiceDefaults.csproj b/dotnet/src/Microsoft.AutoGen/ServiceDefaults/Microsoft.AutoGen.ServiceDefaults.csproj
similarity index 100%
rename from dotnet/src/Microsoft.AutoGen.ServiceDefaults/Microsoft.AutoGen.ServiceDefaults.csproj
rename to dotnet/src/Microsoft.AutoGen/ServiceDefaults/Microsoft.AutoGen.ServiceDefaults.csproj
diff --git a/protos/agent_events.proto b/protos/agent_events.proto
index 6384a7e3b..19b41482e 100644
--- a/protos/agent_events.proto
+++ b/protos/agent_events.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
package agents;
-option csharp_namespace = "Microsoft.AutoGen.Agents.Abstractions";
+option csharp_namespace = "Microsoft.AutoGen.Abstractions";
message Input {
string message = 1;
diff --git a/protos/agent_states.proto b/protos/agent_states.proto
index 2c86778d4..5a51c0c8c 100644
--- a/protos/agent_states.proto
+++ b/protos/agent_states.proto
@@ -1,7 +1,7 @@
syntax = "proto3";
package agents;
-option csharp_namespace = "Microsoft.AutoGen.Agents.Abstractions";
+option csharp_namespace = "Microsoft.AutoGen.Abstractions";
message AgentState {
string message = 1;
diff --git a/protos/agent_worker.proto b/protos/agent_worker.proto
index 69e51211b..ec472923b 100644
--- a/protos/agent_worker.proto
+++ b/protos/agent_worker.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
package agents;
-option csharp_namespace = "Microsoft.AutoGen.Agents.Abstractions";
+option csharp_namespace = "Microsoft.AutoGen.Abstractions";
import "cloudevent.proto";
import "google/protobuf/any.proto";
diff --git a/protos/cloudevent.proto b/protos/cloudevent.proto
index f710ee874..e4b4aeb1b 100644
--- a/protos/cloudevent.proto
+++ b/protos/cloudevent.proto
@@ -5,7 +5,7 @@ package cloudevent;
import "google/protobuf/any.proto";
import "google/protobuf/timestamp.proto";
-option csharp_namespace = "Microsoft.AutoGen.Agents.Abstractions";
+option csharp_namespace = "Microsoft.AutoGen.Abstractions";
message CloudEvent {
diff --git a/python/packages/autogen-core/src/autogen_core/application/protos/agent_worker_pb2.py b/python/packages/autogen-core/src/autogen_core/application/protos/agent_worker_pb2.py
index 01b141eaf..cfbc0522b 100644
--- a/python/packages/autogen-core/src/autogen_core/application/protos/agent_worker_pb2.py
+++ b/python/packages/autogen-core/src/autogen_core/application/protos/agent_worker_pb2.py
@@ -16,14 +16,14 @@ import cloudevent_pb2 as cloudevent__pb2
from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x12\x61gent_worker.proto\x12\x06\x61gents\x1a\x10\x63loudevent.proto\x1a\x19google/protobuf/any.proto\"\'\n\x07TopicId\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\x0e\n\x06source\x18\x02 \x01(\t\"$\n\x07\x41gentId\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\x0b\n\x03key\x18\x02 \x01(\t\"E\n\x07Payload\x12\x11\n\tdata_type\x18\x01 \x01(\t\x12\x19\n\x11\x64\x61ta_content_type\x18\x02 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\"\x89\x02\n\nRpcRequest\x12\x12\n\nrequest_id\x18\x01 \x01(\t\x12$\n\x06source\x18\x02 \x01(\x0b\x32\x0f.agents.AgentIdH\x00\x88\x01\x01\x12\x1f\n\x06target\x18\x03 \x01(\x0b\x32\x0f.agents.AgentId\x12\x0e\n\x06method\x18\x04 \x01(\t\x12 \n\x07payload\x18\x05 \x01(\x0b\x32\x0f.agents.Payload\x12\x32\n\x08metadata\x18\x06 \x03(\x0b\x32 .agents.RpcRequest.MetadataEntry\x1a/\n\rMetadataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x42\t\n\x07_source\"\xb8\x01\n\x0bRpcResponse\x12\x12\n\nrequest_id\x18\x01 \x01(\t\x12 \n\x07payload\x18\x02 \x01(\x0b\x32\x0f.agents.Payload\x12\r\n\x05\x65rror\x18\x03 \x01(\t\x12\x33\n\x08metadata\x18\x04 \x03(\x0b\x32!.agents.RpcResponse.MetadataEntry\x1a/\n\rMetadataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xe4\x01\n\x05\x45vent\x12\x12\n\ntopic_type\x18\x01 \x01(\t\x12\x14\n\x0ctopic_source\x18\x02 \x01(\t\x12$\n\x06source\x18\x03 \x01(\x0b\x32\x0f.agents.AgentIdH\x00\x88\x01\x01\x12 \n\x07payload\x18\x04 \x01(\x0b\x32\x0f.agents.Payload\x12-\n\x08metadata\x18\x05 \x03(\x0b\x32\x1b.agents.Event.MetadataEntry\x1a/\n\rMetadataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x42\t\n\x07_source\"<\n\x18RegisterAgentTypeRequest\x12\x12\n\nrequest_id\x18\x01 \x01(\t\x12\x0c\n\x04type\x18\x02 \x01(\t\"^\n\x19RegisterAgentTypeResponse\x12\x12\n\nrequest_id\x18\x01 \x01(\t\x12\x0f\n\x07success\x18\x02 \x01(\x08\x12\x12\n\x05\x65rror\x18\x03 \x01(\tH\x00\x88\x01\x01\x42\x08\n\x06_error\":\n\x10TypeSubscription\x12\x12\n\ntopic_type\x18\x01 \x01(\t\x12\x12\n\nagent_type\x18\x02 \x01(\t\"T\n\x0cSubscription\x12\x34\n\x10typeSubscription\x18\x01 \x01(\x0b\x32\x18.agents.TypeSubscriptionH\x00\x42\x0e\n\x0csubscription\"X\n\x16\x41\x64\x64SubscriptionRequest\x12\x12\n\nrequest_id\x18\x01 \x01(\t\x12*\n\x0csubscription\x18\x02 \x01(\x0b\x32\x14.agents.Subscription\"\\\n\x17\x41\x64\x64SubscriptionResponse\x12\x12\n\nrequest_id\x18\x01 \x01(\t\x12\x0f\n\x07success\x18\x02 \x01(\x08\x12\x12\n\x05\x65rror\x18\x03 \x01(\tH\x00\x88\x01\x01\x42\x08\n\x06_error\"\xc6\x03\n\x07Message\x12%\n\x07request\x18\x01 \x01(\x0b\x32\x12.agents.RpcRequestH\x00\x12\'\n\x08response\x18\x02 \x01(\x0b\x32\x13.agents.RpcResponseH\x00\x12\x1e\n\x05\x65vent\x18\x03 \x01(\x0b\x32\r.agents.EventH\x00\x12\x44\n\x18registerAgentTypeRequest\x18\x04 \x01(\x0b\x32 .agents.RegisterAgentTypeRequestH\x00\x12\x46\n\x19registerAgentTypeResponse\x18\x05 \x01(\x0b\x32!.agents.RegisterAgentTypeResponseH\x00\x12@\n\x16\x61\x64\x64SubscriptionRequest\x18\x06 \x01(\x0b\x32\x1e.agents.AddSubscriptionRequestH\x00\x12\x42\n\x17\x61\x64\x64SubscriptionResponse\x18\x07 \x01(\x0b\x32\x1f.agents.AddSubscriptionResponseH\x00\x12,\n\ncloudEvent\x18\x08 \x01(\x0b\x32\x16.cloudevent.CloudEventH\x00\x42\t\n\x07message2?\n\x08\x41gentRpc\x12\x33\n\x0bOpenChannel\x12\x0f.agents.Message\x1a\x0f.agents.Message(\x01\x30\x01\x42(\xaa\x02%Microsoft.AutoGen.Agents.Abstractionsb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x12\x61gent_worker.proto\x12\x06\x61gents\x1a\x10\x63loudevent.proto\x1a\x19google/protobuf/any.proto\"\'\n\x07TopicId\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\x0e\n\x06source\x18\x02 \x01(\t\"$\n\x07\x41gentId\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\x0b\n\x03key\x18\x02 \x01(\t\"E\n\x07Payload\x12\x11\n\tdata_type\x18\x01 \x01(\t\x12\x19\n\x11\x64\x61ta_content_type\x18\x02 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\"\x89\x02\n\nRpcRequest\x12\x12\n\nrequest_id\x18\x01 \x01(\t\x12$\n\x06source\x18\x02 \x01(\x0b\x32\x0f.agents.AgentIdH\x00\x88\x01\x01\x12\x1f\n\x06target\x18\x03 \x01(\x0b\x32\x0f.agents.AgentId\x12\x0e\n\x06method\x18\x04 \x01(\t\x12 \n\x07payload\x18\x05 \x01(\x0b\x32\x0f.agents.Payload\x12\x32\n\x08metadata\x18\x06 \x03(\x0b\x32 .agents.RpcRequest.MetadataEntry\x1a/\n\rMetadataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x42\t\n\x07_source\"\xb8\x01\n\x0bRpcResponse\x12\x12\n\nrequest_id\x18\x01 \x01(\t\x12 \n\x07payload\x18\x02 \x01(\x0b\x32\x0f.agents.Payload\x12\r\n\x05\x65rror\x18\x03 \x01(\t\x12\x33\n\x08metadata\x18\x04 \x03(\x0b\x32!.agents.RpcResponse.MetadataEntry\x1a/\n\rMetadataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xe4\x01\n\x05\x45vent\x12\x12\n\ntopic_type\x18\x01 \x01(\t\x12\x14\n\x0ctopic_source\x18\x02 \x01(\t\x12$\n\x06source\x18\x03 \x01(\x0b\x32\x0f.agents.AgentIdH\x00\x88\x01\x01\x12 \n\x07payload\x18\x04 \x01(\x0b\x32\x0f.agents.Payload\x12-\n\x08metadata\x18\x05 \x03(\x0b\x32\x1b.agents.Event.MetadataEntry\x1a/\n\rMetadataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x42\t\n\x07_source\"<\n\x18RegisterAgentTypeRequest\x12\x12\n\nrequest_id\x18\x01 \x01(\t\x12\x0c\n\x04type\x18\x02 \x01(\t\"^\n\x19RegisterAgentTypeResponse\x12\x12\n\nrequest_id\x18\x01 \x01(\t\x12\x0f\n\x07success\x18\x02 \x01(\x08\x12\x12\n\x05\x65rror\x18\x03 \x01(\tH\x00\x88\x01\x01\x42\x08\n\x06_error\":\n\x10TypeSubscription\x12\x12\n\ntopic_type\x18\x01 \x01(\t\x12\x12\n\nagent_type\x18\x02 \x01(\t\"T\n\x0cSubscription\x12\x34\n\x10typeSubscription\x18\x01 \x01(\x0b\x32\x18.agents.TypeSubscriptionH\x00\x42\x0e\n\x0csubscription\"X\n\x16\x41\x64\x64SubscriptionRequest\x12\x12\n\nrequest_id\x18\x01 \x01(\t\x12*\n\x0csubscription\x18\x02 \x01(\x0b\x32\x14.agents.Subscription\"\\\n\x17\x41\x64\x64SubscriptionResponse\x12\x12\n\nrequest_id\x18\x01 \x01(\t\x12\x0f\n\x07success\x18\x02 \x01(\x08\x12\x12\n\x05\x65rror\x18\x03 \x01(\tH\x00\x88\x01\x01\x42\x08\n\x06_error\"\xc6\x03\n\x07Message\x12%\n\x07request\x18\x01 \x01(\x0b\x32\x12.agents.RpcRequestH\x00\x12\'\n\x08response\x18\x02 \x01(\x0b\x32\x13.agents.RpcResponseH\x00\x12\x1e\n\x05\x65vent\x18\x03 \x01(\x0b\x32\r.agents.EventH\x00\x12\x44\n\x18registerAgentTypeRequest\x18\x04 \x01(\x0b\x32 .agents.RegisterAgentTypeRequestH\x00\x12\x46\n\x19registerAgentTypeResponse\x18\x05 \x01(\x0b\x32!.agents.RegisterAgentTypeResponseH\x00\x12@\n\x16\x61\x64\x64SubscriptionRequest\x18\x06 \x01(\x0b\x32\x1e.agents.AddSubscriptionRequestH\x00\x12\x42\n\x17\x61\x64\x64SubscriptionResponse\x18\x07 \x01(\x0b\x32\x1f.agents.AddSubscriptionResponseH\x00\x12,\n\ncloudEvent\x18\x08 \x01(\x0b\x32\x16.cloudevent.CloudEventH\x00\x42\t\n\x07message2?\n\x08\x41gentRpc\x12\x33\n\x0bOpenChannel\x12\x0f.agents.Message\x1a\x0f.agents.Message(\x01\x30\x01\x42!\xaa\x02\x1eMicrosoft.AutoGen.Abstractionsb\x06proto3')
_globals = globals()
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'agent_worker_pb2', _globals)
if _descriptor._USE_C_DESCRIPTORS == False:
_globals['DESCRIPTOR']._options = None
- _globals['DESCRIPTOR']._serialized_options = b'\252\002%Microsoft.AutoGen.Agents.Abstractions'
+ _globals['DESCRIPTOR']._serialized_options = b'\252\002\036Microsoft.AutoGen.Abstractions'
_globals['_RPCREQUEST_METADATAENTRY']._options = None
_globals['_RPCREQUEST_METADATAENTRY']._serialized_options = b'8\001'
_globals['_RPCRESPONSE_METADATAENTRY']._options = None
diff --git a/python/packages/autogen-core/src/autogen_core/application/protos/cloudevent_pb2.py b/python/packages/autogen-core/src/autogen_core/application/protos/cloudevent_pb2.py
index f20699395..a1a9edc11 100644
--- a/python/packages/autogen-core/src/autogen_core/application/protos/cloudevent_pb2.py
+++ b/python/packages/autogen-core/src/autogen_core/application/protos/cloudevent_pb2.py
@@ -16,14 +16,14 @@ from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2
from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x10\x63loudevent.proto\x12\ncloudevent\x1a\x19google/protobuf/any.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\x8b\x05\n\nCloudEvent\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0e\n\x06source\x18\x02 \x01(\t\x12\x14\n\x0cspec_version\x18\x03 \x01(\t\x12\x0c\n\x04type\x18\x04 \x01(\t\x12:\n\nattributes\x18\x05 \x03(\x0b\x32&.cloudevent.CloudEvent.AttributesEntry\x12\x36\n\x08metadata\x18\x06 \x03(\x0b\x32$.cloudevent.CloudEvent.MetadataEntry\x12\x15\n\x0b\x62inary_data\x18\x07 \x01(\x0cH\x00\x12\x13\n\ttext_data\x18\x08 \x01(\tH\x00\x12*\n\nproto_data\x18\t \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x1a\x62\n\x0f\x41ttributesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12>\n\x05value\x18\x02 \x01(\x0b\x32/.cloudevent.CloudEvent.CloudEventAttributeValue:\x02\x38\x01\x1a/\n\rMetadataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a\xd3\x01\n\x18\x43loudEventAttributeValue\x12\x14\n\nce_boolean\x18\x01 \x01(\x08H\x00\x12\x14\n\nce_integer\x18\x02 \x01(\x05H\x00\x12\x13\n\tce_string\x18\x03 \x01(\tH\x00\x12\x12\n\x08\x63\x65_bytes\x18\x04 \x01(\x0cH\x00\x12\x10\n\x06\x63\x65_uri\x18\x05 \x01(\tH\x00\x12\x14\n\nce_uri_ref\x18\x06 \x01(\tH\x00\x12\x32\n\x0c\x63\x65_timestamp\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampH\x00\x42\x06\n\x04\x61ttrB\x06\n\x04\x64\x61taB(\xaa\x02%Microsoft.AutoGen.Agents.Abstractionsb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x10\x63loudevent.proto\x12\ncloudevent\x1a\x19google/protobuf/any.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\x8b\x05\n\nCloudEvent\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0e\n\x06source\x18\x02 \x01(\t\x12\x14\n\x0cspec_version\x18\x03 \x01(\t\x12\x0c\n\x04type\x18\x04 \x01(\t\x12:\n\nattributes\x18\x05 \x03(\x0b\x32&.cloudevent.CloudEvent.AttributesEntry\x12\x36\n\x08metadata\x18\x06 \x03(\x0b\x32$.cloudevent.CloudEvent.MetadataEntry\x12\x15\n\x0b\x62inary_data\x18\x07 \x01(\x0cH\x00\x12\x13\n\ttext_data\x18\x08 \x01(\tH\x00\x12*\n\nproto_data\x18\t \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x1a\x62\n\x0f\x41ttributesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12>\n\x05value\x18\x02 \x01(\x0b\x32/.cloudevent.CloudEvent.CloudEventAttributeValue:\x02\x38\x01\x1a/\n\rMetadataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a\xd3\x01\n\x18\x43loudEventAttributeValue\x12\x14\n\nce_boolean\x18\x01 \x01(\x08H\x00\x12\x14\n\nce_integer\x18\x02 \x01(\x05H\x00\x12\x13\n\tce_string\x18\x03 \x01(\tH\x00\x12\x12\n\x08\x63\x65_bytes\x18\x04 \x01(\x0cH\x00\x12\x10\n\x06\x63\x65_uri\x18\x05 \x01(\tH\x00\x12\x14\n\nce_uri_ref\x18\x06 \x01(\tH\x00\x12\x32\n\x0c\x63\x65_timestamp\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampH\x00\x42\x06\n\x04\x61ttrB\x06\n\x04\x64\x61taB!\xaa\x02\x1eMicrosoft.AutoGen.Abstractionsb\x06proto3')
_globals = globals()
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'cloudevent_pb2', _globals)
if _descriptor._USE_C_DESCRIPTORS == False:
_globals['DESCRIPTOR']._options = None
- _globals['DESCRIPTOR']._serialized_options = b'\252\002%Microsoft.AutoGen.Agents.Abstractions'
+ _globals['DESCRIPTOR']._serialized_options = b'\252\002\036Microsoft.AutoGen.Abstractions'
_globals['_CLOUDEVENT_ATTRIBUTESENTRY']._options = None
_globals['_CLOUDEVENT_ATTRIBUTESENTRY']._serialized_options = b'8\001'
_globals['_CLOUDEVENT_METADATAENTRY']._options = None