clear-skies-aws 1.10.0__py3-none-any.whl → 1.10.2__py3-none-any.whl

{clear_skies_aws-1.10.0.dist-info → clear_skies_aws-1.10.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: clear-skies-aws
-Version: 1.10.0
+Version: 1.10.2
 Summary: clearskies bindings for working in AWS
 License: MIT
 Author: Conor Mancone

{clear_skies_aws-1.10.0.dist-info → clear_skies_aws-1.10.2.dist-info}/RECORD

@@ -16,8 +16,8 @@ clearskies_aws/backends/dynamo_db_backend.py,sha256=i-Na3McQDbyCYmQewBPKgbWEd3A3
 clearskies_aws/backends/dynamo_db_backend_test.py,sha256=wtymsOEVzO9y7_Whu9cCRyioRTmSimbLmRQSt3J4cik,13106
 clearskies_aws/backends/dynamo_db_condition_parser.py,sha256=v-DO4ijdjiHwBsSDF3dUgqQw5twCcG-5NA1aq7kUYQ0,13239
 clearskies_aws/backends/dynamo_db_condition_parser_test.py,sha256=n7snumB8GxyMBVlj-HL7JrsNj-ZJ91c5gdik0UNM5Ag,12664
-clearskies_aws/backends/dynamo_db_parti_ql_backend.py,sha256=iqlUL_oK_GHhfFx6tZEN0Y261KthREK0g5YPd6O9398,41418
-clearskies_aws/backends/dynamo_db_parti_ql_backend_test.py,sha256=mb5f0mmGzlLT6F9QPHDe7LsO3oOpdNagJM-GLMuwZts,23565
+clearskies_aws/backends/dynamo_db_parti_ql_backend.py,sha256=pVd_N7XFf9PcTAm6rhMxih_sj9Ix6RkRj3LwmFy_Mr4,48544
+clearskies_aws/backends/dynamo_db_parti_ql_backend_test.py,sha256=7gH-RDh7JeaiEGLXsOB512SLmOp0hjdtWQ1cMmexvDM,23649
 clearskies_aws/backends/sqs_backend.py,sha256=hT1JCvCMU76Q4Ir7OeX8U8eAMLIu1_tMwGgaN9rpsPk,2726
 clearskies_aws/backends/sqs_backend_test.py,sha256=iCuHVVqZIR_PDGUUMZIkpir8yyJy3dcPR00AWR2N25U,1138
 clearskies_aws/contexts/__init__.py,sha256=YjwRaSoAqC-nmo3aFB8rzyuiHSP9mi77FVM-8RF0hRE,472
@@ -59,13 +59,13 @@ clearskies_aws/secrets/additional_configs/iam_db_auth.py,sha256=K6eLjo_D0uSxtCfq
 clearskies_aws/secrets/additional_configs/iam_db_auth_with_ssm.py,sha256=hzvR_WBwSoLcMdGXwhqkvKMKmjXzhZgimPWfm2MWSZQ,3467
 clearskies_aws/secrets/additional_configs/mysql_connection_dynamic_producer_via_ssh_cert_bastion.py,sha256=L2-E8Tm6BDHV-yJJ_M_Lo72jNY7uBaTp8SPrRuekcUE,3776
 clearskies_aws/secrets/additional_configs/mysql_connection_dynamic_producer_via_ssm_bastion.py,sha256=Llvg8uQW8J-qndAlDDtg9TY_Tvu2h9tUzchxxUtaRik,6444
-clearskies_aws/secrets/akeyless_with_ssm_cache.py,sha256=4_ep7P2SXei3hNbLrMhUSmr14GTzK69hkzjIYYU-dA4,1443
+clearskies_aws/secrets/akeyless_with_ssm_cache.py,sha256=MFAnajwO_XtZWMZHxsHFZBZa8V9vQGH0NSK4I6uVaow,1559
 clearskies_aws/secrets/parameter_store.py,sha256=lxBlp_9d2-vVjGNfl5859XzZCcLVMMrZtlJG8lKGVPA,1810
 clearskies_aws/secrets/parameter_store_test.py,sha256=35fTNau4tq_D4elMwyyByIiLesnmn05QhC_X1FVQXsM,763
 clearskies_aws/secrets/secrets_manager.py,sha256=jlpfAFC23EeSpm50L8B-yrXg4IROQq-M_90zzXDp_ak,3056
 clearskies_aws/secrets/secrets_manager_test.py,sha256=__YSe-YRbbE1S1SBvZZFQd3brIX5DPX2_wE9MI_Ezx0,788
 clearskies_aws/web_socket_connection_model.py,sha256=d_Au_Pu7YXBfc7_lbuI7zz4MZ8ZOOwGM0oooppEofcI,1776
-clear_skies_aws-1.10.0.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
-clear_skies_aws-1.10.0.dist-info/METADATA,sha256=4Pk-HDeBr2wtFohfFfM14Y5fXGQ_wSDqDBNe1I3_uRM,8784
-clear_skies_aws-1.10.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-clear_skies_aws-1.10.0.dist-info/RECORD,,
+clear_skies_aws-1.10.2.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
+clear_skies_aws-1.10.2.dist-info/METADATA,sha256=jgygnKXGfTw4rejQAglNblRFraGfcX0VeRcwG7NYGyk,8784
+clear_skies_aws-1.10.2.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+clear_skies_aws-1.10.2.dist-info/RECORD,,

clearskies_aws/backends/dynamo_db_parti_ql_backend.py

@@ -2,7 +2,8 @@ import base64
 import binascii
 import json
 import logging
-from decimal import Decimal
+import re
+from decimal import Decimal, InvalidOperation
 from typing import Any, Callable, Dict, Generator, List, Optional, Tuple, Union
 
 from boto3.session import Session as Boto3Session
@@ -68,7 +69,10 @@ class DynamoDBPartiQLCursor:
         """
         try:
             call_args: ExecuteStatementInputTypeDef = {"Statement": statement}
-            if parameters is not None:
+            # Only include 'Parameters' if it's not None AND not empty
+            if (
+                parameters
+            ):  # This implies parameters is not None and parameters is not an empty list
                 call_args["Parameters"] = parameters
             if Limit is not None:
                 call_args["Limit"] = Limit
@@ -81,7 +85,7 @@ class DynamoDBPartiQLCursor:
                 **call_args
             )
         except ClientError as err:
-            error_response: Dict[str, Any] = err.response.get("Error", {})
+            error_response: Dict[str, Any] = err.response.get("Error", {})  # type: ignore
             error_code: str = error_response.get("Code", "UnknownCode")
             error_message: str = error_response.get("Message", "Unknown error")
 
@@ -114,6 +118,7 @@ class DynamoDBPartiQLBackend(CursorBackend):
     The count() method uses native DynamoDB Query/Scan operations for accuracy.
     """
 
+    _cursor: DynamoDBPartiQLCursor
     _allowed_configs: List[str] = [
         "table_name",
         "wheres",
@@ -165,7 +170,7 @@ class DynamoDBPartiQLBackend(CursorBackend):
         if not table_name:
             return ""
         esc: str = self._table_escape_character()
-        final_name = f"{esc}{table_name.strip(esc)}{esc}"
+        final_name = f"{esc}{str(table_name).strip(esc)}{esc}"
         if index_name:
             final_name += f".{esc}{index_name.strip(esc)}{esc}"
         return final_name
@@ -279,13 +284,13 @@ class DynamoDBPartiQLBackend(CursorBackend):
 
         if configuration.get("group_by_column"):
             logger.warning(
-                f"Configuration included 'group_by_column={configuration.get("group_by_column")}', "
+                "Configuration included 'group_by_column=" + configuration.get("group_by_column") + "', " +
                 "but GROUP BY is not supported by this DynamoDB PartiQL backend and will be ignored for SQL generation."
             )
 
         if configuration.get("joins"):
             logger.warning(
-                f"Configuration included 'joins={configuration.get("joins")}', "
+                "Configuration included 'joins=" + str(configuration.get("joins")) + "', " +
                 "but JOINs are not supported by this DynamoDB PartiQL backend and will be ignored for SQL generation."
             )
 
@@ -363,8 +368,8 @@ class DynamoDBPartiQLBackend(CursorBackend):
     ) -> Dict[str, Any]:
         """
         Converts a list of 'where' condition dictionaries into DynamoDB native
-        expression strings and attribute maps.
-        This is a simplified implementation.
+        expression strings and attribute maps for Query/Scan operations.
+        This implementation is more comprehensive than the previous one.
         """
         expression_attribute_names: Dict[str, str] = {}
         expression_attribute_values: Dict[str, AttributeValueTypeDef] = {}
@@ -374,65 +379,98 @@ class DynamoDBPartiQLBackend(CursorBackend):
         name_counter = 0
         value_counter = 0
 
-        partition_key_condition_found = False
+        # Helper to get unique placeholder names
+        def get_name_placeholder(column_name: str) -> str:
+            nonlocal name_counter
+            # Sanitize column name for placeholder if it contains special characters
+            sanitized_column_name = re.sub(r"[^a-zA-Z0-9_]", "", column_name)
+            placeholder = f"#{sanitized_column_name}_{name_counter}"
+            expression_attribute_names[placeholder] = column_name
+            name_counter += 1
+            return placeholder
+
+        # Helper to get unique value placeholders and add values
+        def get_value_placeholder(value: Any) -> str:
+            nonlocal value_counter
+            placeholder = f":val{value_counter}"
+            expression_attribute_values[placeholder] = (
+                self.condition_parser.to_dynamodb_attribute_value(value)
+            )
+            value_counter += 1
+            return placeholder
+
+        processed_condition_indices = set()
+
+        # First, try to build KeyConditionExpression for Partition Key and Sort Key
+        # Find partition key equality condition
+        pk_condition_index = -1
         if partition_key_name:
-            processed_indices = set()  # To avoid processing a condition twice
             for i, cond in enumerate(conditions):
-                if i in processed_indices:
-                    continue
                 if (
                     cond.get("column") == partition_key_name
                     and cond.get("operator") == "="
                     and cond.get("values")
                 ):
-                    name_placeholder = f"#pk{name_counter}"
-                    value_placeholder = f":pk_val{value_counter}"
-                    expression_attribute_names[name_placeholder] = partition_key_name
-                    expression_attribute_values[value_placeholder] = (
-                        self.condition_parser.to_dynamodb_attribute_value(
-                            cond["values"][0]
-                        )
-                    )
-                    key_condition_parts.append(
-                        f"{name_placeholder} = {value_placeholder}"
-                    )
-                    name_counter += 1
-                    value_counter += 1
-                    partition_key_condition_found = True
-                    processed_indices.add(i)
+                    pk_condition_index = i
                     break
 
-            # Example for sort key condition (simplified)
-            if (
-                sort_key_name and partition_key_condition_found
-            ):  # Sort key only relevant if PK is there
+        if pk_condition_index != -1:
+            pk_cond = conditions[pk_condition_index]
+            pk_name_ph = get_name_placeholder(pk_cond["column"])
+            pk_value_ph = get_value_placeholder(pk_cond["values"][0])
+            key_condition_parts.append(f"{pk_name_ph} = {pk_value_ph}")
+            processed_condition_indices.add(pk_condition_index)
+
+            # If partition key found, check for sort key condition
+            if sort_key_name:
                 for i, cond in enumerate(conditions):
-                    if i in processed_indices:
+                    if i in processed_condition_indices:
                         continue
                     if cond.get("column") == sort_key_name and cond.get("values"):
-                        # Simplified: only handle '=' for sort key for now
-                        if cond.get("operator") == "=":
-                            name_placeholder = f"#sk{name_counter}"
-                            value_placeholder = f":sk_val{value_counter}"
-                            expression_attribute_names[name_placeholder] = sort_key_name
-                            expression_attribute_values[value_placeholder] = (
-                                self.condition_parser.to_dynamodb_attribute_value(
-                                    cond["values"][0]
+                        op_lower = cond["operator"].lower()
+                        sk_name_ph = get_name_placeholder(cond["column"])
+
+                        if op_lower == "=":
+                            sk_value_ph = get_value_placeholder(cond["values"][0])
+                            key_condition_parts.append(f"{sk_name_ph} = {sk_value_ph}")
+                        elif op_lower == ">":
+                            sk_value_ph = get_value_placeholder(cond["values"][0])
+                            key_condition_parts.append(f"{sk_name_ph} > {sk_value_ph}")
+                        elif op_lower == "<":
+                            sk_value_ph = get_value_placeholder(cond["values"][0])
+                            key_condition_parts.append(f"{sk_name_ph} < {sk_value_ph}")
+                        elif op_lower == ">=":
+                            sk_value_ph = get_value_placeholder(cond["values"][0])
+                            key_condition_parts.append(f"{sk_name_ph} >= {sk_value_ph}")
+                        elif op_lower == "<=":
+                            sk_value_ph = get_value_placeholder(cond["values"][0])
+                            key_condition_parts.append(f"{sk_name_ph} <= {sk_value_ph}")
+                        elif op_lower == "between":
+                            if len(cond["values"]) == 2:
+                                sk_value1_ph = get_value_placeholder(cond["values"][0])
+                                sk_value2_ph = get_value_placeholder(cond["values"][1])
+                                key_condition_parts.append(
+                                    f"{sk_name_ph} BETWEEN {sk_value1_ph} AND {sk_value2_ph}"
                                 )
-                            )
+                            else:
+                                logger.warning(
+                                    f"Skipping malformed BETWEEN condition for sort key: {cond}"
+                                )
+                        elif op_lower == "begins_with":
+                            sk_value_ph = get_value_placeholder(cond["values"][0])
                             key_condition_parts.append(
-                                f"{name_placeholder} = {value_placeholder}"
+                                f"begins_with({sk_name_ph}, {sk_value_ph})"
                             )
-                            name_counter += 1
-                            value_counter += 1
-                            processed_indices.add(i)
-                            break  # Assuming one sort key condition for KeyConditionExpression
+                        else:
+                            # Other operators for sort key are not part of KeyConditionExpression
+                            # They will be handled in FilterExpression below
+                            continue
+                        processed_condition_indices.add(i)
+                        break  # Assume only one sort key condition for KeyConditionExpression
 
-        # Remaining conditions go to FilterExpression
+        # Process all remaining conditions for FilterExpression
         for i, cond in enumerate(conditions):
-            if i in (
-                locals().get("processed_indices") or set()
-            ):  # Check if already processed for KeyCondition
+            if i in processed_condition_indices:
                 continue
 
             col_name = cond.get("column")
@@ -442,31 +480,88 @@ class DynamoDBPartiQLBackend(CursorBackend):
             if not col_name or not op or vals is None:
                 continue
 
-            # This is a very simplified filter builder. A real one would handle all operators.
-            if op == "=" and vals:  # Example: only equality
-                name_placeholder = f"#fn{name_counter}"
-                value_placeholder = f":fv{value_counter}"
-                expression_attribute_names[name_placeholder] = col_name
-                expression_attribute_values[value_placeholder] = (
-                    self.condition_parser.to_dynamodb_attribute_value(vals[0])
-                )
+            name_ph = get_name_placeholder(col_name)
+            op_lower = op.lower()
+
+            if op_lower == "=":
+                value_ph = get_value_placeholder(vals[0])
+                filter_expression_parts.append(f"{name_ph} = {value_ph}")
+            elif op_lower == "!=":
+                value_ph = get_value_placeholder(vals[0])
+                filter_expression_parts.append(f"{name_ph} <> {value_ph}")
+            elif op_lower == ">":
+                value_ph = get_value_placeholder(vals[0])
+                filter_expression_parts.append(f"{name_ph} > {value_ph}")
+            elif op_lower == "<":
+                value_ph = get_value_placeholder(vals[0])
+                filter_expression_parts.append(f"{name_ph} < {value_ph}")
+            elif op_lower == ">=":
+                value_ph = get_value_placeholder(vals[0])
+                filter_expression_parts.append(f"{name_ph} >= {value_ph}")
+            elif op_lower == "<=":
+                value_ph = get_value_placeholder(vals[0])
+                filter_expression_parts.append(f"{name_ph} <= {value_ph}")
+            elif op_lower == "between":
+                if len(vals) == 2:
+                    value1_ph = get_value_placeholder(vals[0])
+                    value2_ph = get_value_placeholder(vals[1])
+                    filter_expression_parts.append(
+                        f"{name_ph} BETWEEN {value1_ph} AND {value2_ph}"
+                    )
+                else:
+                    logger.warning(f"Skipping malformed BETWEEN condition: {cond}")
+            elif op_lower == "in":
+                value_placeholders = ", ".join([get_value_placeholder(v) for v in vals])
+                filter_expression_parts.append(f"{name_ph} IN ({value_placeholders})")
+            elif op_lower == "contains":
+                value_ph = get_value_placeholder(vals[0])
+                filter_expression_parts.append(f"contains({name_ph}, {value_ph})")
+            elif op_lower == "not contains":
+                value_ph = get_value_placeholder(vals[0])
+                filter_expression_parts.append(f"NOT contains({name_ph}, {value_ph})")
+            elif op_lower == "begins_with":
+                value_ph = get_value_placeholder(vals[0])
+                filter_expression_parts.append(f"begins_with({name_ph}, {value_ph})")
+            elif op_lower == "not begins_with":
+                value_ph = get_value_placeholder(vals[0])
                 filter_expression_parts.append(
-                    f"{name_placeholder} = {value_placeholder}"
+                    f"NOT begins_with({name_ph}, {value_ph})"
+                )
+            elif op_lower == "is null":
+                filter_expression_parts.append(f"attribute_not_exists({name_ph})")
+            elif op_lower == "is not null":
+                filter_expression_parts.append(f"attribute_exists({name_ph})")
+            elif (
+                op_lower == "like"
+            ):  # Clearskies 'like' usually translates to begins_with or contains
+                # This is a simplification. A full implementation might need to inspect '%' position.
+                # For now, if it contains '%', assume 'contains'. If it ends with '%', assume 'begins_with'.
+                # If no '%', it's an equality.
+                if len(vals) > 0 and isinstance(vals[0], str):
+                    like_value = vals[0]
+                    if like_value.startswith("%") and like_value.endswith("%"):
+                        value_ph = get_value_placeholder(like_value.strip("%"))
+                        filter_expression_parts.append(
+                            f"contains({name_ph}, {value_ph})"
+                        )
+                    elif like_value.endswith("%"):
+                        value_ph = get_value_placeholder(like_value.rstrip("%"))
+                        filter_expression_parts.append(
+                            f"begins_with({name_ph}, {value_ph})"
+                        )
+                    else:  # Treat as equality if no wildcards or complex pattern
+                        value_ph = get_value_placeholder(like_value)
+                        filter_expression_parts.append(f"{name_ph} = {value_ph}")
+                else:
+                    logger.warning(f"Skipping unsupported LIKE condition: {cond}")
+            else:
+                logger.warning(
+                    f"Skipping unsupported operator '{op}' for native DynamoDB expressions: {cond}"
                 )
-                name_counter += 1
-                value_counter += 1
-            # Add more operator handling here for a complete filter expression builder
 
         result: Dict[str, Any] = {}
-        if (
-            key_condition_parts and partition_key_condition_found
-        ):  # Only add KeyConditionExpression if PK equality was found
+        if key_condition_parts:
             result["KeyConditionExpression"] = " AND ".join(key_condition_parts)
-        elif (
-            key_condition_parts
-        ):  # If we built key_condition_parts but PK equality wasn't the one, move to filter
-            filter_expression_parts.extend(key_condition_parts)
-
         if filter_expression_parts:
             result["FilterExpression"] = " AND ".join(filter_expression_parts)
         if expression_attribute_names:
@@ -495,8 +590,8 @@ class DynamoDBPartiQLBackend(CursorBackend):
                 table_description.get("GlobalSecondaryIndexes", [])
             )
             for gsi in gsi_definitions:
-                if gsi["IndexName"] == chosen_index_name:
-                    for key_element in gsi["KeySchema"]:
+                if gsi.get("IndexName", "") == chosen_index_name:
+                    for key_element in gsi.get("KeySchema", []):
                         if key_element["KeyType"] == "RANGE":
                             sort_key_for_target = key_element["AttributeName"]
                             break
@@ -516,7 +611,7 @@ class DynamoDBPartiQLBackend(CursorBackend):
             wheres_config, partition_key_for_target, sort_key_for_target
         )
 
