awslabs.redshift-mcp-server 0.0.10__tar.gz → 0.0.12__tar.gz

{awslabs_redshift_mcp_server-0.0.10 → awslabs_redshift_mcp_server-0.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: awslabs.redshift-mcp-server
-Version: 0.0.10
+Version: 0.0.12
 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.10 → awslabs_redshift_mcp_server-0.0.12}/awslabs/redshift_mcp_server/__init__.py

@@ -14,4 +14,4 @@
 
 """awslabs.redshift-mcp-server"""
 
-__version__ = '0.0.10'
+__version__ = '0.0.12'

{awslabs_redshift_mcp_server-0.0.10 → awslabs_redshift_mcp_server-0.0.12}/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.10 → awslabs_redshift_mcp_server-0.0.12}/pyproject.toml

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

{awslabs_redshift_mcp_server-0.0.10 → awslabs_redshift_mcp_server-0.0.12}/tests/test_redshift.py

@@ -391,6 +391,124 @@ class TestExecuteProtectedStatement:
                 'target-cluster', 'test-db', 'SELECT 1', allow_read_write=False
             )
 
+    @pytest.mark.asyncio
+    async def test_execute_protected_statement_user_sql_fails_end_succeeds(self, mocker):
+        """Test user SQL fails but END succeeds - should raise user SQL error."""
+        # Mock discover_clusters
+        mock_discover_clusters = mocker.patch(
+            'awslabs.redshift_mcp_server.redshift.discover_clusters'
+        )
+        mock_discover_clusters.return_value = [
+            {'identifier': 'test-cluster', 'type': 'provisioned'}
+        ]
+
+        # Mock session manager
+        mock_session_manager = mocker.patch('awslabs.redshift_mcp_server.redshift.session_manager')
+        mock_session_manager.session = mocker.AsyncMock(return_value='session-123')
+
+        # Mock _execute_statement to fail for user SQL, succeed for BEGIN and END
+        mock_execute_statement = mocker.patch(
+            'awslabs.redshift_mcp_server.redshift._execute_statement'
+        )
+
+        def execute_side_effect(cluster_info, cluster_identifier, database_name, sql, **kwargs):
+            if sql == 'BEGIN READ ONLY;':
+                return 'begin-stmt-id'
+            elif sql == 'SELECT invalid_syntax':
+                raise Exception('SQL syntax error')
+            elif sql == 'END;':
+                return 'end-stmt-id'
+            return 'stmt-id'
+
+        mock_execute_statement.side_effect = execute_side_effect
+
+        with pytest.raises(Exception, match='SQL syntax error'):
+            await _execute_protected_statement(
+                'test-cluster', 'test-db', 'SELECT invalid_syntax', allow_read_write=False
+            )
+
+        # Verify END was still called
+        assert mock_execute_statement.call_count == 3
+        calls = mock_execute_statement.call_args_list
+        assert calls[0][1]['sql'] == 'BEGIN READ ONLY;'
+        assert calls[1][1]['sql'] == 'SELECT invalid_syntax'
+        assert calls[2][1]['sql'] == 'END;'
+
+    @pytest.mark.asyncio
+    async def test_execute_protected_statement_user_sql_succeeds_end_fails(self, mocker):
+        """Test user SQL succeeds but END fails - should raise END error."""
+        # Mock discover_clusters
+        mock_discover_clusters = mocker.patch(
+            'awslabs.redshift_mcp_server.redshift.discover_clusters'
+        )
+        mock_discover_clusters.return_value = [
+            {'identifier': 'test-cluster', 'type': 'provisioned'}
+        ]
+
+        # Mock session manager
+        mock_session_manager = mocker.patch('awslabs.redshift_mcp_server.redshift.session_manager')
+        mock_session_manager.session = mocker.AsyncMock(return_value='session-123')
+
+        # Mock _execute_statement to succeed for user SQL, fail for END
+        mock_execute_statement = mocker.patch(
+            'awslabs.redshift_mcp_server.redshift._execute_statement'
+        )
+
+        def execute_side_effect(cluster_info, cluster_identifier, database_name, sql, **kwargs):
+            if sql == 'BEGIN READ ONLY;':
+                return 'begin-stmt-id'
+            elif sql == 'SELECT 1':
+                return 'user-stmt-id'
+            elif sql == 'END;':
+                raise Exception('END statement failed')
+            return 'stmt-id'
+
+        mock_execute_statement.side_effect = execute_side_effect
+
+        with pytest.raises(Exception, match='END statement failed'):
+            await _execute_protected_statement(
+                'test-cluster', 'test-db', 'SELECT 1', allow_read_write=False
+            )
+
+    @pytest.mark.asyncio
+    async def test_execute_protected_statement_both_user_sql_and_end_fail(self, mocker):
+        """Test both user SQL and END fail - should raise combined error."""
+        # Mock discover_clusters
+        mock_discover_clusters = mocker.patch(
+            'awslabs.redshift_mcp_server.redshift.discover_clusters'
+        )
+        mock_discover_clusters.return_value = [
+            {'identifier': 'test-cluster', 'type': 'provisioned'}
+        ]
+
+        # Mock session manager
+        mock_session_manager = mocker.patch('awslabs.redshift_mcp_server.redshift.session_manager')
+        mock_session_manager.session = mocker.AsyncMock(return_value='session-123')
+
+        # Mock _execute_statement to fail for both user SQL and END
+        mock_execute_statement = mocker.patch(
+            'awslabs.redshift_mcp_server.redshift._execute_statement'
+        )
+
+        def execute_side_effect(cluster_info, cluster_identifier, database_name, sql, **kwargs):
+            if sql == 'BEGIN READ ONLY;':
+                return 'begin-stmt-id'
+            elif sql == 'SELECT invalid_syntax':
+                raise Exception('SQL syntax error')
+            elif sql == 'END;':
+                raise Exception('END statement failed')
+            return 'stmt-id'
+
+        mock_execute_statement.side_effect = execute_side_effect
+
+        with pytest.raises(
+            Exception,
+            match='User SQL failed: SQL syntax error; END statement failed: END statement failed',
+        ):
+            await _execute_protected_statement(
+                'test-cluster', 'test-db', 'SELECT invalid_syntax', allow_read_write=False
+            )
+
 
 class TestExecuteStatement:
     """Tests for _execute_statement function."""

