merged files

Author: Andrew Mathew

Diff for: .github/CODEOWNERS

@@ -178,7 +178,7 @@
 /sdk/keyvault/                                                       @mccoyp
 
 # PRLabel: %Load Test Service
-/sdk/loadtesting/azure-developer-loadtesting/                        @msyyc @iscai-msft
+/sdk/loadtesting/azure-developer-loadtesting/                        @prativen @mitsha-microsoft @ninallam
 
 # PRLabel: %Monitor
 /sdk/loganalytics/azure-loganalytics/                                @azmonapplicationinsights @pvaneck
@@ -306,20 +306,19 @@
 /sdk/mixedreality/azure-mixedreality-authentication/                 @RamonArguelles
 /sdk/remoterendering/                                                @FlorianBorn71
 
-# AzureSdkOwners: @kristapratico
 # ServiceLabel: %OpenAI
 # ServiceOwners: @trrwilson
 
 # PRLabel: %OpenAI
-/sdk/openai/                                                         @kristapratico @glecaros
+/sdk/openai/                                                         @trrwilson
 
 # ServiceLabel: %Operator Nexus - Network Cloud
 # PRLabel: %Operator Nexus - Network Cloud
 /sdk/networkcloud/                                                   @Azure/azure-sdk-write-networkcloud
 
 # ServiceLabel: %Purview
 # PRLabel: %Purview
-/sdk/purview/                                                        @saxenarahulMs
+/sdk/purview/                                                        @saxenarahulMs @adyabansal-ms
 
 # ServiceLabel: %Recovery Services
 # ServiceOwners: @Daya-Patil @Sharmistha-Rai

Diff for: .vscode/cspell.json

@@ -36,6 +36,7 @@
     "sdk/ai/azure-ai-inference/samples/hello_how_are_you.mp3",
     "sdk/ai/azure-ai-inference/tests/hello_how_are_you.mp3",
     "sdk/ai/azure-ai-projects/samples/agents/nifty_500_quarterly_results.csv",
+    "sdk/ai/azure-ai-projects/samples/agents/tripadvisor_openapi.json",
     "/sdk/ai/azure-ai-projects/samples/evaluations/async_samples/data/**",
     "/sdk/ai/azure-ai-projects/samples/evaluations/data/**",
     "sdk/ai/azure-ai-resources/azure/ai/resources/_index/_langchain/vendor/**",
@@ -68,6 +69,7 @@
     "sdk/digitaltwins/azure-digitaltwins-core/**",
     "sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/_vendor/**",
     "sdk/evaluation/azure-ai-evaluation/tests/**",
+    "sdk/evaluation/azure-ai-evaluation/samples/agent_evaluators/**",
     "sdk/eventhub/azure-eventhub-checkpointstoretable/**",
     "sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/**",
     "sdk/eventhub/azure-eventhub/**",
@@ -403,6 +405,7 @@
     "rtsp",
     "rtype",
     "rwdlacu",
+    "sansiohttppolicy",
     "scbedd",
     "sdist",
     "sdpath",
@@ -1342,6 +1345,10 @@
     {
       "filename": "sdk/ai/azure-ai-projects/**",
       "words": [
+        "coso",
+        "longtitude",
+        "abbrev",
+        "accommodations",
         "ENTRAID",
         "entraid",
         "aiservices",
@@ -1400,7 +1407,10 @@
         "upia",
         "xpia",
         "expirable",
-        "ralphe"
+        "ralphe",
+        "Inadherent",
+        "nbformat",
+        "nbconvert",
       ]
     },
     {

Diff for: doc/dev/ai/ai_prompt_workflow.md

@@ -0,0 +1,16 @@
+# AI Prompt Workflow
+
+
+1. In Copilot **Agent** mode, click on `Add Context` and select `prompt` from the dropdown.
+
+*Note*: Agent mode is currently only available in [VSCode Insiders](https://code.visualstudio.com/insiders/).
+
+![Agent Mode](step1.png)
+
+2. Select `next-pylint.prompt.md` or associated prompt for your task.
+
+![Select Prompt](step2.png)
+
+3. Send the prompt to the agent. Follow the instructions provided by the agent to complete the task.
+
+![Hit Enter!](step3.png)

Diff for: doc/dev/ai/step1.png

@@ -1,3 +1,17 @@
-apiview-stub-generator==0.3.16
-azure-pylint-guidelines-checker==0.0.7
-pylint<3.0.0
+astroid==2.15.8
+charset-normalizer==3.4.1
+dill==0.3.9
+isodate==0.6.1
+isort==5.13.2
+lazy-object-proxy==1.10.0
+mccabe==0.7.0
+pkginfo==1.12.1.2
+platformdirs==4.3.6
+pylint==2.17.7
+pylint-guidelines-checker==0.0.7
+six==1.17.0
+tomli==2.2.1
+tomlkit==0.13.2
+typing_extensions==4.12.2
+wrapt==1.17.2
+apiview-stub-generator==0.3.18

Diff for: doc/dev/ai/step2.png

@@ -93,6 +93,11 @@ param (
     })]
     [array] $AllowIpRanges = @(),
 
