resolving merge conflicts

Author: v-dharmarajv

.github/CODEOWNERS

@@ -1,19 +1,6 @@
 # Instructions for CODEOWNERS file format and automatic build failure notifications:
 # https://github.com/Azure/azure-sdk/blob/main/docs/policies/opensource.md#codeowners
 
-################
-# Orphaned paths
-################
-# As of 1/26/2023 these paths have no owners:
-
-# /**
-# /.devcontainer/
-# /.vscode/
-# /conda-releaselogs/
-# /doc/
-# /scripts/
-# /tools/
-
 ###########
 # SDK
 ###########
@@ -76,7 +63,7 @@
 # PRLabel: %Storage
 /sdk/storage/                                                        @annatisch @jalauzon-msft @vincenttran-msft @weirongw23-msft
 
-# AzureSdkOwners: @YalinLi0312
+# AzureSdkOwners: @xiangyan99
 # ServiceLabel: %App Configuration
 # ServiceOwners: @albertofori @avanigupta @mrm9084
 
@@ -162,8 +149,8 @@
 # PRLabel: %Defender EASM
 /sdk/easm/                                                           @nathanfalke
 
-# ServiceLabel: %Face
-# PRLabel: %Face
+# ServiceLabel: %FaceAPI
+# PRLabel: %FaceAPI
 /sdk/face/                                                           @zihyunting
 
 # ServiceLabel: %Cognitive - Health Insights
@@ -202,11 +189,11 @@
 
 # ServiceLabel: %Monitor - Distro
 # PRLabel: %Monitor - Distro
-/sdk/monitor/azure-monitor-opentelemetry/                            @lzchen @jeremydvoss
+/sdk/monitor/azure-monitor-opentelemetry/                            @lzchen @jeremydvoss @hectorhdzg @rads-1996 @Karlie-777 @MSNev @JacksonWeber
 
 # ServiceLabel: %Monitor - Exporter
 # PRLabel: %Monitor - Exporter
-/sdk/monitor/azure-monitor-opentelemetry-exporter/                   @lzchen @hectorhdzg @jeremydvoss
+/sdk/monitor/azure-monitor-opentelemetry-exporter/                   @lzchen @jeremydvoss @hectorhdzg @rads-1996 @Karlie-777 @MSNev @JacksonWeber
 
 # ServiceLabel: %Consumption
 # PRLabel: %Consumption
@@ -216,10 +203,10 @@
 # PRLabel: %Container Instances
 /sdk/containerinstance/                                              @samkreter @xizhamsft
 
-# AzureSdkOwners: @YalinLi0312
+# AzureSdkOwners: @lmazuel
 # ServiceLabel: %Container Registry
 # PRLabel: %Container Registry
-/sdk/containerregistry/                                              @YalinLi0312
+/sdk/containerregistry/                                              @lmazuel
 
 # ServiceLabel: %Container Service
 # PRLabel: %Container Service
@@ -262,6 +249,15 @@
 # ServiceLabel: %AI Model Inference %Service Attention
 /sdk/ai/azure-ai-inference/                                          @dargilco @trangevi @jhakulin
 
+# PRLabel: %AI Agents
+# ServiceLabel: %AI Agents %Service Attention
+/sdk/ai/azure-ai-agents/                                             @dargilco @jhakulin @trangevi @glharper @nick863 @howieleung
+
+# PRLabel: %AI Projects
+# ServiceLabel: %AI Projects %Service Attention
+/sdk/ai/azure-ai-projects/                                           @dargilco @jhakulin
+
+
 # PRLabel: %HDInsight
 /sdk/hdinsight/                                                      @idear1203
 
@@ -310,6 +306,10 @@
 /sdk/mixedreality/azure-mixedreality-authentication/                 @RamonArguelles
 /sdk/remoterendering/                                                @FlorianBorn71
 
+# ServiceLabel: %Online Experimentation
+# PRLabel: %Online Experimentation
+/sdk/onlineexperimentation/                                          @Azure/azure-sdk-write-onlineexperimentation
+
 # ServiceLabel: %OpenAI
 # ServiceOwners: @trrwilson
 
@@ -329,7 +329,7 @@
 
 # ServiceLabel: %Purview
 # PRLabel: %Purview