-        params_for_native_call: Dict[str, Any] = {  # Renamed from params
+        params_for_native_call: Dict[str, Any] = {
             "TableName": table_name,
             "Select": "COUNT",
         }
@@ -524,36 +619,37 @@ class DynamoDBPartiQLBackend(CursorBackend):
             params_for_native_call["IndexName"] = chosen_index_name
 
         can_use_query_for_count = False
+        # A Query operation can be used for count if there is a KeyConditionExpression
+        # that includes an equality condition on the partition key of the target (table or GSI).
+        # We check if the partition key condition was successfully extracted into KeyConditionExpression.
         if (
-            native_expressions.get("KeyConditionExpression")
-            and partition_key_for_target
-            and any(
-                w.get("column") == partition_key_for_target and w.get("operator") == "="
-                for w in wheres_config
-                if isinstance(w, dict)
-            )
+            partition_key_for_target
+            and f"#{re.sub(r'[^a-zA-Z0-9_]', '', partition_key_for_target)}_0"
+            in native_expressions.get("ExpressionAttributeNames", {})
+            and native_expressions.get("KeyConditionExpression")
+            and f"#{re.sub(r'[^a-zA-Z0-9_]', '', partition_key_for_target)}_0 = :val0"
+            in native_expressions[
+                "KeyConditionExpression"
+            ]  # Simplified check, assumes first value is PK
         ):
             can_use_query_for_count = True
             params_for_native_call["KeyConditionExpression"] = native_expressions[
                 "KeyConditionExpression"
             ]
-            if native_expressions.get(
-                "FilterExpression"
-            ):  # Query can also have FilterExpression
+            if native_expressions.get("FilterExpression"):
                 params_for_native_call["FilterExpression"] = native_expressions[
                     "FilterExpression"
                 ]
-        else:  # Fall back to Scan
-            # If KeyConditionExpression was built but not for the PK, it becomes part of Filter for Scan
-            all_filter_parts = []
-            if native_expressions.get("KeyConditionExpression"):
-                all_filter_parts.append(native_expressions["KeyConditionExpression"])
+        else:
+            # Fall back to Scan, and all conditions (including any potential key conditions that
+            # couldn't be used for a Query) go into FilterExpression.
             if native_expressions.get("FilterExpression"):
-                all_filter_parts.append(native_expressions["FilterExpression"])
-            if all_filter_parts:
-                params_for_native_call["FilterExpression"] = " AND ".join(
-                    all_filter_parts
-                )
+                params_for_native_call["FilterExpression"] = native_expressions[
+                    "FilterExpression"
+                ]
+            # If there's a KeyConditionExpression but no PK equality, it should also be part of the filter for scan.
+            # This logic is now handled more robustly within _wheres_to_native_dynamo_expressions
+            # by ensuring only true PK/SK conditions go to KeyConditionExpression initially.
 
         if native_expressions.get("ExpressionAttributeNames"):
             params_for_native_call["ExpressionAttributeNames"] = native_expressions[
@@ -599,18 +695,31 @@ class DynamoDBPartiQLBackend(CursorBackend):
         """
         Creates a new record in DynamoDB using PartiQL INSERT.
         """
-        table_name: str = self._finalize_table_name(model.table_name)  # type: ignore
+        table_name: str = self._finalize_table_name(model.get_table_name())
 
-        item_to_insert: Dict[str, AttributeValueTypeDef] = {
-            key: self.condition_parser.to_dynamodb_attribute_value(value)
-            for key, value in data.items()
-        }
+        if not data:
+            logger.warning("Create called with empty data. Nothing to insert.")
+            return {}
+
+        # Prepare parameters
+        parameters: List[AttributeValueTypeDef] = []
+
+        # Build the 'VALUE {key: ?, key: ?}' part and collect parameters
+        value_struct_parts: List[str] = []
+        for key, value in data.items():
+            # Use single quotes around the key to match PartiQL documentation examples
+            value_struct_parts.append(f"'{key}': ?")
+            parameters.append(self.condition_parser.to_dynamodb_attribute_value(value))
+        value_struct_clause = ", ".join(value_struct_parts)
 
-        parameters: List[AttributeValueTypeDef] = [item_to_insert]  # type: ignore
-        statement = f"INSERT INTO {table_name} VALUE ?"
+        # Construct the INSERT statement with explicit struct format
+        statement = f"INSERT INTO {table_name} VALUE {{{value_struct_clause}}}"
 
         try:
-            self._cursor.execute(statement=statement, parameters=parameters)
+            self._cursor.execute(
+                statement=statement,
+                parameters=parameters,
+            )
             return data
         except Exception as e:
             logger.error(
@@ -624,8 +733,8 @@ class DynamoDBPartiQLBackend(CursorBackend):
         """
         Updates an existing record in DynamoDB using PartiQL UPDATE.
         """
-        table_name: str = self._finalize_table_name(model.table_name)  # type: ignore
-        id_column_name: str = model.id_column_name  # type: ignore
+        table_name: str = self._finalize_table_name(model.get_table_name())
+        id_column_name: str = model.id_column_name
         escaped_id_column: str = (
             f"{self._column_escape_character()}{id_column_name}{self._column_escape_character()}"
         )
@@ -679,13 +788,15 @@ class DynamoDBPartiQLBackend(CursorBackend):
         """
         Deletes a record from DynamoDB using PartiQL DELETE.
         """
-        table_name: str = self._finalize_table_name(model.table_name)  # type: ignore
-        id_column_name: str = model.id_column_name  # type: ignore
+        table_name: str = self._finalize_table_name(model.get_table_name())
+        id_column_name: str = model.id_column_name
         escaped_id_column: str = (
             f"{self._column_escape_character()}{id_column_name}{self._column_escape_character()}"
         )
 
-        parameters: List[AttributeValueTypeDef] = [self.condition_parser.to_dynamodb_attribute_value(id_value)]  # type: ignore
+        parameters: List[AttributeValueTypeDef] = [
+            self.condition_parser.to_dynamodb_attribute_value(id_value)
+        ]
         statement: str = f"DELETE FROM {table_name} WHERE {escaped_id_column} = ?"
 
         try:
@@ -731,7 +842,7 @@ class DynamoDBPartiQLBackend(CursorBackend):
         if "N" in attribute_value:
             try:
                 return Decimal(attribute_value["N"])
-            except DecimalException:
+            except InvalidOperation:  # Changed from DecimalException
                 logger.warning(
                     f"Could not convert N value '{attribute_value['N']}' to Decimal."
                 )
@@ -741,7 +852,13 @@ class DynamoDBPartiQLBackend(CursorBackend):
         if "NULL" in attribute_value:
             return None
         if "B" in attribute_value:
-            return base64.b64decode(attribute_value["B"])
+            try:
+                return base64.b64decode(attribute_value["B"])
+            except (binascii.Error, TypeError) as e:
+                logger.warning(
+                    f"Failed to decode base64 binary value: {attribute_value['B']}, error: {e}"
+                )
+                return attribute_value["B"]  # Return raw if decoding fails
         if "L" in attribute_value:
             return [self._map_from_boto3_value(item) for item in attribute_value["L"]]
         if "M" in attribute_value:
@@ -754,13 +871,19 @@ class DynamoDBPartiQLBackend(CursorBackend):
         if "NS" in attribute_value:
             try:
                 return set(Decimal(n_val) for n_val in attribute_value["NS"])
-            except DecimalException:
+            except InvalidOperation:  # Changed from DecimalException
                 logger.warning(
                     f"Could not convert one or more NS values in '{attribute_value['NS']}' to Decimal."
                 )
                 return set(attribute_value["NS"])
         if "BS" in attribute_value:
-            return set(base64.b64decode(b_val) for b_val in attribute_value["BS"])
+            try:
+                return set(base64.b64decode(b_val) for b_val in attribute_value["BS"])
+            except (binascii.Error, TypeError) as e:
+                logger.warning(
+                    f"Failed to decode one or more base64 binary values in '{attribute_value['BS']}', error: {e}"
+                )
+                return set(attribute_value["BS"])  # Return raw if decoding fails
 
         logger.warning(f"Unrecognized DynamoDB attribute type: {attribute_value}")
         return attribute_value

clearskies_aws/backends/dynamo_db_parti_ql_backend_test.py

@@ -29,7 +29,7 @@ class TestDynamoDBPartiQLBackend(unittest.TestCase):
 
         self.backend = DynamoDBPartiQLBackend(self.cursor_under_test)
         self.mock_model = MagicMock(spec=Model)
-        self.mock_model.table_name = "my_test_table"
+        self.mock_model.get_table_name = MagicMock(return_value="my_test_table")
         self.mock_model.id_column_name = "id"
 
         self.mock_model.schema = MagicMock()
@@ -294,7 +294,9 @@ class TestDynamoDBPartiQLBackend(unittest.TestCase):
 
         results = list(self.backend.records(config, self.mock_model))
 
-        expected_call_kwargs = {"Statement": expected_statement, "Parameters": []}
+        expected_call_kwargs = {
+            "Statement": expected_statement,
+        }
         self.mock_dynamodb_client.execute_statement.assert_called_once_with(
             **expected_call_kwargs
         )
@@ -324,7 +326,6 @@ class TestDynamoDBPartiQLBackend(unittest.TestCase):
 
         expected_call_kwargs = {
             "Statement": expected_statement,
-            "Parameters": [],
             "Limit": 1,
         }
         self.mock_dynamodb_client.execute_statement.assert_called_once_with(
@@ -366,7 +367,6 @@ class TestDynamoDBPartiQLBackend(unittest.TestCase):
 
         expected_call_kwargs1 = {
             "Statement": expected_statement,
-            "Parameters": [],
             "NextToken": initial_ddb_token,
         }
         self.mock_dynamodb_client.execute_statement.assert_called_once_with(
@@ -397,7 +397,6 @@ class TestDynamoDBPartiQLBackend(unittest.TestCase):
         )
         expected_call_kwargs2 = {
             "Statement": expected_statement,
-            "Parameters": [],
             "NextToken": ddb_next_token_page1,
         }
         self.mock_dynamodb_client.execute_statement.assert_called_once_with(
@@ -420,7 +419,7 @@ class TestDynamoDBPartiQLBackend(unittest.TestCase):
         next_page_data = {}
         results = list(self.backend.records(config, self.mock_model, next_page_data))
 
-        expected_call_kwargs = {"Statement": expected_statement, "Parameters": []}
+        expected_call_kwargs = {"Statement": expected_statement}
         self.mock_dynamodb_client.execute_statement.assert_called_once_with(
             **expected_call_kwargs
         )
@@ -451,7 +450,6 @@ class TestDynamoDBPartiQLBackend(unittest.TestCase):
 
         expected_call_kwargs = {
             "Statement": expected_statement,
-            "Parameters": [],
             "Limit": 1,
         }
         self.mock_dynamodb_client.execute_statement.assert_called_once_with(
@@ -470,8 +468,14 @@ class TestDynamoDBPartiQLBackend(unittest.TestCase):
     def test_create_record(self, mock_logger_arg):
         """Test create() inserts a record and returns the input data."""
         data_to_create = {"id": "new_user_123", "name": "Jane Doe", "age": 28}
+        # Updated expected statement and parameters to match the new PartiQL format
+        expected_statement = (
+            "INSERT INTO \"my_test_table\" VALUE {'id': ?, 'name': ?, 'age': ?}"
+        )
         expected_ddb_parameters = [
-            {"id": {"S": "new_user_123"}, "name": {"S": "Jane Doe"}, "age": {"N": "28"}}
+            {"S": "new_user_123"},
+            {"S": "Jane Doe"},
+            {"N": "28"},
         ]
 
         self.mock_dynamodb_client.execute_statement.return_value = {}
@@ -480,7 +484,7 @@ class TestDynamoDBPartiQLBackend(unittest.TestCase):
 
         self.assertEqual(created_data, data_to_create)
         self.mock_dynamodb_client.execute_statement.assert_called_once_with(
-            Statement='INSERT INTO "my_test_table" VALUE ?',
+            Statement=expected_statement,
             Parameters=expected_ddb_parameters,
         )
 

clearskies_aws/secrets/akeyless_with_ssm_cache.py

@@ -1,16 +1,24 @@
+import re
+
 from clearskies.secrets import AKeyless
+
+
 class AkeylessWithSsmCache(AKeyless):
     _boto3 = None
+
     def __init__(self, requests, environment, boto3):
         super().__init__(requests, environment)
         self._boto3 = boto3
-        if not self._environment.get('AWS_REGION', True):
-            raise ValueError("To use parameter store you must use set the 'AWS_REGION' environment variable")
+        if not self._environment.get("AWS_REGION", True):
+            raise ValueError(
+                "To use parameter store you must use set the 'AWS_REGION' environment variable"
+            )
 
     def get(self, path, refresh=False):
-        ssm = self._boto3.client('ssm', region_name='us-east-1')
-        # we have spaces in our akeyless names but parameter store doesn't allow that
-        ssm_name = path.replace(' ', '-')
+        ssm = self._boto3.client("ssm", region_name="us-east-1")
+        # AWS SSM parameter paths only allow a-z, A-Z, 0-9, -, _, ., /, @, and :
+        # Replace any disallowed characters with hyphens
+        ssm_name = re.sub(r"[^a-zA-Z0-9\-_\./@:]", "-", path)
         # if we're not forcing a refresh, then see if it is in paramater store
         if not refresh:
             missing = False
@@ -19,7 +27,7 @@ class AkeylessWithSsmCache(AKeyless):
             except ssm.exceptions.ParameterNotFound:
                 missing = True
             if not missing:
-                value = response['Parameter']['Value']
+                value = response["Parameter"]["Value"]
                 if value:
                     return value
 
@@ -31,7 +39,7 @@ class AkeylessWithSsmCache(AKeyless):
             ssm.put_parameter(
                 Name=ssm_name,
                 Value=value,
-                Type='SecureString',
+                Type="SecureString",
                 Overwrite=True,
             )