+    # Instead of running the post script, create a wrapped file to run it with parameters
+    # so that CI can run it in a subsequent step with a refreshed azure login
+    [Parameter()]
+    [string] $SelfContainedPostScript,
+
     [Parameter()]
     [switch] $CI = ($null -ne $env:SYSTEM_TEAMPROJECTID),
 
@@ -625,9 +630,42 @@ try {
         SetResourceNetworkAccessRules -ResourceGroupName $ResourceGroupName -AllowIpRanges $AllowIpRanges -CI:$CI
 
         $postDeploymentScript = $templateFile.originalFilePath | Split-Path | Join-Path -ChildPath "$ResourceType-resources-post.ps1"
+
+        if ($SelfContainedPostScript -and !(Test-Path $postDeploymentScript)) {
+            throw "-SelfContainedPostScript is not supported if there is no 'test-resources-post.ps1' script in the deployment template directory"
+        }
+
         if (Test-Path $postDeploymentScript) {
-            Log "Invoking post-deployment script '$postDeploymentScript'"
-            &$postDeploymentScript -ResourceGroupName $ResourceGroupName -DeploymentOutputs $deploymentOutputs @PSBoundParameters
+            if ($SelfContainedPostScript) {
+                Log "Creating invokable post-deployment script '$SelfContainedPostScript' from '$postDeploymentScript'"
+
+                $deserialized = @{}
+                foreach ($parameter in $PSBoundParameters.GetEnumerator()) {
+                    if ($parameter.Value -is [System.Management.Automation.SwitchParameter]) {
+                        $deserialized[$parameter.Key] = $parameter.Value.ToBool()
+                    } else {
+                        $deserialized[$parameter.Key] = $parameter.Value
+                    }
+                }
+                $deserialized['ResourceGroupName'] = $ResourceGroupName
+                $deserialized['DeploymentOutputs'] = $deploymentOutputs
+                $serialized = $deserialized | ConvertTo-Json
+
+                $outScript = @"
+`$parameters = `@'
+$serialized
+'`@ | ConvertFrom-Json -AsHashtable
+# Set global variables that aren't always passed as parameters
+`$ResourceGroupName = `$parameters.ResourceGroupName
+`$AdditionalParameters = `$parameters.AdditionalParameters
+`$DeploymentOutputs = `$parameters.DeploymentOutputs
+$postDeploymentScript `@parameters
+"@
+                $outScript | Out-File $SelfContainedPostScript
+            } else {
+                Log "Invoking post-deployment script '$postDeploymentScript'"
+                &$postDeploymentScript -ResourceGroupName $ResourceGroupName -DeploymentOutputs $deploymentOutputs @PSBoundParameters
+            }
         }
 
         if ($templateFile.jsonFilePath.EndsWith('.compiled.json')) {

Diff for: doc/dev/ai/step3.png

@@ -9,6 +9,7 @@ parameters:
   ResourceType: test
   UseFederatedAuth: true
   PersistOidcToken: false
+  SelfContainedPostScript: self-contained-test-resources-post.ps1
 
 # SubscriptionConfiguration will be splatted into the parameters of the test
 # resources script. It should be JSON in the form:
@@ -89,6 +90,8 @@ steps:
           # Write the new SubscriptionConfiguration to be used by the remove test resources
           Write-Host "##vso[task.setvariable variable=SubscriptionConfiguration;]$($subscriptionConfiguration | ConvertTo-Json -Compress)"
 
+          $postScriptPath = $${{ parameters.PersistOidcToken }} ? '$(Agent.TempDirectory)/${{ parameters.SelfContainedPostScript }}' : $null
+
           # The subscriptionConfiguration may have ArmTemplateParameters defined, so
           # pass those in via the ArmTemplateParameters flag, and handle any
           # additional parameters from the pipelines via AdditionalParameters
@@ -100,10 +103,32 @@ steps:
             @subscriptionConfiguration `
             -AdditionalParameters ${{ parameters.ArmTemplateParameters }} `
             -AllowIpRanges ('$(azsdk-corp-net-ip-ranges)' -split ',') `
+            -SelfContainedPostScript $postScriptPath `
             -CI `
             -Force `
             -Verbose | Out-Null
 
+    - ${{ if eq(parameters.PersistOidcToken, true) }}:
+      # ARM deployments that take longer than 10-15 minutes (e.g. HSM) can
+      # cause post scripts to fail with expired credentials.
+      # Add a new task with a refreshed token as a workaround to this issue.
+      - task: AzureCLI@2
+        displayName: Test Resources Post with refreshed login
+        env:
+          ${{ insert }}: ${{ parameters.EnvVars }}
+        inputs:
+          azureSubscription: ${{ parameters.ServiceConnection }}
+          addSpnToEnvironment: true
+          scriptLocation: inlineScript
+          scriptType: pscore
+          inlineScript: |
+            eng/common/scripts/Import-AzModules.ps1  # Support post scripts using az powershell instead of az cli
+            $env:ARM_OIDC_TOKEN = $env:idToken
+            $scriptPath = '$(Agent.TempDirectory)/${{ parameters.SelfContainedPostScript }}'
+            Write-Host "Executing self contained test resources post script '$scriptPath'"
+            & $scriptPath
+            Remove-Item $scriptPath  # avoid any possible complications when we run multiple deploy templates
+
   - ${{ else }}:
     - pwsh: |
         eng/common/scripts/Import-AzModules.ps1

Diff for: eng/apiview_reqs.txt

@@ -45,9 +45,14 @@ parameters:
 - name: EnablePRGeneration
   type: boolean
   default: false
+# name of the variable that will be added when creating batches for the PR Job Matrix
 - name: PRMatrixSetting
   type: string
   default: 'ArtifactPackageNames'
+# name of the key in PackageInfo that will be used to get the identifier when generating matrix batches
+- name: PRMatrixKey
+  type: string
+  default: 'ArtifactName'
 - name: PRJobBatchSize
   type: number
   default: 10
@@ -141,6 +146,7 @@ jobs:
               -PackagePropertiesFolder $(Build.ArtifactStagingDirectory)/PackageInfo `
               -PRMatrixFile matrix.json `
               -PRMatrixSetting ${{ parameters.PRMatrixSetting }} `
+              -PRMatrixKey ${{ parameters.PRMatrixKey }} `
               -DisplayNameFilter '$(displayNameFilter)' `
               -Filters '${{ join(''',''', parameters.MatrixFilters) }}', 'container=^$', 'SupportedClouds=^$|${{ parameters.CloudConfig.Cloud }}', 'Pool=${{ pool.filter }}' `
               -IndirectFilters '${{ join(''',''', parameters.PRMatrixIndirectFilters) }}' `

Diff for: eng/common/TestResources/New-TestResources.ps1

@@ -10,6 +10,9 @@ parameters:
   - name: TargetTags
     type: string
     default: ''
+  - name: PreTestSteps
+    type: object
+    default: []
 
 variables:
   - template: /eng/pipelines/templates/variables/globals.yml
@@ -36,6 +39,8 @@ stages:
           vmImage: $(Image)
 
         steps:
+          - ${{ parameters.PreTestSteps }}
+
           - template: /eng/common/pipelines/templates/steps/run-pester-tests.yml
             parameters:
               TargetDirectory: ${{ parameters.TargetDirectory }}

Diff for: eng/common/TestResources/deploy-test-resources.yml

@@ -30,4 +30,4 @@ catch
 {
   LogError "Remove-GitHubSourceReferences failed with exception:`n$_"
   exit 1
-}
+}

Diff for: eng/common/pipelines/templates/jobs/generate-job-matrix.yml

@@ -117,3 +117,114 @@ function Process-ReviewStatusCode($statusCode, $packageName, $apiApprovalStatus,
   $packageNameStatus.IsApproved = $packageNameApproved
   $packageNameStatus.Details = $packageNameApprovalDetails
 }
+
+function Set-ApiViewCommentForRelatedIssues {
+  param (
+    [Parameter(Mandatory = $true)]
+    [string]$HeadCommitish,
+    [string]$APIViewHost = "https://apiview.dev",
+    [ValidateNotNullOrEmpty()]
+    [Parameter(Mandatory = $true)]
+    $AuthToken
+  )
+  . ${PSScriptRoot}\..\common.ps1
+  $issuesForCommit = $null
+  try {
+    $issuesForCommit = Search-GitHubIssues -CommitHash $HeadCommitish
+    if ($issuesForCommit.items.Count -eq 0) {
+      LogError "No issues found for commit: $HeadCommitish"
+      exit 1
+    }
+  } catch {
+    LogError "No issues found for commit: $HeadCommitish"
+    exit 1
+  }
+  $issuesForCommit.items | ForEach-Object {
+    $urlParts = $_.url -split "/"
+    Set-ApiViewCommentForPR -RepoOwner $urlParts[4] -RepoName $urlParts[5] -PrNumber $urlParts[7] -HeadCommitish $HeadCommitish -APIViewHost $APIViewHost -AuthToken $AuthToken
+  }
+}
+
+function Set-ApiViewCommentForPR {
+  param (
+    [Parameter(Mandatory = $true)]
+    [string]$RepoOwner,
+    [Parameter(Mandatory = $true)]
+    [string]$RepoName,
+    [Parameter(Mandatory = $true)]
+    [string]$PrNumber,
+    [Parameter(Mandatory = $true)]
+    [string]$HeadCommitish,
+    [Parameter(Mandatory = $true)]
+    [string]$APIViewHost,
+    [ValidateNotNullOrEmpty()]
+    [Parameter(Mandatory = $true)]
+    $AuthToken
+  )
+  $repoFullName = "$RepoOwner/$RepoName"
+  $apiviewEndpoint = "$APIViewHost/api/pullrequests?pullRequestNumber=$PrNumber&repoName=$repoFullName&commitSHA=$HeadCommitish"
+  LogDebug "Get APIView information for PR using endpoint: $apiviewEndpoint"
+
+  $commentText = @()
+  $commentText += "## API Change Check"
+  try {
+    $response = Invoke-WebRequest -Uri $apiviewEndpoint -Method Get -MaximumRetryCount 3
+    if ($response.StatusCode -ne 200) {
+      LogWarning "API changes are not detected in this pull request."
+      $commentText += ""
+      $commentText += "API changes are not detected in this pull request."
+    }
+    else {
+      LogSuccess "APIView identified API level changes in this PR and created $($response.Count) API reviews"
+      $commentText += ""
+      $commentText += "APIView identified API level changes in this PR and created the following API reviews"
+      $commentText += ""
+
+      $responseContent = $response.Content | ConvertFrom-Json
+      if ($RepoName.StartsWith(("azure-sdk-for-"))) {
+        $responseContent | ForEach-Object {
+          $commentText += "[$($_.packageName)]($($_.url))"
+        }
+      } else {
+        $commentText += "| Language | API Review for Package |"
+        $commentText += "|----------|---------|"
+        $responseContent | ForEach-Object {
+          $commentText += "| $($_.language) | [$($_.packageName)]($($_.url)) |"
+        }
+      }
+    }
+  } catch{
+    LogError "Failed to get API View information for PR: $PrNumber in repo: $repoFullName with commitSHA: $Commitish. Error: $_"
+    exit 1
+  }
+
+  $commentText += "<!-- Fetch URI: $apiviewEndpoint -->"
+  $commentText = $commentText -join "`r`n"
+  $existingComment = $null;
+  $existingAPIViewComment = $null;
+
+  try {
+    $existingComment = Get-GitHubIssueComments -RepoOwner $RepoOwner -RepoName $RepoName -IssueNumber $PrNumber -AuthToken $AuthToken
+    $existingAPIViewComment = $existingComment | Where-Object { 
+      $_.body.StartsWith("**API Change Check**", [StringComparison]::OrdinalIgnoreCase) -or $_.body.StartsWith("## API Change Check", [StringComparison]::OrdinalIgnoreCase) }
+  } catch {
+    LogWarning "Failed to get comments from Pull Request: $PrNumber in repo: $repoFullName"
+  }
+  
+  try {
+    if ($existingAPIViewComment) {
+      LogDebug "Updating existing APIView comment..."
+      Update-GitHubIssueComment -RepoOwner $RepoOwner -RepoName $RepoName `
+                                -CommentId $existingAPIViewComment.id -Comment $commentText `
+                                -AuthToken $AuthToken
+    } else {
+      LogDebug "Creating new APIView comment..."
+      Add-GitHubIssueComment -RepoOwner $RepoOwner -RepoName $RepoName `
+                             -IssueNumber $PrNumber -Comment $commentText `
+                             -AuthToken $AuthToken
+    }
+  } catch {
+    LogError "Failed to set PR comment for APIView. Error: $_"
+    exit 1
+  }
+}