awslabs.redshift-mcp-server 0.0.4__tar.gz → 0.0.7__tar.gz

{awslabs_redshift_mcp_server-0.0.4 → awslabs_redshift_mcp_server-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: awslabs.redshift-mcp-server
-Version: 0.0.4
+Version: 0.0.7
 Summary: An AWS Labs Model Context Protocol (MCP) server for Redshift
 Project-URL: homepage, https://awslabs.github.io/mcp/
 Project-URL: docs, https://awslabs.github.io/mcp/servers/redshift-mcp-server/
@@ -52,7 +52,11 @@ This MCP server provides tools to discover, explore, and query Amazon Redshift c
 ### AWS Client Requirements
 
 1. **Credentials**: Configure AWS credentials via AWS CLI, or environment variables
-2. **Permissions**: Ensure your AWS credentials have the required permissions (see [Permissions](#permissions) section)
+2. **Region**: Configure AWS region using one of the following (in order of precedence):
+   - `AWS_REGION` environment variable (highest priority)
+   - `AWS_DEFAULT_REGION` environment variable
+   - Region specified in your AWS profile configuration
+3. **Permissions**: Ensure your AWS credentials have the required permissions (see [Permissions](#permissions) section)
 
 ## Installation
 
@@ -70,7 +74,7 @@ Configure the MCP server in your MCP client configuration (e.g., for Amazon Q De
       "args": ["awslabs.redshift-mcp-server@latest"],
       "env": {
         "AWS_PROFILE": "default",
-        "AWS_REGION": "us-east-1",
+        "AWS_DEFAULT_REGION": "us-east-1",
         "FASTMCP_LOG_LEVEL": "INFO"
       },
       "disabled": false,
@@ -80,6 +84,35 @@ Configure the MCP server in your MCP client configuration (e.g., for Amazon Q De
 }
 ```
 
+### Windows Installation
+
+For Windows users, the MCP server configuration format is slightly different:
+
+```json
+{
+  "mcpServers": {
+    "awslabs.redshift-mcp-server": {
+      "disabled": false,
+      "timeout": 60,
+      "type": "stdio",
+      "command": "uv",
+      "args": [
+        "tool",
+        "run",
+        "--from",
+        "awslabs.redshift-mcp-server@latest",
+        "awslabs.redshift-mcp-server.exe"
+      ],
+      "env": {
+        "AWS_PROFILE": "your-aws-profile",
+        "AWS_DEFAULT_REGION": "us-east-1",
+        "FASTMCP_LOG_LEVEL": "ERROR"
+      }
+    }
+  }
+}
+```
+
 or docker after a successful `docker build -t awslabs/redshift-mcp-server:latest .`:
 
 ```json
@@ -93,7 +126,7 @@ or docker after a successful `docker build -t awslabs/redshift-mcp-server:latest
         "--interactive",
         "--env", "AWS_ACCESS_KEY_ID=[your data]",
         "--env", "AWS_SECRET_ACCESS_KEY=[your data]",
-        "--env", "AWS_REGION=[your data]",
+        "--env", "AWS_DEFAULT_REGION=[your data]",
         "awslabs/redshift-mcp-server:latest"
       ]
     }
@@ -103,7 +136,8 @@ or docker after a successful `docker build -t awslabs/redshift-mcp-server:latest
 
 ### Environment Variables
 
-- `AWS_REGION`: AWS region to use (default: `us-east-1`)
+- `AWS_REGION`: AWS region to use (overrides all other region settings)
+- `AWS_DEFAULT_REGION`: Default AWS region (used if AWS_REGION not set and no region in profile)
 - `AWS_PROFILE`: AWS profile to use (optional, uses default if not specified)
 - `FASTMCP_LOG_LEVEL`: Logging level (`DEBUG`, `INFO`, `WARNING`, `ERROR`)
 - `LOG_FILE`: Path to log file (optional, logs to stdout if not specified)

{awslabs_redshift_mcp_server-0.0.4 → awslabs_redshift_mcp_server-0.0.7}/README.md

@@ -21,7 +21,11 @@ This MCP server provides tools to discover, explore, and query Amazon Redshift c
 ### AWS Client Requirements
 
 1. **Credentials**: Configure AWS credentials via AWS CLI, or environment variables
-2. **Permissions**: Ensure your AWS credentials have the required permissions (see [Permissions](#permissions) section)
+2. **Region**: Configure AWS region using one of the following (in order of precedence):
+   - `AWS_REGION` environment variable (highest priority)
+   - `AWS_DEFAULT_REGION` environment variable
+   - Region specified in your AWS profile configuration
+3. **Permissions**: Ensure your AWS credentials have the required permissions (see [Permissions](#permissions) section)
 
 ## Installation
 
@@ -39,7 +43,7 @@ Configure the MCP server in your MCP client configuration (e.g., for Amazon Q De
       "args": ["awslabs.redshift-mcp-server@latest"],
       "env": {
         "AWS_PROFILE": "default",
-        "AWS_REGION": "us-east-1",
+        "AWS_DEFAULT_REGION": "us-east-1",
         "FASTMCP_LOG_LEVEL": "INFO"
       },
       "disabled": false,
@@ -49,6 +53,35 @@ Configure the MCP server in your MCP client configuration (e.g., for Amazon Q De
 }
 ```
 
+### Windows Installation
+
+For Windows users, the MCP server configuration format is slightly different:
+
+```json
+{
+  "mcpServers": {
+    "awslabs.redshift-mcp-server": {
+      "disabled": false,
+      "timeout": 60,
+      "type": "stdio",
+      "command": "uv",
+      "args": [
+        "tool",
+        "run",
+        "--from",
+        "awslabs.redshift-mcp-server@latest",
+        "awslabs.redshift-mcp-server.exe"
+      ],
+      "env": {
+        "AWS_PROFILE": "your-aws-profile",
+        "AWS_DEFAULT_REGION": "us-east-1",
+        "FASTMCP_LOG_LEVEL": "ERROR"
+      }
+    }
+  }
+}
+```
+
 or docker after a successful `docker build -t awslabs/redshift-mcp-server:latest .`:
 
 ```json
@@ -62,7 +95,7 @@ or docker after a successful `docker build -t awslabs/redshift-mcp-server:latest
         "--interactive",
         "--env", "AWS_ACCESS_KEY_ID=[your data]",
         "--env", "AWS_SECRET_ACCESS_KEY=[your data]",
-        "--env", "AWS_REGION=[your data]",
+        "--env", "AWS_DEFAULT_REGION=[your data]",
         "awslabs/redshift-mcp-server:latest"
       ]
     }
@@ -72,7 +105,8 @@ or docker after a successful `docker build -t awslabs/redshift-mcp-server:latest
 
 ### Environment Variables
 
-- `AWS_REGION`: AWS region to use (default: `us-east-1`)
+- `AWS_REGION`: AWS region to use (overrides all other region settings)
+- `AWS_DEFAULT_REGION`: Default AWS region (used if AWS_REGION not set and no region in profile)
 - `AWS_PROFILE`: AWS profile to use (optional, uses default if not specified)
 - `FASTMCP_LOG_LEVEL`: Logging level (`DEBUG`, `INFO`, `WARNING`, `ERROR`)
 - `LOG_FILE`: Path to log file (optional, logs to stdout if not specified)

{awslabs_redshift_mcp_server-0.0.4 → awslabs_redshift_mcp_server-0.0.7}/awslabs/redshift_mcp_server/__init__.py

@@ -14,4 +14,4 @@
 
 """awslabs.redshift-mcp-server"""
 
-__version__ = '0.0.4'
+__version__ = '0.0.7'

{awslabs_redshift_mcp_server-0.0.4 → awslabs_redshift_mcp_server-0.0.7}/awslabs/redshift_mcp_server/consts.py

@@ -14,13 +14,12 @@
 
 """Redshift MCP Server constants."""
 
-# Defaults
-DEFAULT_AWS_REGION = 'us-east-1'
+# System
+CLIENT_CONNECT_TIMEOUT = 60
+CLIENT_READ_TIMEOUT = 600
+CLIENT_RETRIES = {'max_attempts': 5, 'mode': 'adaptive'}
+CLIENT_USER_AGENT_NAME = 'awslabs/mcp/redshift-mcp-server'
 DEFAULT_LOG_LEVEL = 'WARNING'
-
-# Timeouts (seconds), etc
-CLIENT_TIMEOUT = 60
-DATA_CLIENT_TIMEOUT = 60
 QUERY_TIMEOUT = 3600
 QUERY_POLL_INTERVAL = 2
 
@@ -29,11 +28,20 @@ QUERY_POLL_INTERVAL = 2
 CLIENT_BEST_PRACTICES = """
 ## AWS Client Best Practices
 
-### Authentication
+### Authentication and Configuration
 
 - Default AWS credentials chain (IAM roles, ~/.aws/credentials, etc.).
 - AWS_PROFILE environment variable (if set).
-- AWS_REGION environment variable (if set).
+- Region configuration (in order of precedence):
+  - AWS_REGION environment variable (highest priority)
+  - AWS_DEFAULT_REGION environment variable
+  - Region specified in AWS profile configuration
+
+### Error Handling
+
+- Always print out AWS client errors in full to help diagnose configuration issues.
+- For region-related errors, suggest checking AWS_REGION, AWS_DEFAULT_REGION, or AWS profile configuration.
+- For credential errors, suggest verifying AWS credentials setup and permissions.
 """
 
 REDSHIFT_BEST_PRACTICES = """

{awslabs_redshift_mcp_server-0.0.4 → awslabs_redshift_mcp_server-0.0.7}/awslabs/redshift_mcp_server/redshift.py

@@ -20,8 +20,10 @@ import os
 import regex
 from awslabs.redshift_mcp_server import __version__
 from awslabs.redshift_mcp_server.consts import (
-    CLIENT_TIMEOUT,
-    DEFAULT_AWS_REGION,
+    CLIENT_CONNECT_TIMEOUT,
+    CLIENT_READ_TIMEOUT,
+    CLIENT_RETRIES,
+    CLIENT_USER_AGENT_NAME,
     QUERY_POLL_INTERVAL,
     QUERY_TIMEOUT,
     SUSPICIOUS_QUERY_REGEXP,
@@ -37,7 +39,9 @@ from loguru import logger
 class RedshiftClientManager:
     """Manages AWS clients for Redshift operations."""
 
-    def __init__(self, config: Config, aws_region: str, aws_profile: str | None = None):
+    def __init__(
+        self, config: Config, aws_region: str | None = None, aws_profile: str | None = None
+    ):
         """Initialize the client manager."""
         self.aws_region = aws_region
         self.aws_profile = aws_profile
@@ -50,15 +54,12 @@ class RedshiftClientManager:
         """Get or create the Redshift client for provisioned clusters."""
         if self._redshift_client is None:
             try:
-                if self.aws_profile:
-                    session = boto3.Session(profile_name=self.aws_profile)
-                    self._redshift_client = session.client('redshift', config=self._config)
-                    logger.info(f'Created Redshift client with profile: {self.aws_profile}')
-                else:
-                    self._redshift_client = boto3.client(
-                        'redshift', config=self._config, region_name=self.aws_region
-                    )
-                    logger.info('Created Redshift client with default credentials')
+                # Session works with None values - uses default credentials/region chain
+                session = boto3.Session(profile_name=self.aws_profile, region_name=self.aws_region)
+                self._redshift_client = session.client('redshift', config=self._config)
+                logger.info(
+                    f'Created Redshift client with profile: {self.aws_profile or "default"}, region: {self.aws_region or "default"}'
+                )
             except Exception as e:
                 logger.error(f'Error creating Redshift client: {str(e)}')
                 raise
@@ -69,19 +70,14 @@ class RedshiftClientManager:
         """Get or create the Redshift Serverless client."""
         if self._redshift_serverless_client is None:
             try:
-                if self.aws_profile:
-                    session = boto3.Session(profile_name=self.aws_profile)
-                    self._redshift_serverless_client = session.client(
-                        'redshift-serverless', config=self._config
-                    )
-                    logger.info(
-                        f'Created Redshift Serverless client with profile: {self.aws_profile}'
-                    )
-                else:
-                    self._redshift_serverless_client = boto3.client(
-                        'redshift-serverless', config=self._config, region_name=self.aws_region
-                    )
-                    logger.info('Created Redshift Serverless client with default credentials')
+                # Session works with None values - uses default credentials/region chain
+                session = boto3.Session(profile_name=self.aws_profile, region_name=self.aws_region)
+                self._redshift_serverless_client = session.client(
+                    'redshift-serverless', config=self._config
+                )
+                logger.info(
+                    f'Created Redshift Serverless client with profile: {self.aws_profile or "default"}, region: {self.aws_region or "default"}'
+                )
             except Exception as e:
                 logger.error(f'Error creating Redshift Serverless client: {str(e)}')
                 raise
@@ -92,19 +88,12 @@ class RedshiftClientManager:
         """Get or create the Redshift Data API client."""
         if self._redshift_data_client is None:
             try:
-                if self.aws_profile:
-                    session = boto3.Session(profile_name=self.aws_profile)
-                    self._redshift_data_client = session.client(
-                        'redshift-data', config=self._config
-                    )
-                    logger.info(
-                        f'Created Redshift Data API client with profile: {self.aws_profile}'
-                    )
-                else:
-                    self._redshift_data_client = boto3.client(
-                        'redshift-data', config=self._config, region_name=self.aws_region
-                    )
-                    logger.info('Created Redshift Data API client with default credentials')
+                # Session works with None values - uses default credentials/region chain
+                session = boto3.Session(profile_name=self.aws_profile, region_name=self.aws_region)
+                self._redshift_data_client = session.client('redshift-data', config=self._config)
+                logger.info(
+                    f'Created Redshift Data API client with profile: {self.aws_profile or "default"}, region: {self.aws_region or "default"}'
+                )
             except Exception as e:
                 logger.error(f'Error creating Redshift Data API client: {str(e)}')
                 raise
@@ -193,19 +182,22 @@ async def execute_statement(
         )
 
     # Guard from executing read-write statements if not allowed
-    protected_sqls = protect_sql(sql, allow_read_write)
-    logger.debug(f'Protected SQL: {" ".join(protected_sqls)}')
+    sqls = protect_sql(sql, allow_read_write)
+    # Add application name and version
+    sqls = [f"SET application_name TO '{CLIENT_USER_AGENT_NAME}/{__version__}';"] + sqls
+
+    logger.debug(f'Protected and versioned SQL: {" ".join(sqls)}')
 
     # Execute the query using Data API
     if cluster_info['type'] == 'provisioned':
         logger.debug(f'Using ClusterIdentifier for provisioned cluster: {cluster_identifier}')
         response = data_client.batch_execute_statement(
-            ClusterIdentifier=cluster_identifier, Database=database_name, Sqls=protected_sqls
+            ClusterIdentifier=cluster_identifier, Database=database_name, Sqls=sqls
         )
     elif cluster_info['type'] == 'serverless':
         logger.debug(f'Using WorkgroupName for serverless workgroup: {cluster_identifier}')
         response = data_client.batch_execute_statement(
-            WorkgroupName=cluster_identifier, Database=database_name, Sqls=protected_sqls
+            WorkgroupName=cluster_identifier, Database=database_name, Sqls=sqls
         )
     else:
         raise Exception(f'Unknown cluster type: {cluster_info["type"]}')
@@ -237,9 +229,9 @@ async def execute_statement(
         raise Exception(f'Query timed out after {QUERY_TIMEOUT} seconds')
 
     # Get user query results
-    subquery1_id = status_response['SubStatements'][1]['Id']
-    results_response = data_client.get_statement_result(Id=subquery1_id)
-    return results_response, subquery1_id
+    subquery2_id = status_response['SubStatements'][2]['Id']
+    results_response = data_client.get_statement_result(Id=subquery2_id)
+    return results_response, subquery2_id
 
 
 async def discover_clusters() -> list[dict]:
@@ -620,11 +612,11 @@ async def execute_query(cluster_identifier: str, database_name: str, sql: str) -
 # Global client manager instance
 client_manager = RedshiftClientManager(
     config=Config(
-        connect_timeout=CLIENT_TIMEOUT,
-        read_timeout=CLIENT_TIMEOUT,
-        retries={'max_attempts': 3, 'mode': 'adaptive'},
-        user_agent_extra=f'awslabs/mcp/redshift-mcp-server/{__version__}',
+        connect_timeout=CLIENT_CONNECT_TIMEOUT,
+        read_timeout=CLIENT_READ_TIMEOUT,
+        retries=CLIENT_RETRIES,
+        user_agent_extra=f'{CLIENT_USER_AGENT_NAME}/{__version__}',
     ),
-    aws_region=os.environ.get('AWS_REGION', DEFAULT_AWS_REGION),
+    aws_region=os.environ.get('AWS_REGION'),
     aws_profile=os.environ.get('AWS_PROFILE'),
 )

{awslabs_redshift_mcp_server-0.0.4 → awslabs_redshift_mcp_server-0.0.7}/awslabs/redshift_mcp_server/server.py

@@ -85,7 +85,7 @@ This tool uses the Redshift Data API to run queries and return results.
 
 ## Getting Started
 
-1. Ensure your AWS credentials are configured (via AWS_PROFILE or default credentials).
+1. Ensure your AWS configuration and credentials are configured (environment variables or profile configuration file).
 2. Use the list_clusters tool to discover available Redshift instances.
 3. Note the cluster identifiers for use with other tools (coming in future milestones).
 

{awslabs_redshift_mcp_server-0.0.4 → awslabs_redshift_mcp_server-0.0.7}/pyproject.toml

@@ -2,7 +2,7 @@
 name = "awslabs.redshift-mcp-server"
 
 # NOTE: "Patch"=9223372036854775807 bumps next release to zero.
-version = "0.0.4"
+version = "0.0.7"
 
 description = "An AWS Labs Model Context Protocol (MCP) server for Redshift"
 readme = "README.md"

{awslabs_redshift_mcp_server-0.0.4 → awslabs_redshift_mcp_server-0.0.7}/tests/test_redshift.py

@@ -29,21 +29,21 @@ class TestRedshiftClientManagerRedshiftClient:
     def test_redshift_client_creation_default_credentials(self, mocker):
         """Test Redshift client creation with default credentials."""
         mock_client = mocker.Mock()
-        mock_boto3_client = mocker.patch('boto3.client', return_value=mock_client)
+        mock_boto3_session = mocker.patch('boto3.Session')
+        mock_boto3_session.return_value.client.return_value = mock_client
 
         config = Config()
-        manager = RedshiftClientManager(config, 'us-east-1')
+        manager = RedshiftClientManager(config)
         client = manager.redshift_client()
 
         assert client == mock_client
 
-        # Verify boto3.client was called with correct parameters
-        mock_boto3_client.assert_called_once_with(
-            'redshift', config=config, region_name='us-east-1'
-        )
+        # Verify boto3.Session was called with correct parameters
+        mock_boto3_session.assert_called_once_with(profile_name=None, region_name=None)
+        mock_boto3_session.return_value.client.assert_called_once_with('redshift', config=config)
 
-    def test_redshift_client_creation_with_profile(self, mocker):
-        """Test Redshift client creation with AWS profile."""
+    def test_redshift_client_creation_with_profile_and_region(self, mocker):
+        """Test Redshift client creation with AWS profile and region."""
         mock_session = mocker.Mock()
         mock_client = mocker.Mock()
         mock_session.client.return_value = mock_client
@@ -55,28 +55,20 @@ class TestRedshiftClientManagerRedshiftClient:
 
         assert client == mock_client
 
-        # Verify session was created with profile and client was created
-        mock_session_class.assert_called_once_with(profile_name='test-profile')
+        # Verify session was created with profile and region
+        mock_session_class.assert_called_once_with(
+            profile_name='test-profile', region_name='us-west-2'
+        )
         mock_session.client.assert_called_once_with('redshift', config=config)
 
-    def test_redshift_client_creation_error_default_credentials(self, mocker):
-        """Test error handling when client creation fails with default credentials."""
-        mocker.patch('boto3.client', side_effect=Exception('Credentials error'))
-
-        config = Config()
-        manager = RedshiftClientManager(config, 'us-east-1')
-
-        with pytest.raises(Exception, match='Credentials error'):
-            manager.redshift_client()
-
-    def test_redshift_client_creation_error_with_profile(self, mocker):
-        """Test error handling when session creation fails with profile."""
-        mocker.patch('boto3.Session', side_effect=Exception('Profile not found'))
+    def test_redshift_client_creation_error(self, mocker):
+        """Test error handling when session creation fails."""
+        mocker.patch('boto3.Session', side_effect=Exception('Session error'))
 
         config = Config()
-        manager = RedshiftClientManager(config, 'us-east-1', 'non-existent-profile')
+        manager = RedshiftClientManager(config)
 
-        with pytest.raises(Exception, match='Profile not found'):
+        with pytest.raises(Exception, match='Session error'):
             manager.redshift_client()
 
 
@@ -86,21 +78,23 @@ class TestRedshiftClientManagerServerlessClient:
     def test_redshift_serverless_client_creation_default_credentials(self, mocker):
         """Test Redshift Serverless client creation with default credentials."""
         mock_client = mocker.Mock()
-        mock_boto3_client = mocker.patch('boto3.client', return_value=mock_client)
+        mock_boto3_session = mocker.patch('boto3.Session')
+        mock_boto3_session.return_value.client.return_value = mock_client
 
         config = Config()
-        manager = RedshiftClientManager(config, 'us-east-1')
+        manager = RedshiftClientManager(config)
         client = manager.redshift_serverless_client()
 
         assert client == mock_client
 
-        # Verify boto3.client was called with correct parameters
-        mock_boto3_client.assert_called_once_with(
-            'redshift-serverless', config=config, region_name='us-east-1'
+        # Verify boto3.Session was called with correct parameters
+        mock_boto3_session.assert_called_once_with(profile_name=None, region_name=None)
+        mock_boto3_session.return_value.client.assert_called_once_with(
+            'redshift-serverless', config=config
         )
 
-    def test_redshift_serverless_client_creation_with_profile(self, mocker):
-        """Test Redshift Serverless client creation with AWS profile."""
+    def test_redshift_serverless_client_creation_with_profile_and_region(self, mocker):
+        """Test Redshift Serverless client creation with AWS profile and region."""
         mock_session = mocker.Mock()
         mock_client = mocker.Mock()
         mock_session.client.return_value = mock_client
@@ -112,28 +106,20 @@ class TestRedshiftClientManagerServerlessClient:
 
         assert client == mock_client
 
-        # Verify session was created with profile and client was created
-        mock_session_class.assert_called_once_with(profile_name='test-profile')
+        # Verify session was created with profile and region
+        mock_session_class.assert_called_once_with(
+            profile_name='test-profile', region_name='us-west-2'
+        )
         mock_session.client.assert_called_once_with('redshift-serverless', config=config)
 
-    def test_redshift_serverless_client_creation_error_default_credentials(self, mocker):
-        """Test error handling when serverless client creation fails with default credentials."""
-        mocker.patch('boto3.client', side_effect=Exception('Credentials error'))
+    def test_redshift_serverless_client_creation_error(self, mocker):
+        """Test error handling when session creation fails."""
+        mocker.patch('boto3.Session', side_effect=Exception('Session error'))
 
         config = Config()
-        manager = RedshiftClientManager(config, 'us-east-1')
+        manager = RedshiftClientManager(config)
 
-        with pytest.raises(Exception, match='Credentials error'):
-            manager.redshift_serverless_client()
-
-    def test_redshift_serverless_client_creation_error_with_profile(self, mocker):
-        """Test error handling when session creation fails with profile."""
-        mocker.patch('boto3.Session', side_effect=Exception('Profile not found'))
-
-        config = Config()
-        manager = RedshiftClientManager(config, 'us-east-1', 'non-existent-profile')
-
-        with pytest.raises(Exception, match='Profile not found'):
+        with pytest.raises(Exception, match='Session error'):
             manager.redshift_serverless_client()
 
 
@@ -143,21 +129,23 @@ class TestRedshiftClientManagerDataClient:
     def test_redshift_data_client_creation_default_credentials(self, mocker):
         """Test Redshift Data API client creation with default credentials."""
         mock_client = mocker.Mock()
-        mock_boto3_client = mocker.patch('boto3.client', return_value=mock_client)
+        mock_boto3_session = mocker.patch('boto3.Session')
+        mock_boto3_session.return_value.client.return_value = mock_client
 
         config = Config()
-        manager = RedshiftClientManager(config, 'us-east-1')
+        manager = RedshiftClientManager(config)
         client = manager.redshift_data_client()
 
         assert client == mock_client
 
-        # Verify boto3.client was called with correct parameters
-        mock_boto3_client.assert_called_once_with(
-            'redshift-data', config=config, region_name='us-east-1'
+        # Verify boto3.Session was called with correct parameters
+        mock_boto3_session.assert_called_once_with(profile_name=None, region_name=None)
+        mock_boto3_session.return_value.client.assert_called_once_with(
+            'redshift-data', config=config
         )
 
-    def test_redshift_data_client_creation_with_profile(self, mocker):
-        """Test Redshift Data API client creation with AWS profile."""
+    def test_redshift_data_client_creation_with_profile_and_region(self, mocker):
+        """Test Redshift Data API client creation with AWS profile and region."""
         mock_session = mocker.Mock()
         mock_client = mocker.Mock()
         mock_session.client.return_value = mock_client
@@ -169,28 +157,20 @@ class TestRedshiftClientManagerDataClient:
 
         assert client == mock_client
 
-        # Verify session was created with profile and client was created
-        mock_session_class.assert_called_once_with(profile_name='test-profile')
+        # Verify session was created with profile and region
+        mock_session_class.assert_called_once_with(
+            profile_name='test-profile', region_name='us-west-2'
+        )
         mock_session.client.assert_called_once_with('redshift-data', config=config)
 
-    def test_redshift_data_client_creation_error_default_credentials(self, mocker):
-        """Test error handling when data client creation fails with default credentials."""
-        mocker.patch('boto3.client', side_effect=Exception('Credentials error'))
-
-        config = Config()
-        manager = RedshiftClientManager(config, 'us-east-1')
-
-        with pytest.raises(Exception, match='Credentials error'):
-            manager.redshift_data_client()
-
-    def test_redshift_data_client_creation_error_with_profile(self, mocker):
-        """Test error handling when session creation fails with profile."""
-        mocker.patch('boto3.Session', side_effect=Exception('Profile not found'))
+    def test_redshift_data_client_creation_error(self, mocker):
+        """Test error handling when session creation fails."""
+        mocker.patch('boto3.Session', side_effect=Exception('Session error'))
 
         config = Config()
-        manager = RedshiftClientManager(config, 'us-east-1', 'non-existent-profile')
+        manager = RedshiftClientManager(config)
 
-        with pytest.raises(Exception, match='Profile not found'):
+        with pytest.raises(Exception, match='Session error'):
             manager.redshift_data_client()
 
 

{awslabs_redshift_mcp_server-0.0.4 → awslabs_redshift_mcp_server-0.0.7}/tests/test_server.py

@@ -815,6 +815,7 @@ class TestExecuteQueryTool:
         mock_data_client.describe_statement.return_value = {
             'Status': 'FINISHED',
             'SubStatements': [
+                {'Id': 'set-app-name'},  # SET application_name
                 {'Id': 'sub-query-0'},  # BEGIN READ ONLY
                 {'Id': 'query-123'},  # Our actual SQL query
                 {'Id': 'sub-query-2'},  # END

awslabs_redshift_mcp_server-0.0.7/uv-requirements.txt

@@ -0,0 +1,24 @@
+# This file was autogenerated by uv via the following command:
+#    echo "uv==0.8.10" > uv-requirements.in
+#    uv pip compile --generate-hashes --output-file=uv-requirements.txt --strip-extras --python=3.10 uv-requirements.in
+uv==0.8.10 \
+    --hash=sha256:31e4fc37ee94b94c032384a0957ad32ba7dce4ce6c04b4880fd3e31e25e51a82 \
+    --hash=sha256:36a5ce708d52388c37043e7335f9eb3fea5a19a56166a2cc6adb365179a1cd77 \
+    --hash=sha256:38286d230daad82388469c8dc7a1d2f5dc279c11178319c886d1a88d7938e513 \
+    --hash=sha256:3e190cee3bb2b4f574a419eef87ae8e33f713e9cd6f856b83277ece70ad9ca9b \
+    --hash=sha256:3fdf89fc40af9902141c39ed943bcfca15664623363335eb032a44f22001e2b4 \
+    --hash=sha256:4cc190d403a89e46d13cec83b6f8e8d7d07aaf1e5a996eac9a3f0c2a8cd92537 \
+    --hash=sha256:57b71dc79eff25a5419d3fe4a563d3b9397f55d789f685ef27f43f033b31f482 \
+    --hash=sha256:86fe044c2be43977566a0d184a487edd7aace2febb757fd95927684b629ef50b \
+    --hash=sha256:88df34c32555064fae459cce665757619fd1af7deb2dc393352b15d909d2d131 \
+    --hash=sha256:9ad21eeaa4156a1bf5ed85903f80db06e2c02badd3a587ba98d3171517960555 \
+    --hash=sha256:a5495b5a6e3111c03cf5e4dbdd598bc8fd1da887e3920d58cd5a2d4c8bc9a473 \
+    --hash=sha256:ab072cd3bf2f9dc264659a1ff48ad91a910ac4830bcfe965e2d3f89c86646f46 \
+    --hash=sha256:af8a5526b0e331775a264fa0dbccfd53c183cb974f269a208af136d7561f9eb2 \
+    --hash=sha256:b00637c63d5dfc9f879281c5c91db2bb909ab1f9ab275dab015e7fb6cac6be5b \
+    --hash=sha256:b3ff3c451fcd23ea78356d8c18e802d0e423cbe655273601e3ec039a51b33286 \
+    --hash=sha256:c4a493cd4b15b3aef11523531aff96a77a586666a63e842fa437966b7b7ee62d \
+    --hash=sha256:defc50bb319be2d58be74a680710cd4b7697e88d5f79974eacd354df95f0b6b0 \
+    --hash=sha256:e0a02bcec766eb0862b7082ab746b204add7d9fcaa62322502d159b5a7ccc54a \
+    --hash=sha256:eb79a46d8099f563ef58237bf4e9009f876a40145e757ea883a92b24b724d01e
+    # via -r uv-requirements.in