Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ Desktop.ini
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

.idea/

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
Expand Down
50 changes: 27 additions & 23 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<AgentFrameworkVersion>1.0.0-preview.260209.1</AgentFrameworkVersion>
<AspireVersion>13.1.0</AspireVersion>
<AspNetCoreVersion>10.0.2</AspNetCoreVersion>
<MicrosoftExteionsionsVersion>10.2.0</MicrosoftExteionsionsVersion>
<OpenTelemetryVersion>1.15.0</OpenTelemetryVersion>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<AgentFrameworkVersion>1.13.0</AgentFrameworkVersion>
<AgentFrameworkPreviewVersion>1.13.0-preview.260703.1</AgentFrameworkPreviewVersion>
<AspireVersion>13.4.6</AspireVersion>
<AspNetCoreVersion>10.0.9</AspNetCoreVersion>
<MicrosoftExteionsionsVersion>10.7.0</MicrosoftExteionsionsVersion>
<OpenTelemetryVersion>1.16.0</OpenTelemetryVersion>
</PropertyGroup>
<ItemGroup>
<!-- ASP.NET Core-->
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="$(AspNetCoreVersion)" />

<!-- Agent Framework -->
<PackageVersion Include="Microsoft.Agents.AI" Version="$(AgentFrameworkVersion)" />
<PackageVersion Include="Microsoft.Agents.AI.Hosting.A2A" Version="$(AgentFrameworkVersion)" />
<PackageVersion Include="Microsoft.Agents.AI.Hosting.A2A.AspNetCore" Version="$(AgentFrameworkVersion)" />
<PackageVersion Include="Microsoft.Agents.AI.AzureAI.Persistent" Version="$(AgentFrameworkVersion)" />
<PackageVersion Include="Microsoft.Agents.AI.Hosting.A2A" Version="$(AgentFrameworkPreviewVersion)" />
<PackageVersion Include="Microsoft.Agents.AI.Hosting.A2A.AspNetCore" Version="$(AgentFrameworkPreviewVersion)" />
<PackageVersion Include="Microsoft.Agents.AI.AzureAI.Persistent" Version="$(AgentFrameworkPreviewVersion)" />

<!-- Microsoft.Extensions -->
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="$(MicrosoftExteionsionsVersion)" />
Expand All @@ -26,36 +28,38 @@
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="$(MicrosoftExteionsionsVersion)" />
<PackageVersion Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="$(MicrosoftExteionsionsVersion)" />
<PackageVersion Include="Microsoft.Extensions.AI.Evaluation.Reporting" Version="$(MicrosoftExteionsionsVersion)" />
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="$(MicrosoftExteionsionsVersion)-preview.1.26063.2" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.2" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.2" />
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="$(MicrosoftExteionsionsVersion)" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.9" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.9" />

<!-- Pinned to patched 2.x line (GHSA-v5pm-xwqc-g5wc) -->
<PackageVersion Include="Microsoft.OpenApi" Version="2.9.0" />

<!-- Azure -->
<PackageVersion Include="Azure.AI.Inference" Version="1.0.0-beta.5" />
<PackageVersion Include="Azure.AI.OpenAI" Version="2.8.0-beta.1" />
<PackageVersion Include="Azure.Identity" Version="1.17.1" />
<PackageVersion Include="Azure.AI.Projects" Version="1.2.0-beta.5" />
<PackageVersion Include="Azure.AI.OpenAI" Version="2.9.0-beta.1" />
<PackageVersion Include="Azure.Identity" Version="1.21.0" />
<PackageVersion Include="Azure.AI.Projects" Version="2.1.0-beta.4" />

<!-- Scalar -->
<PackageVersion Include="Scalar.AspNetCore" Version="2.12.14" />
<PackageVersion Include="Scalar.AspNetCore" Version="2.16.10" />

<!-- Aspire -->
<PackageVersion Include="Aspire.Azure.AI.Inference" Version="$(AspireVersion)-preview.1.25616.3" />
<PackageVersion Include="Aspire.Azure.AI.OpenAI" Version="$(AspireVersion)-preview.1.25616.3" />
<PackageVersion Include="Aspire.Hosting.AppHost" Version="$(AspireVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.AIFoundry" Version="$(AspireVersion)-preview.1.25616.3" />
<PackageVersion Include="Aspire.Hosting.Azure.PostgreSQL" Version="$(AspireVersion)" />
<PackageVersion Include="Aspire.Azure.AI.Inference" Version="13.4.6-preview.1.26319.6" />
<PackageVersion Include="Aspire.Azure.AI.OpenAI" Version="13.4.6-preview.1.26319.6" />
<PackageVersion Include="Aspire.Hosting.Azure.AIFoundry" Version="13.1.3-preview.1.26166.8" />
<PackageVersion Include="Aspire.Hosting.Azure.PostgreSQL" Version="13.4.6" />
<PackageVersion Include="Aspire.Hosting.Testing" Version="$(AspireVersion)" />

