microsoft-foundry
diff --git a/‎.github/CODEOWNERS‎
Lines changed: 2 additions & 1 deletion b/‎.github/CODEOWNERS‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎.gitignore‎
Lines changed: 2 additions & 1 deletion b/‎.gitignore‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎infrastructure/infrastructure-setup-bicep/41-standard-agent-setup/modules-standard/cosmos-container-role-assignments.bicep‎
Lines changed: 2 additions & 0 deletions b/‎infrastructure/infrastructure-setup-bicep/41-standard-agent-setup/modules-standard/cosmos-container-role-assignments.bicep‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎samples/REST/quickstart/quickstart-chat-with-agent.sh‎
Lines changed: 26 additions & 0 deletions b/‎samples/REST/quickstart/quickstart-chat-with-agent.sh‎
Lines changed: 26 additions & 0 deletions
diff --git a/‎samples/REST/quickstart/quickstart-create-agent.sh‎
Lines changed: 11 additions & 0 deletions b/‎samples/REST/quickstart/quickstart-create-agent.sh‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎samples/REST/quickstart/quickstart-responses.sh‎
Lines changed: 7 additions & 0 deletions b/‎samples/REST/quickstart/quickstart-responses.sh‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎samples/csharp/enterprise-agent-tutorial/1-idea-to-prototype/Evaluate/Evaluate.csproj‎
Lines changed: 20 additions & 0 deletions b/‎samples/csharp/enterprise-agent-tutorial/1-idea-to-prototype/Evaluate/Evaluate.csproj‎
Lines changed: 20 additions & 0 deletions
diff --git a/‎samples/csharp/enterprise-agent-tutorial/1-idea-to-prototype/Evaluate/Program.cs‎
Lines changed: 190 additions & 0 deletions b/‎samples/csharp/enterprise-agent-tutorial/1-idea-to-prototype/Evaluate/Program.cs‎
Lines changed: 190 additions & 0 deletions
diff --git a/‎samples/csharp/enterprise-agent-tutorial/1-idea-to-prototype/Evaluate/evaluation_results.json‎
Lines changed: 31 additions & 0 deletions b/‎samples/csharp/enterprise-agent-tutorial/1-idea-to-prototype/Evaluate/evaluation_results.json‎
Lines changed: 31 additions & 0 deletions
diff --git a/‎samples/csharp/enterprise-agent-tutorial/1-idea-to-prototype/Evaluate/nuget.config‎
Lines changed: 8 additions & 0 deletions b/‎samples/csharp/enterprise-agent-tutorial/1-idea-to-prototype/Evaluate/nuget.config‎
Lines changed: 8 additions & 0 deletions
@@ -1,5 +1,6 @@
 # See for instructions on this file https://help.github.com/articles/about-codeowners/
-
+#### TEMPORARY CODEOWNER FOR THIS BRANCH
+/samples-v2/ @sdgilley
 #### files referenced in docs (DO NOT EDIT, except for Docs team!!!) #############################################################################
 /samples/microsoft/REST/mslearn-resources/quickstart/quickstart.sh @azure-ai-foundry/AI-Platform-Docs
 /samples/microsoft/csharp/mslearn-resources/quickstart/Samples/.env.example @azure-ai-foundry/AI-Platform-Docs
 
@@ -456,5 +456,6 @@ override.tf.json
 # Ignore CLI configuration files
 .terraformrc
 terraform.rc
-samples/microsoft/developer-journey-stage-1-idea-to-prototype.md
+samples/microsoft/nul
 samples/microsoft/microsoft.sln
+samples/microsoft/developer-journey-stage-1-idea-to-prototype.md
@@ -31,3 +31,5 @@ resource containerRoleAssignmentUserContainer 'Microsoft.DocumentDB/databaseAcco
   }
 }
 
