From 8e37cef69ddc5c2514663038236dd6cc5ee8238b Mon Sep 17 00:00:00 2001 From: Ryan Sweet Date: Wed, 9 Oct 2024 09:58:21 -0700 Subject: [PATCH] Rysweet dotnet folder moves (#3693) * add service defaults to Host * add otel to app host * ran format * remove HelloAgents * moving things around to fit the folder structure/naming conventions --------- Co-authored-by: Xiaoyun Zhang --- README.md | 2 +- dotnet/AutoGen.sln | 66 +++++++++---------- dotnet/samples/Hello/Hello.csproj | 4 +- .../DevTeam.AgentHost.csproj | 2 +- .../DevTeam.Agents/DevTeam.Agents.csproj | 4 +- .../DevTeam.Backend/DevTeam.Backend.csproj | 4 +- .../DevTeam.Shared/DevTeam.Shared.csproj | 2 +- ...rosoft.AutoGen.Agents.Abstractions.csproj} | 8 +-- .../Client}/AgentBase.cs | 0 .../Client}/AgentBaseExtensions.cs | 0 .../Client}/AgentClient.cs | 0 .../Client}/AgentContext.cs | 0 .../Client}/AgentId.cs | 0 .../Client}/AgentWorkerRuntime.cs | 0 .../Client}/Agents/AIAgent/AiAgent.cs | 0 .../IOAgent/ConsoleAgent/ConsoleAgent.cs | 0 .../Agents/IOAgent/FileAgent/FileAgent.cs | 0 .../Client}/Agents/IOAgent/IOAgent.cs | 0 .../Agents/IOAgent/WebAPIAgent/WebAPIAgent.cs | 0 .../Client}/App.cs | 2 + .../Client}/HostBuilderExtensions.cs | 0 .../Client}/IAgentContext.cs | 0 .../Client}/IAgentWorkerRuntime.cs | 0 .../Microsoft.AutoGen.Agents.Client.csproj | 4 +- .../CloudEvents/CloudEventExtensions.cs | 0 ...toGen.Agents.Extensions.CloudEvents.csproj | 2 +- .../CloudEvents/Protos/states.proto | 0 ...en.Agents.Extensions.SemanticKernel.csproj | 2 +- .../SemanticKernel/Options/OpenAIOptions.cs | 0 .../SemanticKernel/Options/QdrantOptions.cs | 0 .../SemanticKernelHostingExtensions.cs | 0 .../Runtime}/AgentStateGrain.cs | 0 .../Runtime}/AgentWorkerHostingExtensions.cs | 0 .../Runtime}/AgentWorkerRegistryGrain.cs | 0 .../Runtime}/Host.cs | 2 + .../Runtime}/IAgentStateGrain.cs | 0 .../Runtime}/IAgentWorkerRegistryGrain.cs | 0 .../Runtime}/IWorkerGateway.cs | 0 .../Microsoft.AutoGen.Agents.Runtime.csproj | 3 +- .../Runtime}/WorkerGateway.cs | 0 .../Runtime}/WorkerGatewayService.cs | 0 .../Runtime}/WorkerProcessConnection.cs | 0 42 files changed, 54 insertions(+), 53 deletions(-) rename dotnet/src/Microsoft.AutoGen.Agents/{Microsoft.AutoGen.Agents.csproj => Abstractions/Microsoft.AutoGen.Agents.Abstractions.csproj} (59%) rename dotnet/src/{Microsoft.AutoGen.Agents.Client => Microsoft.AutoGen.Agents/Client}/AgentBase.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Client => Microsoft.AutoGen.Agents/Client}/AgentBaseExtensions.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Client => Microsoft.AutoGen.Agents/Client}/AgentClient.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Client => Microsoft.AutoGen.Agents/Client}/AgentContext.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Client => Microsoft.AutoGen.Agents/Client}/AgentId.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Client => Microsoft.AutoGen.Agents/Client}/AgentWorkerRuntime.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Client => Microsoft.AutoGen.Agents/Client}/Agents/AIAgent/AiAgent.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Client => Microsoft.AutoGen.Agents/Client}/Agents/IOAgent/ConsoleAgent/ConsoleAgent.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Client => Microsoft.AutoGen.Agents/Client}/Agents/IOAgent/FileAgent/FileAgent.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Client => Microsoft.AutoGen.Agents/Client}/Agents/IOAgent/IOAgent.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Client => Microsoft.AutoGen.Agents/Client}/Agents/IOAgent/WebAPIAgent/WebAPIAgent.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Client => Microsoft.AutoGen.Agents/Client}/App.cs (95%) rename dotnet/src/{Microsoft.AutoGen.Agents.Client => Microsoft.AutoGen.Agents/Client}/HostBuilderExtensions.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Client => Microsoft.AutoGen.Agents/Client}/IAgentContext.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Client => Microsoft.AutoGen.Agents/Client}/IAgentWorkerRuntime.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Client => Microsoft.AutoGen.Agents/Client}/Microsoft.AutoGen.Agents.Client.csproj (77%) rename dotnet/src/{Microsoft.AutoGen.Agents.Extensions => Microsoft.AutoGen.Agents/Extensions}/CloudEvents/CloudEventExtensions.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Extensions => Microsoft.AutoGen.Agents/Extensions}/CloudEvents/Microsoft.AutoGen.Agents.Extensions.CloudEvents.csproj (73%) rename dotnet/src/{Microsoft.AutoGen.Agents.Extensions => Microsoft.AutoGen.Agents/Extensions}/CloudEvents/Protos/states.proto (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Extensions => Microsoft.AutoGen.Agents/Extensions}/SemanticKernel/Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj (84%) rename dotnet/src/{Microsoft.AutoGen.Agents.Extensions => Microsoft.AutoGen.Agents/Extensions}/SemanticKernel/Options/OpenAIOptions.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Extensions => Microsoft.AutoGen.Agents/Extensions}/SemanticKernel/Options/QdrantOptions.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Extensions => Microsoft.AutoGen.Agents/Extensions}/SemanticKernel/SemanticKernelHostingExtensions.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Runtime => Microsoft.AutoGen.Agents/Runtime}/AgentStateGrain.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Runtime => Microsoft.AutoGen.Agents/Runtime}/AgentWorkerHostingExtensions.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Runtime => Microsoft.AutoGen.Agents/Runtime}/AgentWorkerRegistryGrain.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Runtime => Microsoft.AutoGen.Agents/Runtime}/Host.cs (88%) rename dotnet/src/{Microsoft.AutoGen.Agents.Runtime => Microsoft.AutoGen.Agents/Runtime}/IAgentStateGrain.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Runtime => Microsoft.AutoGen.Agents/Runtime}/IAgentWorkerRegistryGrain.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Runtime => Microsoft.AutoGen.Agents/Runtime}/IWorkerGateway.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Runtime => Microsoft.AutoGen.Agents/Runtime}/Microsoft.AutoGen.Agents.Runtime.csproj (78%) rename dotnet/src/{Microsoft.AutoGen.Agents.Runtime => Microsoft.AutoGen.Agents/Runtime}/WorkerGateway.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Runtime => Microsoft.AutoGen.Agents/Runtime}/WorkerGatewayService.cs (100%) rename dotnet/src/{Microsoft.AutoGen.Agents.Runtime => Microsoft.AutoGen.Agents/Runtime}/WorkerProcessConnection.cs (100%) diff --git a/README.md b/README.md index 9f5c2ed460e2..18c9efad489d 100644 --- a/README.md +++ b/README.md @@ -136,7 +136,7 @@ git switch staging-dev # Build the project cd dotnet && dotnet build AutoGen.sln # In your source code, add AutoGen to your project -dotnet add reference /dotnet/src/Microsoft.AutoGen.Agents.Client/Microsoft.AutoGen.Agents.Client.csproj +dotnet add reference /dotnet/src/Microsoft.AutoGen.Agents/Client/Microsoft.AutoGen.Agents.Client.csproj ``` Then, define and run your first agent: diff --git a/dotnet/AutoGen.sln b/dotnet/AutoGen.sln index d1d00420cfa6..d15dd8d530f1 100644 --- a/dotnet/AutoGen.sln +++ b/dotnet/AutoGen.sln @@ -78,16 +78,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoGen.OpenAI", "src\AutoG EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoGen.OpenAI.Tests", "test\AutoGen.OpenAI.Tests\AutoGen.OpenAI.Tests.csproj", "{42A8251C-E7B3-47BB-A82E-459952EBE132}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Agents", "src\Microsoft.AutoGen.Agents\Microsoft.AutoGen.Agents.csproj", "{F716F5EA-DE34-4B3D-82F8-64B0B5C4A795}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Agents.Client", "src\Microsoft.AutoGen.Agents.Client\Microsoft.AutoGen.Agents.Client.csproj", "{6DA7A583-DFDD-489A-884F-D12C58022A05}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Agents.Extensions.CloudEvents", "src\Microsoft.AutoGen.Agents.Extensions\CloudEvents\Microsoft.AutoGen.Agents.Extensions.CloudEvents.csproj", "{C1E69C6D-066E-42E4-83C6-D9A4C84A6670}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Agents.Extensions.SemanticKernel", "src\Microsoft.AutoGen.Agents.Extensions\SemanticKernel\Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj", "{F520E059-9B54-4B79-8716-FEF09447C928}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Agents.Runtime", "src\Microsoft.AutoGen.Agents.Runtime\Microsoft.AutoGen.Agents.Runtime.csproj", "{FEF07BCC-DBE3-4592-9FD2-565A091F19DC}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AgentChat", "AgentChat", "{4BB66E06-37D8-45A0-9B97-DE590AFBA340}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AgentChat", "AgentChat", "{C7A2D42D-9277-47AC-862B-D86DF9D6AD48}" @@ -114,6 +104,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hello", "samples\Hello\Hell EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.ServiceDefaults", "src\Microsoft.AutoGen.ServiceDefaults\Microsoft.AutoGen.ServiceDefaults.csproj", "{F70C6FD7-9615-4EDD-8D55-5460FCC5A46D}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.AutoGen.Agents", "Microsoft.AutoGen.Agents", "{143BF45F-1091-458C-A772-DAD5C57B72FA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Agents.Runtime", "src\Microsoft.AutoGen.Agents\Runtime\Microsoft.AutoGen.Agents.Runtime.csproj", "{32AF1495-4068-4048-A34A-FCA1E110F02E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Agents.Extensions.SemanticKernel", "src\Microsoft.AutoGen.Agents\Extensions\SemanticKernel\Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj", "{2B1701A5-BEA2-4844-863B-0275ECCCD11D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Agents.Extensions.CloudEvents", "src\Microsoft.AutoGen.Agents\Extensions\CloudEvents\Microsoft.AutoGen.Agents.Extensions.CloudEvents.csproj", "{FDD6787A-EE6A-4A8E-872F-CDA97A824D08}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Agents.Client", "src\Microsoft.AutoGen.Agents\Client\Microsoft.AutoGen.Agents.Client.csproj", "{CEEC175F-8752-4040-9226-8F5FEC7563B8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -260,26 +260,6 @@ Global {42A8251C-E7B3-47BB-A82E-459952EBE132}.Debug|Any CPU.Build.0 = Debug|Any CPU {42A8251C-E7B3-47BB-A82E-459952EBE132}.Release|Any CPU.ActiveCfg = Release|Any CPU {42A8251C-E7B3-47BB-A82E-459952EBE132}.Release|Any CPU.Build.0 = Release|Any CPU - {F716F5EA-DE34-4B3D-82F8-64B0B5C4A795}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F716F5EA-DE34-4B3D-82F8-64B0B5C4A795}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F716F5EA-DE34-4B3D-82F8-64B0B5C4A795}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F716F5EA-DE34-4B3D-82F8-64B0B5C4A795}.Release|Any CPU.Build.0 = Release|Any CPU - {6DA7A583-DFDD-489A-884F-D12C58022A05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6DA7A583-DFDD-489A-884F-D12C58022A05}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6DA7A583-DFDD-489A-884F-D12C58022A05}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6DA7A583-DFDD-489A-884F-D12C58022A05}.Release|Any CPU.Build.0 = Release|Any CPU - {C1E69C6D-066E-42E4-83C6-D9A4C84A6670}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1E69C6D-066E-42E4-83C6-D9A4C84A6670}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1E69C6D-066E-42E4-83C6-D9A4C84A6670}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1E69C6D-066E-42E4-83C6-D9A4C84A6670}.Release|Any CPU.Build.0 = Release|Any CPU - {F520E059-9B54-4B79-8716-FEF09447C928}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F520E059-9B54-4B79-8716-FEF09447C928}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F520E059-9B54-4B79-8716-FEF09447C928}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F520E059-9B54-4B79-8716-FEF09447C928}.Release|Any CPU.Build.0 = Release|Any CPU - {FEF07BCC-DBE3-4592-9FD2-565A091F19DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FEF07BCC-DBE3-4592-9FD2-565A091F19DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FEF07BCC-DBE3-4592-9FD2-565A091F19DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FEF07BCC-DBE3-4592-9FD2-565A091F19DC}.Release|Any CPU.Build.0 = Release|Any CPU {7228A701-C79D-4E15-BF45-48D11F721A84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7228A701-C79D-4E15-BF45-48D11F721A84}.Debug|Any CPU.Build.0 = Debug|Any CPU {7228A701-C79D-4E15-BF45-48D11F721A84}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -308,6 +288,22 @@ Global {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -348,11 +344,6 @@ Global {143725E2-206C-4D37-93E4-9EDF699826B2} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64} {3AF1CBEC-2877-41E9-92AE-3A391B2AA9E8} = {4BB66E06-37D8-45A0-9B97-DE590AFBA340} {42A8251C-E7B3-47BB-A82E-459952EBE132} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64} - {F716F5EA-DE34-4B3D-82F8-64B0B5C4A795} = {18BF8DD7-0585-48BF-8F97-AD333080CE06} - {6DA7A583-DFDD-489A-884F-D12C58022A05} = {18BF8DD7-0585-48BF-8F97-AD333080CE06} - {C1E69C6D-066E-42E4-83C6-D9A4C84A6670} = {18BF8DD7-0585-48BF-8F97-AD333080CE06} - {F520E059-9B54-4B79-8716-FEF09447C928} = {18BF8DD7-0585-48BF-8F97-AD333080CE06} - {FEF07BCC-DBE3-4592-9FD2-565A091F19DC} = {18BF8DD7-0585-48BF-8F97-AD333080CE06} {4BB66E06-37D8-45A0-9B97-DE590AFBA340} = {18BF8DD7-0585-48BF-8F97-AD333080CE06} {C7A2D42D-9277-47AC-862B-D86DF9D6AD48} = {FBFEAD1F-29EB-4D99-A672-0CD8473E10B9} {616F30DF-1F41-4047-BAA4-64BA03BF5AEA} = {FBFEAD1F-29EB-4D99-A672-0CD8473E10B9} @@ -363,6 +354,11 @@ Global {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} 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 3598a2acfe3d..2c9715293c11 100644 --- a/dotnet/samples/Hello/Hello.csproj +++ b/dotnet/samples/Hello/Hello.csproj @@ -1,8 +1,8 @@  - - + + diff --git a/dotnet/samples/dev-team/DevTeam.AgentHost/DevTeam.AgentHost.csproj b/dotnet/samples/dev-team/DevTeam.AgentHost/DevTeam.AgentHost.csproj index 1f6da64e3301..96ee09c57796 100644 --- a/dotnet/samples/dev-team/DevTeam.AgentHost/DevTeam.AgentHost.csproj +++ b/dotnet/samples/dev-team/DevTeam.AgentHost/DevTeam.AgentHost.csproj @@ -9,7 +9,7 @@ - + diff --git a/dotnet/samples/dev-team/DevTeam.Agents/DevTeam.Agents.csproj b/dotnet/samples/dev-team/DevTeam.Agents/DevTeam.Agents.csproj index 065f31b0dd0f..0cff3b8347ba 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 @@ - + - + diff --git a/dotnet/samples/dev-team/DevTeam.Backend/DevTeam.Backend.csproj b/dotnet/samples/dev-team/DevTeam.Backend/DevTeam.Backend.csproj index 5200f1f45caf..0fbce0eaffc3 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 @@ - + @@ -31,7 +31,7 @@ - + diff --git a/dotnet/samples/dev-team/DevTeam.Shared/DevTeam.Shared.csproj b/dotnet/samples/dev-team/DevTeam.Shared/DevTeam.Shared.csproj index edcc15fd2291..093dc4fda06e 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 @@  - + diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Microsoft.AutoGen.Agents.csproj b/dotnet/src/Microsoft.AutoGen.Agents/Abstractions/Microsoft.AutoGen.Agents.Abstractions.csproj similarity index 59% rename from dotnet/src/Microsoft.AutoGen.Agents/Microsoft.AutoGen.Agents.csproj rename to dotnet/src/Microsoft.AutoGen.Agents/Abstractions/Microsoft.AutoGen.Agents.Abstractions.csproj index cd3f1637b887..2bb1de50dc5e 100644 --- a/dotnet/src/Microsoft.AutoGen.Agents/Microsoft.AutoGen.Agents.csproj +++ b/dotnet/src/Microsoft.AutoGen.Agents/Abstractions/Microsoft.AutoGen.Agents.Abstractions.csproj @@ -11,10 +11,10 @@ - - - - + + + + diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Client/AgentBase.cs b/dotnet/src/Microsoft.AutoGen.Agents/Client/AgentBase.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Client/AgentBase.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Client/AgentBase.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Client/AgentBaseExtensions.cs b/dotnet/src/Microsoft.AutoGen.Agents/Client/AgentBaseExtensions.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Client/AgentBaseExtensions.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Client/AgentBaseExtensions.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Client/AgentClient.cs b/dotnet/src/Microsoft.AutoGen.Agents/Client/AgentClient.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Client/AgentClient.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Client/AgentClient.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Client/AgentContext.cs b/dotnet/src/Microsoft.AutoGen.Agents/Client/AgentContext.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Client/AgentContext.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Client/AgentContext.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Client/AgentId.cs b/dotnet/src/Microsoft.AutoGen.Agents/Client/AgentId.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Client/AgentId.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Client/AgentId.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Client/AgentWorkerRuntime.cs b/dotnet/src/Microsoft.AutoGen.Agents/Client/AgentWorkerRuntime.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Client/AgentWorkerRuntime.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Client/AgentWorkerRuntime.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Client/Agents/AIAgent/AiAgent.cs b/dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/AIAgent/AiAgent.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Client/Agents/AIAgent/AiAgent.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/AIAgent/AiAgent.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Client/Agents/IOAgent/ConsoleAgent/ConsoleAgent.cs b/dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/IOAgent/ConsoleAgent/ConsoleAgent.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Client/Agents/IOAgent/ConsoleAgent/ConsoleAgent.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/IOAgent/ConsoleAgent/ConsoleAgent.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Client/Agents/IOAgent/FileAgent/FileAgent.cs b/dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/IOAgent/FileAgent/FileAgent.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Client/Agents/IOAgent/FileAgent/FileAgent.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/IOAgent/FileAgent/FileAgent.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Client/Agents/IOAgent/IOAgent.cs b/dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/IOAgent/IOAgent.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Client/Agents/IOAgent/IOAgent.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/IOAgent/IOAgent.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Client/Agents/IOAgent/WebAPIAgent/WebAPIAgent.cs b/dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/IOAgent/WebAPIAgent/WebAPIAgent.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Client/Agents/IOAgent/WebAPIAgent/WebAPIAgent.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Client/Agents/IOAgent/WebAPIAgent/WebAPIAgent.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Client/App.cs b/dotnet/src/Microsoft.AutoGen.Agents/Client/App.cs similarity index 95% rename from dotnet/src/Microsoft.AutoGen.Agents.Client/App.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Client/App.cs index e8b3651fa613..65a4abb327f6 100644 --- a/dotnet/src/Microsoft.AutoGen.Agents.Client/App.cs +++ b/dotnet/src/Microsoft.AutoGen.Agents/Client/App.cs @@ -1,6 +1,7 @@ using Google.Protobuf; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; namespace Microsoft.AutoGen.Agents.Client; @@ -14,6 +15,7 @@ public static async ValueTask StartAsync(AgentTypes? agentTypes // start the server runtime RuntimeApp ??= await Runtime.Host.StartAsync(local); var clientBuilder = WebApplication.CreateBuilder(); + clientBuilder.AddServiceDefaults(); var appBuilder = clientBuilder.AddAgentWorker(); agentTypes ??= AgentTypes.GetAgentTypesFromAssembly() ?? throw new InvalidOperationException("No agent types found in the assembly"); diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Client/HostBuilderExtensions.cs b/dotnet/src/Microsoft.AutoGen.Agents/Client/HostBuilderExtensions.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Client/HostBuilderExtensions.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Client/HostBuilderExtensions.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Client/IAgentContext.cs b/dotnet/src/Microsoft.AutoGen.Agents/Client/IAgentContext.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Client/IAgentContext.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Client/IAgentContext.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Client/IAgentWorkerRuntime.cs b/dotnet/src/Microsoft.AutoGen.Agents/Client/IAgentWorkerRuntime.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Client/IAgentWorkerRuntime.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Client/IAgentWorkerRuntime.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Client/Microsoft.AutoGen.Agents.Client.csproj b/dotnet/src/Microsoft.AutoGen.Agents/Client/Microsoft.AutoGen.Agents.Client.csproj similarity index 77% rename from dotnet/src/Microsoft.AutoGen.Agents.Client/Microsoft.AutoGen.Agents.Client.csproj rename to dotnet/src/Microsoft.AutoGen.Agents/Client/Microsoft.AutoGen.Agents.Client.csproj index 6d708bb55038..3622a29dc4ee 100644 --- a/dotnet/src/Microsoft.AutoGen.Agents.Client/Microsoft.AutoGen.Agents.Client.csproj +++ b/dotnet/src/Microsoft.AutoGen.Agents/Client/Microsoft.AutoGen.Agents.Client.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Extensions/CloudEvents/CloudEventExtensions.cs b/dotnet/src/Microsoft.AutoGen.Agents/Extensions/CloudEvents/CloudEventExtensions.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Extensions/CloudEvents/CloudEventExtensions.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Extensions/CloudEvents/CloudEventExtensions.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Extensions/CloudEvents/Microsoft.AutoGen.Agents.Extensions.CloudEvents.csproj b/dotnet/src/Microsoft.AutoGen.Agents/Extensions/CloudEvents/Microsoft.AutoGen.Agents.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.Agents/Extensions/CloudEvents/Microsoft.AutoGen.Agents.Extensions.CloudEvents.csproj index 608d431f522c..89fcc1b77ff7 100644 --- a/dotnet/src/Microsoft.AutoGen.Agents.Extensions/CloudEvents/Microsoft.AutoGen.Agents.Extensions.CloudEvents.csproj +++ b/dotnet/src/Microsoft.AutoGen.Agents/Extensions/CloudEvents/Microsoft.AutoGen.Agents.Extensions.CloudEvents.csproj @@ -1,7 +1,7 @@ - + diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Extensions/CloudEvents/Protos/states.proto b/dotnet/src/Microsoft.AutoGen.Agents/Extensions/CloudEvents/Protos/states.proto similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Extensions/CloudEvents/Protos/states.proto rename to dotnet/src/Microsoft.AutoGen.Agents/Extensions/CloudEvents/Protos/states.proto diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Extensions/SemanticKernel/Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj b/dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj similarity index 84% rename from dotnet/src/Microsoft.AutoGen.Agents.Extensions/SemanticKernel/Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj rename to dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj index ffa5ee03a5dd..a0f369821571 100644 --- a/dotnet/src/Microsoft.AutoGen.Agents.Extensions/SemanticKernel/Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj +++ b/dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj @@ -1,7 +1,7 @@ - + diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Extensions/SemanticKernel/Options/OpenAIOptions.cs b/dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/Options/OpenAIOptions.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Extensions/SemanticKernel/Options/OpenAIOptions.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/Options/OpenAIOptions.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Extensions/SemanticKernel/Options/QdrantOptions.cs b/dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/Options/QdrantOptions.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Extensions/SemanticKernel/Options/QdrantOptions.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/Options/QdrantOptions.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Extensions/SemanticKernel/SemanticKernelHostingExtensions.cs b/dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/SemanticKernelHostingExtensions.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Extensions/SemanticKernel/SemanticKernelHostingExtensions.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/SemanticKernelHostingExtensions.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Runtime/AgentStateGrain.cs b/dotnet/src/Microsoft.AutoGen.Agents/Runtime/AgentStateGrain.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Runtime/AgentStateGrain.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Runtime/AgentStateGrain.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Runtime/AgentWorkerHostingExtensions.cs b/dotnet/src/Microsoft.AutoGen.Agents/Runtime/AgentWorkerHostingExtensions.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Runtime/AgentWorkerHostingExtensions.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Runtime/AgentWorkerHostingExtensions.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Runtime/AgentWorkerRegistryGrain.cs b/dotnet/src/Microsoft.AutoGen.Agents/Runtime/AgentWorkerRegistryGrain.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Runtime/AgentWorkerRegistryGrain.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Runtime/AgentWorkerRegistryGrain.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Runtime/Host.cs b/dotnet/src/Microsoft.AutoGen.Agents/Runtime/Host.cs similarity index 88% rename from dotnet/src/Microsoft.AutoGen.Agents.Runtime/Host.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Runtime/Host.cs index e3e8107b4d12..f80f79aec208 100644 --- a/dotnet/src/Microsoft.AutoGen.Agents.Runtime/Host.cs +++ b/dotnet/src/Microsoft.AutoGen.Agents/Runtime/Host.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.Hosting; namespace Microsoft.AutoGen.Agents.Runtime; @@ -7,6 +8,7 @@ public static class Host public static async Task StartAsync(bool local = false) { var builder = WebApplication.CreateBuilder(); + builder.AddServiceDefaults(); if (local) { builder.AddLocalAgentService(); diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Runtime/IAgentStateGrain.cs b/dotnet/src/Microsoft.AutoGen.Agents/Runtime/IAgentStateGrain.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Runtime/IAgentStateGrain.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Runtime/IAgentStateGrain.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Runtime/IAgentWorkerRegistryGrain.cs b/dotnet/src/Microsoft.AutoGen.Agents/Runtime/IAgentWorkerRegistryGrain.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Runtime/IAgentWorkerRegistryGrain.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Runtime/IAgentWorkerRegistryGrain.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Runtime/IWorkerGateway.cs b/dotnet/src/Microsoft.AutoGen.Agents/Runtime/IWorkerGateway.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Runtime/IWorkerGateway.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Runtime/IWorkerGateway.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Runtime/Microsoft.AutoGen.Agents.Runtime.csproj b/dotnet/src/Microsoft.AutoGen.Agents/Runtime/Microsoft.AutoGen.Agents.Runtime.csproj similarity index 78% rename from dotnet/src/Microsoft.AutoGen.Agents.Runtime/Microsoft.AutoGen.Agents.Runtime.csproj rename to dotnet/src/Microsoft.AutoGen.Agents/Runtime/Microsoft.AutoGen.Agents.Runtime.csproj index 5b7c0ca6002e..5eb1e274d4c7 100644 --- a/dotnet/src/Microsoft.AutoGen.Agents.Runtime/Microsoft.AutoGen.Agents.Runtime.csproj +++ b/dotnet/src/Microsoft.AutoGen.Agents/Runtime/Microsoft.AutoGen.Agents.Runtime.csproj @@ -13,7 +13,8 @@ - + + diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Runtime/WorkerGateway.cs b/dotnet/src/Microsoft.AutoGen.Agents/Runtime/WorkerGateway.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Runtime/WorkerGateway.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Runtime/WorkerGateway.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Runtime/WorkerGatewayService.cs b/dotnet/src/Microsoft.AutoGen.Agents/Runtime/WorkerGatewayService.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Runtime/WorkerGatewayService.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Runtime/WorkerGatewayService.cs diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Runtime/WorkerProcessConnection.cs b/dotnet/src/Microsoft.AutoGen.Agents/Runtime/WorkerProcessConnection.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen.Agents.Runtime/WorkerProcessConnection.cs rename to dotnet/src/Microsoft.AutoGen.Agents/Runtime/WorkerProcessConnection.cs