Skip to content

Commit 34f05b7

Browse files
saicharan-MSsaicharan-MS
authored
Merge branch 'main' into saicharan-MS/openapi-server-override-hierarchy-support
2 parents 3ffcc62 + 8875f9f commit 34f05b7

File tree

47 files changed

+1953
-191
lines changed

Some content is hidden

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

47 files changed

+1953
-191
lines changed

‎dotnet/Directory.Packages.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<PackageVersion Include="Google.Apis.Auth" Version="1.69.0" />
3232
<PackageVersion Include="ModelContextProtocol" Version="0.1.0-preview.1.25171.12" />
3333
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.13" />
34-
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.13" />
34+
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.14" />
3535
<PackageVersion Include="Microsoft.ML.Tokenizers.Data.Cl100kBase" Version="1.0.1" />
3636
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.5.1" />
3737
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.12.19" />

‎dotnet/samples/Demos/AgentFrameworkWithAspire/ChatWithAgent.ApiService/Controllers/AgentCompletionsController.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ private async IAsyncEnumerable<ChatMessageContent> CompleteAsync(ChatHistory cha
7171
{
7272
var thread = new ChatHistoryAgentThread(chatHistory);
7373
IAsyncEnumerable<AgentResponseItem<ChatMessageContent>> content =
74-
this._agent.InvokeAsync([], thread, options: new() { KernelArguments = arguments }, cancellationToken: cancellationToken);
74+
this._agent.InvokeAsync(thread, options: new() { KernelArguments = arguments }, cancellationToken: cancellationToken);
7575

7676
await foreach (ChatMessageContent item in content.ConfigureAwait(false))
7777
{
@@ -90,7 +90,7 @@ private async IAsyncEnumerable<StreamingChatMessageContent> CompleteSteamingAsyn
9090
{
9191
var thread = new ChatHistoryAgentThread(chatHistory);
9292
IAsyncEnumerable<AgentResponseItem<StreamingChatMessageContent>> content =
93-
this._agent.InvokeStreamingAsync([], thread, options: new() { KernelArguments = arguments }, cancellationToken: cancellationToken);
93+
this._agent.InvokeStreamingAsync(thread, options: new() { KernelArguments = arguments }, cancellationToken: cancellationToken);
9494

9595
await foreach (StreamingChatMessageContent item in content.ConfigureAwait(false))
9696
{

‎dotnet/samples/GettingStartedWithAgents/AzureAIAgent/Step01_AzureAIAgent.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ await InvokeAgentAsync(
5858
// Local function to invoke agent and display the response.
5959
async Task InvokeAgentAsync(KernelArguments? arguments = null)
6060
{
61-
await foreach (ChatMessageContent response in agent.InvokeAsync([], thread, new() { KernelArguments = arguments }))
61+
await foreach (ChatMessageContent response in agent.InvokeAsync(thread, new() { KernelArguments = arguments }))
6262
{
6363
WriteAgentChatMessage(response);
6464
}

‎dotnet/samples/GettingStartedWithAgents/BedrockAgent/Step04_BedrockAgent_Trace.cs

+6-9
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
using System.ComponentModel;
44
using Amazon.BedrockAgentRuntime.Model;
55
using Microsoft.SemanticKernel;
6+
using Microsoft.SemanticKernel.Agents;
67
using Microsoft.SemanticKernel.Agents.Bedrock;
8+
using Microsoft.SemanticKernel.ChatCompletion;
79

810
namespace GettingStarted.BedrockAgents;
911

@@ -27,19 +29,14 @@ public async Task UseAgentWithTraceAsync()
2729
var userQuery = "What is the current weather in Seattle and what is the weather forecast in Seattle?";
2830
try
2931
{
30-
// Customize the request for advanced scenarios
31-
InvokeAgentRequest invokeAgentRequest = new()
32+
AgentThread agentThread = new BedrockAgentThread(this.RuntimeClient);
33+
BedrockAgentInvokeOptions options = new()
3234
{
33-
AgentAliasId = BedrockAgent.WorkingDraftAgentAlias,
34-
AgentId = bedrockAgent.Id,
35-
SessionId = BedrockAgent.CreateSessionId(),
36-
InputText = userQuery,
37-
// Enable trace to inspect the agent's thought process
3835
EnableTrace = true,
3936
};
4037

41-
var responses = bedrockAgent.InvokeAsync(invokeAgentRequest, null);
42-
await foreach (var response in responses)
38+
var responses = bedrockAgent.InvokeAsync([new ChatMessageContent(AuthorRole.User, userQuery)], agentThread, options);
39+
await foreach (ChatMessageContent response in responses)
4340
{
4441
if (response.Content != null)
4542
{

‎dotnet/samples/GettingStartedWithAgents/BedrockAgent/Step05_BedrockAgent_FileSearch.cs

+6-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
// Copyright (c) Microsoft. All rights reserved.
22

3-
using Amazon.BedrockAgentRuntime.Model;
3+
using Microsoft.SemanticKernel;
4+
using Microsoft.SemanticKernel.Agents;
45
using Microsoft.SemanticKernel.Agents.Bedrock;
6+
using Microsoft.SemanticKernel.ChatCompletion;
57

68
namespace GettingStarted.BedrockAgents;
79

@@ -48,17 +50,9 @@ public async Task UseAgentWithFileSearchAsync()
4850
var userQuery = "What is Semantic Kernel?";
4951
try
5052
{
51-
// Customize the request for advanced scenarios
52-
InvokeAgentRequest invokeAgentRequest = new()
53-
{
54-
AgentAliasId = BedrockAgent.WorkingDraftAgentAlias,
55-
AgentId = bedrockAgent.Id,
56-
SessionId = BedrockAgent.CreateSessionId(),
57-
InputText = userQuery,
58-
};
59-
60-
var responses = bedrockAgent.InvokeAsync(invokeAgentRequest, null, CancellationToken.None);
61-
await foreach (var response in responses)
53+
AgentThread bedrockThread = new BedrockAgentThread(this.RuntimeClient);
54+
var responses = bedrockAgent.InvokeAsync(new ChatMessageContent(AuthorRole.User, userQuery), bedrockThread, null, CancellationToken.None);
55+
await foreach (ChatMessageContent response in responses)
6256
{
6357
if (response.Content != null)
6458
{

‎dotnet/samples/GettingStartedWithAgents/OpenAIAssistant/Step01_Assistant.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ await InvokeAgentAsync(
5858
// Local function to invoke agent and display the response.
5959
async Task InvokeAgentAsync(KernelArguments? arguments = null)
6060
{
61-
await foreach (ChatMessageContent response in agent.InvokeAsync([], thread, options: new() { KernelArguments = arguments }))
61+
await foreach (ChatMessageContent response in agent.InvokeAsync(thread, options: new() { KernelArguments = arguments }))
6262
{
6363
WriteAgentChatMessage(response);
6464
}

‎dotnet/samples/GettingStartedWithAgents/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ To set your secrets with .NET Secret Manager:
114114
dotnet user-secrets set "OpenAI:ApiKey" "..."
115115
```
116116
117-
5. Or Azure Open AI:
117+
5. Or Azure OpenAI:
118118
119119
```
120120
dotnet user-secrets set "AzureOpenAI:ChatDeploymentName" "gpt-4o"
@@ -136,7 +136,7 @@ To set your secrets with .NET Secret Manager:
136136
dotnet user-secrets set "BedrockAgent:FoundationModel" "..."
137137
```
138138
139-
> NOTE: Azure secrets will take precedence, if both Open AI and Azure Open AI secrets are defined, unless `ForceOpenAI` is set:
139+
> NOTE: Azure secrets will take precedence, if both Open AI and Azure OpenAI secrets are defined, unless `ForceOpenAI` is set:
140140
141141
```
142142
protected override bool ForceOpenAI => true;

‎dotnet/samples/GettingStartedWithAgents/Step01_Agent.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ await InvokeAgentAsync(
173173
async Task InvokeAgentAsync(KernelArguments? arguments = null)
174174
{
175175
// Invoke the agent without any messages, since the agent has all that it needs via the template and arguments.
176-
await foreach (ChatMessageContent content in agent.InvokeAsync([], options: new() { KernelArguments = arguments }))
176+
await foreach (ChatMessageContent content in agent.InvokeAsync(options: new() { KernelArguments = arguments }))
177177
{
178178
WriteAgentChatMessage(content);
179179
}

‎dotnet/samples/GettingStartedWithProcesses/Step03/ProcessesStates/FishSandwichStateProcessSuccess.json

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,54 @@
11
{
2-
"$type": "Process",
32
"stepsState": {
43
"FriedFishWithStatefulStepsProcess": {
54
"$type": "Process",
65
"stepsState": {
76
"GatherFriedFishIngredientsWithStockStep": {
87
"$type": "Step",
9-
"id": "2908f8c88cf0476a8e0075c3a8020d5d",
8+
"id": "7d4c02d000a744f490f2b5f9bad721fb",
109
"name": "GatherFriedFishIngredientsWithStockStep",
1110
"versionInfo": "GatherFishIngredient.V2",
1211
"state": {
13-
"IngredientsStock": 3
12+
"IngredientsStock": 2
1413
}
1514
},
1615
"CutFoodStep": {
1716
"$type": "Step",
18-
"id": "014388cf0bbd41119b8730dfc4b0b459",
17+
"id": "f147010a57d34587a3dc1ed4677e5163",
1918
"name": "CutFoodStep",
2019
"versionInfo": "CutFoodStep.V1"
2120
},
2221
"FryFoodStep": {
2322
"$type": "Step",
24-
"id": "c55af0425d864c4e97b6ae67bd715480",
23+
"id": "78cc5af4106549afb74d7a6813016f87",
2524
"name": "FryFoodStep",
2625
"versionInfo": "FryFoodStep.V1"
2726
}
2827
},
29-
"id": "cab89a17aeae4b9a97568967dbf1ea47",
28+
"id": "282717158b9f49e5b1acce81429610e0",
3029
"name": "FriedFishWithStatefulStepsProcess",
3130
"versionInfo": "FriedFishProcess.v1"
3231
},
3332
"AddBunsStep": {
3433
"$type": "Step",
35-
"id": "35d09b83dea24ddf8e0c24fbe6a3746c",
34+
"id": "31e953154e574470911d168a39588ed8",
3635
"name": "AddBunsStep",
3736
"versionInfo": "v1"
3837
},
3938
"AddSpecialSauceStep": {
4039
"$type": "Step",
41-
"id": "aa0d408976574afea94387e3da7ca111",
40+
"id": "67ee29ff28e4446d8046417675ec21e8",
4241
"name": "AddSpecialSauceStep",
4342
"versionInfo": "v1"
4443
},
4544
"ExternalFriedFishStep": {
4645
"$type": "Step",
47-
"id": "2eda38b8ee8745a4ab8b21f4fa01d173",
46+
"id": "873b1c8dee45412e975a5e8db2ed0b43",
4847
"name": "ExternalFriedFishStep",
4948
"versionInfo": "v1"
5049
}
5150
},
52-
"id": "973b06f1-a522-4d2d-9e1c-ec45a07e275c",
51+
"id": "af40089f-e57b-46d1-a15b-40c0d7f3800f",
5352
"name": "FishSandwichWithStatefulStepsProcess",
5453
"versionInfo": "FishSandwich.V1"
5554
}

‎dotnet/samples/GettingStartedWithProcesses/Step03/ProcessesStates/FriedFishProcessStateSuccess.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
11
{
2-
"$type": "Process",
32
"stepsState": {
43
"GatherFriedFishIngredientsWithStockStep": {
54
"$type": "Step",
6-
"id": "92a4cda38c7248648b0aa7ffaaa57f21",
5+
"id": "77c2f967cd354e66a51828e9755d2f07",
76
"name": "GatherFriedFishIngredientsWithStockStep",
87
"versionInfo": "GatherFishIngredient.V2",
98
"state": {
10-
"IngredientsStock": 3
9+
"IngredientsStock": 4
1110
}
1211
},
1312
"CutFoodStep": {
1413
"$type": "Step",
15-
"id": "7ace89e38e1c48b0b3a700b40d160c68",
14+
"id": "9276d03e64c44a6792d5fd81bd0dc143",
1615
"name": "CutFoodStep",
1716
"versionInfo": "CutFoodStep.V1"
1817
},
1918
"FryFoodStep": {
2019
"$type": "Step",
21-
"id": "09bc39ba6d9745439c7c792b8dac0af7",
20+
"id": "af2a00be4fe2408181ab5654318ed56b",
2221
"name": "FryFoodStep",
2322
"versionInfo": "FryFoodStep.V1"
2423
}
2524
},
26-
"id": "669c5850-9efc-4585-b3f0-9291a4471887",
25+
"id": "2050a24b-3e9d-418a-8413-74cadf4f6b4c",
2726
"name": "FriedFishWithStatefulStepsProcess",
2827
"versionInfo": "FriedFishProcess.v1"
2928
}

0 commit comments

Comments
 (0)