-/sdk/purview/                                                        @saxenarahulMs @adyabansal-ms
+/sdk/purview/                                                        @adyabansal-ms
 
 # ServiceLabel: %Recovery Services
 # ServiceOwners: @Daya-Patil @Sharmistha-Rai
@@ -381,12 +381,12 @@
 # PRLabel: %Health Deidentification
 /sdk/healthdataaiservices/                                           @alexathomases @Azure/healthdatadeidentification
 
-# AzureSdkOwners: @YalinLi0312
+# AzureSdkOwners: @catalinaperalta
 # ServiceLabel: %Cognitive - Form Recognizer
 # ServiceOwners: @bojunehsu @vkurpad
 
 # PRLabel: %Cognitive - Form Recognizer
-/sdk/formrecognizer/                                                 @YalinLi0312
+/sdk/formrecognizer/                                                 @catalinaperalta
 
 # AzureSdkOwners: @YalinLi0312
 # ServiceLabel: %Document Intelligence
@@ -828,9 +828,8 @@
 # Management Plane
 /**/*mgmt*/                                                          @ChenxiJiang333 @msyyc
 
-
 ###########
-# Eng Sys
+# Eng Sys and other
 ###########
 /eng/                                                                @scbedd @weshaggard @benbp
 /eng/common/                                                         @Azure/azure-sdk-eng
@@ -839,8 +838,13 @@
 /sdk/pullrequest.yml                                                 @scbedd @weshaggard @benbp
 
 /.config/1espt/                                                      @benbp @weshaggard
+/.devcontainer/                                                      @scbedd @mccoyp @benbp @weshaggard
+/.vscode/                                                            @scbedd @mccoyp @benbp @weshaggard
 
 /tools/                                                              @scbedd @mccoyp
+/scripts/                                                            @scbedd @mccoyp
+/doc/                                                                @scbedd @mccoyp
+/conda/                                                              @scbedd @xiangyan99 @lmazuel
 
 # Add owners for notifications for specific pipelines
 /eng/pipelines/templates/jobs/tests-nightly-python.yml               @lmazuel @mccoyp
@@ -851,5 +855,5 @@
 /eng/emitter-package.json                                            @mccoyp @catalinaperalta @kristapratico @iscai-msft
 /eng/emitter-package-lock.json                                       @mccoyp @catalinaperalta @kristapratico @iscai-msft
 
-/pylintrc                                                            @l0lawrence
+/pylintrc                                                            @l0lawrence @scbedd @mccoyp
 /sdk/**/ci.yml                                                       @msyyc @lmazuel

.vscode/cspell.json

@@ -35,10 +35,6 @@
     "sdk/ai/azure-ai-generative/tests/**",
     "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/**",
     "sdk/ai/azure-ai-resources/azure/ai/resources/_restclient/**",
     "sdk/cognitiveservices/azure-cognitiveservices-search-autosuggest/**",
@@ -75,6 +71,7 @@
     "sdk/eventhub/azure-eventhub/**",
     "sdk/easm/azure-defender-easm/azure/defender/easm/**",
     "sdk/graphrbac/azure-graphrbac/**",
+    "sdk/healthdataaiservices/azure-health-deidentification/tests/data/**/*",
     "sdk/healthinsights/azure-healthinsights-cancerprofiling/azure/**",
     "sdk/healthinsights/azure-healthinsights-clinicalmatching/azure/**",
     "sdk/formrecognizer/azure-ai-formrecognizer/samples/sample_forms/**",
@@ -227,6 +224,8 @@
     "dateutil",
     "ddos",
     "decryptor",
+    "deidentification",
+    "deidservice",
     "delenv",
     "dependened",
     "deque",
@@ -343,6 +342,7 @@
     "mynewpackage",
     "mypackage",
     "myvault",
+    "myservice",
     "mytable",
     "nazsdk",
     "nbytes",
@@ -391,6 +391,7 @@
     "pyright",
     "pyrightconfig",
     "parameterizing",
+    "pypirc",
     "pyrit",
     "pytyped",
     "pytz",
@@ -430,6 +431,7 @@
     "struct",
     "STRUCT",
     "substringof",
+    "surrogated",
     "systemperf",
     "tenvparallel",
     "Teradata",
