Merge branch 'develop' into vasiliyr/03152026

Author: VasiliyRad

.coderabbit.yaml

@@ -131,6 +131,13 @@ reviews:
       instructions: >-
         This directory contains the core functionality of the toolkit. Changes should prioritize backward compatibility.
 
+    - path: "packages/nvidia_nat_core/src/nat/eval/**/*"
+      instructions: >-
+        - This is a deprecated compatibility shim area and should not grow.
+        - Flag any PR that adds new files under this path as a blocking issue.
+        - New evaluation code should be added under `packages/nvidia_nat_eval/src/nat/plugins/eval/` instead.
+        - Changes in this path should be limited to compatibility-only fixes that are explicitly justified in PR notes.
+
     - path: "packages/**/*"
       instructions: >-
         - This directory contains packages for the toolkit, each should contain a `pyproject.toml` file.
@@ -145,17 +152,31 @@ reviews:
         - `nvidia-nat-test` should likely be listed as an optional dependency in the `test` extra
         - A single dependency should be listed on each line and should always have a version specifier.
         - All dependencies should be listed under the `[tool.setuptools_dynamic_dependencies]` section
-        - Any dependency that is an NVIDIA NeMo Agent Toolkit package should be declared with a version constraint of `== {version}` 
+        - Any dependency that is an NVIDIA NeMo Agent Toolkit package should be declared with a version constraint of `== {version}`
+
+    - path: "packages/nvidia_nat_core/pyproject.toml"
+      instructions: >-
+        - This package is part of the thin-core strategy; default to minimizing direct dependencies.
+        - Treat any new dependency addition as high-risk and require explicit justification in PR review notes.
+        - Prefer moving framework-specific or optional capabilities into non-core plugin packages instead of adding dependencies here.
+        - If a new dependency is unavoidable, confirm it is required by core contracts/runtime and not by optional evaluators, exporters, profiling, or framework integrations.
+
+    - path: "packages/nvidia_nat_eval/pyproject.toml"
+      instructions: >-
+        - This package follows a thin-core eval strategy; prioritize keeping dependencies minimal.
+        - Treat any new dependency addition as high-risk and require explicit justification in PR review notes.
+        - Prefer package-affinity placement (framework/profiler/security/exporter packages) instead of adding dependencies here.
+        - If a new dependency is unavoidable, confirm it supports core harness/contracts only and is not better hosted in optional packages.
 
     - path: "**/tests/**/*.py"
       instructions: >-
         - Ensure that tests are comprehensive, cover edge cases, and validate the functionality of the code.
         - Test functions should be named using the `test_` prefix, using snake_case.
         - Any frequently repeated code should be extracted into pytest fixtures.
         - Pytest fixtures should define the name argument when applying the pytest.fixture decorator. The fixture
-          function being decorated should be named using the `fixture_` prefix, using snake_case. Example:
-            @pytest.fixture(name="my_fixture")
-            def fixture_my_fixture():
+          function being decorated should be named using either a `fixture_` prefix or `_fixture` suffix, using snake_case. Example:
+            @pytest.fixture(name="my_custom_config")
+            def my_custom_config_fixture():
                 pass
         - Do NOT add `@pytest.mark.asyncio` to any test. Async tests are automatically detected and run by the
           async runner - the decorator is unnecessary clutter.

.cursor/rules/general.mdc

@@ -113,11 +113,11 @@ These are the overarching standards that every **source, test, documentation and
   - Test functions should be named using the `test_` prefix, using snake_case.
   - Any frequently repeated code should be extracted into pytest fixtures.
   - Pytest fixtures should define the name argument when applying the pytest.fixture decorator.
-  - The fixture function being decorated should be named using the `fixture_` prefix, using snake_case.
+  - The fixture function being decorated should be named using the `fixture_` prefix or `_fixture` suffix, using snake_case.
   - Example:
     ```python
-    @pytest.fixture(name="my_fixture")
-    def fixture_my_fixture():
+    @pytest.fixture(name="my_custom_config")
+    def my_custom_config_fixture():
         pass
     ```
 - Maintain **≥ 80 %** coverage; add or update tests when introducing changes.

.cursor/rules/nat-tests/general.mdc

