Skip to content

Commit 4c6ce3b

Browse files
Merge branch 'main' into fix/in-memory-file-store-path-collision-reopen
2 parents dacf006 + 67ba500 commit 4c6ce3b

40 files changed

Lines changed: 1468 additions & 883 deletions

File tree

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
applyTo: 'dotnet/**'
3+
---
4+
5+
Before reviewing .NET changes, read and apply
6+
[dotnet/AGENTS.md](../../dotnet/AGENTS.md). Use the task-specific skills under
7+
`dotnet/.github/skills/` for build and test commands, project structure, pull
8+
requests, and sample verification.
9+
10+
Do not duplicate purely mechanical findings that `dotnet format`, analyzers, or
11+
other required CI checks will report.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
applyTo: 'python/**'
3+
---
4+
5+
Before reviewing Python changes, read and apply the canonical
6+
[Python coding standards](../../python/CODING_STANDARD.md). Use
7+
[python/AGENTS.md](../../python/AGENTS.md) and the nearest package or sample `AGENTS.md`
8+
for task-specific architecture and workflow guidance.
9+
10+
- Review new or materially edited code against the standards. Do not report unrelated legacy convention violations
11+
elsewhere in a touched file.
12+
- Independently report material correctness or security defects visible in affected files, even when they predate
13+
the changed lines.
14+
- Treat `MUST` and `MUST NOT` violations as review findings.
15+
- Report `SHOULD` and `SHOULD NOT` violations when they have a material correctness, API, maintainability,
16+
performance, or usability impact.
17+
- Do not report `MAY` choices as violations.
18+
- Do not duplicate purely mechanical findings that Ruff, Pyright, or another required CI check will report.

‎dotnet/nuget/nuget-package.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
22
<PropertyGroup>
33
<!-- Central version prefix - applies to all nuget packages. -->
4-
<VersionPrefix>1.25.0</VersionPrefix>
4+
<VersionPrefix>1.26.0</VersionPrefix>
55
<RCNumber>1</RCNumber>
6-
<DateSuffix>261014</DateSuffix>
6+
<DateSuffix>261023</DateSuffix>
77
<PackageVersion Condition="'$(IsReleaseCandidate)' == 'true'">$(VersionPrefix)-rc$(RCNumber)</PackageVersion>
88
<PackageVersion Condition="'$(IsReleaseCandidate)' != 'true' AND '$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix).$(DateSuffix).1</PackageVersion>
99
<PackageVersion Condition="'$(IsReleaseCandidate)' != 'true' AND '$(VersionSuffix)' == ''">$(VersionPrefix)-preview.$(DateSuffix).1</PackageVersion>

‎dotnet/samples/02-agents/AGUI/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This directory contains samples that demonstrate how to build AG-UI (Agent UI Pr
77
88
## Prerequisites
99

10-
- .NET 9.0 or later
10+
- .NET 10.0 SDK or later
1111
- Azure OpenAI service endpoint and deployment configured
1212
- Azure CLI installed and authenticated (`az login`)
1313
- User has the `Cognitive Services OpenAI Contributor` role for the Azure OpenAI resource
@@ -291,11 +291,11 @@ Ensure the server is running before starting the client:
291291

292292
```bash
293293
# Terminal 1
294-
cd AGUI_Step01_ServerBasic
294+
cd Step01_GettingStarted/Server
295295
dotnet run --urls http://localhost:8888
296296

297297
# Terminal 2 (after server starts)
298-
cd AGUI_Step02_ClientBasic
298+
cd Step01_GettingStarted/Client
299299
dotnet run
300300
```
301301

‎dotnet/samples/04-hosting/af-hosting/local_responses/Server/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ static string LookupWeather([Description("The city to look up weather for.")] st
113113
});
114114

115115
// Bind to a fixed local URL so the paired client sample has a deterministic default.
116-
// Override with the ASPNETCORE_URLS environment variable when needed.
116+
// To use a different address, change the URL below and set RESPONSES_SERVER_URL in the client.
117117
app.Run("http://localhost:5000");
118118

119119
// Application-owned trust decision. Replace with real authentication + authorization: verify the caller,

‎dotnet/samples/04-hosting/af-hosting/local_responses/Server/README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ The route persists each turn under a continuation id chosen by how the caller co
2525
under the newly minted response id, so a later `previous_response_id` can branch from that exact point and
2626
two branches from the same prior response stay independent.
2727

28-
The agent has a deterministic `lookup_weather` tool. Binds to `http://localhost:5000` (override with
29-
`ASPNETCORE_URLS`).
28+
The agent has a deterministic `lookup_weather` tool. Binds to `http://localhost:5000`. To use a different address,
29+
change the URL passed to `app.Run` in `Program.cs` and set `RESPONSES_SERVER_URL` to the same address
30+
in the client shell.
3031