<!-- OpenTelemetry -->
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="$(OpenTelemetryVersion)" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="$(OpenTelemetryVersion)" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="$(OpenTelemetryVersion)" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="$(OpenTelemetryVersion)" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="$(OpenTelemetryVersion)" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />

Comment on lines 55 to 60
<!-- MS Test -->
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageVersion Include="MSTest" Version="4.0.2" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
<PackageVersion Include="MSTest" Version="4.2.3" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ flowchart TB
direction LR
Agent["Agent Service<br/>(ASP.NET Core)"]
Postgres[("Azure Postgres<br/>(pgvector)")]
Foundry["Azure AI Foundry<br/>(GPT-4o)"]
Foundry["Azure AI Foundry<br/>(GPT-5)"]

Agent <--> Postgres
Agent <--> Foundry
Expand Down
2 changes: 1 addition & 1 deletion exercises/US1-taskadheranceeval.md
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ dotnet aieval report -p C:\TestReports -o test-report.html
- **Diagnostics**: The evaluator's chain-of-thought reasoning showing step-by-step analysis of tool usage and response quality
- **Metadata Table**: Key-value pairs including:
- `built-in-eval`: Whether the evaluator is built-in
- `eval-model`: The model used for evaluation (e.g., `gpt-4o-2024-11-20`)
- `eval-model`: The model used for evaluation (e.g., `gpt-5.4`)
- `eval-input-tokens` / `eval-output-tokens` / `eval-total-tokens`: Token usage for the evaluation
- `eval-duration-ms`: Time taken for the evaluation
- **Conversation Panel**: Collapsible section showing token counts and the full message exchange
Expand Down
12 changes: 12 additions & 0 deletions nuget.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="https://api.nuget.org/v3/index.json" value="https://api.nuget.org/v3/index.json" />
</packageSources>
<packageSourceMapping>
<packageSource key="https://api.nuget.org/v3/index.json">
<package pattern="*" />
</packageSource>
</packageSourceMapping>
</configuration>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Aspire.AppHost.Sdk/13.1.0">
<Project Sdk="Aspire.AppHost.Sdk/13.4.6">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
Expand All @@ -11,7 +11,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" />
<PackageReference Include="Aspire.Hosting.Azure.AIFoundry" />
<PackageReference Include="Aspire.Hosting.Azure.PostgreSQL" />
</ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/AgentEvalsWorkshop.AppHost/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using Aspire.Hosting.Azure;
using Azure.Core;
using Azure.Provisioning.CognitiveServices;
using Humanizer.Localisation;
using System;
using System.Linq;

Expand Down
5 changes: 5 additions & 0 deletions src/AgentEvalsWorkshop.AppHost/aspire.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"appHost": {
"path": "AgentEvalsWorkshop.AppHost.csproj"
}
}
15 changes: 14 additions & 1 deletion src/AgentEvalsWorkshop/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,18 @@
var endpoint = ConnectionStringParser.GetEndpointFromConnectionString(builder.Configuration.GetConnectionString("az-foundry")!);
var foundryDeploymentName = builder.Configuration["FOUNDRY_DEPLOYMENT_NAME"]!;

var azureOpenAIClient = new AzureOpenAIClient(
endpoint,
new DefaultAzureCredential(),
new AzureOpenAIClientOptions(AzureOpenAIClientOptions.ServiceVersion.V2025_04_01_Preview)
{
Comment on lines +19 to +23
ClientLoggingOptions = new System.ClientModel.Primitives.ClientLoggingOptions
{
EnableMessageContentLogging = true,
EnableLogging = true,
}
});

builder.Services.AddSingleton(_ => new AzureOpenAIClient(
endpoint,
new DefaultAzureCredential(),
Expand All @@ -35,6 +47,7 @@
.AsIChatClient();
});

builder.Services.AddA2AServer(US1Agent.BuildUS1Agent(azureOpenAIClient.GetChatClient(foundryDeploymentName).AsIChatClient()));

var app = builder.Build();

Expand All @@ -47,7 +60,7 @@

app.UseHttpsRedirection();

app.MapA2A(US1Agent.BuildUS1Agent(app.Services.GetRequiredService<IChatClient>()), "/us1agent");
app.MapA2AJsonRpc(US1Agent.BuildUS1Agent(app.Services.GetRequiredService<IChatClient>()), "/us1agent");

app.Run();

Expand Down