awslabs.redshift-mcp-server 0.0.6__py3-none-any.whl → 0.0.7__py3-none-any.whl

awslabs/redshift_mcp_server/__init__.py

@@ -14,4 +14,4 @@
 
 """awslabs.redshift-mcp-server"""
 
-__version__ = '0.0.6'
+__version__ = '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/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/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.6.dist-info → awslabs_redshift_mcp_server-0.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: awslabs.redshift-mcp-server
-Version: 0.0.6
+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,
@@ -79,6 +83,7 @@ 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:
@@ -99,16 +104,15 @@ For Windows users, the MCP server configuration format is slightly different:
         "awslabs.redshift-mcp-server.exe"
       ],
       "env": {
-        "FASTMCP_LOG_LEVEL": "ERROR",
         "AWS_PROFILE": "your-aws-profile",
-        "AWS_REGION": "us-east-1"
+        "AWS_DEFAULT_REGION": "us-east-1",
+        "FASTMCP_LOG_LEVEL": "ERROR"
       }
     }
   }
 }
 ```
 
-
 or docker after a successful `docker build -t awslabs/redshift-mcp-server:latest .`:
 
 ```json
@@ -122,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"
       ]
     }
@@ -132,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.7.dist-info/RECORD

@@ -0,0 +1,12 @@
+awslabs/__init__.py,sha256=WuqxdDgUZylWNmVoPKiK7qGsTB_G4UmuXIrJ-VBwDew,731
+awslabs/redshift_mcp_server/__init__.py,sha256=zubBv8l-CU0fO2qBX9BFtysTrX0q202KEIxSdlmACHk,673
+awslabs/redshift_mcp_server/consts.py,sha256=0BElrreRZhjZ7sqbO7mtU5MkQP1NAupJp38MtKPfv64,4213
+awslabs/redshift_mcp_server/models.py,sha256=p6oKcVz4xfaqQzXjJrZK9YlfuUnzMDCphXbTK1LT1k4,6437
+awslabs/redshift_mcp_server/redshift.py,sha256=Hhb_t4ZJ61s42bIyHLXQviEuHu0Ngr8s8e8aXh5olCc,24314
+awslabs/redshift_mcp_server/server.py,sha256=HL0stDv4BGWrqtKWvOfoONvZOxvl36TgwqU27g5Kdug,26131
+awslabs_redshift_mcp_server-0.0.7.dist-info/METADATA,sha256=cegav5bZfvHNL_OoLI1QVYaRHvrCcrHIGIml7f846uY,16570
+awslabs_redshift_mcp_server-0.0.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+awslabs_redshift_mcp_server-0.0.7.dist-info/entry_points.txt,sha256=o2G-onpmq80KMTQw2OrY1G07GmwPaurcJcIqfvMR9Sw,88
+awslabs_redshift_mcp_server-0.0.7.dist-info/licenses/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
+awslabs_redshift_mcp_server-0.0.7.dist-info/licenses/NOTICE,sha256=iIvfV8gFGERQ7xLtxV8bD_Lsrj9KOIPpvk49qp5-K0c,95
+awslabs_redshift_mcp_server-0.0.7.dist-info/RECORD,,

awslabs_redshift_mcp_server-0.0.6.dist-info/RECORD

@@ -1,12 +0,0 @@
-awslabs/__init__.py,sha256=WuqxdDgUZylWNmVoPKiK7qGsTB_G4UmuXIrJ-VBwDew,731
-awslabs/redshift_mcp_server/__init__.py,sha256=dSiLO85AiX9WDWinzOaxhO-qdzqjs6VvfOnDmD18-ec,673
-awslabs/redshift_mcp_server/consts.py,sha256=_r7BEcNEjW8bEOxMwcb6ScCv3w9aXR0vRmd7HzAokyI,3683
-awslabs/redshift_mcp_server/models.py,sha256=p6oKcVz4xfaqQzXjJrZK9YlfuUnzMDCphXbTK1LT1k4,6437
-awslabs/redshift_mcp_server/redshift.py,sha256=FfzCPi5njzUvehNURHqAaHZr9Lz60Z9bAFXveGHLZR4,24696
-awslabs/redshift_mcp_server/server.py,sha256=UNlBqgYS8KLhT9fFKKIPbszH1MtFTY5xCWbED_h-CJ8,26100
-awslabs_redshift_mcp_server-0.0.6.dist-info/METADATA,sha256=gIGrr8hnNi5DpDW3Ye-tLUtSTqnPsmjPupyt82rN4Mc,16184
-awslabs_redshift_mcp_server-0.0.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-awslabs_redshift_mcp_server-0.0.6.dist-info/entry_points.txt,sha256=o2G-onpmq80KMTQw2OrY1G07GmwPaurcJcIqfvMR9Sw,88
-awslabs_redshift_mcp_server-0.0.6.dist-info/licenses/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
-awslabs_redshift_mcp_server-0.0.6.dist-info/licenses/NOTICE,sha256=iIvfV8gFGERQ7xLtxV8bD_Lsrj9KOIPpvk49qp5-K0c,95
-awslabs_redshift_mcp_server-0.0.6.dist-info/RECORD,,