awslabs.stepfunctions-tool-mcp-server 0.1.4__tar.gz → 0.1.6__tar.gz

{awslabs_stepfunctions_tool_mcp_server-0.1.4 → awslabs_stepfunctions_tool_mcp_server-0.1.6}/Dockerfile

@@ -10,7 +10,7 @@
 # and limitations under the License.
 
 #FROM public.ecr.aws/sam/build-python3.10:1.137.1-20250411084548
-FROM public.ecr.aws/sam/build-python3.10@sha256:04cdbe84bec08d17d621192bc3f0a9e4a85a83f2ac99aa9241659dfac0d845ea AS uv
+FROM public.ecr.aws/sam/build-python3.10@sha256:e78695db10ca8cb129e59e30f7dc9789b0dbd0181dba195d68419c72bac51ac1 AS uv
 
 # Install the project into `/app`
 WORKDIR /app
@@ -44,7 +44,7 @@ RUN --mount=type=cache,target=/root/.cache/uv \
 # Make the directory just in case it doesn't exist
 RUN mkdir -p /root/.local
 
-FROM public.ecr.aws/sam/build-python3.10@sha256:04cdbe84bec08d17d621192bc3f0a9e4a85a83f2ac99aa9241659dfac0d845ea
+FROM public.ecr.aws/sam/build-python3.10@sha256:e78695db10ca8cb129e59e30f7dc9789b0dbd0181dba195d68419c72bac51ac1
 
 # Place executables in the environment at the front of the path and include other binaries
 ENV PATH="/app/.venv/bin:$PATH:/usr/sbin"