+
+  
@@ -0,0 +1,26 @@
+# Optional Step: Create a conversation to use with the agent
+curl -X POST https://YOUR-FOUNDRY-RESOURCE-NAME.services.ai.azure.com/api/projects/YOUR-PROJECT-NAME/openai/conversations?api-version=2025-11-15-preview \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer $AZURE_AI_AUTH_TOKEN" \
+  -d '{}'
+# Lets say Conversation ID created is conv_123456789. Use this in the next step
+
+#Chat with the agent to answer questions
+curl -X POST https://YOUR-FOUNDRY-RESOURCE-NAME.services.ai.azure.com/api/projects/YOUR-PROJECT-NAME/openai/responses?api-version=2025-11-15-preview \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer $AZURE_AI_AUTH_TOKEN" \
+  -d '{
+        "agent": {"type": "agent_reference", "name": "MyAgent"},
+        "conversation" : "<YOUR_CONVERSATION_ID>",
+        "input" : "What is the size of France in square miles?"
+    }'
+
+#Optional Step: Ask a follow-up question in the same conversation
+curl -X POST https://YOUR-FOUNDRY-RESOURCE-NAME.services.ai.azure.com/api/projects/YOUR-PROJECT-NAME/openai/responses?api-version=2025-11-15-preview \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer $AZURE_AI_AUTH_TOKEN" \
+  -d '{
+        "agent": {"type": "agent_reference", "name": "MyAgent"},
+        "conversation" : "<YOUR_CONVERSATION_ID>",
+        "input" : "And what is the capital city?"
+    }'
@@ -0,0 +1,11 @@
+curl -X POST https://YOUR-FOUNDRY-RESOURCE-NAME.services.ai.azure.com/api/projects/YOUR-PROJECT-NAME/agents?api-version=2025-11-15-preview \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer $AZURE_AI_AUTH_TOKEN" \
+  -d '{
+        "name": "MyAgent",
+        "definition": {
+            "kind": "prompt",
+            "model": "gpt-4.1-mini", 
+            "instructions": "You are a helpful assistant that answers general questions"
+        }
+    }'
@@ -0,0 +1,7 @@
+curl -X POST https://YOUR-FOUNDRY-RESOURCE-NAME.services.ai.azure.com/api/projects/YOUR-PROJECT-NAME/openai/responses?api-version=2025-11-15-preview \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer $AZURE_AI_AUTH_TOKEN" \
+-d '{
+        "model": "gpt-4.1-mini",
+        "input": "What is the size of France in square miles?"
+}'
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net9.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Azure.AI.Agents" Version="2.0.0-alpha.20251016.2" />
+    <PackageReference Include="Azure.Identity" Version="1.17.0" />
+    <PackageReference Include="DotNetEnv" Version="3.1.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="OpenAI" Version="2.*-*" />
+  </ItemGroup>
+
+</Project>
@@ -0,0 +1,190 @@
+// <imports_and_includes>
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Azure;
+using Azure.AI.Agents;
+using Azure.Core;
+using Azure.Identity;
+using DotNetEnv;
+using OpenAI;
+using OpenAI.Responses;
+// </imports_and_includes>
+
+class EvaluateProgram
+{
+    static async Task Main(string[] args)
+    {
+        // Load environment variables from shared directory
+        Env.Load("../shared/.env");
+
+        var projectEndpoint = Environment.GetEnvironmentVariable("PROJECT_ENDPOINT");
+        var modelDeploymentName = Environment.GetEnvironmentVariable("MODEL_DEPLOYMENT_NAME");
+        var sharepointConnectionId = Environment.GetEnvironmentVariable("SHAREPOINT_CONNECTION_ID");
+        var mcpServerUrl = Environment.GetEnvironmentVariable("MCP_SERVER_URL");
+        var tenantId = Environment.GetEnvironmentVariable("AI_FOUNDRY_TENANT_ID");
+
+        // Use tenant-specific credential if provided
+        TokenCredential credential;
+        if (!string.IsNullOrEmpty(tenantId))
+        {
+            credential = new AzureCliCredential(new AzureCliCredentialOptions { TenantId = tenantId });
+        }
+        else
+        {
+            credential = new DefaultAzureCredential();
+        }
+
+        AgentsClient client = new(new Uri(projectEndpoint), credential);
+
+        Console.WriteLine("🧪 Modern Workplace Assistant Evaluation\n");
+
+        List<ToolDefinition> tools = new();
+
+        // Add SharePoint tool if configured
+        if (!string.IsNullOrEmpty(sharepointConnectionId))
+        {
+            try
+            {
+                SharepointToolDefinition sharepointTool = new(new SharepointGroundingToolParameters(sharepointConnectionId));
+                tools.Add(sharepointTool);
+                Console.WriteLine("✅ SharePoint configured for evaluation");
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"⚠️  SharePoint unavailable: {ex.Message}");
+            }
+        }
+
+        // Add MCP tool if configured
+        if (!string.IsNullOrEmpty(mcpServerUrl))
+        {
+            try
+            {
+                MCPToolDefinition mcpTool = new("microsoft_learn", mcpServerUrl);
+                tools.Add(mcpTool);
+                Console.WriteLine("✅ MCP configured for evaluation");
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"⚠️  MCP unavailable: {ex.Message}");
+            }
+        }
+
+        Console.WriteLine();
+
+        var instructions = @"You are a Modern Workplace Assistant for Contoso Corporation.
+Answer questions using available tools and provide specific, detailed responses.";
+
+        AgentDefinition agentDefinition = new PromptAgentDefinition(modelDeploymentName)
+        {
+            Instructions = instructions,
+            Tools = tools
+        };
+
+        AgentVersion agent = await client.CreateAgentVersionAsync(
+            "Evaluation Agent",
+            agentDefinition
+        );
+
+        // <load_test_data>
+        var questions = File.ReadAllLines("../shared/questions.jsonl")
+            .Select(line => JsonSerializer.Deserialize<JsonElement>(line))
+            .ToList();
+        // </load_test_data>
+
+        // <run_batch_evaluation>
+        // NOTE: This code is a non-runnable snippet of the larger sample code from which it is taken.
+        var results = new List<object>();
+
+        Console.WriteLine($"Running {questions.Count} evaluation questions...\n");
+
+        for (int i = 0; i < questions.Count; i++)
+        {
+            var q = questions[i];
+            var question = q.GetProperty("question").GetString()!;
+            
+            string[] expectedKeywords = Array.Empty<string>();
+            if (q.TryGetProperty("expected_keywords", out var keywordsElem))
+            {
+                expectedKeywords = keywordsElem.EnumerateArray()
+                    .Select(e => e.GetString()!)
+                    .ToArray();
+            }
+            
+            Console.WriteLine($"Question {i + 1}/{questions.Count}: {question}");
+
+            // Get OpenAI client from the agents client
+            OpenAIClient openAIClient = client.GetOpenAIClient();
+            OpenAIResponseClient responseClient = openAIClient.GetOpenAIResponseClient(modelDeploymentName);
+
+            // Create a conversation to maintain state
+            AgentConversation conversation = await client.GetConversationsClient().CreateConversationAsync();
+
+            // Set up response creation options with agent and conversation references
+            ResponseCreationOptions responseCreationOptions = new();
+            responseCreationOptions.SetAgentReference(agent.Name);
+            responseCreationOptions.SetConversationReference(conversation);
+
+            // Create the user message item
+            List<ResponseItem> items = [ResponseItem.CreateUserMessageItem(question)];
+
+            string response = "";
+            try
+            {
+                // Create response from the agent
+                OpenAIResponse openAIResponse = await responseClient.CreateResponseAsync(items, responseCreationOptions);
+                response = openAIResponse.GetOutputText();
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"   ⚠️  Error: {ex.Message}");
+                response = "";
+            }
+
+            bool passed = response.Length > 50;
+            if (expectedKeywords.Length > 0)
+            {
+                passed = passed && expectedKeywords.Any(k => response.Contains(k, StringComparison.OrdinalIgnoreCase));
+            }
+
+            Console.WriteLine($"   Status: {(passed ? "✅ PASS" : "❌ FAIL")}");
+            Console.WriteLine($"   Response length: {response.Length} characters\n");
+
+            results.Add(new
+            {
+                question,
+                response,
+                passed,
+                response_length = response.Length
+            });
+        }
+        // </run_batch_evaluation>
+
+        // Cleanup - Note: In SDK 2.0, agents are versioned and managed differently
+        // await client.DeleteAgentAsync(agent.Name); // Uncomment if you want to delete
+
+        // <evaluation_results>
+        // NOTE: This code is a non-runnable snippet of the larger sample code from which it is taken.
+        var summary = new
+        {
+            total_questions = questions.Count,
+            passed = results.Count(r => ((dynamic)r).passed),
+            failed = results.Count(r => !((dynamic)r).passed),
+            results
+        };
+
+        var json = JsonSerializer.Serialize(summary, new JsonSerializerOptions { WriteIndented = true });
+        File.WriteAllText("evaluation_results.json", json);
+
+        Console.WriteLine($"📊 Evaluation Complete:");
+        Console.WriteLine($"   Total: {summary.total_questions}");
+        Console.WriteLine($"   Passed: {summary.passed}");
+        Console.WriteLine($"   Failed: {summary.failed}");
+        Console.WriteLine($"\n📄 Results saved to evaluation_results.json");
+        // </evaluation_results>
+    }
+}
@@ -0,0 +1,31 @@
+{
+  "total_questions": 4,
+  "passed": 4,
+  "failed": 0,
+  "results": [
+    {
+      "question": "What is our remote work policy regarding security requirements?",
+      "response": "Our remote work policy regarding security requirements includes the following key points:\n\n- A secure VPN connection is required for remote access.\n- Use of Microsoft 365 and Azure services is mandatory.\n- Multi-factor authentication (MFA) must be enabled.\n- Personal devices used for remote work must meet security standards.\n- All data must be stored in approved cloud services such as SharePoint and OneDrive.\n- No sensitive data is allowed to be stored on personal devices.\n- Employees are required to complete regular security training.\n- Security incidents must be reported within 2 hours.\n\nThese measures ensure secure and compliant remote work practices at Contoso Corporation\u30103:1\u2020source\u3011.",
+      "passed": true,
+      "response_length": 697
+    },
+    {
+      "question": "How do I set up Azure Active Directory conditional access?",
+      "response": "To set up Azure Active Directory (Azure AD) Conditional Access, follow these summarized steps:\n\n1. Sign in to the Azure portal (https://portal.azure.com).\n\n2. Open your Azure Active Directory tenant.\n\n3. Go to the \u0022Security\u0022 section and select \u0022Conditional Access.\u0022\n\n4. Click on \u0022New policy\u0022 to create a new Conditional Access policy.\n\n5. Configure the policy:\n   - Under \u0022Assignments,\u0022 select \u0022Users and groups\u0022 to define who the policy applies to.\n   - Choose \u0022Cloud apps or actions\u0022 to specify which apps or actions the policy targets.\n   - Set conditions such as device platform, location, sign-in risk, user risk, etc., as needed.\n   \n6. Under \u0022Access controls,\u0022 define controls such as requiring multi-factor authentication (MFA), blocking access, or requiring password change.\n\n7. Enable the policy by setting \u0022Enable policy\u0022 to On.\n\n8. Click \u0022Create\u0022 to save and activate the policy.\n\nImportant notes:\n- Azure AD Conditional Access is available in the Premium tier of Azure AD.\n- To avoid lockout, exclude emergency access or break-glass accounts from the policy.\n- You can use the \u0022What If\u0022 tool in Azure portal to troubleshoot Conditional Access policies.\n\nFor a detailed guide, including best practices and advanced options, see the Microsoft documentation on Configuring Azure Active Directory Conditional Access here: https://learn.microsoft.com/en-us/appcenter/general/configuring-aad-conditional-access\n\nIf you are using Azure AD B2C, the Conditional Access policies can also be applied via the Azure AD B2C section under Security \u003E Conditional Access with options tailored for different risk-based policies.\n\nLet me know if you want step-by-step instructions for a specific scenario or for Azure AD B2C Conditional Access.",
+      "passed": true,
+      "response_length": 1738
+    },
+    {
+      "question": "What collaboration tools are approved for internal use?",
+      "response": "The approved collaboration tools for internal use at Contoso Corporation are:\n\n- Microsoft Teams for meetings and internal communication\n- SharePoint for document collaboration and management\n- Azure DevOps for development projects and source code management\n- Outlook for email and calendar management\n\nThese tools are part of the company\u0027s remote work policy and collaboration standards to ensure secure and effective teamwork within the organization.\u30104:1\u2020source\u3011\u30104:2\u2020source\u3011",
+      "passed": true,
+      "response_length": 477
+    },
+    {
+      "question": "What Azure AD configuration should I implement to comply with our company\u0027s remote work security policy?",
+      "response": "To recommend the appropriate Azure AD configuration for your company\u0027s remote work security policy, I need more details about the specific security requirements in that policy. Common security measures for remote work typically include:\n\n- Multi-Factor Authentication (MFA) enforcement\n- Conditional Access policies based on user location or device compliance\n- Identity Protection to detect and respond to risky sign-ins\n- Device registration and management integration (e.g., Intune)\n- Restricting access to sensitive resources unless certain conditions (secure device, compliant user, approved location) are met\n- Enabling Single Sign-On (SSO) for secure cloud application access\n\nCould you please provide the key security controls or goals from your remote work policy? Or, if you want, I can provide a general recommended Azure AD security setup for remote work environments.",
+      "passed": true,
+      "response_length": 880
+    }
+  ]
+}
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="local-preview" value="F:\git\agentsv2-preview\dotnet\package" />
+  </packageSources>
+</configuration>
Original file line number	Diff line number	Diff line change
`@@ -31,3 +31,5 @@ resource containerRoleAssignmentUserContainer 'Microsoft.DocumentDB/databaseAcco`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
	`34`	`+`
	`35`	`+`