Merge remote-tracking branch 'origin/main'

Author: Nagkumar Arkalgud

.github/CODEOWNERS

@@ -4,3 +4,20 @@
 
 # Default owner for everything, unless overridden by a more specific rule.
 * @Azure-Samples/azure-ai-samples-maintainers
+
+
+#### files referenced in docs (DO NOT EDIT, except for Docs team!!!) ###################
+/scenarios/projects/basic/chat-simple.py @azure-samples/AI-Platform-Docs
+/scenarios/projects/basic/chat-template.py @azure-samples/AI-Platform-Docs
+/scenarios/rag/custom-rag-app/assets/chat_eval_data.jsonl @azure-samples/AI-Platform-Docs
+/scenarios/rag/custom-rag-app/assets/grounded_chat.prompty @azure-samples/AI-Platform-Docs
+/scenarios/rag/custom-rag-app/assets/intent_mapping.prompty @azure-samples/AI-Platform-Docs
+/scenarios/rag/custom-rag-app/assets/products.csv @azure-samples/AI-Platform-Docs
+/scenarios/rag/custom-rag-app/chat_with_products.py @azure-samples/AI-Platform-Docs
+/scenarios/rag/custom-rag-app/config.py @azure-samples/AI-Platform-Docs
+/scenarios/rag/custom-rag-app/create_search_index.py @azure-samples/AI-Platform-Docs
+/scenarios/rag/custom-rag-app/evaluate.py @azure-samples/AI-Platform-Docs
+/scenarios/rag/custom-rag-app/get_product_documents.py @azure-samples/AI-Platform-Docs
+/scenarios/rag/custom-rag-app/requirements.txt @azure-samples/AI-Platform-Docs
+/scenarios/langchain/getting-started-with-langchain-chat-models.ipynb @azure-samples/AI-Platform-Docs
+/scenarios/langchain/getting-started-with-langchain-embeddings.ipynb @azure-samples/AI-Platform-Docs

.github/scripts/build_agent_setup_bicep.py

@@ -0,0 +1,68 @@
+import os
+import sys
+from pathlib import Path
+from azure.cli.core import get_default_cli
+from typing import List, Union
+
+
+def run_az_command(*args: Union[str, Path]) -> None:
+    """Runs an Azure CLI command using the Azure CLI Python SDK."""
+    cli = get_default_cli()
+    command = list(args)
+    exit_code = cli.invoke(command)
+
+    if exit_code != 0:
+        print(f"❌ Failed to execute: {' '.join(command)}")
+        sys.exit(exit_code)
+
+
+def get_main_bicep_files(modified_files: List[Path]) -> List[Path]:
+    """Finds unique folders with modified files and ensures 'main.bicep' exists in each."""
+    modified_folders = {Path(f).parent for f in modified_files}
+    return [folder / "main.bicep" for folder in modified_folders if (folder / "main.bicep").exists()]
+
+
+def build_bicep_file(bicep_file: Path) -> None:
+    """Builds a Bicep file using Azure CLI Python SDK and ensures azuredeploy.json is created."""
+    output_file = bicep_file.with_name("azuredeploy.json")
+
+    print(f"🔹 Building Bicep: {bicep_file} -> {output_file}")
+    os.environ.update({"AZURE_BICEP_USE_BINARY_FROM_PATH": "false", "AZURE_BICEP_CHECK_VERSION": "false"})
+
+    # Pin the bicep CLI to minimize pre-commit failures due to modified metadata in files.
+    run_az_command("bicep", "install", "--version", "v0.33.93")
+
+    # Run az bicep build using Azure CLI SDK
+    run_az_command("bicep", "build", "--file", str(bicep_file), "--outfile", str(output_file))
+
+    # Verify if azuredeploy.json was created
+    if not output_file.exists():
+        print(f"❌ Build succeeded, but {output_file} was not created!")
+        sys.exit(1)
+
+    print(f"✅ Successfully built: {bicep_file} -> {output_file}")
+
+
+def main() -> None:
+    """Main script execution."""
+    print("🚀 Running Bicep build using Azure CLI SDK...")
+
+    # Get modified Bicep files from pre-commit
+    modified_files = [Path(f) for f in sys.argv[1:]]
+
+    if not modified_files:
+        print("✅ No modified Bicep files detected. Skipping build.")
+        sys.exit(0)
+
+    # Run Bicep build on each modified file
+    bicep_files = get_main_bicep_files(modified_files)
+
+    for bicep_file in bicep_files:
+        build_bicep_file(bicep_file)
+
+    print("🎉 All Bicep files successfully built!")
+    sys.exit(0)
+
+
+if __name__ == "__main__":
+    main()

