From 3686d4ce7373df0569161500aa22599768d1d59d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E9=9C=87=E5=B7=8D?= Date: Fri, 17 May 2024 19:24:44 +0800 Subject: [PATCH 1/3] #2708 add Add a judgment to the graph constructor --- dotnet/src/AutoGen.Core/GroupChat/Graph.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dotnet/src/AutoGen.Core/GroupChat/Graph.cs b/dotnet/src/AutoGen.Core/GroupChat/Graph.cs index 02f4da50bae..51c33846c4e 100644 --- a/dotnet/src/AutoGen.Core/GroupChat/Graph.cs +++ b/dotnet/src/AutoGen.Core/GroupChat/Graph.cs @@ -12,9 +12,16 @@ public class Graph { private readonly List transitions = new List(); + public Graph() + { + } + public Graph(IEnumerable transitions) { - this.transitions.AddRange(transitions); + if (transitions != null) + { + this.transitions.AddRange(transitions); + } } public void AddTransition(Transition transition) From 6b87a635983370f99e3d78a93b7cdf0ae3cdecba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E9=9C=87=E5=B7=8D?= Date: Fri, 17 May 2024 19:24:44 +0800 Subject: [PATCH 2/3] #2708 add Add a judgment to the graph constructor & added unit test --- dotnet/AutoGen.sln | 39 ++++++++++++------- dotnet/src/AutoGen.Core/GroupChat/Graph.cs | 11 +++++- .../AutoGen.Core.Tests.csproj | 26 +++++++++++++ .../GroupChat/GraphTests.cs | 17 ++++++++ 4 files changed, 77 insertions(+), 16 deletions(-) create mode 100644 dotnet/test/AutoGen.Core.Tests/AutoGen.Core.Tests.csproj create mode 100644 dotnet/test/AutoGen.Core.Tests/GroupChat/GraphTests.cs diff --git a/dotnet/AutoGen.sln b/dotnet/AutoGen.sln index b29e5e21e95..1b8a51d974d 100644 --- a/dotnet/AutoGen.sln +++ b/dotnet/AutoGen.sln @@ -8,6 +8,9 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{18BF8DD7-0585-48BF-8F97-AD333080CE06}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F823671B-3ECA-4AE6-86DA-25E920D3FE64}" + ProjectSection(SolutionItems) = preProject + test\AutoGen.Core.Tests\AutoGen.Core.Tests.csproj = test\AutoGen.Core.Tests\AutoGen.Core.Tests.csproj + EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoGen.Tests", "test\AutoGen.Tests\AutoGen.Tests.csproj", "{FDD99AEC-4C57-4020-B23F-650612856102}" EndProject @@ -35,12 +38,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoGen.Mistral.Tests", "te EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoGen.SemanticKernel.Tests", "test\AutoGen.SemanticKernel.Tests\AutoGen.SemanticKernel.Tests.csproj", "{1DFABC4A-8458-4875-8DCB-59F3802DAC65}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoGen.OpenAI.Tests", "test\AutoGen.OpenAI.Tests\AutoGen.OpenAI.Tests.csproj", "{D36A85F9-C172-487D-8192-6BFE5D05B4A7}" -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoGen.DotnetInteractive.Tests", "test\AutoGen.DotnetInteractive.Tests\AutoGen.DotnetInteractive.Tests.csproj", "{B61388CA-DC73-4B7F-A7B2-7B9A86C9229E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoGen.OpenAI.Tests", "test\AutoGen.OpenAI.Tests\AutoGen.OpenAI.Tests.csproj", "{D36A85F9-C172-487D-8192-6BFE5D05B4A7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Autogen.Ollama", "src\Autogen.Ollama\Autogen.Ollama.csproj", "{A4EFA175-44CC-44A9-B93E-1C7B6FAC38F1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoGen.DotnetInteractive.Tests", "test\AutoGen.DotnetInteractive.Tests\AutoGen.DotnetInteractive.Tests.csproj", "{B61388CA-DC73-4B7F-A7B2-7B9A86C9229E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Autogen.Ollama.Tests", "test\Autogen.Ollama.Tests\Autogen.Ollama.Tests.csproj", "{C24FDE63-952D-4F8E-A807-AF31D43AD675}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Autogen.Ollama", "src\Autogen.Ollama\Autogen.Ollama.csproj", "{A4EFA175-44CC-44A9-B93E-1C7B6FAC38F1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Autogen.Ollama.Tests", "test\Autogen.Ollama.Tests\Autogen.Ollama.Tests.csproj", "{C24FDE63-952D-4F8E-A807-AF31D43AD675}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoGen.Core.Tests", "test\AutoGen.Core.Tests\AutoGen.Core.Tests.csproj", "{C72D435A-86F8-4276-BF4C-FF00335E7014}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -96,14 +102,6 @@ Global {15441693-3659-4868-B6C1-B106F52FF3BA}.Debug|Any CPU.Build.0 = Debug|Any CPU {15441693-3659-4868-B6C1-B106F52FF3BA}.Release|Any CPU.ActiveCfg = Release|Any CPU {15441693-3659-4868-B6C1-B106F52FF3BA}.Release|Any CPU.Build.0 = Release|Any CPU - {A4EFA175-44CC-44A9-B93E-1C7B6FAC38F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4EFA175-44CC-44A9-B93E-1C7B6FAC38F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4EFA175-44CC-44A9-B93E-1C7B6FAC38F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4EFA175-44CC-44A9-B93E-1C7B6FAC38F1}.Release|Any CPU.Build.0 = Release|Any CPU - {C24FDE63-952D-4F8E-A807-AF31D43AD675}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C24FDE63-952D-4F8E-A807-AF31D43AD675}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C24FDE63-952D-4F8E-A807-AF31D43AD675}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C24FDE63-952D-4F8E-A807-AF31D43AD675}.Release|Any CPU.Build.0 = Release|Any CPU {1DFABC4A-8458-4875-8DCB-59F3802DAC65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1DFABC4A-8458-4875-8DCB-59F3802DAC65}.Debug|Any CPU.Build.0 = Debug|Any CPU {1DFABC4A-8458-4875-8DCB-59F3802DAC65}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -116,6 +114,18 @@ Global {B61388CA-DC73-4B7F-A7B2-7B9A86C9229E}.Debug|Any CPU.Build.0 = Debug|Any CPU {B61388CA-DC73-4B7F-A7B2-7B9A86C9229E}.Release|Any CPU.ActiveCfg = Release|Any CPU {B61388CA-DC73-4B7F-A7B2-7B9A86C9229E}.Release|Any CPU.Build.0 = Release|Any CPU + {A4EFA175-44CC-44A9-B93E-1C7B6FAC38F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A4EFA175-44CC-44A9-B93E-1C7B6FAC38F1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A4EFA175-44CC-44A9-B93E-1C7B6FAC38F1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A4EFA175-44CC-44A9-B93E-1C7B6FAC38F1}.Release|Any CPU.Build.0 = Release|Any CPU + {C24FDE63-952D-4F8E-A807-AF31D43AD675}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C24FDE63-952D-4F8E-A807-AF31D43AD675}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C24FDE63-952D-4F8E-A807-AF31D43AD675}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C24FDE63-952D-4F8E-A807-AF31D43AD675}.Release|Any CPU.Build.0 = Release|Any CPU + {C72D435A-86F8-4276-BF4C-FF00335E7014}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C72D435A-86F8-4276-BF4C-FF00335E7014}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C72D435A-86F8-4276-BF4C-FF00335E7014}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C72D435A-86F8-4276-BF4C-FF00335E7014}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -133,11 +143,12 @@ Global {63445BB7-DBB9-4AEF-9D6F-98BBE75EE1EC} = {18BF8DD7-0585-48BF-8F97-AD333080CE06} {6585D1A4-3D97-4D76-A688-1933B61AEB19} = {18BF8DD7-0585-48BF-8F97-AD333080CE06} {15441693-3659-4868-B6C1-B106F52FF3BA} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64} - {A4EFA175-44CC-44A9-B93E-1C7B6FAC38F1} = {18BF8DD7-0585-48BF-8F97-AD333080CE06} - {C24FDE63-952D-4F8E-A807-AF31D43AD675} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64} {1DFABC4A-8458-4875-8DCB-59F3802DAC65} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64} {D36A85F9-C172-487D-8192-6BFE5D05B4A7} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64} {B61388CA-DC73-4B7F-A7B2-7B9A86C9229E} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64} + {A4EFA175-44CC-44A9-B93E-1C7B6FAC38F1} = {18BF8DD7-0585-48BF-8F97-AD333080CE06} + {C24FDE63-952D-4F8E-A807-AF31D43AD675} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64} + {C72D435A-86F8-4276-BF4C-FF00335E7014} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {93384647-528D-46C8-922C-8DB36A382F0B} diff --git a/dotnet/src/AutoGen.Core/GroupChat/Graph.cs b/dotnet/src/AutoGen.Core/GroupChat/Graph.cs index 02f4da50bae..d6b71e2a3f1 100644 --- a/dotnet/src/AutoGen.Core/GroupChat/Graph.cs +++ b/dotnet/src/AutoGen.Core/GroupChat/Graph.cs @@ -12,9 +12,16 @@ public class Graph { private readonly List transitions = new List(); - public Graph(IEnumerable transitions) + public Graph() { - this.transitions.AddRange(transitions); + } + + public Graph(IEnumerable? transitions) + { + if (transitions != null) + { + this.transitions.AddRange(transitions); + } } public void AddTransition(Transition transition) diff --git a/dotnet/test/AutoGen.Core.Tests/AutoGen.Core.Tests.csproj b/dotnet/test/AutoGen.Core.Tests/AutoGen.Core.Tests.csproj new file mode 100644 index 00000000000..8d3803bc2aa --- /dev/null +++ b/dotnet/test/AutoGen.Core.Tests/AutoGen.Core.Tests.csproj @@ -0,0 +1,26 @@ + + + + netstandard2.0 + enable + enable + + false + true + + + + + + + + + + + + + + + + + diff --git a/dotnet/test/AutoGen.Core.Tests/GroupChat/GraphTests.cs b/dotnet/test/AutoGen.Core.Tests/GroupChat/GraphTests.cs new file mode 100644 index 00000000000..9354a504560 --- /dev/null +++ b/dotnet/test/AutoGen.Core.Tests/GroupChat/GraphTests.cs @@ -0,0 +1,17 @@ + +namespace AutoGen.Core.Tests +{ + [TestClass()] + public class GraphTests + { + [TestMethod()] + public void GraphTest() + { + var graph1 = new Graph(); + Assert.IsNotNull(graph1); + + var graph2 = new Graph(null); + Assert.IsNotNull(graph2); + } + } +} From 7a9c884377880014cda34e82257617836da8596b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E9=9C=87=E5=B7=8D?= Date: Wed, 22 May 2024 21:35:08 +0800 Subject: [PATCH 3/3] #2708 #2079 move GraphTests to AutoGen.Tests; delete AutoGen.Core.Tests project --- dotnet/AutoGen.sln | 10 ------- .../AutoGen.Core.Tests.csproj | 26 ------------------- .../GroupChat/GraphTests.cs | 11 ++++---- 3 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 dotnet/test/AutoGen.Core.Tests/AutoGen.Core.Tests.csproj rename dotnet/test/{AutoGen.Core.Tests => AutoGen.Tests}/GroupChat/GraphTests.cs (55%) diff --git a/dotnet/AutoGen.sln b/dotnet/AutoGen.sln index 1b8a51d974d..d3abffc981f 100644 --- a/dotnet/AutoGen.sln +++ b/dotnet/AutoGen.sln @@ -8,9 +8,6 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{18BF8DD7-0585-48BF-8F97-AD333080CE06}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F823671B-3ECA-4AE6-86DA-25E920D3FE64}" - ProjectSection(SolutionItems) = preProject - test\AutoGen.Core.Tests\AutoGen.Core.Tests.csproj = test\AutoGen.Core.Tests\AutoGen.Core.Tests.csproj - EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoGen.Tests", "test\AutoGen.Tests\AutoGen.Tests.csproj", "{FDD99AEC-4C57-4020-B23F-650612856102}" EndProject @@ -46,8 +43,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Autogen.Ollama", "src\Autog EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Autogen.Ollama.Tests", "test\Autogen.Ollama.Tests\Autogen.Ollama.Tests.csproj", "{C24FDE63-952D-4F8E-A807-AF31D43AD675}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoGen.Core.Tests", "test\AutoGen.Core.Tests\AutoGen.Core.Tests.csproj", "{C72D435A-86F8-4276-BF4C-FF00335E7014}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -122,10 +117,6 @@ Global {C24FDE63-952D-4F8E-A807-AF31D43AD675}.Debug|Any CPU.Build.0 = Debug|Any CPU {C24FDE63-952D-4F8E-A807-AF31D43AD675}.Release|Any CPU.ActiveCfg = Release|Any CPU {C24FDE63-952D-4F8E-A807-AF31D43AD675}.Release|Any CPU.Build.0 = Release|Any CPU - {C72D435A-86F8-4276-BF4C-FF00335E7014}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C72D435A-86F8-4276-BF4C-FF00335E7014}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C72D435A-86F8-4276-BF4C-FF00335E7014}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C72D435A-86F8-4276-BF4C-FF00335E7014}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -148,7 +139,6 @@ Global {B61388CA-DC73-4B7F-A7B2-7B9A86C9229E} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64} {A4EFA175-44CC-44A9-B93E-1C7B6FAC38F1} = {18BF8DD7-0585-48BF-8F97-AD333080CE06} {C24FDE63-952D-4F8E-A807-AF31D43AD675} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64} - {C72D435A-86F8-4276-BF4C-FF00335E7014} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {93384647-528D-46C8-922C-8DB36A382F0B} diff --git a/dotnet/test/AutoGen.Core.Tests/AutoGen.Core.Tests.csproj b/dotnet/test/AutoGen.Core.Tests/AutoGen.Core.Tests.csproj deleted file mode 100644 index 8d3803bc2aa..00000000000 --- a/dotnet/test/AutoGen.Core.Tests/AutoGen.Core.Tests.csproj +++ /dev/null @@ -1,26 +0,0 @@ - - - - netstandard2.0 - enable - enable - - false - true - - - - - - - - - - - - - - - - - diff --git a/dotnet/test/AutoGen.Core.Tests/GroupChat/GraphTests.cs b/dotnet/test/AutoGen.Tests/GroupChat/GraphTests.cs similarity index 55% rename from dotnet/test/AutoGen.Core.Tests/GroupChat/GraphTests.cs rename to dotnet/test/AutoGen.Tests/GroupChat/GraphTests.cs index 9354a504560..77e2c99dcd1 100644 --- a/dotnet/test/AutoGen.Core.Tests/GroupChat/GraphTests.cs +++ b/dotnet/test/AutoGen.Tests/GroupChat/GraphTests.cs @@ -1,17 +1,18 @@  -namespace AutoGen.Core.Tests +using Xunit; + +namespace AutoGen.Tests { - [TestClass()] public class GraphTests { - [TestMethod()] + [Fact] public void GraphTest() { var graph1 = new Graph(); - Assert.IsNotNull(graph1); + Assert.NotNull(graph1); var graph2 = new Graph(null); - Assert.IsNotNull(graph2); + Assert.NotNull(graph2); } } }