merge main into branch #338
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Delete samples/microsoft/csharp/developer-journey-stage-1-idea-to-prototype directory * Delete samples/microsoft/java/developer-journey-stage-1-idea-to-prototype directory * Delete samples/microsoft/python/developer-journey-stage-1-idea-to-prototype directory * Delete samples/microsoft/typescript/developer-journey-stage-1-idea-to-prototype directory
* Add Bicep file for private network agent project setup creating additional projects for account * Add parameters for second project setup Added parameters for a new project setup including details for existing AI services and shared resources. * Add script to get existing Azure resources This script retrieves the names of existing Azure resources such as AI Services, Storage Account, AI Search Service, and Cosmos DB Account from a specified Resource Group to be used on add-project.bicepparam * Add Bicep file for AI project identity setup This Bicep file defines parameters and resources for setting up a project with unique connection names for CosmosDB, Azure Storage, and Azure Cognitive Search, utilizing system-assigned identity. * Add role assignments for blob storage container adds roles for projects in add-project.bicep * Enhance README with multi-project deployment guide Added a guide for adding multiple projects to AI Foundry deployment, including prerequisites and steps
Clarified VNET address space overlap requirements.
…icepparam (#329) Updated comments to clarify network configuration behavior based on existing VNet resource ID.
sdgilley
added a commit
that referenced
this pull request
Dec 4, 2025
* merge main into branch (#338) * Removed code until ready for publication (#332) * Delete samples/microsoft/csharp/developer-journey-stage-1-idea-to-prototype directory * Delete samples/microsoft/java/developer-journey-stage-1-idea-to-prototype directory * Delete samples/microsoft/python/developer-journey-stage-1-idea-to-prototype directory * Delete samples/microsoft/typescript/developer-journey-stage-1-idea-to-prototype directory * Adding Projects to Vnet Injected Foundry (#324) * Add Bicep file for private network agent project setup creating additional projects for account * Add parameters for second project setup Added parameters for a new project setup including details for existing AI services and shared resources. * Add script to get existing Azure resources This script retrieves the names of existing Azure resources such as AI Services, Storage Account, AI Search Service, and Cosmos DB Account from a specified Resource Group to be used on add-project.bicepparam * Add Bicep file for AI project identity setup This Bicep file defines parameters and resources for setting up a project with unique connection names for CosmosDB, Azure Storage, and Azure Cognitive Search, utilizing system-assigned identity. * Add role assignments for blob storage container adds roles for projects in add-project.bicep * Enhance README with multi-project deployment guide Added a guide for adding multiple projects to AI Foundry deployment, including prerequisites and steps * Update README with VNET address space guidelines (#330) Clarified VNET address space overlap requirements. * clarify network parameter behavior for new vs existing VNet in main.bicepparam (#329) Updated comments to clarify network configuration behavior based on existing VNet resource ID. * Add new CODEOWNERS entries for Terraform files (#335) --------- Co-authored-by: Jon Burchel <jburchel@microsoft.com> Co-authored-by: geabdluca <73857153+geabdluca@users.noreply.github.com> Co-authored-by: AhmadAbdullah91 <91725950+AhmadAbdullah91@users.noreply.github.com> Co-authored-by: kazuyaonuki-MSFT <93357408+KazuOnuki@users.noreply.github.com> Co-authored-by: s-polly <109610942+s-polly@users.noreply.github.com> * Enterprise agent tutorial: Stage 1 - Idea to prototype (#331) * Starting from scratch after issues arose with non-Python samples in testing * Updates to sample content data * Fixes for other languages * Updates * Pre-upgrade commit: saving current state before Java 21 upgrade * Upgrade project to Java 21 using openrewrite. * Clean up extraneous files: remove status reports, .vscode, and build artifacts * Update all enterprise-agent-tutorial READMEs to match Python style with emojis, encouragement, and better structure * Configure Java pom.xml for ultra-minimal structure with source files in project root * Remove .vscode directory from tracking * Add comprehensive validation summary documenting all changes and test results * Remove duplicate .env files from python/enterprise-agent-tutorial parent directory * Fixes * Updates to fix C# * Fixes to C# * Now C# and Python both fully working. Whew... * Structural improvements and fixes to Evaluate project. * Improvements to sample questions, fixes to C# SharePoint implementation * Python updates for SDK 2.0 * C# updates for SDK v2 * Java implementation * Adds tags to samples for doc references * 2025 10 22 enterprise agent tutorial updates (#340) * Starting from scratch after issues arose with non-Python samples in testing * Updates to sample content data * Fixes for other languages * Updates * Pre-upgrade commit: saving current state before Java 21 upgrade * Upgrade project to Java 21 using openrewrite. * Clean up extraneous files: remove status reports, .vscode, and build artifacts * Update all enterprise-agent-tutorial READMEs to match Python style with emojis, encouragement, and better structure * Configure Java pom.xml for ultra-minimal structure with source files in project root * Remove .vscode directory from tracking * Add comprehensive validation summary documenting all changes and test results * Remove duplicate .env files from python/enterprise-agent-tutorial parent directory * Fixes * Updates to fix C# * Fixes to C# * Now C# and Python both fully working. Whew... * Structural improvements and fixes to Evaluate project. * Improvements to sample questions, fixes to C# SharePoint implementation * Python updates for SDK 2.0 * C# updates for SDK v2 * Java implementation * Adds tags to samples for doc references * Improvement to code layout * Add non-runnable code snippet notes in main.py Added notes indicating that the code snippets are non-runnable parts of a larger sample. * Add non-runnable snippet notes to evaluate.py Added notes indicating that the code snippets are non-runnable parts of a larger sample. * Add notes for non-runnable code snippets Added notes indicating that the code snippets are non-runnable parts of a larger sample. * Add notes for non-runnable code snippets Added notes indicating that the code snippets are non-runnable. * Add notes for non-runnable code snippets Added notes indicating that code snippets are non-runnable. * Add non-runnable snippet notes to ModernWorkplaceAssistant Added notes indicating that the code snippets are non-runnable parts of a larger sample. * enterprise-agent-tutorial\2-prototype-to-production (#342) * Developer journey tutorial: Stage 3 - Production to adoption (#343) * Delete samples/microsoft/csharp/enterprise-agent-tutorial/2-prototype-to-production directory * Delete samples/microsoft/csharp/enterprise-agent-tutorial/3-production-to-adoption directory * Delete samples/microsoft/python/enterprise-agent-tutorial/2-prototype-to-production directory * Delete samples/microsoft/python/enterprise-agent-tutorial/3-production-to-adoption directory * Delete samples/microsoft/java/enterprise-agent-tutorial/2-prototype-to-production directory * Delete samples/microsoft/java/enterprise-agent-tutorial/3-production-to-adoption directory * Delete samples/microsoft/enterprise-agent-tutorial directory * create samples-v2 * change model * Adding Quickstart for Python Agents v2 * Revert "Adding Quickstart for Python Agents v2" This reverts commit 3843848. * Added Python Quickstart * Adding REST Quickstart * Tidying up the code pieces * Update quickstart Python files (#355) * initial submit * updated based on feedback * use env var for agent name * Fixed commenting in python files. Added separate samples for REST * add codeowner for the samples-v2 directory in branch * initial submit (#357) * Nov25 updates (#358) * Removed code until ready for publication (#332) * Delete samples/microsoft/csharp/developer-journey-stage-1-idea-to-prototype directory * Delete samples/microsoft/java/developer-journey-stage-1-idea-to-prototype directory * Delete samples/microsoft/python/developer-journey-stage-1-idea-to-prototype directory * Delete samples/microsoft/typescript/developer-journey-stage-1-idea-to-prototype directory * Adding Projects to Vnet Injected Foundry (#324) * Add Bicep file for private network agent project setup creating additional projects for account * Add parameters for second project setup Added parameters for a new project setup including details for existing AI services and shared resources. * Add script to get existing Azure resources This script retrieves the names of existing Azure resources such as AI Services, Storage Account, AI Search Service, and Cosmos DB Account from a specified Resource Group to be used on add-project.bicepparam * Add Bicep file for AI project identity setup This Bicep file defines parameters and resources for setting up a project with unique connection names for CosmosDB, Azure Storage, and Azure Cognitive Search, utilizing system-assigned identity. * Add role assignments for blob storage container adds roles for projects in add-project.bicep * Enhance README with multi-project deployment guide Added a guide for adding multiple projects to AI Foundry deployment, including prerequisites and steps * Update README with VNET address space guidelines (#330) Clarified VNET address space overlap requirements. * clarify network parameter behavior for new vs existing VNet in main.bicepparam (#329) Updated comments to clarify network configuration behavior based on existing VNet resource ID. * Add new CODEOWNERS entries for Terraform files (#335) * BYO Storage for Speech and Language in Foundry resources (#337) * Included BYOS for Speech and Language BICEP * allowProjectManagement changed to true * updated bicep template to include storage account check * allowing for template to take in storage accounts from another subscriptions, but not create one in another sub. * updated README.md * updated README.md for final check * Add UMI support for private network-secured setup for agents (#341) * added aca env bicep * add umi pvt setup * remove princiaplId output * update azuredeply json and readme * Revert "added aca env bicep" This reverts commit d1b08be. * Update samples/microsoft/infrastructure-setup/17-private-network-standard-user-assigned-identity-agent-setup/README.md Co-authored-by: Meera Kurup <meerakurup@microsoft.com> * update readme for classA support --------- Co-authored-by: Meera Kurup <meerakurup@microsoft.com> * enterprise-agent-tutorial\2-prototype-to-production * Remove whitelisting note in README and main (#344) Remove whitelisting note in README and main * Update README with additional reserved IP range (#346) Update README with additional reserved IP range * SDK v2 updates * Got Java working fully now * Updates TypeScript and C# samples to work with SDKv2 * Policy samples (#349) * deny connection variants * include custom policy samples * update readme for delete acc caphost (#353) * Add policy sample to restrict to aiservices kind (#350) * deny connection variants * include custom policy samples * add sample * fix sample * fix missing var * Updates TypeScript Golden Path tutorial * update readme and scripts (#356) * Syncs questions.jsonl between all 3 samples --------- Co-authored-by: geabdluca <73857153+geabdluca@users.noreply.github.com> Co-authored-by: AhmadAbdullah91 <91725950+AhmadAbdullah91@users.noreply.github.com> Co-authored-by: kazuyaonuki-MSFT <93357408+KazuOnuki@users.noreply.github.com> Co-authored-by: s-polly <109610942+s-polly@users.noreply.github.com> Co-authored-by: Andy <127872853+andyaviles121@users.noreply.github.com> Co-authored-by: sarajag <64988727+sarajag@users.noreply.github.com> Co-authored-by: Meera Kurup <meerakurup@microsoft.com> Co-authored-by: Dennis Eikelenboom <92387505+deeikele@users.noreply.github.com> * Add fallback for SharePoint tool configuration * Nov25 updates (#390) * Removed code until ready for publication (#332) * Delete samples/microsoft/csharp/developer-journey-stage-1-idea-to-prototype directory * Delete samples/microsoft/java/developer-journey-stage-1-idea-to-prototype directory * Delete samples/microsoft/python/developer-journey-stage-1-idea-to-prototype directory * Delete samples/microsoft/typescript/developer-journey-stage-1-idea-to-prototype directory * Adding Projects to Vnet Injected Foundry (#324) * Add Bicep file for private network agent project setup creating additional projects for account * Add parameters for second project setup Added parameters for a new project setup including details for existing AI services and shared resources. * Add script to get existing Azure resources This script retrieves the names of existing Azure resources such as AI Services, Storage Account, AI Search Service, and Cosmos DB Account from a specified Resource Group to be used on add-project.bicepparam * Add Bicep file for AI project identity setup This Bicep file defines parameters and resources for setting up a project with unique connection names for CosmosDB, Azure Storage, and Azure Cognitive Search, utilizing system-assigned identity. * Add role assignments for blob storage container adds roles for projects in add-project.bicep * Enhance README with multi-project deployment guide Added a guide for adding multiple projects to AI Foundry deployment, including prerequisites and steps * Update README with VNET address space guidelines (#330) Clarified VNET address space overlap requirements. * clarify network parameter behavior for new vs existing VNet in main.bicepparam (#329) Updated comments to clarify network configuration behavior based on existing VNet resource ID. * Add new CODEOWNERS entries for Terraform files (#335) * BYO Storage for Speech and Language in Foundry resources (#337) * Included BYOS for Speech and Language BICEP * allowProjectManagement changed to true * updated bicep template to include storage account check * allowing for template to take in storage accounts from another subscriptions, but not create one in another sub. * updated README.md * updated README.md for final check * Add UMI support for private network-secured setup for agents (#341) * added aca env bicep * add umi pvt setup * remove princiaplId output * update azuredeply json and readme * Revert "added aca env bicep" This reverts commit d1b08be. * Update samples/microsoft/infrastructure-setup/17-private-network-standard-user-assigned-identity-agent-setup/README.md Co-authored-by: Meera Kurup <meerakurup@microsoft.com> * update readme for classA support --------- Co-authored-by: Meera Kurup <meerakurup@microsoft.com> * enterprise-agent-tutorial\2-prototype-to-production * Remove whitelisting note in README and main (#344) Remove whitelisting note in README and main * Update README with additional reserved IP range (#346) Update README with additional reserved IP range * SDK v2 updates * Got Java working fully now * Updates TypeScript and C# samples to work with SDKv2 * Policy samples (#349) * deny connection variants * include custom policy samples * update readme for delete acc caphost (#353) * Add policy sample to restrict to aiservices kind (#350) * deny connection variants * include custom policy samples * add sample * fix sample * fix missing var * Updates TypeScript Golden Path tutorial * update readme and scripts (#356) * Syncs questions.jsonl between all 3 samples * Fix * Updates to golden path tutorial --------- Co-authored-by: geabdluca <73857153+geabdluca@users.noreply.github.com> Co-authored-by: AhmadAbdullah91 <91725950+AhmadAbdullah91@users.noreply.github.com> Co-authored-by: kazuyaonuki-MSFT <93357408+KazuOnuki@users.noreply.github.com> Co-authored-by: s-polly <109610942+s-polly@users.noreply.github.com> Co-authored-by: Andy <127872853+andyaviles121@users.noreply.github.com> Co-authored-by: sarajag <64988727+sarajag@users.noreply.github.com> Co-authored-by: Meera Kurup <meerakurup@microsoft.com> Co-authored-by: Dennis Eikelenboom <92387505+deeikele@users.noreply.github.com> * move enterprise-agent-tutorial * move quickstart * remove sln file --------- Co-authored-by: Jon Burchel <jburchel@microsoft.com> Co-authored-by: geabdluca <73857153+geabdluca@users.noreply.github.com> Co-authored-by: AhmadAbdullah91 <91725950+AhmadAbdullah91@users.noreply.github.com> Co-authored-by: kazuyaonuki-MSFT <93357408+KazuOnuki@users.noreply.github.com> Co-authored-by: s-polly <109610942+s-polly@users.noreply.github.com> Co-authored-by: Bala P V <33712765+balapv@users.noreply.github.com> Co-authored-by: John Alexander (MSFT) <174467815+ms-johnalex@users.noreply.github.com> Co-authored-by: Andy <127872853+andyaviles121@users.noreply.github.com> Co-authored-by: sarajag <64988727+sarajag@users.noreply.github.com> Co-authored-by: Meera Kurup <meerakurup@microsoft.com> Co-authored-by: Dennis Eikelenboom <92387505+deeikele@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.