Merge branch 'Azure:main' into main

Author: nagkumar91

.github/CODEOWNERS

@@ -67,7 +67,7 @@
 # ServiceOwners: @albertofori @avanigupta @mrm9084
 
 # PRLabel: %App Configuration
-/sdk/appconfiguration/                                               @albertofori @avanigupta @mrm9084 @rossgrambo @xiangyan99
+/sdk/appconfiguration/                                               @albertofori @avanigupta @mrm9084 @rossgrambo @xiangyan99 @jimmyca15
 
 # ServiceLabel: %Attestation
 # PRLabel: %Attestation
@@ -389,19 +389,22 @@
 # PRLabel: %Health Deidentification
 /sdk/healthdataaiservices/                                           @alexathomases @Azure/healthdatadeidentification
 
-# AzureSdkOwners: @yungshinlintw @vkurpad
+# AzureSdkOwners: @yungshinlintw @bojunehsu
 # ServiceLabel: %Cognitive - Form Recognizer
-# ServiceOwners: @yungshinlintw @vkurpad
+# ServiceOwners: @yungshinlintw @bojunehsu
 
 # PRLabel: %Cognitive - Form Recognizer
-/sdk/formrecognizer/                                                 @yungshinlintw @vkurpad
+/sdk/formrecognizer/                                                 @yungshinlintw @bojunehsu
 
-# AzureSdkOwners: @yungshinlintw @vkurpad
+# AzureSdkOwners: @yungshinlintw @bojunehsu
 # ServiceLabel: %Document Intelligence
-# ServiceOwners: @yungshinlintw @vkurpad
+# ServiceOwners: @yungshinlintw @bojunehsu
+
+# PRLabel: %Cognitive - Content Understanding
+/sdk/contentunderstanding/                                           @yungshinlintw @bojunehsu
 
 # PRLabel: %Document Intelligence
-/sdk/documentintelligence/                                           @yungshinlintw @vkurpad
+/sdk/documentintelligence/                                           @yungshinlintw @bojunehsu
 
 # AzureSdkOwners: @xiangyan99
 # ServiceLabel: %Cognitive - Metrics Advisor

.github/skills/emitter-package-update/SKILL.md

@@ -0,0 +1,86 @@
+---
+name: emitter-package-update
+description: Automate bumping typespec-python version in emitter-package.json for the Azure SDK for Python repository. Use this skill when the user wants to update @azure-tools/typespec-python to the latest version, create a PR for the version bump, or manage emitter-package.json updates.
+---
+
+# Emitter Package Update
+
+Bump `@azure-tools/typespec-python` to the latest version in `emitter-package.json` and create a PR.
+
+## Prerequisites
+
+Before running this workflow, verify the following tools are installed:
+
+```bash
+# Check npm-check-updates
+npx npm-check-updates --version
+
+# Check tsp-client
+tsp-client --version
+
+# Check GitHub CLI
+gh --version
+```
+
+If any tool is missing:
+- **npm-check-updates**: Install via `npm install -g npm-check-updates`
+- **tsp-client**: Install via `npm install -g @azure-tools/typespec-client-generator-cli`
+- **GitHub CLI**: Install from https://cli.github.com/ or via `winget install GitHub.cli`
+
+## Workflow
+
+### 1. Prepare Repository
+
+Reset and sync the SDK repo to a clean state:
+
+```bash
+git reset HEAD && git checkout . && git clean -fd && git checkout origin/main && git pull origin main
+```
+
+### 2. Determine Latest Version
+
+Run npm-check-updates to find the latest `@azure-tools/typespec-python` version:
+
+```bash
+npx npm-check-updates --packageFile eng/emitter-package.json
+```
+
+Extract the target version from the output (e.g., `0.46.4`).
+
+### 3. Create Feature Branch
+
+```bash
+git checkout -b bump-typespec-python-{version}
+```
+
+Replace `{version}` with the actual version number (e.g., `bump-typespec-python-0.46.4`).
+
+### 4. Update Dependencies
+
+Apply the version update:
+
+```bash
+npx npm-check-updates --packageFile eng/emitter-package.json -u
+```
+
+Regenerate the lock file:
+
+```bash
+tsp-client generate-lock-file
+```
+
+### 5. Commit Changes
+
+```bash
+git add eng/emitter-package.json eng/emitter-package-lock.json
+git commit -m "bump typespec-python {version}"
+```
+
+### 6. Create Pull Request
+
+Push branch and create PR:
+
+```bash
+git push -u origin bump-typespec-python-{version}
+gh pr create --title "bump typespec-python {version}" --body "Bump @azure-tools/typespec-python to version {version}"
+```