.infra/pytest_plugins/changed_samples/src/pytest_changed_samples/plugin.py

@@ -13,6 +13,11 @@
 PR_CHANGES_OPTION = "--changed-samples-only-from"
 
 
+def is_plugin_active(config: pytest.Config) -> bool:
+    """Return whether any of the plugin provided options were provided on commandline."""
+    return get_diff_paths_function(config) is not None
+
+
 def pytest_addoption(parser: pytest.Parser) -> None:
     parser.addoption(
         WORKING_TREE_CHANGES_OPTION,
@@ -42,10 +47,18 @@ def pytest_configure(config: pytest.Config) -> None:
 
 @pytest.hookimpl(hookwrapper=True)
 def pytest_collection(session: pytest.Session) -> None:
+    """Set up path filtering based on git diff."""
     config = session.config
     diff_path_trie = Trie()
 
-    for p in get_diff_paths_function(config)():
+    paths_filter = get_diff_paths_function(config)
+
+    if paths_filter is None:
+        # Exit early if there's no path filter
+        yield
+        return
+
+    for p in paths_filter():
         diff_path_trie.insert(p.parts)
 
     config.stash[DIFF_PATH_TRIE_KEY] = diff_path_trie
@@ -56,8 +69,9 @@ def pytest_collection(session: pytest.Session) -> None:
 
 
 def pytest_ignore_collect(collection_path: Path, config: pytest.Config) -> Optional[bool]:
+    """Ignore paths that were not touched by the current git diff."""
     if DIFF_PATH_TRIE_KEY not in config.stash:
-        # Occures when calling `pytest --fixtures`
+        # Occurs when calling `pytest --fixtures`
         return None
 
     diff_path_trie = config.stash[DIFF_PATH_TRIE_KEY]
@@ -72,7 +86,16 @@ def pytest_ignore_collect(collection_path: Path, config: pytest.Config) -> Optio
     return (not diff_path_trie.is_prefix(ignore_dir.resolve().parts)) or None
 
 
-def get_diff_paths_function(config: pytest.Config) -> Callable[[], Iterable[Path]]:
+@pytest.hookimpl(trylast=True)
+def pytest_sessionfinish(session: pytest.Session, exitstatus: int) -> None:
+    if not is_plugin_active(session.config):
+        return
+
+    if exitstatus == pytest.ExitCode.NO_TESTS_COLLECTED:
+        session.exitstatus = pytest.ExitCode.OK
+
+
+def get_diff_paths_function(config: pytest.Config) -> Optional[Callable[[], Iterable[Path]]]:
     """Get the function that returns paths present in a diff specfied by cmdline arguments
 
     :param pytest.Config config: The pytest config
@@ -87,7 +110,7 @@ def get_diff_paths_function(config: pytest.Config) -> Callable[[], Iterable[Path
     if ref := config.getoption(opt_var(PR_CHANGES_OPTION)):
         return lambda: get_branch_diff_paths(ref)
 
-    return lambda: ()
+    return None
 
 
 def opt_var(s: str) -> str:

.pre-commit-config.yaml

@@ -15,7 +15,7 @@ repos:
       language: system
       types_or: [jupyter]
       minimum_pre_commit_version: 2.9.2
-      args: ["-m", "tox", "-qqq", "run", "-e", "nb-clean", "--", "clean", "--preserve-cell-metadata", "tags", "--"]
+      args: ["-m", "tox", "-qqq", "run", "-e", "nb-clean", "--", "clean", "--preserve-cell-metadata", "tags", "name", "--"]
     - id: ruff
       name: ruff
       description: "Run 'ruff' for extremely fast Python linting"
@@ -40,3 +40,13 @@ repos:
       entry: python .github/scripts/detect_azure_secrets.py
       language: python
       types: [file]
+    - id: bicep-build
+      name: Regenerate azuredeploy.json for Agent samples
+      description: "Automatically build Bicep files into azuredeploy.json before commit"
+      types: [text]
+      files: ^scenarios/Agents/setup/.*\.bicep$
+      require_serial: true
+      pass_filenames: true
+      entry: python
+      language: system
+      args: ["-m", "tox", "-qqq", "run", "-e", "build-agent-bicep", "--"]

CONTRIBUTING.md

@@ -64,14 +64,17 @@ python -m pip install -r dev-requirements.txt
 [pre-commit](https://pre-commit.com/) is a tool that enables us to run code when committing to a local repository. We
 use this to automate running code formatters, linters, etc...
 
-To install pre-commit in the repository, run the following from the root of the repository:
+To enable `pre-commit`, run the following from the root of the repository:
 
 ```shell
 pre-commit install
 ```
 
-`pre-commit` will run automatically when you commit changes, but you can also manually run it using 
-`pre-commit run --all-files`.
+`pre-commit` will now automatically run a series of code quality checks when you commit changes, which
+will accelerate the identification of issues that will be flagged when the PR is submitted.
+
+If needed, you can manually run `pre-commit` against all files  with `pre-commit run --all-files`. See
+[the documentation for `pre-commit run`](https://pre-commit.com/#pre-commit-run) for more information.
 
 Note: 
 
@@ -115,8 +118,6 @@ Note that samples are organized by scenario, find the one best-suited for your s
     git push -f
     ```
 
-That's it! Thank you for your contribution!
-
 > [!IMPORTANT]
 >
 > You should expect to budget time to engage with reviewers (responding to comments, fixing PR checks) before your PR is merged in. This is especially
@@ -125,6 +126,45 @@ That's it! Thank you for your contribution!
 > Adhering to the guidance in this document (i.e [using pre-commit](#3-set-up-pre-commit), [using provided templates](#write-your-contribution)) ***will***
 > help expedite the review process.
 
+#### Resolve Failing Pull Request Checks
+
+
+> [!IMPORTANT]
+>
+> This repository requires approval from someone with write access for pull request checks
+> to run against a PR, to avoid abuse of live resources.
+>
+> All of the PR checks can also be run from developers machine, which should prevent the approval
+> processes from unnecessarily lengthening the feedback cycle.
+
+> [!NOTE]
+> If you are a Microsoft employee, you can skip the approval process for PR checks by:
+>
+>   * Joining the "[Azure-Samples](https://github.com/Azure-Samples)" organization
+>   * [Setting your org membership visibility to public](https://docs.github.com/en/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/publicizing-or-hiding-organization-membership#changing-the-visibility-of-your-organization-membership)
+>
+
+##### pre-commit
+
+###### black
+
+[black](https://github.com/psf/black) is a code formatter for Python and Jupyter notebooks.
+
+**How to Fix**: If the `pre-commit` check is failing on your PR because of `black`, just run `pre-commit run black --all-files` and commit the changes.
+
+###### nb-clean
+
+[nb-clean](https://github.com/srstevenson/nb-clean) that removes metadata from Jupyter Notebooks to make them more ammenable to version control.
+
+**How to Fix**: If the `nb-clean` check is failing on your PR because of `nb-clean`, just run `pre-commit run nb-clean --all-files` and commit the changes.
+
+###### ruff
+
+[ruff](https://github.com/astral-sh/ruff) is a linter for Python and Jupyter Notebooks.
+
+**How to Fix**: If the `pre-commit` step is failing on your PR because of `ruff`:
+  * ruff makes an attempt to automatically fix issues it detects. You can run `pre-commit run ruff --all-files` and commit any changes.
+  * Issues that ruff can't fix should be manually updated and committed. See ruff's [rule list](https://docs.astral.sh/ruff/rules/) for more info on issues it reports.
 
 ### Discoverability
 

README.md

@@ -15,7 +15,14 @@ Use the samples in this repository to try out Azure AI scenarios on your local m
 
 ### Other Sample Repositories
 
-#### Azure AI Studio
+#### Azure AI Agent Service
+
+* **[Azure/azure-sdk-for-python](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/ai/azure-ai-projects/samples/agents)** - Repo containing Python SDK samples for the Azure AI Agent Service.
+* **[Azure/azure-sdk-for-net](https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/ai/Azure.AI.Projects/tests/Samples/Agent)** - Repo containing .NET SDK samples for the Azure AI Agent Service.
+* **[Azure-Samples/azureai-travel-agent-python](https://github.com/Azure-Samples/azureai-travel-agent-python/tree/main)** - Sample showing how to build a travel agent using the Azure AI Agent Service in Python.
+* **[Azure-Samples/azure-ai-projects-file-search](https://github.com/Azure-Samples/azure-ai-projects-file-search)** - A simple Python Quart app that streams responses from Azure AI Agents to an HTML/JS frontend using Server-Sent Events (SSEs).
+
+#### Azure AI Foundry
 
 * **[Azure/aistudio-copilot-sample]** - Quickstart repo for building an enterprise chat copilot in Azure AI Studio.
 * **[Azure-Samples/contoso-chat](https://github.com/Azure-Samples/contoso-chat)** - End-to-end solution sample for a custom RAG-based retail copilot built code-first with Prompty & Azure AI Studio.

conftest.py

@@ -8,7 +8,7 @@
 REPO_ROOT = Path(__file__).parent.resolve()
 
 
-@pytest.fixture()
+@pytest.fixture
 def notebook_path(
     # Create and activate a new venv for each test that requests `notebook_path`
     venv: types.SimpleNamespace,  # noqa: ARG001
@@ -18,7 +18,7 @@ def notebook_path(
     return notebook_path
 
 
-@pytest.fixture()
+@pytest.fixture
 def deployment_outputs() -> Dict[str, str]:
     """The outputs of the deployment used to setup resources for testing samples.
 
@@ -43,7 +43,7 @@ def deployment_outputs() -> Dict[str, str]:
     return {output_name: output["value"] for output_name, output in outputs.items()}
 
 
-@pytest.fixture()
+@pytest.fixture
 def azure_ai_project(deployment_outputs: Dict[str, str]) -> Dict[str, str]:
     """Azure ai project dictionary."""
     return {
@@ -53,7 +53,7 @@ def azure_ai_project(deployment_outputs: Dict[str, str]) -> Dict[str, str]:
     }
 
 
-@pytest.fixture()
+@pytest.fixture
 def azure_ai_project_connection_string(deployment_outputs: Dict[str, str]) -> str:
     """The connection string for the azure ai project"""
     return ";".join(
@@ -66,19 +66,19 @@ def azure_ai_project_connection_string(deployment_outputs: Dict[str, str]) -> st
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def azure_openai_endpoint(deployment_outputs: Dict[str, str]) -> str:
     """The azure openai endpoint for the azure ai project."""
     return deployment_outputs["azure_openai_endpoint"]
 
 
-@pytest.fixture()
+@pytest.fixture
 def azure_openai_gpt4_deployment(deployment_outputs: Dict[str, str]) -> str:
     """The deployment name of the gpt-4 deployment."""
     return deployment_outputs["azure_openai_gpt4_deployment_name"]
 
 
-@pytest.fixture()
+@pytest.fixture
 def azure_openai_gpt4_api_version(deployment_outputs: Dict[str, str]) -> str:
     """The api version of the gpt-4 deployment."""
     return deployment_outputs["azure_openai_gpt4_api_version"]

dev-requirements.txt

@@ -4,4 +4,5 @@ python-dotenv ~= 1.0
 pytest ~= 8.0
 pytest-iovis[papermill] == 0.1.0
 ipykernel ~= 6.0
+azure-cli ~= 2.69
 .infra/pytest_plugins/changed_samples

pyproject.toml

@@ -18,9 +18,6 @@ extend-select = [
   "ANN",
   "RUF",
 ]
-ignore = [
-  "ANN101", # missing-type-self: This can be inferred and will be deprecated by ruff
-]
 
 [tool.ruff.lint.extend-per-file-ignores]
 "*.ipynb" = [