@@ -23,11 +23,26 @@ All tests in NeMo Agent Toolkit use pytest. See the general coding guidelines fo
 
 - Use `pytest` for all unit tests
 - Name test files `test_*.py`
-- Use `@pytest.fixture(name="fixture_name")` decorator pattern
 - Mock external services with `pytest_httpserver` or `unittest.mock`
 - Maintain ≥ 80% code coverage
 - Do NOT add `@pytest.mark.asyncio` to any test - async tests are automatically detected and run by the async runner
 
+### Fixtures
+- Use `@pytest.fixture(name="fixture_name")` decorator pattern
+- Fixtures that are used in multiple tests should be defined in the `packages/nvidia_nat_test/src/nat/test/plugin.py` file, fixtures specific to a single package should be defined in a `conftest.py` file in the `tests` directory of the package, and fixtures that are specific to a single test can be defined in the test file itself.
+
+#### Available Fixtures
+
+**API Keys**: `nvidia_api_key`, `openai_api_key`, `tavily_api_key`, `mem0_api_key`
+
+**Services**: `milvus_uri`, `redis_url`, `mysql_connection_info`, `phoenix_url`
+
+**Directories**: `root_repo_dir`, `examples_dir` (NAT repo only)
+
+**Mocked Objects**: `mock_httpx_async_client`, `mock_httpx_sync_client`, `mock_builder`
+
+There are many more fixtures available, refer to the [plugin.py](mdc:packages/nvidia_nat_test/src/nat/test/plugin.py) file and any `conftest.py` files defined in the file hierarchy of the current test file for the complete list.
+
 ### Integration Tests
 
 For workflows that require actual LLM services or external services, follow the integration testing guidelines:
@@ -94,14 +109,6 @@ pytest --run_slow --run_integration packages/nvidia_nat_langchain
 - `run_workflow(config_file, question, expected_answer)` - Run and validate workflows
 - `load_config(config_file)` - Load configuration objects
 
-### Available Fixtures
-
-**API Keys**: `nvidia_api_key`, `openai_api_key`, `tavily_api_key`, `mem0_api_key`
-
-**Services**: `milvus_uri`, `redis_url`, `mysql_connection_info`, `phoenix_url`
-
-**Directories**: `root_repo_dir`, `examples_dir` (NAT repo only)
-
 ### Test LLM
 
 - `_type: nat_test_llm` - Use in YAML configs to stub LLM responses

.github/workflows/ci_pipe.yml

@@ -209,6 +209,15 @@ jobs:
         shell: bash
         run: ./nat/ci/scripts/github/build_wheel.sh
 
+      - name: Upload Package Reports
+        uses: actions/upload-artifact@v6
+        if: ${{ always() }}
+        with:
+          name: "package_listings"
+          path: "${{ github.workspace }}/tmp/package_listings.tar.bz2"
+          if-no-files-found: error
+          compression-level: 0
+
       - name: Upload Wheels
         uses: actions/upload-artifact@v6
         with:

.pre-commit-config.yaml

@@ -26,39 +26,25 @@ repos:
       # Run the linter.
       - id: ruff-check
         args: [ --fix ]
-
-  - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.9.28
+  - repo: local
     hooks:
-      - { id: uv-lock, name: "uv-lock", files: "pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-a2a", args: [--project, packages/nvidia_nat_a2a], files: "packages/nvidia_nat_a2a/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-adk", args: [--project, packages/nvidia_nat_adk], files: "packages/nvidia_nat_adk/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-agno", args: [--project, packages/nvidia_nat_agno], files: "packages/nvidia_nat_agno/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-autogen", args: [--project, packages/nvidia_nat_autogen], files: "packages/nvidia_nat_autogen/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-core", args: [--project, packages/nvidia_nat_core], files: "packages/nvidia_nat_core/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-crewai", args: [--project, packages/nvidia_nat_crewai], files: "packages/nvidia_nat_crewai/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-data_flywheel", args: [--project, packages/nvidia_nat_data_flywheel], files: "packages/nvidia_nat_data_flywheel/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-eval", args: [--project, packages/nvidia_nat_eval], files: "packages/nvidia_nat_eval/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-fastmcp", args: [--project, packages/nvidia_nat_fastmcp], files: "packages/nvidia_nat_fastmcp/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-langchain", args: [--project, packages/nvidia_nat_langchain], files: "packages/nvidia_nat_langchain/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-llama_index", args: [--project, packages/nvidia_nat_llama_index], files: "packages/nvidia_nat_llama_index/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-mcp", args: [--project, packages/nvidia_nat_mcp], files: "packages/nvidia_nat_mcp/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-mem0ai", args: [--project, packages/nvidia_nat_mem0ai], files: "packages/nvidia_nat_mem0ai/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-mysql", args: [--project, packages/nvidia_nat_mysql], files: "packages/nvidia_nat_mysql/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-nemo_customizer", args: [--project, packages/nvidia_nat_nemo_customizer], files: "packages/nvidia_nat_nemo_customizer/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-openpipe_art", args: [--project, packages/nvidia_nat_openpipe_art], files: "packages/nvidia_nat_openpipe_art/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-opentelemetry", args: [--project, packages/nvidia_nat_opentelemetry], files: "packages/nvidia_nat_opentelemetry/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-phoenix", args: [--project, packages/nvidia_nat_phoenix], files: "packages/nvidia_nat_phoenix/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-rag", args: [--project, packages/nvidia_nat_rag], files: "packages/nvidia_nat_rag/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-ragaai", args: [--project, packages/nvidia_nat_ragaai], files: "packages/nvidia_nat_ragaai/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-redis", args: [--project, packages/nvidia_nat_redis], files: "packages/nvidia_nat_redis/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-s3", args: [--project, packages/nvidia_nat_s3], files: "packages/nvidia_nat_s3/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-semantic_kernel", args: [--project, packages/nvidia_nat_semantic_kernel], files: "packages/nvidia_nat_semantic_kernel/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-strands", args: [--project, packages/nvidia_nat_strands], files: "packages/nvidia_nat_strands/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-test", args: [--project, packages/nvidia_nat_test], files: "packages/nvidia_nat_test/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-vanna", args: [--project, packages/nvidia_nat_vanna], files: "packages/nvidia_nat_vanna/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-weave", args: [--project, packages/nvidia_nat_weave], files: "packages/nvidia_nat_weave/pyproject.toml" }
-      - { id: uv-lock, name: "uv-lock-zep_cloud", args: [--project, packages/nvidia_nat_zep_cloud], files: "packages/nvidia_nat_zep_cloud/pyproject.toml" }
+      - id: uv-lock-all-pyprojects
+        name: Ensure `uv lock` is run for all pyproject.toml files
+        entry: >-
+          bash -ec '
+            status=0
+            while IFS= read -r -d "" pyproject; do
+              (
+                echo "Locking $(dirname "$pyproject")" &&
+                cd "$(dirname "$pyproject")" &&
+                uv lock
+              ) || status=$?
+            done < <(find . -name pyproject.toml -not -path "*/.*/*" -print0)
+            exit "$status"
+          '
+        language: system
+        files: "pyproject\\.toml$"
+        pass_filenames: false
   - repo: local
     hooks:
       - id: clear-notebook-output-cells
@@ -73,7 +59,7 @@ repos:
     hooks:
       - id: markdown-link-check
         args: ["-q", "--config", "ci/markdown-link-check-config.json"]
-        exclude: "^(src/nat/meta/pypi\\.md|CHANGELOG\\.md)$"
+        exclude: "^(packages/nvidia_nat_core/src/nat/meta/pypi\\.md|CHANGELOG\\.md)$"
 
 default_language_version:
   python: python3

.pytest.ini

@@ -13,9 +13,6 @@ markers =
     integration: Integration tests which do not use mocks and may require external services
     requires_cache: Tests that require a reverse-proxy cache to be running
     slow: Slow tests
-filterwarnings =
-    # Work-around for a warning emitted by strands https://github.com/strands-agents/sdk-python/issues/1236
-    ignore:^These events have been moved to production.*strands:DeprecationWarning
 asyncio_mode = auto
 asyncio_default_fixture_loop_scope = session
 

ci/release/update-version.sh

