Skip to content

Commit 8b29e7e

Browse files
authored
Merge branch 'main' into main
2 parents c7b09ba + a98580a commit 8b29e7e

File tree

213 files changed

+13284
-620
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

213 files changed

+13284
-620
lines changed

dotnet/Directory.Packages.props

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<ItemGroup>
88
<PackageVersion Include="Aspire.Azure.AI.OpenAI" Version="9.1.0-preview.1.25121.10" />
99
<PackageVersion Include="Aspire.Azure.Search.Documents" Version="9.2.1" />
10-
<PackageVersion Include="Aspire.Hosting.Azure.Search" Version="9.1.0" />
1110
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.2.0" />
1211
<PackageVersion Include="Aspire.Hosting.Azure.CognitiveServices" Version="9.1.0" />
12+
<PackageVersion Include="Aspire.Hosting.Azure.Search" Version="9.1.0" />
1313
<PackageVersion Include="AWSSDK.BedrockAgent" Version="4.0.0-preview.13" />
1414
<PackageVersion Include="AWSSDK.BedrockAgentRuntime" Version="4.0.0-preview.13" />
1515
<PackageVersion Include="AWSSDK.BedrockRuntime" Version="4.0.0.2" />
@@ -31,28 +31,30 @@
3131
<PackageVersion Include="EntityFramework" Version="6.5.1" />
3232
<PackageVersion Include="FastBertTokenizer" Version="1.0.28" />
3333
<PackageVersion Include="Google.Apis.Auth" Version="1.69.0" />
34+
<PackageVersion Include="Google.Apis.CustomSearchAPI.v1" Version="1.68.0.3520" />
3435
<PackageVersion Include="Google.Protobuf" Version="3.27.1" />
3536
<PackageVersion Include="Grpc.AspNetCore" Version="2.70.0" />
3637
<PackageVersion Include="Grpc.AspNetCore.Server" Version="2.70.0" />
3738
<PackageVersion Include="Grpc.AspNetCore.Server.Reflection" Version="2.70.0" />
3839
<PackageVersion Include="Grpc.AspNetCore.Web" Version="2.70.0" />
40+
<PackageVersion Include="Grpc.Net.Client" Version="2.70.0" />
3941
<PackageVersion Include="Grpc.Tools" Version="2.71.0" />
40-
<PackageVersion Include="ModelContextProtocol" Version="0.1.0-preview.13" />
41-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.13" />
42-
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.14" />
43-
<PackageVersion Include="Microsoft.ML.Tokenizers.Data.Cl100kBase" Version="1.0.1" />
44-
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.5.1" />
45-
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.12.19" />
42+
<PackageVersion Include="JmesPath.Net" Version="1.0.330" />
43+
<PackageVersion Include="JsonSchema.Net.Generation" Version="5.0.2" />
4644
<PackageVersion Include="Handlebars.Net.Helpers" Version="2.4.10" />
4745
<PackageVersion Include="Handlebars.Net" Version="2.1.6" />
4846
<PackageVersion Include="HtmlAgilityPack" Version="1.11.72" />
49-
<PackageVersion Include="JsonSchema.Net" Version="5.4.2" />
47+
<PackageVersion Include="JsonSchema.Net" Version="7.3.4" />
5048
<PackageVersion Include="Markdig" Version="0.40.0" />
5149
<PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
50+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.13" />
51+
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.14" />
5252
<PackageVersion Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
5353
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.3.0" />
54-
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.0.0" />
55-
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Storage.Queues" Version="5.5.0" />
54+
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore"
55+
Version="2.0.0" />
56+
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Storage.Queues"
57+
Version="5.5.0" />
5658
<PackageVersion Include="Microsoft.Azure.Functions.Worker.SDK" Version="2.0.0" />
5759
<PackageVersion Include="Microsoft.Azure.Kusto.Data" Version="12.2.8" />
5860
<PackageVersion Include="Microsoft.Azure.WebJobs.Extensions.OpenApi" Version="1.5.1" />
@@ -64,7 +66,11 @@
6466
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
6567
<PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="8.0.1" />
6668
<PackageVersion Include="Microsoft.Identity.Client" Version="4.67.2" />
69+
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.5.1" />
6770
<PackageVersion Include="Microsoft.ML.OnnxRuntime" Version="1.21.0" />
71+
<PackageVersion Include="Microsoft.ML.Tokenizers.Data.Cl100kBase" Version="1.0.1" />
72+
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.12.19" />
73+
<PackageVersion Include="ModelContextProtocol" Version="0.1.0-preview.13" />
6874
<PackageVersion Include="MSTest.TestFramework" Version="3.8.0" />
6975
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
7076
<PackageVersion Include="Npgsql" Version="8.0.6" />
@@ -98,12 +104,14 @@
98104
<!-- Microsoft.Extensions.* -->
99105
<PackageVersion Include="Microsoft.Extensions.AI" Version="9.5.0-preview.1.25262.9" />
100106
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="9.5.0-preview.1.25262.9" />
101-
<PackageVersion Include="Microsoft.Extensions.AI.AzureAIInference" Version="9.5.0-preview.1.25262.9" />
107+
<PackageVersion Include="Microsoft.Extensions.AI.AzureAIInference"
108+
Version="9.5.0-preview.1.25262.9" />
102109
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.5.0-preview.1.25262.9" />
103110
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
104111
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
105112
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
106-
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
113+
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables"
114+
Version="8.0.0" />
107115
<PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
108116
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
109117
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
@@ -147,8 +155,6 @@
147155
<PackageVersion Include="Microsoft.OpenApi.Readers" Version="1.6.23" />
148156
<PackageVersion Include="Microsoft.OpenApi.ApiManifest" Version="0.5.6-preview" />
149157
<PackageVersion Include="Microsoft.Plugins.Manifest" Version="1.0.0-rc3" />
150-
<PackageVersion Include="Google.Apis.CustomSearchAPI.v1" Version="1.68.0.3520" />
151-
<PackageVersion Include="Grpc.Net.Client" Version="2.70.0" />
152158
<PackageVersion Include="protobuf-net" Version="3.2.45" />
153159
<PackageVersion Include="protobuf-net.Reflection" Version="3.2.12" />
154160
<PackageVersion Include="YamlDotNet" Version="15.3.0" />