3132
```bash
3233
export FOUNDRY_PROJECT_ENDPOINT="https://<your-resource>.services.ai.azure.com/api/projects/<your-project>"

‎dotnet/samples/04-hosting/af-hosting/local_responses_workflow/Server/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ static Workflow BuildWorkflow(AIAgent writer)
118118
});
119119

120120
// Bind to a fixed local URL so the paired client sample has a deterministic default.
121-
// Override with the ASPNETCORE_URLS environment variable when needed.
121+
// To use a different address, change the URL below and set RESPONSES_SERVER_URL in the client.
122122
app.Run("http://localhost:5001");
123123

124124
// Flattens the Responses input messages into a single brief string for the workflow's start executor.

‎dotnet/samples/04-hosting/af-hosting/local_responses_workflow/Server/README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ This server supports **`previous_response_id` continuation only** and **rejects
1111
with HTTP 400**. Because `previous_response_id` rotates every turn, the app owns a cursor that maps each
1212
response id to the stable workflow session id, so the whole rotating chain resumes the same checkpointed
1313
run. The first turn runs the workflow forward; later turns restore the latest checkpoint and run forward
14-
with the new brief. Binds to `http://localhost:5001` (override with `ASPNETCORE_URLS`).
14+
with the new brief. Binds to `http://localhost:5001`. To use a different address,
15+
change the URL passed to `app.Run` in `Program.cs` and set `RESPONSES_SERVER_URL` to the same address
16+
in the client shell.
1517

1618
`HostedWorkflowState` is constructed with a **workflow factory** and `cacheWorkflow: false` (the default,
1719
shown explicitly), so it builds a fresh workflow instance for every run. This lets independent sessions run

‎dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/Interpreter/WorkflowActionVisitor.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
1010
using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
1111
using Microsoft.Agents.ObjectModel;
12+
using Microsoft.Extensions.Logging;
1213

1314
namespace Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
1415

@@ -27,6 +28,7 @@ internal static class Steps
2728
public static string Restart(string actionId) => $"{actionId}_{nameof(Restart)}";
2829
}
2930

31+
private readonly ILogger _logger;
3032
private readonly Executor _rootAction;
3133
private readonly WorkflowModel<Func<object?, bool>> _workflowModel;
3234
private readonly DeclarativeWorkflowOptions _workflowOptions;
@@ -37,6 +39,7 @@ public WorkflowActionVisitor(
3739
WorkflowFormulaState state,
3840
DeclarativeWorkflowOptions options)
3941
{
42+
this._logger = options.LoggerFactory.CreateLogger<WorkflowActionVisitor>();
4043
this._rootAction = rootAction;
4144
this._workflowModel = new WorkflowModel<Func<object?, bool>>((IModeledAction)rootAction);
4245
this._workflowOptions = options;
@@ -650,6 +653,7 @@ private static string GetParentId(BotElement item) =>
650653
private void NotSupported(DialogAction item)
651654
{
652655
Debug.WriteLine($"> UNKNOWN: {new string('\t', this._workflowModel.GetDepth(item.GetParentId()))}{FormatItem(item)} => {FormatParent(item)}");
656+
this._logger.LogWarning("Unsupported action skipped: {ActionType} ({ActionId}).", item.GetType().Name, item.GetId());
653657
this.HasUnsupportedActions = true;
654658
}
655659

‎dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/DeclarativeWorkflowTest.cs‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
using Microsoft.Agents.ObjectModel;
1414
using Microsoft.Extensions.AI;
1515
using Microsoft.Extensions.Configuration;
16+
using Microsoft.Extensions.Logging;
1617
using Microsoft.PowerFx.Types;
1718
using Moq;
19+
using Shared.UnitTests;
1820
using Xunit.Sdk;
1921

2022
namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests;
@@ -524,6 +526,36 @@ public void UnsupportedAction(Type type)
524526
Assert.True(visitor.HasUnsupportedActions);
525527
}
526528

529+
[Fact]
530+
public void UnsupportedActionLogsWarning()
531+
{
532+
SearchKnowledgeSources.Builder unsupportedAction = new() { Id = "action_bad" };
533+
AdaptiveDialog.Builder dialogBuilder =
534+
new()
535+
{
536+
BeginDialog =
537+
new OnActivity.Builder()
538+
{
539+
Id = "anything",
540+
Actions = [unsupportedAction]
541+
}
542+
};
543+
AdaptiveDialog dialog = dialogBuilder.Build();
544+
545+
WorkflowFormulaState state = new(RecalcEngineFactory.Create());
546+
Mock<ResponseAgentProvider> mockAgentProvider = CreateMockProvider("1");
547+
CapturingLoggerFactory loggerFactory = new();
548+
DeclarativeWorkflowOptions options = new(mockAgentProvider.Object) { LoggerFactory = loggerFactory };
549+
WorkflowActionVisitor visitor = new(new DeclarativeWorkflowExecutor<string>(WorkflowActionVisitor.Steps.Root("anything"), options, state, (message) => DeclarativeWorkflowBuilder.DefaultTransform(message)), state, options);
550+
WorkflowElementWalker walker = new(visitor);
551+
walker.Visit(dialog);
552+
553+
Assert.True(visitor.HasUnsupportedActions);
554+
(LogLevel Level, string Message) warning = Assert.Single(loggerFactory.Entries, entry => entry.Level == LogLevel.Warning);
555+
Assert.Contains(nameof(SearchKnowledgeSources), warning.Message, StringComparison.Ordinal);
556+
Assert.Contains("action_bad", warning.Message, StringComparison.Ordinal);
557+
}
558+
527559
[Theory]
528560
[InlineData("CaseInsensitive.yaml", "end_when_match")]
529561
[InlineData("ClearAllVariables.yaml", "clear_all")]

0 commit comments

Comments
 (0)