awslabs.redshift-mcp-server 0.0.9__py3-none-any.whl → 0.0.11__py3-none-any.whl

awslabs/redshift_mcp_server/__init__.py

@@ -14,4 +14,4 @@
 
 """awslabs.redshift-mcp-server"""
 
-__version__ = '0.0.9'
+__version__ = '0.0.11'

awslabs/redshift_mcp_server/redshift.py

@@ -263,27 +263,50 @@ async def _execute_protected_statement(
         session_id=session_id,
     )
 
-    # Execute user SQL with parameters
-    user_query_id = await _execute_statement(
-        cluster_info=cluster_info,
-        cluster_identifier=cluster_identifier,
-        database_name=database_name,
-        sql=sql,
-        parameters=parameters,
-        session_id=session_id,
-    )
+    # Execute user SQL with parameters, ensuring transaction is always closed
+    user_query_id = None
+    user_sql_error = None
 
-    # Execute END statement to close transaction
-    await _execute_statement(
-        cluster_info=cluster_info,
-        cluster_identifier=cluster_identifier,
-        database_name=database_name,
-        sql='END;',
-        session_id=session_id,
-    )
+    try:
+        user_query_id = await _execute_statement(
+            cluster_info=cluster_info,
+            cluster_identifier=cluster_identifier,
+            database_name=database_name,
+            sql=sql,
+            parameters=parameters,
+            session_id=session_id,
+        )
+    except Exception as e:
+        user_sql_error = e
+        logger.error(f'User SQL execution failed: {e}')
+
+    # Always execute END statement to close transaction
+    try:
+        await _execute_statement(
+            cluster_info=cluster_info,
+            cluster_identifier=cluster_identifier,
+            database_name=database_name,
+            sql='END;',
+            session_id=session_id,
+        )
+    except Exception as end_error:
+        logger.error(f'END statement execution failed: {end_error}')
+        if user_sql_error:
+            # Both failed - raise combined error
+            raise Exception(
+                f'User SQL failed: {user_sql_error}; END statement failed: {end_error}'
+            )
+        else:
+            # Only END failed
+            raise end_error
+
+    # If user SQL failed but END succeeded, raise user SQL error
+    if user_sql_error:
+        raise user_sql_error
 
     # Get results from user query
     data_client = client_manager.redshift_data_client()
+    assert user_query_id is not None, 'user_query_id should not be None at this point'
     results_response = data_client.get_statement_result(Id=user_query_id)
     return results_response, user_query_id
 

{awslabs_redshift_mcp_server-0.0.9.dist-info → awslabs_redshift_mcp_server-0.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: awslabs.redshift-mcp-server
-Version: 0.0.9
+Version: 0.0.11
 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/

awslabs_redshift_mcp_server-0.0.11.dist-info/RECORD

@@ -0,0 +1,12 @@
+awslabs/__init__.py,sha256=WuqxdDgUZylWNmVoPKiK7qGsTB_G4UmuXIrJ-VBwDew,731
+awslabs/redshift_mcp_server/__init__.py,sha256=8DVGZt1w7Ce3QiW02QChX2feXiR3SOlPBkTGSiKEuGc,674
+awslabs/redshift_mcp_server/consts.py,sha256=Ou07Q81KMsSw1AYKrU4sawCjbeD2tovQCnYVc5CPWyk,4302
+awslabs/redshift_mcp_server/models.py,sha256=p6oKcVz4xfaqQzXjJrZK9YlfuUnzMDCphXbTK1LT1k4,6437
+awslabs/redshift_mcp_server/redshift.py,sha256=K6rhKTgOQjZs3ffnNsRpGk4xGZsKqIaebpIjXzfJcZQ,30695
+awslabs/redshift_mcp_server/server.py,sha256=msHWX_g8g82kM705wgWjkeK0vVEou_Cz1emEI7VuDPM,26503
+awslabs_redshift_mcp_server-0.0.11.dist-info/METADATA,sha256=Q1_K0YD7lvBDXy2AK8HAHEMzGspIbox2ftgX6fu2_Po,16661
+awslabs_redshift_mcp_server-0.0.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+awslabs_redshift_mcp_server-0.0.11.dist-info/entry_points.txt,sha256=o2G-onpmq80KMTQw2OrY1G07GmwPaurcJcIqfvMR9Sw,88
+awslabs_redshift_mcp_server-0.0.11.dist-info/licenses/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
+awslabs_redshift_mcp_server-0.0.11.dist-info/licenses/NOTICE,sha256=iIvfV8gFGERQ7xLtxV8bD_Lsrj9KOIPpvk49qp5-K0c,95
+awslabs_redshift_mcp_server-0.0.11.dist-info/RECORD,,

awslabs_redshift_mcp_server-0.0.9.dist-info/RECORD

@@ -1,12 +0,0 @@
-awslabs/__init__.py,sha256=WuqxdDgUZylWNmVoPKiK7qGsTB_G4UmuXIrJ-VBwDew,731
-awslabs/redshift_mcp_server/__init__.py,sha256=8_vNDaN2KJ-FKrcdrNOrmb6Jk5dePWVq4vOFFjSwMRY,673
-awslabs/redshift_mcp_server/consts.py,sha256=Ou07Q81KMsSw1AYKrU4sawCjbeD2tovQCnYVc5CPWyk,4302
-awslabs/redshift_mcp_server/models.py,sha256=p6oKcVz4xfaqQzXjJrZK9YlfuUnzMDCphXbTK1LT1k4,6437
-awslabs/redshift_mcp_server/redshift.py,sha256=ljmLLXXUpAN-wkpxu9rNNOCqYMCCLvGXWNVKDzOTMfA,29821
-awslabs/redshift_mcp_server/server.py,sha256=msHWX_g8g82kM705wgWjkeK0vVEou_Cz1emEI7VuDPM,26503
-awslabs_redshift_mcp_server-0.0.9.dist-info/METADATA,sha256=PNwyFlMRZMWYPiZ9qNBTmV2n2_fcyTTQQSsyeu5jv9o,16660
-awslabs_redshift_mcp_server-0.0.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-awslabs_redshift_mcp_server-0.0.9.dist-info/entry_points.txt,sha256=o2G-onpmq80KMTQw2OrY1G07GmwPaurcJcIqfvMR9Sw,88
-awslabs_redshift_mcp_server-0.0.9.dist-info/licenses/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
-awslabs_redshift_mcp_server-0.0.9.dist-info/licenses/NOTICE,sha256=iIvfV8gFGERQ7xLtxV8bD_Lsrj9KOIPpvk49qp5-K0c,95
-awslabs_redshift_mcp_server-0.0.9.dist-info/RECORD,,