more review comments

Author: scmacdon

python/example_code/neptune/analytics/create_neptune_graph_example.py

@@ -30,12 +30,14 @@ def main():
 def execute_create_graph(client, graph_name):
     try:
         print("Creating Neptune graph...")
-        response = client.create_graph(graph_name=graph_name)
-
-        graph = response.get("graph", {})
-        created_graph_name = graph.get("name")
-        graph_arn = graph.get("arn")
-        graph_endpoint = graph.get("endpoint")
+        response = client.create_graph(
+            graphName=graph_name,
+            provisionedMemory = 16
+        )
+
+        created_graph_name = response.get("name")
+        graph_arn = response.get("arn")
+        graph_endpoint = response.get("endpoint")
 
         print("Graph created successfully!")
         print(f"Graph Name: {created_graph_name}")

python/example_code/neptune/analytics/neptune_analytics_query_example.py

@@ -53,10 +53,6 @@ def run_open_cypher_query(client, graph_id):
 
     except client.exceptions.InternalServerException as e:
         print(f"InternalServerException: {e.response['Error']['Message']}")
-    except client.exceptions.BadRequestException as e:
-        print(f"BadRequestException: {e.response['Error']['Message']}")
-    except client.exceptions.LimitExceededException as e:
-        print(f"LimitExceededException: {e.response['Error']['Message']}")
     except ClientError as e:
         print(f"ClientError: {e.response['Error']['Message']}")
     except Exception as e:  # <--- ADD THIS BLOCK
@@ -78,10 +74,6 @@ def run_open_cypher_query_with_params(client, graph_id):
 
     except client.exceptions.InternalServerException as e:
         print(f"InternalServerException: {e.response['Error']['Message']}")
-    except client.exceptions.BadRequestException as e:
-        print(f"BadRequestException: {e.response['Error']['Message']}")
-    except client.exceptions.LimitExceededException as e:
-        print(f"LimitExceededException: {e.response['Error']['Message']}")
     except ClientError as e:
         print(f"ClientError: {e.response['Error']['Message']}")
     except Exception as e:  # <--- ADD THIS BLOCK
@@ -96,7 +88,7 @@ def run_open_cypher_explain_query(client, graph_id):
             graphIdentifier=graph_id,
             queryString="MATCH (n {code: 'ANC'}) RETURN n",
             language='OPEN_CYPHER',
-            explainMode="debug"
+            explainMode='DETAILS'
         )
         print(resp['payload'].read().decode('UTF-8'))
 

python/example_code/neptune/database/neptune_execute_gremlin_profile_query.py

@@ -37,7 +37,6 @@ def main():
     )
 
     try:
-        run_explain_query(neptune_client)
         run_profile_query(neptune_client)
     except ClientError as e:
         print(f"Neptune error: {e.response['Error']['Message']}")
@@ -46,23 +45,6 @@ def main():
     except Exception as e:
         print(f"Unexpected error: {str(e)}")
 