dotnet/SK-dotnet.sln

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Runtime.InProcess.UnitTests
550550
EndProject
551551
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectorData.UnitTests", "src\Connectors\VectorData.UnitTests\VectorData.UnitTests.csproj", "{AAC7B5E8-CC4E-49D0-AF6A-2B4F7B43BD84}"
552552
EndProject
553+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Agents.Orchestration", "src\Agents\Orchestration\Agents.Orchestration.csproj", "{D1A02387-FA60-22F8-C2ED-4676568B6CC3}"
554+
EndProject
553555
Global
554556
GlobalSection(SolutionConfigurationPlatforms) = preSolution
555557
Debug|Any CPU = Debug|Any CPU
@@ -1511,6 +1513,12 @@ Global
15111513
{AAC7B5E8-CC4E-49D0-AF6A-2B4F7B43BD84}.Publish|Any CPU.Build.0 = Debug|Any CPU
15121514
{AAC7B5E8-CC4E-49D0-AF6A-2B4F7B43BD84}.Release|Any CPU.ActiveCfg = Release|Any CPU
15131515
{AAC7B5E8-CC4E-49D0-AF6A-2B4F7B43BD84}.Release|Any CPU.Build.0 = Release|Any CPU
1516+
{D1A02387-FA60-22F8-C2ED-4676568B6CC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1517+
{D1A02387-FA60-22F8-C2ED-4676568B6CC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
1518+
{D1A02387-FA60-22F8-C2ED-4676568B6CC3}.Publish|Any CPU.ActiveCfg = Publish|Any CPU
1519+
{D1A02387-FA60-22F8-C2ED-4676568B6CC3}.Publish|Any CPU.Build.0 = Publish|Any CPU
1520+
{D1A02387-FA60-22F8-C2ED-4676568B6CC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
1521+
{D1A02387-FA60-22F8-C2ED-4676568B6CC3}.Release|Any CPU.Build.0 = Release|Any CPU
15141522
EndGlobalSection
15151523
GlobalSection(SolutionProperties) = preSolution
15161524
HideSolutionNode = FALSE
@@ -1536,7 +1544,7 @@ Global
15361544
{AFA81EB7-F869-467D-8A90-744305D80AAC} = {1B4CBDE0-10C2-4E7D-9CD0-FE7586C96ED1}
15371545
{627742DB-1E52-468A-99BD-6FF1A542D25B} = {831DDCA2-7D2C-4C31-80DB-6BDB3E1F7AE0}
15381546
{E3299033-EB81-4C4C-BCD9-E8DC40937969} = {831DDCA2-7D2C-4C31-80DB-6BDB3E1F7AE0}
1539-
{078F96B4-09E1-4E0E-B214-F71A4F4BF633} = {831DDCA2-7D2C-4C31-80DB-6BDB3E1F7AE0}
1547+
{078F96B4-09E1-4E0E-B214-F71A4F4BF633} = {9ECD1AA0-75B3-4E25-B0B5-9F0945B64974}
15401548
{F51017A9-15C8-472D-893C-080046D710A6} = {078F96B4-09E1-4E0E-B214-F71A4F4BF633}
15411549
{EC3BB6D1-2FB2-4702-84C6-F791DE533ED4} = {24503383-A8C4-4255-9998-28D70FE8E99A}
15421550
{4D226C2F-AE9F-4EFB-AF2D-45C8FE5CB34E} = {24503383-A8C4-4255-9998-28D70FE8E99A}
@@ -1716,6 +1724,7 @@ Global
17161724
{CCC909E4-5269-A31E-0BFD-4863B4B29BBB} = {A70ED5A7-F8E1-4A57-9455-3C05989542DA}
17171725
{DA6B4ED4-ED0B-D25C-889C-9F940E714891} = {A70ED5A7-F8E1-4A57-9455-3C05989542DA}
17181726
{AAC7B5E8-CC4E-49D0-AF6A-2B4F7B43BD84} = {5A7028A7-4DDF-4E4F-84A9-37CE8F8D7E89}
1727+
{D1A02387-FA60-22F8-C2ED-4676568B6CC3} = {6823CD5E-2ABE-41EB-B865-F86EC13F0CF9}
17191728
EndGlobalSection
17201729
GlobalSection(ExtensibilityGlobals) = postSolution
17211730
SolutionGuid = {FBDC56A3-86AD-4323-AA0F-201E59123B83}

dotnet/docs/EXPERIMENTS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ You can use the following diagnostic IDs to ignore warnings or errors for a part
8383
| SKEXP0070 | Amazon AI connector | | | | | |
8484
| | | | | | | |
8585
| SKEXP0080 | Process Framework |
86+
| SKEXP0081 | Process Framework - Foundry Process
8687
| | | | | | | |
8788
| SKEXP0101 | Experiment with Assistants |
8889
| SKEXP0101 | Experiment with Flow Orchestration |

dotnet/nuget.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
3+
44
<packageSources>
55
<clear />
66
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
@@ -11,5 +11,5 @@
1111
<package pattern="*" />
1212
</packageSource>
1313
</packageSourceMapping>
14-
14+
1515
</configuration>

dotnet/nuget/nuget-package.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project>
22
<PropertyGroup>
33
<!-- Central version prefix - applies to all nuget packages. -->
4-
<VersionPrefix>1.50.0</VersionPrefix>
4+
<VersionPrefix>1.51.0</VersionPrefix>
55
<PackageVersion Condition="'$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix)</PackageVersion>
66
<PackageVersion Condition="'$(VersionSuffix)' == ''">$(VersionPrefix)</PackageVersion>
77

88
<Configurations>Debug;Release;Publish</Configurations>
99
<IsPackable>true</IsPackable>
1010

1111
<!-- Package validation. Baseline Version should be the latest version available on NuGet. -->
12-
<PackageValidationBaselineVersion>1.49.0</PackageValidationBaselineVersion>
12+
<PackageValidationBaselineVersion>1.50.0</PackageValidationBaselineVersion>
1313
<!-- Validate assembly attributes only for Publish builds -->
1414
<NoWarn Condition="'$(Configuration)' != 'Publish'">$(NoWarn);CP0003</NoWarn>
1515
<!-- Do not validate reference assemblies -->

dotnet/samples/Demos/ProcessFrameworkWithAspire/ProcessFramework.Aspire/ProcessFramework.Aspire.ProcessOrchestrator/Program.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434

3535
processBuilder
3636
.OnInputEvent(ProcessEvents.TranslateDocument)
37-
.SendEventTo(new(translateDocumentStep, TranslateStep.Functions.Translate, parameterName: "textToTranslate"));
37+
.SendEventTo(new(translateDocumentStep, TranslateStep.ProcessFunctions.Translate, parameterName: "textToTranslate"));
3838

3939
translateDocumentStep
4040
.OnEvent(ProcessEvents.DocumentTranslated)
41-
.SendEventTo(new(summarizeDocumentStep, SummarizeStep.Functions.Summarize, parameterName: "textToSummarize"));
41+
.SendEventTo(new ProcessFunctionTargetBuilder(summarizeDocumentStep, SummarizeStep.ProcessFunctions.Summarize, parameterName: "textToSummarize"));
4242

4343
summarizeDocumentStep
4444
.OnEvent(ProcessEvents.DocumentSummarized)

dotnet/samples/Demos/ProcessFrameworkWithAspire/ProcessFramework.Aspire/ProcessFramework.Aspire.ProcessOrchestrator/Steps/SummarizeStep.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ namespace ProcessFramework.Aspire.ProcessOrchestrator.Steps;
77

88
public class SummarizeStep : KernelProcessStep
99
{
10-
public static class Functions
10+
public static class ProcessFunctions
1111
{
1212
public const string Summarize = nameof(Summarize);
1313
}
1414

15-
[KernelFunction(Functions.Summarize)]
15+
[KernelFunction(ProcessFunctions.Summarize)]
1616
public async ValueTask SummarizeAsync(KernelProcessStepContext context, Kernel kernel, string textToSummarize)
1717
{
1818
var summaryAgentHttpClient = kernel.GetRequiredService<SummaryAgentHttpClient>();

dotnet/samples/Demos/ProcessFrameworkWithAspire/ProcessFramework.Aspire/ProcessFramework.Aspire.ProcessOrchestrator/Steps/TranslateStep.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ namespace ProcessFramework.Aspire.ProcessOrchestrator.Steps;
77

88
public class TranslateStep : KernelProcessStep
99
{
10-
public static class Functions
10+
public static class ProcessFunctions
1111
{
1212
public const string Translate = nameof(Translate);
1313
}
1414

15-
[KernelFunction(Functions.Translate)]
15+
[KernelFunction(ProcessFunctions.Translate)]
1616
public async ValueTask TranslateAsync(KernelProcessStepContext context, Kernel kernel, string textToTranslate)
1717
{
1818
var translatorAgentHttpClient = kernel.GetRequiredService<TranslatorAgentHttpClient>();

dotnet/samples/Demos/ProcessWithCloudEvents/ProcessWithCloudEvents.Processes/DocumentGenerationProcess.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public static ProcessBuilder CreateProcessBuilder(string processName = "Document
6161
var docsProofreadStep = processBuilder.AddStepFromType<ProofReadDocumentationStep>();
6262
var docsPublishStep = processBuilder.AddStepFromType<PublishDocumentationStep>();
6363

64-
var proxyStep = processBuilder.AddProxyStep([DocGenerationTopics.RequestUserReview, DocGenerationTopics.PublishDocumentation]);
64+
var proxyStep = processBuilder.AddProxyStep(id: processName, [DocGenerationTopics.RequestUserReview, DocGenerationTopics.PublishDocumentation]);
6565

6666
// Orchestrate the external input events
6767
processBuilder
@@ -70,7 +70,7 @@ public static ProcessBuilder CreateProcessBuilder(string processName = "Document
7070

7171
processBuilder
7272
.OnInputEvent(DocGenerationEvents.UserRejectedDocument)
73-
.SendEventTo(new(docsGenerationStep, functionName: GenerateDocumentationStep.Functions.ApplySuggestions));
73+
.SendEventTo(new(docsGenerationStep, functionName: GenerateDocumentationStep.ProcessFunctions.ApplySuggestions));
7474

7575
processBuilder
7676
.OnInputEvent(DocGenerationEvents.UserApprovedDocument)
@@ -79,22 +79,22 @@ public static ProcessBuilder CreateProcessBuilder(string processName = "Document
7979
// Hooking up the rest of the process steps
8080
infoGatheringStep
8181
.OnFunctionResult()
82-
.SendEventTo(new(docsGenerationStep, functionName: GenerateDocumentationStep.Functions.GenerateDocs));
82+
.SendEventTo(new ProcessFunctionTargetBuilder(docsGenerationStep, functionName: GenerateDocumentationStep.ProcessFunctions.GenerateDocs));
8383

8484
docsGenerationStep
8585
.OnEvent(GenerateDocumentationStep.OutputEvents.DocumentationGenerated)
86-
.SendEventTo(new(docsProofreadStep));
86+
.SendEventTo(new ProcessFunctionTargetBuilder(docsProofreadStep));
8787

8888
docsProofreadStep
8989
.OnEvent(ProofReadDocumentationStep.OutputEvents.DocumentationRejected)
90-
.SendEventTo(new(docsGenerationStep, functionName: GenerateDocumentationStep.Functions.ApplySuggestions));
90+
.SendEventTo(new ProcessFunctionTargetBuilder(docsGenerationStep, functionName: GenerateDocumentationStep.ProcessFunctions.ApplySuggestions));
9191

9292
// When the proofreader approves the documentation, send it to the 'docs' parameter of the docsPublishStep
9393
// Additionally, the generated document is emitted externally for user approval using the pre-configured proxyStep
9494
docsProofreadStep
9595
.OnEvent(ProofReadDocumentationStep.OutputEvents.DocumentationApproved)
9696
.EmitExternalEvent(proxyStep, DocGenerationTopics.RequestUserReview)
97-
.SendEventTo(new(docsPublishStep, parameterName: "document"));
97+
.SendEventTo(new ProcessFunctionTargetBuilder(docsPublishStep, parameterName: "document"));
9898

9999
// When event is approved by user, it gets published externally too
100100
docsPublishStep

dotnet/samples/Demos/ProcessWithCloudEvents/ProcessWithCloudEvents.Processes/Steps/GenerateDocumentationStep.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class GenerateDocumentationStep : KernelProcessStep<GenerateDocumentation
1414
/// <summary>
1515
/// Function names of the steps, to be refereced when hooking up the step in a SK process
1616
/// </summary>
17-
public static class Functions
17+
public static class ProcessFunctions
1818
{
1919
/// <summary>
2020
/// Genereta Doc function name
@@ -63,7 +63,7 @@ public override ValueTask ActivateAsync(KernelProcessStepState<GenerateDocumenta
6363
/// <param name="context">instance of <see cref="KernelProcessStepContext"/></param>
6464
/// <param name="productInfo">content to be used for document generation</param>
6565
/// <returns></returns>
66-
[KernelFunction(Functions.GenerateDocs)]
66+
[KernelFunction(ProcessFunctions.GenerateDocs)]
6767
public async Task GenerateDocumentationAsync(Kernel kernel, KernelProcessStepContext context, ProductInfo productInfo)
6868
{
6969
Console.WriteLine($"[{nameof(GenerateDocumentationStep)}]:\tGenerating documentation for provided productInfo...");
@@ -94,7 +94,7 @@ public async Task GenerateDocumentationAsync(Kernel kernel, KernelProcessStepCon
9494
/// <param name="context">instance of <see cref="KernelProcessStepContext"/></param>
9595
/// <param name="suggestions">suggestions to be integrated into the document content</param>
9696
/// <returns></returns>
97-
[KernelFunction(Functions.ApplySuggestions)]
97+
[KernelFunction(ProcessFunctions.ApplySuggestions)]
9898
public async Task ApplySuggestionsAsync(Kernel kernel, KernelProcessStepContext context, string suggestions)
9999
{
100100
Console.WriteLine($"[{nameof(GenerateDocumentationStep)}]:\tRewriting documentation with provided suggestions...");

0 commit comments

Comments
 (0)