@@ -1389,24 +1391,6 @@
         "smirnov"
       ]
     },
-    {
-      "filename": "sdk/ai/azure-ai-projects/**",
-      "words": [
-        "coso",
-        "longtitude",
-        "abbrev",
-        "accommodations",
-        "ENTRAID",
-        "entraid",
-        "aiservices",
-        "OTEL",
-        "GENAI",
-        "fspath",
-        "myindexname",
-        "wttr",
-        "azureopenai"
-      ]
-    },
     {
       "filename": "sdk/ai/azure-ai-inference/**",
       "words": [

README.md

@@ -52,6 +52,41 @@ Management libraries can be identified by namespaces that start with `azure-mgmt
 * File an issue via [GitHub Issues](https://github.com/Azure/azure-sdk-for-python/issues)
 * Check [previous questions](https://stackoverflow.com/questions/tagged/azure+python) or ask new ones on StackOverflow using `azure` and `python` tags.
 
+
+## Data Collection
+The software may collect information about you and your use of the software and send it to Microsoft. Microsoft may use this information to provide services and improve our products and services. You may turn off the telemetry as described below. You can learn more about data collection and use in the help documentation and Microsoft’s [privacy statement](https://go.microsoft.com/fwlink/?LinkID=824704). For more information on the data collected by the Azure SDK, please visit the [Telemetry Guidelines](https://azure.github.io/azure-sdk/general_azurecore.html#telemetry-policy) page.
+
+### Telemetry Configuration
+Telemetry collection is on by default.
+
+To opt out, you can disable telemetry at client construction. Define a `NoUserAgentPolicy` class that is a subclass of `UserAgentPolicy` with an `on_request` method that does nothing. Then pass instance of this class as kwargs `user_agent_policy=NoUserAgentPolicy()` during client creation. This will disable telemetry for all methods in the client. Do this for every new client.
+
+The example below uses the `azure-storage-blob` package. In your code, you can replace `azure-storage-blob` with the package you are using.
+
+```python
+import os
+from azure.identity import ManagedIdentityCredential
+from azure.storage.blob import BlobServiceClient
+from azure.core.pipeline.policies import UserAgentPolicy
+
+
+# Create your credential you want to use
+mi_credential = ManagedIdentityCredential()
+
+account_url = "https://<storageaccountname>.blob.core.windows.net"
+
+# Set up user-agent override
+class NoUserAgentPolicy(UserAgentPolicy):
+    def on_request(self, request):
+        pass
+
+# Create the BlobServiceClient object
+blob_service_client = BlobServiceClient(account_url, credential=mi_credential, user_agent_policy=NoUserAgentPolicy())
+
+container_client = blob_service_client.get_container_client(container=<container_name>) 
+# TODO: do something with the container client like download blob to a file
+```
+
 ### Reporting security issues and security bugs
 
 Security issues and bugs should be reported privately, via email, to the Microsoft Security Response Center (MSRC) <[email protected]>. You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Further information, including the MSRC PGP key, can be found in the [Security TechCenter](https://www.microsoft.com/msrc/faqs-report-an-issue).

doc/dev/code_snippets.md

@@ -2,8 +2,8 @@
 
 All code snippets in README should be up to date and runnable. And we want to have single source of truth hence we only need to maintain one copy. To achieve it, we want to have:
 
-- [Store samples in samples folder and setup the pipeline to run them to make sure no sample is broken](#create-samples)
-- [In README, refer the code snippet from the samples](#refer-samples)
+- [Define snippet definitions in the samples folder](#create-samples)
+- [In README, refer to the code snippets from the samples](#refer-samples)
 - [Run `python_snippet_updater.py` to keep them in sync](#python_snippet_updater-tool)
 
 ## Create samples
@@ -29,35 +29,38 @@ https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/core/azure-core/samp
 
 Instead of copying the code snippet into README which is hard to maintain and validate, we add reference to the sample snippet in README. We use the annotation `\<!-- SNIPPET:file_name.snippet_name-->` to refer the code snippet in README file.
 
-It is like:
-
-`\<!-- SNIPPET:test_example_async.asyncio -->`
+If you have a file in `samples\text_example_async.py` with a snippet named `asyncio`, you can reference it in your README like:
 
+````markdown
+<!-- SNIPPET:test_example_async.asyncio -->
 ```python
-from azure.core.pipeline.transport import AsyncioRequestsTransport
-
-async with AsyncPipeline(AsyncioRequestsTransport(), policies=policies) as pipeline:
-    response = await pipeline.run(request)
 ```
+<!-- END SNIPPET -->
+````
 
-`\<!-- END SNIPPET -->`
-
-**Note:** you need to make sure there is
-
-\```python
-
-\```
-
-within `\<!-- SNIPPET:` & `\<!-- END SNIPPET -->` in README.MD to make the annotation valid.
+> Make sure you include a Python code fence within the snippet reference!
 
 ## Run python_snippet_updater tool
 
 ```powershell
 python <azure-sdk-for-python>/tools/azure-sdk-tools/ci_tools/snippet_update/python_snippet_updater.py <path_to_the_service>
 ```
 
-The script scans the snippets in samples folder and auto replace the snippets in README with the one from samples folder.
+The script scans the snippets in samples folder and populates snippet references in README with the snippet definitions from samples folder.
+
+The example reference above could become:
+
+````markdown
+<!-- SNIPPET:test_example_async.asyncio -->
+
+```python
+from azure.core.pipeline.transport import AsyncioRequestsTransport
+
+async with AsyncPipeline(AsyncioRequestsTransport(), policies=policies) as pipeline:
+    response = await pipeline.run(request)
+```
 
-**NOTE: the snippets in README will be overwritten!**
+<!-- END SNIPPET -->
+````
 
-Now you are all set!
+Once you've run the script, you can commit your changes. Now you are all set!

doc/dev/dev_setup.md

@@ -43,8 +43,7 @@ or execute the various commands available in the toolbox.
 
 5.  Create a .env file to store your secrets.
 
-    The recommended place to store your .env file is one directory higher than the `azure-sdk-for-python` location.
-    This ensures the secrets will be loaded by the interpreter and most importantly not be committed to Git history.
+    The recommended place to store your .env file in the root of the SDK repository, as it will be gitignored.
 
 ## Follow test-running guidance
 

doc/dev/release.md

@@ -1,14 +1,15 @@
 # Release process
 
-### Disclaimer
-This article assumes you have code on `main` that is ready to publish:
-- Version is accurate
-- ChangeLog is updated
-- Readme is accurate, etc.
+## Prerequisites
+First, ensure your code on `main` is ready to publish.
 
-If you don't, and you are working with Management packages, start with this page:
-https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/mgmt/mgmt_release.md
+For management (control plane) packages, start with this page: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/mgmt/mgmt_release.md
 
+For client (data plane) packages, ensure that:
+- The version at `sdk/path-to-your-package/_version.py` has been updated following [these guidelines](https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/package_version/package_version_rule.md).
+- The changelog has been updated following [these guidelines](https://azure.github.io/azure-sdk/policies_releases.html#change-logs).
+- Package README has been updated following [these guidelines](https://azure.github.io/azure-sdk/python_documentation.html).
+- Samples have been updated following [these guidelines](https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/sample_guide.md).
 
 ## Python Package Index
 

doc/dev/sample_guide.md

@@ -42,6 +42,8 @@ Note that the metadata under `products` must match an existing product slug foun
 
 ## Capturing code snippets in reference documentation
 Code snippets from samples can be captured as [examples][qa_example] in our reference documentation.
+See [code snippets documentation](https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/code_snippets.md) for more details on how to define and reference code snippets in Markdown files.
+
 To do this, place `# [START <keyword>]` and `# [END <keyword>]` comments which span the lines you want to show up in the reference documentation example.
 Note that the <keyword> used should be unique across all sync/async samples added to a client library.
 

eng/.docsettings.yml

@@ -14,6 +14,7 @@ omitted_paths:
   - sdk/**/swagger/*
   - sdk/ml/azure-ai-ml/tests/*
   - sdk/vision/azure-ai-vision-imageanalysis/tests/*
+  - sdk/ai/azure-ai-agents/tests/*
   - sdk/ai/azure-ai-inference/tests/*
   - sdk/ai/azure-ai-projects/tests/*
   - sdk/storage/azure-storage-extensions/*