{awslabs_stepfunctions_tool_mcp_server-0.1.4 → awslabs_stepfunctions_tool_mcp_server-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: awslabs.stepfunctions-tool-mcp-server
-Version: 0.1.4
+Version: 0.1.6
 Summary: An AWS Labs Model Context Protocol (MCP) server for AWS Step Functions
 Project-URL: Homepage, https://awslabs.github.io/mcp/
 Project-URL: Documentation, https://awslabs.github.io/mcp/servers/stepfunctions-tool-mcp-server/

awslabs_stepfunctions_tool_mcp_server-0.1.6/awslabs/stepfunctions_tool_mcp_server/aws_helper.py

@@ -0,0 +1,57 @@
+"""AWS Helper for Step Functions Tool MCP Server."""
+
+import boto3
+import botocore.config
+import os
+from typing import Any, Optional
+
+
+class AwsHelper:
+    """Helper class for AWS operations."""
+
+    @staticmethod
+    def get_aws_region() -> Optional[str]:
+        """Get AWS region from environment variable.
+
+        Returns:
+            str: AWS region if set in environment, None otherwise
+        """
+        return os.environ.get('AWS_REGION', 'us-east-1')
+
+    @staticmethod
+    def get_aws_profile() -> Optional[str]:
+        """Get AWS profile from environment variable.
+
+        Returns:
+            str: AWS profile if set in environment, None otherwise
+        """
+        return os.environ.get('AWS_PROFILE')
+
+    @staticmethod
+    def create_boto3_client(service_name: str, region_name: Optional[str] = None) -> Any:
+        """Create a boto3 client with the appropriate configuration.
+
+        Args:
+            service_name: AWS service name (e.g., 'stepfunctions', 'schemas')
+            region_name: Optional region override
+
+        Returns:
+            boto3.client: Configured boto3 client
+        """
+        from awslabs.stepfunctions_tool_mcp_server.server import __version__
+
+        # Create config with user agent
+        config = botocore.config.Config(
+            user_agent_extra=f'awslabs/mcp/aws-stepfunctions-tool-mcp-server/{__version__}'
+        )
+
+        # Get profile and region
+        profile = AwsHelper.get_aws_profile()
+        region = region_name or AwsHelper.get_aws_region()
+
+        # Create client with or without profile
+        if profile:
+            session = boto3.Session(profile_name=profile)
+            return session.client(service_name, region_name=region, config=config)
+        else:
+            return boto3.client(service_name, region_name=region, config=config)

{awslabs_stepfunctions_tool_mcp_server-0.1.4 → awslabs_stepfunctions_tool_mcp_server-0.1.6}/awslabs/stepfunctions_tool_mcp_server/server.py

@@ -1,11 +1,14 @@
 """awslabs Step Functions Tool MCP Server implementation."""
 
+# This version should match the version in pyproject.toml
+__version__ = '0.1.5'
+
 import asyncio
-import boto3
 import json
 import logging
 import os
 import re
+from awslabs.stepfunctions_tool_mcp_server.aws_helper import AwsHelper
 from mcp.server.fastmcp import Context, FastMCP
 from typing import Optional
 
@@ -14,11 +17,8 @@ from typing import Optional
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
-AWS_PROFILE = os.environ.get('AWS_PROFILE', 'default')
-logger.info(f'AWS_PROFILE: {AWS_PROFILE}')
-
-AWS_REGION = os.environ.get('AWS_REGION', 'us-east-1')
-logger.info(f'AWS_REGION: {AWS_REGION}')
+logger.info(f'AWS_PROFILE: {AwsHelper.get_aws_profile()}')
+logger.info(f'AWS_REGION: {AwsHelper.get_aws_region()}')
 
 STATE_MACHINE_PREFIX = os.environ.get('STATE_MACHINE_PREFIX', '')
 logger.info(f'STATE_MACHINE_PREFIX: {STATE_MACHINE_PREFIX}')
@@ -40,9 +40,8 @@ STATE_MACHINE_INPUT_SCHEMA_ARN_TAG_KEY = os.environ.get('STATE_MACHINE_INPUT_SCH
 logger.info(f'STATE_MACHINE_INPUT_SCHEMA_ARN_TAG_KEY: {STATE_MACHINE_INPUT_SCHEMA_ARN_TAG_KEY}')
 
 # Initialize AWS clients
-session = boto3.Session(profile_name=AWS_PROFILE, region_name=AWS_REGION)
-sfn_client = session.client('stepfunctions')
-schemas_client = session.client('schemas')
+sfn_client = AwsHelper.create_boto3_client('stepfunctions')
+schemas_client = AwsHelper.create_boto3_client('schemas')
 
 mcp = FastMCP(
     'awslabs.stepfunctions-tool-mcp-server',

{awslabs_stepfunctions_tool_mcp_server-0.1.4 → awslabs_stepfunctions_tool_mcp_server-0.1.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "awslabs.stepfunctions-tool-mcp-server"
-version = "0.1.4"
+version = "0.1.6"  # When updating this version, also update __version__ in awslabs/stepfunctions_tool_mcp_server/server.py
 description = "An AWS Labs Model Context Protocol (MCP) server for AWS Step Functions"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -47,6 +47,7 @@ dev = [
     "pytest-asyncio>=0.26.0",
     "pytest-cov>=4.1.0",
     "pytest-mock>=3.12.0",
+    "tomli>=2.0.1",
 ]
 
 [build-system]

awslabs_stepfunctions_tool_mcp_server-0.1.6/tests/test_aws_helper.py

@@ -0,0 +1,66 @@
+"""Tests for the AWS Helper."""
+
+import os
+from awslabs.stepfunctions_tool_mcp_server.aws_helper import AwsHelper
+from awslabs.stepfunctions_tool_mcp_server.server import __version__
+from unittest.mock import ANY, MagicMock, patch
+
+
+class TestAwsHelper:
+    """Tests for the AwsHelper class."""
+
+    def test_get_aws_region_default(self):
+        """Test that get_aws_region returns the default region."""
+        with patch.dict(os.environ, {}, clear=True):
+            region = AwsHelper.get_aws_region()
+            assert region == 'us-east-1'
+
+    @patch.dict(os.environ, {'AWS_REGION': 'us-west-2'})
+    def test_get_aws_region_from_env(self):
+        """Test that get_aws_region returns the region from the environment."""
+        region = AwsHelper.get_aws_region()
+        assert region == 'us-west-2'
+
+    @patch.dict(os.environ, {'AWS_PROFILE': 'test-profile'})
+    def test_get_aws_profile_from_env(self):
+        """Test that get_aws_profile returns the profile from the environment."""
+        profile = AwsHelper.get_aws_profile()
+        assert profile == 'test-profile'
+
+    @patch('boto3.Session')
+    def test_create_boto3_client_with_profile(self, mock_boto3_session):
+        """Test client creation with profile."""
+        mock_session = MagicMock()
+        mock_boto3_session.return_value = mock_session
+
+        with patch.object(AwsHelper, 'get_aws_profile', return_value='test-profile'):
+            with patch.object(AwsHelper, 'get_aws_region', return_value='us-west-2'):
+                AwsHelper.create_boto3_client('stepfunctions')
+                mock_boto3_session.assert_called_once_with(profile_name='test-profile')
+                mock_session.client.assert_called_once_with(
+                    'stepfunctions', region_name='us-west-2', config=ANY
+                )
+
+    @patch('boto3.client')
+    def test_create_boto3_client_without_profile(self, mock_boto3_client):
+        """Test client creation without profile."""
+        with patch.object(AwsHelper, 'get_aws_profile', return_value=None):
+            with patch.object(AwsHelper, 'get_aws_region', return_value='us-west-2'):
+                AwsHelper.create_boto3_client('stepfunctions')
+                mock_boto3_client.assert_called_once_with(
+                    'stepfunctions', region_name='us-west-2', config=ANY
+                )
+
+    def test_create_boto3_client_user_agent(self):
+        """Test that create_boto3_client sets the user agent correctly."""
+        mock_session = MagicMock()
+        with patch('boto3.Session', return_value=mock_session):
+            with patch.object(AwsHelper, 'get_aws_profile', return_value='test-profile'):
+                AwsHelper.create_boto3_client('stepfunctions')
+                _, kwargs = mock_session.client.call_args
+                config = kwargs.get('config')
+                assert config is not None
+                assert (
+                    config.user_agent_extra
+                    == f'awslabs/mcp/aws-stepfunctions-tool-mcp-server/{__version__}'
+                )

awslabs_stepfunctions_tool_mcp_server-0.1.6/tests/test_server.py

@@ -0,0 +1,23 @@
+"""Tests for the Step Functions Tool MCP Server."""
+
+from awslabs.stepfunctions_tool_mcp_server.server import __version__
+
+
+def test_version_matches_pyproject():
+    """Test that the version in server.py matches pyproject.toml."""
+    import pathlib
+    import tomli
+
+    # Read pyproject.toml
+    pyproject_path = pathlib.Path(__file__).parent.parent / 'pyproject.toml'
+    with open(pyproject_path, 'rb') as f:
+        pyproject = tomli.load(f)
+
+    # Get version from pyproject.toml
+    pyproject_version = pyproject['project']['version']
+
+    # Verify versions match
+    assert __version__ == pyproject_version, (
+        f'Version mismatch: server.py has version {__version__}, '
+        f'but pyproject.toml has version {pyproject_version}'
+    )

{awslabs_stepfunctions_tool_mcp_server-0.1.4 → awslabs_stepfunctions_tool_mcp_server-0.1.6}/uv.lock

@@ -37,7 +37,7 @@ wheels = [
 
 [[package]]
 name = "awslabs-stepfunctions-tool-mcp-server"
-version = "0.1.3"
+version = "0.1.5"
 source = { editable = "." }
 dependencies = [
     { name = "boto3" },
@@ -55,6 +55,7 @@ dev = [
     { name = "pytest-cov" },
     { name = "pytest-mock" },
     { name = "ruff" },
+    { name = "tomli" },
 ]
 
 [package.metadata]
@@ -74,6 +75,7 @@ dev = [
     { name = "pytest-cov", specifier = ">=4.1.0" },
     { name = "pytest-mock", specifier = ">=3.12.0" },
     { name = "ruff", specifier = ">=0.9.7" },
+    { name = "tomli", specifier = ">=2.0.1" },
 ]
 
 [[package]]