-
-def run_explain_query(neptune_client):
-    """
-    Runs an EXPLAIN query on the Neptune graph database.
-    """
-    print("Running Gremlin EXPLAIN query...")
-
-    try:
-        response = neptune_client.execute_gremlin_explain_query(
-            gremlinQuery="g.V().has('code', 'ANC')"
-        )
-        print("Explain Query Result:")
-        print(response.get("output", "No explain output returned."))
-    except Exception as e:
-        print(f"Failed to execute EXPLAIN query: {str(e)}")
-
-
 def run_profile_query(neptune_client):
     """
     Runs a PROFILE query on the Neptune graph database.
@@ -74,7 +56,11 @@ def run_profile_query(neptune_client):
             gremlinQuery="g.V().has('code', 'ANC')"
         )
         print("Profile Query Result:")
-        print(response['output'].read().decode('UTF-8'))
+        output = response.get("output")
+        if output:
+            print(output.read().decode('utf-8'))
+        else:
+            print("No explain output returned.")
     except Exception as e:
         print(f"Failed to execute PROFILE query: {str(e)}")
 

python/example_code/neptune/database/neptune_execute_gremlin_query.py

@@ -23,15 +23,15 @@
 # Customize this with your Neptune endpoint
 NEPTUNE_ENDPOINT = "https://<your-neptune-endpoint>:8182"
 
-def execute_gremlin_profile_query(client):
+def execute_gremlin_query(client):
     """
     Executes a Gremlin query using the provided Neptune Data client.
     """
-    print("Executing Gremlin PROFILE query...")
+    print("Executing Gremlin query...")
 
     try:
         response = client.execute_gremlin_query(
-            gremlinQueyr="g.V().has('code', 'ANC')"
+            gremlinQuery="g.V().has('code', 'ANC')"
         )
 
         print("Response is:")
@@ -59,7 +59,7 @@ def main():
         config=config
     )
 
-    execute_gremlin_profile_query(neptune_client)
+    execute_gremlin_query(neptune_client)
 
 
 if __name__ == "__main__":

python/example_code/neptune/database/neptune_execute_open_cypher_query.py

@@ -82,7 +82,7 @@ def execute_open_cypher_explain_query(client):
         print("\nRunning OpenCypher EXPLAIN query (debug mode)...")
         resp = client.execute_open_cypher_explain_query(
             openCypherQuery="MATCH (n {code: 'ANC'}) RETURN n",
-            explainMode="debug"
+            explainMode="details"
         )
         results = resp.get('results')
         if results is None:

python/example_code/neptune/tests/analytics_tests/neptune_graph_stubber.py

@@ -0,0 +1,75 @@
+import boto3
+import io
+from botocore.stub import Stubber
+from botocore.response import StreamingBody
+from botocore.config import Config
+
+GRAPH_ID = "my-graph-id"
+GRAPH_NAME = "my-test-graph"
+
+class NeptuneGraphStubber:
+    def __init__(self):
+        """
+        Create NeptuneGraph client and stubber with minimal retry config for testing.
+        """
+        config = Config(retries={"total_max_attempts": 1, "mode": "standard"}, read_timeout=None)
+        self.client = boto3.client("neptune-graph", config=config)
+        self.stubber = Stubber(self.client)
+
+    def add_execute_query_stub(self, graph_id, query_string, language, explain_mode=None, parameters=None):
+        """
+        Add stub response for execute_query call matching parameters including optional explainMode and parameters.
+        """
+        expected_params = {
+            "graphIdentifier": graph_id,
+            "queryString": query_string,
+            "language": language,
+        }
+        if explain_mode is not None:
+            expected_params["explainMode"] = explain_mode
+        if parameters is not None:
+            expected_params["parameters"] = parameters
+
+        # Example JSON payload response the service expects
+        payload_bytes = b'{"results": [{"n": {"code": "ANC"}}]}'
+        response_body = StreamingBody(io.BytesIO(payload_bytes), len(payload_bytes))
+        response = {"payload": response_body}
+
+        self.stubber.add_response("execute_query", response, expected_params)
+
+    def add_create_graph_stub(self, graph_name, memory=16):
+        """
+        Add stub response for create_graph call matching graphName and provisionedMemory parameters.
+        """
+        expected_params = {
+            "graphName": graph_name,
+            "provisionedMemory": memory
+        }
+        response = {
+            "id": "test-graph-id",  # Required field in response
+            "name": graph_name,
+            "arn": f"arn:aws:neptune-graph:us-east-1:123456789012:graph/{graph_name}",
+            "endpoint": f"https://{graph_name}.cluster-neptune.amazonaws.com"
+        }
+        self.stubber.add_response("create_graph", response, expected_params)
+
+    def activate(self):
+        """
+        Activate the stubber.
+        """
+        self.stubber.activate()
+
+    def deactivate(self):
+        """
+        Deactivate the stubber.
+        """
+        self.stubber.deactivate()
+
+    def get_client(self):
+        """
+        Return the stubbed NeptuneGraph client.
+        """
+        return self.client
+
+
+

python/example_code/neptune/tests/analytics_tests/test_create_graph.py

@@ -1,44 +1,55 @@
-# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-from unittest.mock import MagicMock
+import pytest
 from botocore.exceptions import ClientError, BotoCoreError
-from analytics.create_neptune_graph_example import execute_create_graph  # Adjust import as needed
+from analytics.create_neptune_graph_example import execute_create_graph
+from neptune_graph_stubber import NeptuneGraphStubber
 
-def test_execute_create_graph(capfd):
-    mock_client = MagicMock()
+class MockBotoCoreError(BotoCoreError):
+    def __init__(self, message="BotoCore error occurred"):
+        super().__init__()
+        self.message = message
+
+    def __str__(self):
+        return self.message
 
+def test_execute_create_graph(capfd):
     # --- Success case ---
-    mock_client.create_graph.return_value = {
-        "GraphName": "test-graph",
-        "GraphArn": "arn:aws:neptune:region:123456789012:graph/test-graph",
-        "GraphEndpoint": "https://test-graph.endpoint"
-    }
+    stubber = NeptuneGraphStubber()
+    client = stubber.get_client()
+    stubber.activate()
 
-    execute_create_graph(mock_client, "test-graph")
+    stubber.add_create_graph_stub("test-graph")
+    execute_create_graph(client, "test-graph")
     out, _ = capfd.readouterr()
     assert "Creating Neptune graph..." in out
     assert "Graph created successfully!" in out
     assert "Graph Name: test-graph" in out
-    assert "Graph ARN: arn:aws:neptune:region:123456789012:graph/test-graph" in out
-    assert "Graph Endpoint: https://test-graph.endpoint" in out
+    assert "Graph ARN: arn:aws:neptune-graph:us-east-1:123456789012:graph/test-graph" in out
+    assert "Graph Endpoint: https://test-graph.cluster-neptune.amazonaws.com" in out
+
+    stubber.deactivate()  # deactivate the stubber before mocking
 
     # --- ClientError case ---
-    mock_client.create_graph.side_effect = ClientError(
-        {"Error": {"Message": "Client error occurred"}}, "CreateGraph"
-    )
-    execute_create_graph(mock_client, "test-graph")
+    def raise_client_error(**kwargs):
+        raise ClientError(
+            {"Error": {"Message": "Client error occurred"}}, "CreateGraph"
+        )
+    client.create_graph = raise_client_error
+    execute_create_graph(client, "test-graph")
     out, _ = capfd.readouterr()
     assert "Failed to create graph: Client error occurred" in out
 
     # --- BotoCoreError case ---
-    mock_client.create_graph.side_effect = BotoCoreError()
-    execute_create_graph(mock_client, "test-graph")
+    def raise_boto_core_error(**kwargs):
+        raise MockBotoCoreError()
+    client.create_graph = raise_boto_core_error
+    execute_create_graph(client, "test-graph")
     out, _ = capfd.readouterr()
-    assert "Failed to create graph:" in out  # check prefix only
+    assert "Failed to create graph: BotoCore error occurred" in out
 
     # --- Generic Exception case ---
-    mock_client.create_graph.side_effect = Exception("Generic failure")
-    execute_create_graph(mock_client, "test-graph")
+    def raise_generic_error(**kwargs):
+        raise Exception("Generic failure")
+    client.create_graph = raise_generic_error
+    execute_create_graph(client, "test-graph")
     out, _ = capfd.readouterr()
     assert "Unexpected error: Generic failure" in out