Merge branch 'aws:main' into main

Author: parameja1

build_artifacts/v2/v2.9/v2.9.0/cpu.additional_packages_env.in

@@ -0,0 +1 @@
+conda-forge::mcp

build_artifacts/v2/v2.9/v2.9.0/gpu.additional_packages_env.in

@@ -0,0 +1 @@
+conda-forge::mcp

build_artifacts/v3/v3.4/v3.4.0/cpu.additional_packages_env.in

@@ -0,0 +1 @@
+conda-forge::mcp

build_artifacts/v3/v3.4/v3.4.0/gpu.additional_packages_env.in

@@ -0,0 +1 @@
+conda-forge::mcp

template/v2/dirs/etc/sagemaker-ui/workflows/plugins/amzn_sagemaker_studio-1.0.16-py3-none-any.whl renamed to template/v2/dirs/etc/sagemaker-ui/workflows/plugins/amzn_sagemaker_studio-1.0.19-py3-none-any.whl

@@ -0,0 +1,16 @@
+ARG SAGEMAKER_DISTRIBUTION_IMAGE
+FROM $SAGEMAKER_DISTRIBUTION_IMAGE
+
+ARG MAMBA_DOCKERFILE_ACTIVATE=1
+
+RUN python -c "import mcp"
+
+RUN git clone --recursive https://github.com/modelcontextprotocol/python-sdk.git && \
+    :
+RUN micromamba install --freeze-installed -y pyright pytest uv ruff trio pytest-flakefinder pytest-xdist pytest-pretty inline-snapshot dirty-equals
+WORKDIR "python-sdk/"
+COPY --chown=$MAMBA_USER:$MAMBA_USER scripts/run_mcp_tests.sh .
+RUN chmod +x run_mcp_tests.sh
+
+# Run tests in run_mcp_tests.sh
+CMD ["./run_mcp_tests.sh"]

template/v3/dirs/etc/sagemaker-ui/workflows/plugins/amzn_sagemaker_studio-1.0.16-py3-none-any.whl renamed to template/v3/dirs/etc/sagemaker-ui/workflows/plugins/amzn_sagemaker_studio-1.0.19-py3-none-any.whl

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# We need to checkout the version of mcp python-sdk that is installed in the mamba environment.
+mcp_version=$(micromamba list | grep ' mcp ' | tr -s ' ' | cut -d ' ' -f 3)
+
+# Checkout the corresponding mcp python-sdk version
+git checkout tags/v$mcp_version
+
+pytest tests/server tests/issues tests/shared || exit $?

test/test_artifacts/v2/mcp.test.Dockerfile

@@ -0,0 +1,16 @@
+ARG SAGEMAKER_DISTRIBUTION_IMAGE
+FROM $SAGEMAKER_DISTRIBUTION_IMAGE
+
+ARG MAMBA_DOCKERFILE_ACTIVATE=1
+
+RUN python -c "import mcp"
+
+RUN git clone --recursive https://github.com/modelcontextprotocol/python-sdk.git && \
+    :
+RUN micromamba install --freeze-installed -y pyright pytest uv ruff trio pytest-flakefinder pytest-xdist pytest-pretty inline-snapshot dirty-equals
+WORKDIR "python-sdk/"
+COPY --chown=$MAMBA_USER:$MAMBA_USER scripts/run_mcp_tests.sh .
+RUN chmod +x run_mcp_tests.sh
+
+# Run tests in run_mcp_tests.sh
+CMD ["./run_mcp_tests.sh"]

test/test_artifacts/v2/scripts/run_mcp_tests.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# We need to checkout the version of mcp python-sdk that is installed in the mamba environment.
+mcp_version=$(micromamba list | grep ' mcp ' | tr -s ' ' | cut -d ' ' -f 3)
+
+# Checkout the corresponding mcp python-sdk version
+git checkout tags/v$mcp_version
+
+pytest tests/server tests/issues tests/shared || exit $?