diff --git a/docs/SKILLS.md b/docs/SKILLS.md index 19fe4f45ab..cc0a756432 100644 --- a/docs/SKILLS.md +++ b/docs/SKILLS.md @@ -68,9 +68,8 @@ Each file will contain multiple native functions that are associated with a skil Skills are stored in one of three places: 1. Core Skills: these are skills available at any time to the kernel that embody - a few standard capabilities like working with time, text, files, http requests, - and the [Planners](PLANNERS.md). The core skills can be found - [here](../dotnet/src/SemanticKernel/CoreSkills). + a few standard capabilities like working with time, text, files, and http requests. + The core skills can be found [here](../dotnet/src/Skills/Skills.Core). 2. Semantic Skills: these skills are managed by you in a directory of your choice. diff --git a/dotnet/SK-dotnet.sln b/dotnet/SK-dotnet.sln index bef015c238..d7c363a098 100644 --- a/dotnet/SK-dotnet.sln +++ b/dotnet/SK-dotnet.sln @@ -144,6 +144,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Http", "Http", "{1C19D805-3 src\InternalUtilities\src\Http\NonDisposableHttpClientHandler.cs = src\InternalUtilities\src\Http\NonDisposableHttpClientHandler.cs EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Skills.Core", "src\Skills\Skills.Core\Skills.Core.csproj", "{0D0C4DAD-E6BC-4504-AE3A-EEA4E35920C1}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -351,6 +353,12 @@ Global {50FAE231-6F24-4779-9D02-12ABBC9A49E2}.Publish|Any CPU.Build.0 = Publish|Any CPU {50FAE231-6F24-4779-9D02-12ABBC9A49E2}.Release|Any CPU.ActiveCfg = Release|Any CPU {50FAE231-6F24-4779-9D02-12ABBC9A49E2}.Release|Any CPU.Build.0 = Release|Any CPU + {0D0C4DAD-E6BC-4504-AE3A-EEA4E35920C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0D0C4DAD-E6BC-4504-AE3A-EEA4E35920C1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0D0C4DAD-E6BC-4504-AE3A-EEA4E35920C1}.Publish|Any CPU.ActiveCfg = Debug|Any CPU + {0D0C4DAD-E6BC-4504-AE3A-EEA4E35920C1}.Publish|Any CPU.Build.0 = Debug|Any CPU + {0D0C4DAD-E6BC-4504-AE3A-EEA4E35920C1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0D0C4DAD-E6BC-4504-AE3A-EEA4E35920C1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -402,6 +410,7 @@ Global {B00AD427-0047-4850-BEF9-BA8237EA9D8B} = {958AD708-F048-4FAF-94ED-D2F2B92748B9} {DB950192-30F1-48B1-88D7-F43FECCA1A1C} = {958AD708-F048-4FAF-94ED-D2F2B92748B9} {1C19D805-3573-4477-BF07-40180FCDE1BD} = {958AD708-F048-4FAF-94ED-D2F2B92748B9} + {0D0C4DAD-E6BC-4504-AE3A-EEA4E35920C1} = {9ECD1AA0-75B3-4E25-B0B5-9F0945B64974} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBDC56A3-86AD-4323-AA0F-201E59123B83} diff --git a/dotnet/samples/KernelSyntaxExamples/Example01_NativeFunctions.cs b/dotnet/samples/KernelSyntaxExamples/Example01_NativeFunctions.cs index 8fd5358396..de95f6d8d7 100644 --- a/dotnet/samples/KernelSyntaxExamples/Example01_NativeFunctions.cs +++ b/dotnet/samples/KernelSyntaxExamples/Example01_NativeFunctions.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. using System; -using Microsoft.SemanticKernel.CoreSkills; +using Microsoft.SemanticKernel.Skills.Core; // ReSharper disable once InconsistentNaming public static class Example01_NativeFunctions diff --git a/dotnet/samples/KernelSyntaxExamples/Example02_Pipeline.cs b/dotnet/samples/KernelSyntaxExamples/Example02_Pipeline.cs index 65b5daaed1..b0771dc89c 100644 --- a/dotnet/samples/KernelSyntaxExamples/Example02_Pipeline.cs +++ b/dotnet/samples/KernelSyntaxExamples/Example02_Pipeline.cs @@ -4,8 +4,8 @@ using System; using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Microsoft.SemanticKernel; -using Microsoft.SemanticKernel.CoreSkills; using Microsoft.SemanticKernel.Orchestration; +using Microsoft.SemanticKernel.Skills.Core; using RepoUtils; // ReSharper disable once InconsistentNaming diff --git a/dotnet/samples/KernelSyntaxExamples/Example06_TemplateLanguage.cs b/dotnet/samples/KernelSyntaxExamples/Example06_TemplateLanguage.cs index c0138d03b3..5903c2b968 100644 --- a/dotnet/samples/KernelSyntaxExamples/Example06_TemplateLanguage.cs +++ b/dotnet/samples/KernelSyntaxExamples/Example06_TemplateLanguage.cs @@ -3,7 +3,7 @@ using System; using System.Threading.Tasks; using Microsoft.SemanticKernel; -using Microsoft.SemanticKernel.CoreSkills; +using Microsoft.SemanticKernel.Skills.Core; using Microsoft.SemanticKernel.TemplateEngine; using RepoUtils; diff --git a/dotnet/samples/KernelSyntaxExamples/Example08_RetryHandler.cs b/dotnet/samples/KernelSyntaxExamples/Example08_RetryHandler.cs index 7d76031b96..c8e5098d6c 100644 --- a/dotnet/samples/KernelSyntaxExamples/Example08_RetryHandler.cs +++ b/dotnet/samples/KernelSyntaxExamples/Example08_RetryHandler.cs @@ -5,8 +5,8 @@ using System.Net; using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Microsoft.SemanticKernel; -using Microsoft.SemanticKernel.CoreSkills; using Microsoft.SemanticKernel.Reliability; +using Microsoft.SemanticKernel.Skills.Core; using Reliability; using RepoUtils; diff --git a/dotnet/samples/KernelSyntaxExamples/Example10_DescribeAllSkillsAndFunctions.cs b/dotnet/samples/KernelSyntaxExamples/Example10_DescribeAllSkillsAndFunctions.cs index 44b25c2c7a..3664e9954a 100644 --- a/dotnet/samples/KernelSyntaxExamples/Example10_DescribeAllSkillsAndFunctions.cs +++ b/dotnet/samples/KernelSyntaxExamples/Example10_DescribeAllSkillsAndFunctions.cs @@ -4,8 +4,8 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; using Microsoft.SemanticKernel; -using Microsoft.SemanticKernel.CoreSkills; using Microsoft.SemanticKernel.SkillDefinition; +using Microsoft.SemanticKernel.Skills.Core; using RepoUtils; using Skills; diff --git a/dotnet/samples/KernelSyntaxExamples/Example12_SequentialPlanner.cs b/dotnet/samples/KernelSyntaxExamples/Example12_SequentialPlanner.cs index 182cb9c8e3..54792102cc 100644 --- a/dotnet/samples/KernelSyntaxExamples/Example12_SequentialPlanner.cs +++ b/dotnet/samples/KernelSyntaxExamples/Example12_SequentialPlanner.cs @@ -164,7 +164,7 @@ internal static class Example12_SequentialPlanner kernel.ImportSkill(new EmailSkill(), "email"); kernel.ImportSkill(new StaticTextSkill(), "statictext"); - kernel.ImportSkill(new Microsoft.SemanticKernel.CoreSkills.TextSkill(), "coretext"); + kernel.ImportSkill(new Microsoft.SemanticKernel.Skills.Core.TextSkill(), "coretext"); var goal = "Create a book with 3 chapters about a group of kids in a club called 'The Thinking Caps.'"; diff --git a/dotnet/samples/KernelSyntaxExamples/Example13_ConversationSummarySkill.cs b/dotnet/samples/KernelSyntaxExamples/Example13_ConversationSummarySkill.cs index 135386ee61..96fb77d7c2 100644 --- a/dotnet/samples/KernelSyntaxExamples/Example13_ConversationSummarySkill.cs +++ b/dotnet/samples/KernelSyntaxExamples/Example13_ConversationSummarySkill.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.SemanticKernel; -using Microsoft.SemanticKernel.CoreSkills; using Microsoft.SemanticKernel.Orchestration; using Microsoft.SemanticKernel.SkillDefinition; +using Microsoft.SemanticKernel.Skills.Core; using RepoUtils; // ReSharper disable once InconsistentNaming diff --git a/dotnet/samples/KernelSyntaxExamples/Example15_MemorySkill.cs b/dotnet/samples/KernelSyntaxExamples/Example15_MemorySkill.cs index ac8e20c939..5d00f4751d 100644 --- a/dotnet/samples/KernelSyntaxExamples/Example15_MemorySkill.cs +++ b/dotnet/samples/KernelSyntaxExamples/Example15_MemorySkill.cs @@ -3,9 +3,9 @@ using System; using System.Threading.Tasks; using Microsoft.SemanticKernel; -using Microsoft.SemanticKernel.CoreSkills; using Microsoft.SemanticKernel.Memory; using Microsoft.SemanticKernel.SkillDefinition; +using Microsoft.SemanticKernel.Skills.Core; using RepoUtils; // ReSharper disable once InconsistentNaming diff --git a/dotnet/samples/KernelSyntaxExamples/Example30_ChatWithPrompts.cs b/dotnet/samples/KernelSyntaxExamples/Example30_ChatWithPrompts.cs index ad1ce4624c..f438a0570a 100644 --- a/dotnet/samples/KernelSyntaxExamples/Example30_ChatWithPrompts.cs +++ b/dotnet/samples/KernelSyntaxExamples/Example30_ChatWithPrompts.cs @@ -5,7 +5,7 @@ using System.Globalization; using System.Threading.Tasks; using Microsoft.SemanticKernel; using Microsoft.SemanticKernel.AI.ChatCompletion; -using Microsoft.SemanticKernel.CoreSkills; +using Microsoft.SemanticKernel.Skills.Core; using Microsoft.SemanticKernel.TemplateEngine; using RepoUtils; using Resources; diff --git a/dotnet/samples/KernelSyntaxExamples/Example31_CustomPlanner.cs b/dotnet/samples/KernelSyntaxExamples/Example31_CustomPlanner.cs index d94e26746a..2ec4a8af52 100644 --- a/dotnet/samples/KernelSyntaxExamples/Example31_CustomPlanner.cs +++ b/dotnet/samples/KernelSyntaxExamples/Example31_CustomPlanner.cs @@ -7,11 +7,11 @@ using System.Threading.Tasks; using System.Xml; using System.Xml.XPath; using Microsoft.SemanticKernel; -using Microsoft.SemanticKernel.CoreSkills; using Microsoft.SemanticKernel.Memory; using Microsoft.SemanticKernel.Orchestration; using Microsoft.SemanticKernel.Planning; using Microsoft.SemanticKernel.SkillDefinition; +using Microsoft.SemanticKernel.Skills.Core; using Microsoft.SemanticKernel.Skills.Web; using Microsoft.SemanticKernel.Skills.Web.Bing; using RepoUtils; diff --git a/dotnet/samples/KernelSyntaxExamples/Example48_GroundednessChecks.cs b/dotnet/samples/KernelSyntaxExamples/Example48_GroundednessChecks.cs index 2e13eed892..e9074ab6e6 100644 --- a/dotnet/samples/KernelSyntaxExamples/Example48_GroundednessChecks.cs +++ b/dotnet/samples/KernelSyntaxExamples/Example48_GroundednessChecks.cs @@ -3,9 +3,9 @@ using System; using System.Threading.Tasks; using Microsoft.SemanticKernel; -using Microsoft.SemanticKernel.CoreSkills; using Microsoft.SemanticKernel.Planning; using Microsoft.SemanticKernel.Planning.Sequential; +using Microsoft.SemanticKernel.Skills.Core; using RepoUtils; // ReSharper disable CommentTypo diff --git a/dotnet/samples/KernelSyntaxExamples/KernelSyntaxExamples.csproj b/dotnet/samples/KernelSyntaxExamples/KernelSyntaxExamples.csproj index d6a55889d6..80fb92c759 100644 --- a/dotnet/samples/KernelSyntaxExamples/KernelSyntaxExamples.csproj +++ b/dotnet/samples/KernelSyntaxExamples/KernelSyntaxExamples.csproj @@ -35,6 +35,7 @@ + diff --git a/dotnet/src/SemanticKernel.MetaPackage/SemanticKernel.MetaPackage.csproj b/dotnet/src/SemanticKernel.MetaPackage/SemanticKernel.MetaPackage.csproj index 2210336a1e..73e4cb561a 100644 --- a/dotnet/src/SemanticKernel.MetaPackage/SemanticKernel.MetaPackage.csproj +++ b/dotnet/src/SemanticKernel.MetaPackage/SemanticKernel.MetaPackage.csproj @@ -18,6 +18,7 @@ Empowers app owners to integrate cutting-edge LLM technology quickly and easily + diff --git a/dotnet/src/SemanticKernel/CoreSkills/ConversationSummarySkill.cs b/dotnet/src/Skills/Skills.Core/ConversationSummarySkill.cs similarity index 99% rename from dotnet/src/SemanticKernel/CoreSkills/ConversationSummarySkill.cs rename to dotnet/src/Skills/Skills.Core/ConversationSummarySkill.cs index e0bfccc210..30fb4689a3 100644 --- a/dotnet/src/SemanticKernel/CoreSkills/ConversationSummarySkill.cs +++ b/dotnet/src/Skills/Skills.Core/ConversationSummarySkill.cs @@ -7,7 +7,7 @@ using Microsoft.SemanticKernel.Orchestration; using Microsoft.SemanticKernel.SkillDefinition; using Microsoft.SemanticKernel.Text; -namespace Microsoft.SemanticKernel.CoreSkills; +namespace Microsoft.SemanticKernel.Skills.Core; /// /// Semantic skill that enables conversations summarization. diff --git a/dotnet/src/SemanticKernel/CoreSkills/FileIOSkill.cs b/dotnet/src/Skills/Skills.Core/FileIOSkill.cs similarity index 97% rename from dotnet/src/SemanticKernel/CoreSkills/FileIOSkill.cs rename to dotnet/src/Skills/Skills.Core/FileIOSkill.cs index f04fbb6e60..7835516b95 100644 --- a/dotnet/src/SemanticKernel/CoreSkills/FileIOSkill.cs +++ b/dotnet/src/Skills/Skills.Core/FileIOSkill.cs @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; using Microsoft.SemanticKernel.SkillDefinition; -namespace Microsoft.SemanticKernel.CoreSkills; +namespace Microsoft.SemanticKernel.Skills.Core; /// /// Read and write from a file. diff --git a/dotnet/src/SemanticKernel/CoreSkills/HttpSkill.cs b/dotnet/src/Skills/Skills.Core/HttpSkill.cs similarity index 99% rename from dotnet/src/SemanticKernel/CoreSkills/HttpSkill.cs rename to dotnet/src/Skills/Skills.Core/HttpSkill.cs index dd9ba3fae7..f64c31cd50 100644 --- a/dotnet/src/SemanticKernel/CoreSkills/HttpSkill.cs +++ b/dotnet/src/Skills/Skills.Core/HttpSkill.cs @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.SemanticKernel.SkillDefinition; -namespace Microsoft.SemanticKernel.CoreSkills; +namespace Microsoft.SemanticKernel.Skills.Core; /// /// A skill that provides HTTP functionality. diff --git a/dotnet/src/SemanticKernel/CoreSkills/MathSkill.cs b/dotnet/src/Skills/Skills.Core/MathSkill.cs similarity index 97% rename from dotnet/src/SemanticKernel/CoreSkills/MathSkill.cs rename to dotnet/src/Skills/Skills.Core/MathSkill.cs index b71a1b078f..7878f3d772 100644 --- a/dotnet/src/SemanticKernel/CoreSkills/MathSkill.cs +++ b/dotnet/src/Skills/Skills.Core/MathSkill.cs @@ -3,7 +3,7 @@ using System.ComponentModel; using Microsoft.SemanticKernel.SkillDefinition; -namespace Microsoft.SemanticKernel.CoreSkills; +namespace Microsoft.SemanticKernel.Skills.Core; /// /// MathSkill provides a set of functions to make Math calculations. diff --git a/dotnet/src/SemanticKernel/CoreSkills/SemanticFunctionConstants.cs b/dotnet/src/Skills/Skills.Core/SemanticFunctionConstants.cs similarity index 98% rename from dotnet/src/SemanticKernel/CoreSkills/SemanticFunctionConstants.cs rename to dotnet/src/Skills/Skills.Core/SemanticFunctionConstants.cs index 656be84567..329b21561b 100644 --- a/dotnet/src/SemanticKernel/CoreSkills/SemanticFunctionConstants.cs +++ b/dotnet/src/Skills/Skills.Core/SemanticFunctionConstants.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. -namespace Microsoft.SemanticKernel.CoreSkills; +namespace Microsoft.SemanticKernel.Skills.Core; internal static class SemanticFunctionConstants { diff --git a/dotnet/src/Skills/Skills.Core/Skills.Core.csproj b/dotnet/src/Skills/Skills.Core/Skills.Core.csproj new file mode 100644 index 0000000000..3d9e6e4b1a --- /dev/null +++ b/dotnet/src/Skills/Skills.Core/Skills.Core.csproj @@ -0,0 +1,23 @@ + + + + + Microsoft.SemanticKernel.Skills.Core + $(AssemblyName) + netstandard2.0 + + + + + + + + Semantic Kernel - Core Skills + Semantic Kernel core skills. + + + + + + + diff --git a/dotnet/src/SemanticKernel/CoreSkills/TextMemorySkill.cs b/dotnet/src/Skills/Skills.Core/TextMemorySkill.cs similarity index 99% rename from dotnet/src/SemanticKernel/CoreSkills/TextMemorySkill.cs rename to dotnet/src/Skills/Skills.Core/TextMemorySkill.cs index 73e794e6b5..89d4322f62 100644 --- a/dotnet/src/SemanticKernel/CoreSkills/TextMemorySkill.cs +++ b/dotnet/src/Skills/Skills.Core/TextMemorySkill.cs @@ -11,7 +11,7 @@ using Microsoft.SemanticKernel.Memory; using Microsoft.SemanticKernel.Orchestration; using Microsoft.SemanticKernel.SkillDefinition; -namespace Microsoft.SemanticKernel.CoreSkills; +namespace Microsoft.SemanticKernel.Skills.Core; /// /// TextMemorySkill provides a skill to save or recall information from the long or short term memory. diff --git a/dotnet/src/SemanticKernel/CoreSkills/TextSkill.cs b/dotnet/src/Skills/Skills.Core/TextSkill.cs similarity index 98% rename from dotnet/src/SemanticKernel/CoreSkills/TextSkill.cs rename to dotnet/src/Skills/Skills.Core/TextSkill.cs index b484d3a773..8069b0e113 100644 --- a/dotnet/src/SemanticKernel/CoreSkills/TextSkill.cs +++ b/dotnet/src/Skills/Skills.Core/TextSkill.cs @@ -4,7 +4,7 @@ using System.ComponentModel; using System.Globalization; using Microsoft.SemanticKernel.SkillDefinition; -namespace Microsoft.SemanticKernel.CoreSkills; +namespace Microsoft.SemanticKernel.Skills.Core; /// /// TextSkill provides a set of functions to manipulate strings. diff --git a/dotnet/src/SemanticKernel/CoreSkills/TimeSkill.cs b/dotnet/src/Skills/Skills.Core/TimeSkill.cs similarity index 99% rename from dotnet/src/SemanticKernel/CoreSkills/TimeSkill.cs rename to dotnet/src/Skills/Skills.Core/TimeSkill.cs index 92319a7352..b0ae361b17 100644 --- a/dotnet/src/SemanticKernel/CoreSkills/TimeSkill.cs +++ b/dotnet/src/Skills/Skills.Core/TimeSkill.cs @@ -4,7 +4,7 @@ using System; using System.ComponentModel; using Microsoft.SemanticKernel.SkillDefinition; -namespace Microsoft.SemanticKernel.CoreSkills; +namespace Microsoft.SemanticKernel.Skills.Core; /// /// TimeSkill provides a set of functions to get the current time and date. diff --git a/dotnet/src/SemanticKernel/CoreSkills/WaitSkill.cs b/dotnet/src/Skills/Skills.Core/WaitSkill.cs similarity index 92% rename from dotnet/src/SemanticKernel/CoreSkills/WaitSkill.cs rename to dotnet/src/Skills/Skills.Core/WaitSkill.cs index 66bb08d28b..c3930123ae 100644 --- a/dotnet/src/SemanticKernel/CoreSkills/WaitSkill.cs +++ b/dotnet/src/Skills/Skills.Core/WaitSkill.cs @@ -4,7 +4,7 @@ using System.ComponentModel; using System.Threading.Tasks; using Microsoft.SemanticKernel.SkillDefinition; -namespace Microsoft.SemanticKernel.CoreSkills; +namespace Microsoft.SemanticKernel.Skills.Core; /// /// WaitSkill provides a set of functions to wait before making the rest of operations. @@ -46,7 +46,7 @@ public sealed class WaitSkill public async Task SecondsAsync([Description("The number of seconds to wait")] decimal seconds) { var milliseconds = seconds * 1000; - milliseconds = (milliseconds > 0) ? milliseconds : 0; + milliseconds = milliseconds > 0 ? milliseconds : 0; await this._waitProvider.DelayAsync((int)milliseconds).ConfigureAwait(false); } diff --git a/dotnet/src/SemanticKernel.UnitTests/CoreSkills/FileIOSkillTests.cs b/dotnet/src/Skills/Skills.UnitTests/Core/FileIOSkillTests.cs similarity index 95% rename from dotnet/src/SemanticKernel.UnitTests/CoreSkills/FileIOSkillTests.cs rename to dotnet/src/Skills/Skills.UnitTests/Core/FileIOSkillTests.cs index ffd464f677..b66c28c0a4 100644 --- a/dotnet/src/SemanticKernel.UnitTests/CoreSkills/FileIOSkillTests.cs +++ b/dotnet/src/Skills/Skills.UnitTests/Core/FileIOSkillTests.cs @@ -4,10 +4,10 @@ using System; using System.IO; using System.Threading.Tasks; using Microsoft.SemanticKernel; -using Microsoft.SemanticKernel.CoreSkills; +using Microsoft.SemanticKernel.Skills.Core; using Xunit; -namespace SemanticKernel.UnitTests.CoreSkills; +namespace SemanticKernel.Skills.UnitTests.Core; public class FileIOSkillTests { diff --git a/dotnet/src/SemanticKernel.UnitTests/CoreSkills/HttpSkillTests.cs b/dotnet/src/Skills/Skills.UnitTests/Core/HttpSkillTests.cs similarity index 97% rename from dotnet/src/SemanticKernel.UnitTests/CoreSkills/HttpSkillTests.cs rename to dotnet/src/Skills/Skills.UnitTests/Core/HttpSkillTests.cs index a0f822847a..8c743a395f 100644 --- a/dotnet/src/SemanticKernel.UnitTests/CoreSkills/HttpSkillTests.cs +++ b/dotnet/src/Skills/Skills.UnitTests/Core/HttpSkillTests.cs @@ -6,12 +6,12 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; using Microsoft.SemanticKernel; -using Microsoft.SemanticKernel.CoreSkills; +using Microsoft.SemanticKernel.Skills.Core; using Moq; using Moq.Protected; using Xunit; -namespace SemanticKernel.UnitTests.CoreSkills; +namespace SemanticKernel.Skills.UnitTests.Core; public class HttpSkillTests : IDisposable { diff --git a/dotnet/src/SemanticKernel.UnitTests/CoreSkills/MathSkillTests.cs b/dotnet/src/Skills/Skills.UnitTests/Core/MathSkillTests.cs similarity index 97% rename from dotnet/src/SemanticKernel.UnitTests/CoreSkills/MathSkillTests.cs rename to dotnet/src/Skills/Skills.UnitTests/Core/MathSkillTests.cs index c72416f51c..422874a647 100644 --- a/dotnet/src/SemanticKernel.UnitTests/CoreSkills/MathSkillTests.cs +++ b/dotnet/src/Skills/Skills.UnitTests/Core/MathSkillTests.cs @@ -2,10 +2,11 @@ using System.Threading.Tasks; using Microsoft.SemanticKernel; -using Microsoft.SemanticKernel.CoreSkills; +using Microsoft.SemanticKernel.Skills.Core; +using SemanticKernel.UnitTests; using Xunit; -namespace SemanticKernel.UnitTests.CoreSkills; +namespace SemanticKernel.Skills.UnitTests.Core; public class MathSkillTests { diff --git a/dotnet/src/SemanticKernel.UnitTests/CoreSkills/TextSkillTests.cs b/dotnet/src/Skills/Skills.UnitTests/Core/TextSkillTests.cs similarity index 96% rename from dotnet/src/SemanticKernel.UnitTests/CoreSkills/TextSkillTests.cs rename to dotnet/src/Skills/Skills.UnitTests/Core/TextSkillTests.cs index e693b03c11..8a0f6f5af3 100644 --- a/dotnet/src/SemanticKernel.UnitTests/CoreSkills/TextSkillTests.cs +++ b/dotnet/src/Skills/Skills.UnitTests/Core/TextSkillTests.cs @@ -1,10 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. using Microsoft.SemanticKernel; -using Microsoft.SemanticKernel.CoreSkills; +using Microsoft.SemanticKernel.Skills.Core; using Xunit; -namespace SemanticKernel.UnitTests.CoreSkills; +namespace SemanticKernel.Skills.UnitTests.Core; public class TextSkillTests { diff --git a/dotnet/src/SemanticKernel.UnitTests/CoreSkills/TimeSkillTests.cs b/dotnet/src/Skills/Skills.UnitTests/Core/TimeSkillTests.cs similarity index 95% rename from dotnet/src/SemanticKernel.UnitTests/CoreSkills/TimeSkillTests.cs rename to dotnet/src/Skills/Skills.UnitTests/Core/TimeSkillTests.cs index b38e328117..13982a0fe5 100644 --- a/dotnet/src/SemanticKernel.UnitTests/CoreSkills/TimeSkillTests.cs +++ b/dotnet/src/Skills/Skills.UnitTests/Core/TimeSkillTests.cs @@ -5,10 +5,11 @@ using System.Collections.Generic; using System.Globalization; using System.Threading.Tasks; using Microsoft.SemanticKernel; -using Microsoft.SemanticKernel.CoreSkills; +using Microsoft.SemanticKernel.Skills.Core; +using SemanticKernel.UnitTests; using Xunit; -namespace SemanticKernel.UnitTests.CoreSkills; +namespace SemanticKernel.Skills.UnitTests.Core; // TODO: allow clock injection and test all functions public class TimeSkillTests diff --git a/dotnet/src/SemanticKernel.UnitTests/CoreSkills/WaitSkillTests.cs b/dotnet/src/Skills/Skills.UnitTests/Core/WaitSkillTests.cs similarity index 94% rename from dotnet/src/SemanticKernel.UnitTests/CoreSkills/WaitSkillTests.cs rename to dotnet/src/Skills/Skills.UnitTests/Core/WaitSkillTests.cs index 1e9efe97ea..3352015981 100644 --- a/dotnet/src/SemanticKernel.UnitTests/CoreSkills/WaitSkillTests.cs +++ b/dotnet/src/Skills/Skills.UnitTests/Core/WaitSkillTests.cs @@ -2,11 +2,12 @@ using System.Threading.Tasks; using Microsoft.SemanticKernel; -using Microsoft.SemanticKernel.CoreSkills; +using Microsoft.SemanticKernel.Skills.Core; using Moq; +using SemanticKernel.UnitTests; using Xunit; -namespace SemanticKernel.UnitTests.CoreSkills; +namespace SemanticKernel.Skills.UnitTests.Core; // TODO: allow clock injection and test all functions public class WaitSkillTests diff --git a/dotnet/src/Skills/Skills.UnitTests/Skills.UnitTests.csproj b/dotnet/src/Skills/Skills.UnitTests/Skills.UnitTests.csproj index 8875870155..c449a27e01 100644 --- a/dotnet/src/Skills/Skills.UnitTests/Skills.UnitTests.csproj +++ b/dotnet/src/Skills/Skills.UnitTests/Skills.UnitTests.csproj @@ -42,6 +42,7 @@ + diff --git a/samples/apps/chat-summary-webapp-react/README.md b/samples/apps/chat-summary-webapp-react/README.md index 5ef3ecbe88..b4c7aa39b2 100644 --- a/samples/apps/chat-summary-webapp-react/README.md +++ b/samples/apps/chat-summary-webapp-react/README.md @@ -26,8 +26,8 @@ Watch the [Chat Summary Quick Start Video](https://aka.ms/SK-Samples-SimChat-Vid The Simple Chat Summary sample allows you to see the power of semantic functions used in a chat. -The sample highlights the [SummarizeConversation](../../../dotnet/src/SemanticKernel/CoreSkills/SemanticFunctionConstants.cs#377), [GetConversationActionItems](../../../dotnet/src/SemanticKernel/CoreSkills/SemanticFunctionConstants.cs#390), and [GetConversationTopics](../../../dotnet/src/SemanticKernel/CoreSkills/SemanticFunctionConstants.cs#433) -native functions in the [Conversation Summary Skill](../../../dotnet/src/SemanticKernel/CoreSkills/ConversationSummarySkill.cs). +The sample highlights the [SummarizeConversation](../../../dotnet/src/Skills/Skills.Core/SemanticFunctionConstants.cs#7), [GetConversationActionItems](../../../dotnet/src/Skills/Skills.Core/SemanticFunctionConstants.cs#20), and [GetConversationTopics](../../../dotnet/src/Skills/Skills.Core/SemanticFunctionConstants.cs#63) +native functions in the [Conversation Summary Skill](../../../dotnet/src/Skills//Skills.Core/ConversationSummarySkill.cs). Each function calls Open AI to review the information in the chat window and produces insights. The chat data can be loaded from this [data file](src/components/chat/ChatThread.ts) – which you diff --git a/samples/apps/chat-summary-webapp-react/src/App.tsx b/samples/apps/chat-summary-webapp-react/src/App.tsx index e1ebc199fa..d0fcd6f054 100644 --- a/samples/apps/chat-summary-webapp-react/src/App.tsx +++ b/samples/apps/chat-summary-webapp-react/src/App.tsx @@ -63,15 +63,15 @@ const App: FC = () => { items: [ { title: 'Summarize', - uri: 'https://github.com/microsoft/semantic-kernel/blob/main/dotnet/src/SemanticKernel/CoreSkills/ConversationSummarySkill.cs#L70', + uri: 'https://github.com/microsoft/semantic-kernel/blob/main/dotnet/src/Skills/Skills.Core/ConversationSummarySkill.cs#L70', }, { title: 'Action Items', - uri: 'https://github.com/microsoft/semantic-kernel/blob/main/dotnet/src/SemanticKernel/CoreSkills/ConversationSummarySkill.cs#L87', + uri: 'https://github.com/microsoft/semantic-kernel/blob/main/dotnet/src/Skills/Skills.Core/ConversationSummarySkill.cs#L87', }, { title: 'Topics', - uri: 'https://github.com/microsoft/semantic-kernel/blob/main/dotnet/src/SemanticKernel/CoreSkills/ConversationSummarySkill.cs#L104', + uri: 'https://github.com/microsoft/semantic-kernel/blob/main/dotnet/src/Skills/Skills.Core/ConversationSummarySkill.cs#L104', }, ], },