m

Author: Lucas McDonald

.github/workflows/ci_examples_python.yml

@@ -26,8 +26,9 @@ on:
 jobs:
   testPython:
     strategy:
+      max-parallel: 1
       matrix:
-        python-version: [3.11]
+        python-version: [3.11, 3.12, 3.13]
         os: [macos-13]
     runs-on: ${{ matrix.os }}
     permissions:

.github/workflows/ci_test_vector_python.yml

@@ -30,6 +30,10 @@ jobs:
       matrix:
         library: [TestVectors]
         python-version: [3.11, 3.12, 3.13]
+        # Only ubuntu for now;
+        # As of 4.10.1, Dafny's Python JSON processing is still very slow (1 hour to run test vectors on ubuntu)
+        # and Github's macOS runners are also very slow (~2x slower than ubuntu).
+        # If Dafny's JSON processing speed is improved, we can add macOS back.
         os: [ubuntu-22.04]
         interface: [client, resource, table]
     runs-on: ${{ matrix.os }}

.github/workflows/daily_ci.yml

@@ -71,6 +71,16 @@ jobs:
     uses: ./.github/workflows/ci_examples_python.yml
     with:
       dafny: ${{needs.getVersion.outputs.version}}
+  daily-ci-python-test-vectors:
+    needs: getVersion
+    uses: ./.github/workflows/ci_test_vector_python.yml
+    with:
+      dafny: ${{needs.getVersion.outputs.version}}
+  daily-ci-python-static-analysis:
+    needs: getVersion
+    uses: ./.github/workflows/ci_static_analysis_python.yml
+    with:
+      dafny: ${{needs.getVersion.outputs.version}}
   daily-ci-net-test-vectors:
     needs: getVersion
     uses: ./.github/workflows/ci_test_vector_net.yml

.github/workflows/manual.yml

@@ -67,6 +67,16 @@ jobs:
     with:
       dafny: ${{ inputs.dafny }}
       regenerate-code: ${{ inputs.regenerate-code }}
+  manual-ci-python-test-vectors:
+    uses: ./.github/workflows/ci_test_vector_python.yml
+    with:
+      dafny: ${{ inputs.dafny }}
+      regenerate-code: ${{ inputs.regenerate-code }}
+  manual-ci-python-static-analysis:
+    uses: ./.github/workflows/ci_static_analysis_python.yml
+    with:
+      dafny: ${{ inputs.dafny }}
+      regenerate-code: ${{ inputs.regenerate-code }}
   manual-ci-net-test-vectors:
     uses: ./.github/workflows/ci_test_vector_net.yml
     with:

.github/workflows/nightly.yml

@@ -64,6 +64,12 @@ jobs:
     with:
       dafny: "nightly-latest"
       regenerate-code: true
+  dafny-nightly-python-test-vectors:
+    if: github.event_name != 'schedule' || github.repository_owner == 'aws'
+    uses: ./.github/workflows/ci_test_vector_python.yml
+    with:
+      dafny: "nightly-latest"
+      regenerate-code: true
   dafny-nightly-test-vectors-net:
     if: github.event_name != 'schedule' || github.repository_owner == 'aws'
     uses: ./.github/workflows/ci_test_vector_net.yml

.github/workflows/push.yml

@@ -69,6 +69,11 @@ jobs:
   pr-ci-python-static-analysis:
     needs: getVersion
     uses: ./.github/workflows/ci_static_analysis_python.yml
+  pr-ci-python-test-vectors:
+    needs: getVersion
+    uses: ./.github/workflows/ci_test_vector_python.yml
+    with:
+      dafny: ${{needs.getVersion.outputs.version}}
   pr-ci-net-test-vectors:
     needs: getVersion
     uses: ./.github/workflows/ci_test_vector_net.yml

DynamoDbEncryption/runtimes/python/test/unit/internal/test_resource_to_client.py

@@ -476,8 +476,6 @@ def assert_condition_expressions_are_equal(expected_item, actual_item, key):
         actual_item["ExpressionAttributeNames"] if "ExpressionAttributeNames" in actual_item else {},
         actual_item["ExpressionAttributeValues"] if "ExpressionAttributeValues" in actual_item else {},
     )
-    print(f"{expected_key_condition_expression=}")
-    print(f"{actual_key_condition_expression=}")
     assert expected_key_condition_expression == actual_key_condition_expression
 
 

TestVectors/runtimes/python/src/aws_dbesdk_dynamodb_test_vectors/internaldafny/extern/CreateInterceptedDDBTable.py

@@ -21,16 +21,16 @@
 from typing import Any, Dict
 
 def load_test_data() -> Dict[str, Any]:
-    """Load the test data from data.json file."""
+    """Load the ExpressionAttributeValues from data.json file."""
     # Get the directory of the current file
     current_dir = os.getcwd()
     # Navigate to the data.json file
     data_file = os.path.join(current_dir, 'data.json')
 
     with open(data_file, 'r') as f:
-        return json.load(f)
+        return json.load(f)["Values"]
 
-expression_attribute_values_from_json = load_test_data()["Values"]
+expression_attribute_values_from_json = load_test_data()
 
 def get_test_value(name) -> Any:
     """
@@ -56,7 +56,7 @@ def get_test_value(name) -> Any:
         elif "L" in value:
             return list(value["L"])
         else:
-            raise ValueError(f"Unknown value type: {value}")
+            raise KeyError(f"Unknown ExpressionAttributeValue type: {value}")
     return value
 
 
@@ -231,9 +231,7 @@ def transact_write_items(self, **kwargs):
         raise NotImplementedError("transact_write_items not supported on table interface; remove tests calling this")
 
     def query(self, **kwargs):
-        print(f'{kwargs=}')
         table_input = self._client_shape_to_resource_shape_converter.query_request(kwargs)
-        print(f'{table_input=}')
         # To exhaustively test Tables,
         # convert the string-based KeyConditionExpression and FilterExpression
         # into the boto3.conditions.Key and boto3.conditions.Attr resource-formatted queries.
@@ -262,7 +260,6 @@ def query(self, **kwargs):
                 # Pass the original string through.
                 # The table will accept the string as-is.
                 pass
-        print(f'{table_input=}')
         table_output = self._table.query(**table_input)
         client_output = self._resource_shape_to_client_shape_converter.query_response(table_output)
         return client_output