awslabs_redshift_mcp_server-0.0.12/uv-requirements.txt

@@ -0,0 +1,27 @@
+#
+# This file is autogenerated by pip-compile with Python 3.12
+# by the following command:
+#
+#    pip-compile --generate-hashes --output-file=uv-requirements.txt --strip-extras uv-requirements.in
+#
+uv==0.9.6 \
+    --hash=sha256:0169a85d3ba5ef1c37089d64ff26de573439ca84ecf549276a2eee42d7f833f2 \
+    --hash=sha256:0fde18c22376c8b02954c7db3847bc75ac42619932c44b43f49d056e5cfb05f9 \
+    --hash=sha256:166175ba952d2ad727e1dbd57d7cfc1782dfe7b8d79972174a46a7aa33ddceec \
+    --hash=sha256:3c2c2b2b093330e603d838fec26941ab6f62e8d62a012f9fa0d5ed88da39d907 \
+    --hash=sha256:538716ec97f8d899baa7e1c427f4411525459c0ef72ea9b3625ce9610c9976e6 \
+    --hash=sha256:547fd27ab5da7cd1a833288a36858852451d416a056825f162ecf2af5be6f8b8 \
+    --hash=sha256:62e3f057a9ae5e5003a7cd56b617e940f519f6dabcbb22d36cdd0149df25d409 \
+    --hash=sha256:6403176b55388cf94fb8737e73b26ee2a7b1805a9139da5afa951210986d4fcd \
+    --hash=sha256:7e89c964f614fa3f0481060cac709d6da50feac553e1e11227d6c4c81c87af7c \
+    --hash=sha256:86e05782f9b75d39ab1c0af98bf11e87e646a36a61d425021d5b284073e56315 \
+    --hash=sha256:90122a76e6441b8c580fc9faf06bd8c4dbe276cb1c185ad91eceb2afa78e492a \
+    --hash=sha256:95a62c1f668272555ad0c446bf44a9924dee06054b831d04c162e0bad736dc28 \
+    --hash=sha256:a7c6067919d87208c4a6092033c3bc9799cb8be1c8bc6ef419a1f6d42a755329 \
+    --hash=sha256:b2f934737c93f88c906b6a47bcc083170210fe5d66565e80a7c139599e5cbf2f \
+    --hash=sha256:b31377ebf2d0499afc5abe3fe1abded5ca843f3a1161b432fe26eb0ce15bab8e \
+    --hash=sha256:d1072db92cc9525febdf9d113c23916dfc20ca03e21218cc7beefe7185a90631 \
+    --hash=sha256:e700b2098f9d365061c572d0729b4e8bc71c6468d83dfaae2537cd66e3cb1b98 \
+    --hash=sha256:ea67369918af24ea7e01991dfc8b8988d1b0b7c49cb39d9e5bc0c409930a0a3f \
+    --hash=sha256:f0ba311b3ca49d246f36d444d3ee81571619ef95e5f509eb694a81defcbed262
+    # via -r uv-requirements.in (contents of `uv==0.9.6`)

{awslabs_redshift_mcp_server-0.0.10 → awslabs_redshift_mcp_server-0.0.12}/uv.lock

@@ -46,7 +46,7 @@ wheels = [
 
 [[package]]
 name = "awslabs-redshift-mcp-server"
-version = "0.0.10"
+version = "0.0.12"
 source = { editable = "." }
 dependencies = [
     { name = "boto3" },

awslabs_redshift_mcp_server-0.0.10/uv-requirements.txt

@@ -1,24 +0,0 @@
-# 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