common/smoketest/dependencies.py

@@ -1,5 +1,8 @@
 import argparse
-import pkg_resources
+
+import importlib.metadata as importlib_metadata
+
+from packaging.requirements import Requirement
 
 try:
     # pip < 20
@@ -10,44 +13,89 @@
     from pip._internal.req import parse_requirements
     from pip._internal.network.session import PipSession
 
+
 def combine_requirements(requirements):
-    name = requirements[0].project_name
+    name = requirements[0].name  # packaging.requirements.Requirement uses 'name' instead of 'project_name'
     specs = []
     for req in requirements:
-        if len(req.specs) == 0:
+        if len(req.specifier) == 0:  # packaging.requirements.Requirement uses 'specifier' instead of 'specs'
             continue
 
-        specs.extend([s[0] + s[1] for s in req.specs])
+        # Convert specifier to the expected format
+        specs.extend([str(spec) for spec in req.specifier])
 
     return name + ",".join(specs)
 
+
 def get_dependencies(packages):
     requirements = []
     for package in packages:
-        package_info = pkg_resources.working_set.by_key[package]
+        try:
+            # Get the distribution for this package
+            package_info = importlib_metadata.distribution(package)
 
-        applicable_requirements = [r for r in package_info.requires() if r.marker is None or r.marker.evaluate()]
-        requirements.extend(applicable_requirements)
+            # Get requirements and process them like pkg_resources did
+            if package_info.requires:
+                for req_str in package_info.requires:
+                    # Parse the requirement string
+                    req = Requirement(req_str)
+
+                    # Apply the same filtering as the original code:
+                    # include requirements where marker is None or evaluates to True
+                    if req.marker is None or req.marker.evaluate():
+                        requirements.append(req)
+        except importlib_metadata.PackageNotFoundError:
+            # Package not found, skip it (similar to how pkg_resources would handle missing packages)
+            continue
+        except Exception:
+            # Skip packages that can't be processed
+            continue
 
     return requirements
 
+
 if __name__ == "__main__":
-    parser = argparse.ArgumentParser(
-        description="List dependencies for a given requirements.txt file"
-    )
+    parser = argparse.ArgumentParser(description="List dependencies for a given requirements.txt file")
 
     parser.add_argument(
         "-r",
         "--requirements",
         dest="requirements_file",
         help="File containing list of packages for which to find dependencies",
-        required=True
+        required=True,
     )
 
     args = parser.parse_args()
     # Get package names from requirements.txt
     requirements = parse_requirements(args.requirements_file, session=PipSession())
-    package_names = [item.req.name for item in requirements]
+
+    # Handle different pip versions - extract package names
+    package_names = []
+    for item in requirements:
+        if hasattr(item, "requirement"):
+            # Parse the requirement string to get the name
+            req_str = item.requirement
+            if isinstance(req_str, str):
+                # Parse the requirement string using packaging.requirements
+                try:
+                    req = Requirement(req_str)
+                    package_names.append(req.name)
+                except Exception:
+                    # If parsing fails, try to extract name directly
+                    name = req_str.split("==")[0].split(">=")[0].split("<=")[0].split(">")[0].split("<")[0].strip()
+                    package_names.append(name)
+            else:
+                package_names.append(req_str.name)
+        elif hasattr(item, "req"):
+            # Older pip versions
+            package_names.append(item.req.name)
+        else:
+            # Try to get name from the object directly
+            try:
+                package_names.append(item.name)
+            except AttributeError:
+                # Skip items we can't parse
+                continue
 
     dependencies = get_dependencies(package_names)
 