@@ -54,7 +54,8 @@ function sed_runner() {
 # Currently only the pypi.md file for the nvidia-nat package contains links to documentation
 # Replace this with a `find ./ -name "pypi.md"` if this is needed for the other pypi.md files
 if [[ -z "${SKIP_MD_UPDATE}" ]]; then
-   sed_runner "s|https:\/\/docs.nvidia.com\/nemo\/agent-toolkit\/\([0-9|\.]\+\)|https:\/\/docs.nvidia.com\/nemo\/agent-toolkit\/${NEXT_SHORT_TAG}|g" src/nat/meta/pypi.md
+   sed_runner "s|https:\/\/docs.nvidia.com\/nemo\/agent-toolkit\/\([0-9|\.]\+\)|https:\/\/docs.nvidia.com\/nemo\/agent-toolkit\/${NEXT_SHORT_TAG}|g" \
+      "${PROJECT_ROOT}/packages/nvidia_nat_core/src/nat/meta/pypi.md"
 fi
 
 mapfile -t NAT_NOTEBOOKS < <(find ./examples/notebooks -name "*.ipynb" | sort)

ci/scripts/copyright.py

@@ -28,7 +28,7 @@
 
 FilesToCheck = [
     # Get all of these extensions and templates (*.in)
-    re.compile(r"[.](cmake|cpp|cc|css|cu|cuh|h|hpp|md|rst|sh|pxd|py|pyx|yml|yaml)(\.in)?$"),
+    re.compile(r"[.](cmake|cpp|cc|css|cu|cuh|h|hpp|md|rst|sh|pxd|py|pyx|toml|yml|yaml)(\.in)?$"),
     # And files with a particular file/extension combo
     re.compile(r"CMakeLists[.]txt$"),
     re.compile(r"setup[.]cfg$"),
@@ -48,6 +48,7 @@
     re.compile(r"[^ \/\n]*conda/environments/.*\.yaml$"),  # Ignore generated environment files
     re.compile(r"LICENSE\.md$"),  # Ignore the license file itself
     re.compile(r"^examples/.*/data/.*.md$"),  # Ignore data files in examples
+    re.compile(r"^\.nspect-allowlist\.toml$"),  # Ignore the nspect allowlist file
 ]
 
 # this will break starting at year 10000, which is probably OK :)
@@ -457,6 +458,7 @@ def _main():
     'pyx': A2_LIC_HASH,
     'rst': A2_LIC_RST,
     'sh': A2_LIC_HASH,
+    'toml': A2_LIC_HASH,
     'txt': A2_LIC_HASH,
     'yaml': A2_LIC_HASH,
     'yml': A2_LIC_HASH,

ci/scripts/github/build_wheel.sh

@@ -21,6 +21,8 @@ GITHUB_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd
 source ${GITHUB_SCRIPT_DIR}/common.sh
 WHEELS_BASE_DIR="${WORKSPACE_TMP}/wheels"
 WHEELS_DIR="${WHEELS_BASE_DIR}/nvidia-nat"
+PIP_REPORTS_DIR="${WORKSPACE_TMP}/pip_reports"
+mkdir -p "${PIP_REPORTS_DIR}"
 
 GIT_TAG=$(get_git_tag)
 rapids-logger "Git Version: ${GIT_TAG}"
@@ -57,6 +59,18 @@ deactivate
 TEMP_INSTALL_LOCATION="${WORKSPACE_TMP}/wheel_test_env"
 install_python_versions
 
+function create_package_report_tarball() {
+    local tarball_path="${WORKSPACE_TMP}/package_listings.tar.bz2"
+    tar -cjf "${tarball_path}" -C "${PIP_REPORTS_DIR}" .
+
+    # Clean out the reports directory, in CI this doesn't have an impact, but if running locally it prevents old
+    # reports from being included in future tarballs
+    rm -rf "${PIP_REPORTS_DIR}"
+    echo "${tarball_path}"
+}
+
+trap create_package_report_tarball EXIT
+
 for whl in "${MOVED_WHEELS[@]}"; do
 
     for pyver in "${SUPPORTED_PYTHON_VERSIONS[@]}"; do
@@ -76,6 +90,10 @@ for whl in "${MOVED_WHEELS[@]}"; do
         UV_PIP_OUT=$(uv pip install -q --prerelease=allow --find-links "${WHEELS_BASE_DIR}" "${whl}" 2>&1)
         INSTALL_RESULT=$?
 
+        # Report the packages in the environment regardless of install success
+        rapids-logger "Installed wheel ${whl} with Python ${pyver}, pip install exit code ${INSTALL_RESULT}"
+        uv pip list --format json > "${PIP_REPORTS_DIR}/$(basename "${whl}" .whl)_py${pyver}_packages.json"
+
         if [[ ${INSTALL_RESULT} -ne 0 ]]; then
             rapids-logger "Error, failed to install wheel ${whl} with Python ${pyver}"
             echo "${UV_PIP_OUT}"
@@ -119,3 +137,5 @@ for whl in "${MOVED_WHEELS[@]}"; do
         rm -rf "${TEMP_INSTALL_LOCATION}"
     done
 done
+
+exit 0

ci/scripts/gitlab/artifactory_upload.sh

@@ -54,8 +54,8 @@ if [[ -z "${URM_USER}" || -z "${URM_API_KEY}" ]]; then
     exit 1
 fi
 
-if [[ -z "${AIQ_ARTIFACTORY_URL}" || -z "${AIQ_ARTIFACTORY_NAME}" ]]; then
-    echo "Error: AIQ_ARTIFACTORY_URL or AIQ_ARTIFACTORY_NAME is not set. Exiting."
+if [[ -z "${NAT_ARTIFACTORY_URL}" || -z "${NAT_ARTIFACTORY_NAME}" ]]; then
+    echo "Error: NAT_ARTIFACTORY_URL or NAT_ARTIFACTORY_NAME is not set. Exiting."
     exit 1
 fi
 
@@ -113,11 +113,11 @@ if [[ "${UPLOAD_TO_ARTIFACTORY}" == "true" ]]; then
                 # as this is an already established path in artifactory
                 RELATIVE_PATH="${WHEEL_FILE#${WHEELS_BASE_DIR}/}"
                 RELATIVE_PATH=$(echo "${RELATIVE_PATH}" | sed -e 's|^nvidia-nat/|aiqtoolkit/|' | sed -e 's|^nat/|aiqtoolkit/|')
-                ARTIFACTORY_PATH="${AIQ_ARTIFACTORY_NAME}/${RELATIVE_PATH}"
+                ARTIFACTORY_PATH="${NAT_ARTIFACTORY_NAME}/${RELATIVE_PATH}"
 
                 echo "Uploading ${WHEEL_FILE} to ${ARTIFACTORY_PATH}..."
 
-                CI=true jf rt u --fail-no-op --url="${AIQ_ARTIFACTORY_URL}" \
+                CI=true jf rt u --fail-no-op --url="${NAT_ARTIFACTORY_URL}" \
                     --user="${URM_USER}" --password="${URM_API_KEY}" \
                     --flat=false "${WHEEL_FILE}" "${ARTIFACTORY_PATH}" \
                     --target-props "arch=${NAT_ARCH};os=${NAT_OS};branch=${GIT_TAG};component_name=${ARTIFACTORY_COMPONENT_FIXED_NAME};version=${GIT_TAG};release_approver=${RELEASE_APPROVER};release_status=${RELEASE_STATUS}"
@@ -131,8 +131,8 @@ fi
 
 # List Artifactory contents (disabled by default as the output is very verbose)
 if [[ "${LIST_ARTIFACTORY_CONTENTS}" == "true" ]]; then
-    echo "Listing contents of Artifactory (${AIQ_ARTIFACTORY_NAME}):"
-    CI=true jf rt s --url="${AIQ_ARTIFACTORY_URL}" \
+    echo "Listing contents of Artifactory (${NAT_ARTIFACTORY_NAME}):"
+    CI=true jf rt s --url="${NAT_ARTIFACTORY_URL}" \
         --user="${URM_USER}" --password="${URM_API_KEY}" \
-        "${AIQ_ARTIFACTORY_NAME}/*/${GIT_TAG}/" --recursive
+        "${NAT_ARTIFACTORY_NAME}/*/${GIT_TAG}/" --recursive
 fi