@@ -61,10 +109,12 @@ def get_dependencies(packages):
     # According to https://packaging.python.org/glossary/#term-requirement-specifier
     grouped_dependencies = {}
     for dep in dependencies:
-        if dep.key in grouped_dependencies:
-            grouped_dependencies[dep.key].append(dep)
+        # Use 'name' instead of 'key' for packaging.requirements.Requirement
+        dep_name = dep.name
+        if dep_name in grouped_dependencies:
+            grouped_dependencies[dep_name].append(dep)
         else:
-            grouped_dependencies[dep.key] = [dep]
+            grouped_dependencies[dep_name] = [dep]
 
     final_dependencies = [combine_requirements(r) for r in grouped_dependencies.values()]
 

conda/conda-recipes/azure-ai-contentsafety/meta.yaml

@@ -16,7 +16,6 @@ requirements:
   host:
     - azure-core >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - azure-identity >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
-    - msrest >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - pip
     - python
     - six
@@ -26,7 +25,6 @@ requirements:
   run:
     - azure-core >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - azure-identity >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
-    - msrest >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - python
     - six
     - requests-oauthlib >=0.5.0

conda/conda-recipes/azure-ai-evaluation/meta.yaml

@@ -16,7 +16,6 @@ requirements:
   host:
     - azure-core >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - azure-identity >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
-    - msrest >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - pip
     - python
     - six
@@ -28,7 +27,6 @@ requirements:
   run:
     - azure-core >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - azure-identity >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
-    - msrest >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - python
     - six
     - requests-oauthlib >=0.5.0

conda/conda-recipes/azure-ai-formrecognizer/meta.yaml

@@ -16,7 +16,6 @@ requirements:
   host:
     - azure-core >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - azure-identity >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
-    - msrest >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - pip
     - python
     - six
@@ -26,7 +25,6 @@ requirements:
   run:
     - azure-core >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - azure-identity >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
-    - msrest >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - python
     - six
     - requests-oauthlib >=0.5.0

conda/conda-recipes/azure-ai-language-conversations/meta.yaml

@@ -16,7 +16,6 @@ requirements:
   host:
     - azure-core >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - azure-identity >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
-    - msrest >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - pip
     - python
     - six
@@ -26,7 +25,6 @@ requirements:
   run:
     - azure-core >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - azure-identity >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
-    - msrest >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - python
     - six
     - requests-oauthlib >=0.5.0

conda/conda-recipes/azure-ai-language-questionanswering/meta.yaml

@@ -16,7 +16,6 @@ requirements:
   host:
     - azure-core >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - azure-identity >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
-    - msrest >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - pip
     - python
     - six
@@ -26,7 +25,6 @@ requirements:
   run:
     - azure-core >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - azure-identity >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
-    - msrest >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - python
     - six
     - requests-oauthlib >=0.5.0

conda/conda-recipes/azure-ai-ml/meta.yaml

@@ -16,7 +16,6 @@ requirements:
   host:
     - azure-core >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - azure-identity >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
-    - msrest >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - aiohttp
     - azure-storage >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - colorama <=0.4.4
@@ -37,7 +36,6 @@ requirements:
   run:
     - azure-core >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - azure-identity >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
-    - msrest >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - aiohttp
     - azure-storage >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - colorama <=0.4.4

conda/conda-recipes/azure-ai-textanalytics/meta.yaml

@@ -16,7 +16,6 @@ requirements:
   host:
     - azure-core >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - azure-identity >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
-    - msrest >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - pip
     - python
     - six
@@ -26,7 +25,6 @@ requirements:
   run:
     - azure-core >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - azure-identity >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
-    - msrest >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
     - python
     - six
     - requests-oauthlib >=0.5.0