boto3-assist 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl

boto3_assist/dynamodb/dynamodb_helpers.py

@@ -142,24 +142,37 @@ class DynamoDBHelpers:
         Wraps Up Some usefull information when dealing with
 
         """
-        response: dict[str, List] = {"Items": [], "Batches": []}
+        response: dict[str, Any] = {"Items": [], "Batches": []}
         record_start: int = 0
+        total_count = 0
+        total_scanned_count = 0
+        record_end = 0
         for item in collection:
             record_start += 1
-            record_end = record_start + len(collection)
+            record_end = record_end + len(item["Items"])
             response["Items"].extend(item["Items"])
-            response["Batches"].append(
-                {
-                    "LastKey": item["LastKey"],
-                    "Count": item["Count"],
-                    "Scanned": item["Scanned"],
-                    "MoreRecords": item["MoreRecords"],
-                    "Records": {"start": record_start, "end": record_end},
-                }
-            )
+
+            batch: dict[str, Any] = {}
+            if "LastEvaluatedKey" in item:
+                batch["LastKey"] = item["LastEvaluatedKey"]
+
+            if "Count" in item:
+                batch["Count"] = item["Count"]
+                total_count += item["Count"]
+
+            if "ScannedCount" in item:
+                batch["ScannedCount"] = item["ScannedCount"]
+                total_scanned_count += item["ScannedCount"]
+
+            batch["Records"] = {"start": record_start, "end": record_end}
+
+            response["Batches"].append(batch)
 
             record_start = record_end
 
+        response["Count"] = total_count
+        response["ScannedCount"] = total_scanned_count
+
         return response
 
     @staticmethod

boto3_assist/dynamodb/dynamodb_index.py

@@ -6,7 +6,7 @@ https://github.com/geekcafe/boto3-assist
 """
 
 from __future__ import annotations
-from typing import Optional
+from typing import Optional, Any
 from boto3.dynamodb.conditions import (
     ConditionBase,
     Key,
@@ -110,7 +110,8 @@ class DynamoDBIndex:
         *,
         include_sort_key: bool = True,
         condition: str = "begins_with",
-        high_value: Optional[DynamoDBKey] = None,
+        low_value: Any = None,
+        high_value: Any = None,
         # sk_value_2: Optional[str | int | float] = None,
     ) -> dict | Key | ConditionBase | ComparisonCondition | Equals:
         """Get the key for a given index"""
@@ -129,6 +130,7 @@ class DynamoDBIndex:
             key = self._build_query_key(
                 include_sort_key=include_sort_key,
                 condition=condition,
+                low_value=low_value,
                 high_value=high_value,
             )
             return key
@@ -138,7 +140,8 @@ class DynamoDBIndex:
         *,
         include_sort_key: bool = True,
         condition: str = "begins_with",
-        high_value: Optional[DynamoDBKey] = None,
+        low_value: Any = None,
+        high_value: Any = None,
     ) -> And | Equals:
         """Get the GSI index name and key"""
 
@@ -146,13 +149,22 @@ class DynamoDBIndex:
             self.partition_key.value
         )
 
-        if include_sort_key and self.sort_key.attribute_name and self.sort_key.value:
+        if (
+            include_sort_key
+            and self.sort_key.attribute_name
+            and (
+                self.sort_key.value
+                or (low_value is not None and high_value is not None)
+            )
+        ):
             # if self.sk_value_2:
-            if high_value:
+            if low_value is not None and high_value is not None:
                 match condition:
                     case "between":
+                        low = f"{self.sort_key.value}{low_value}"
+                        high = f"{self.sort_key.value}{high_value}"
                         key = key & Key(f"{self.sort_key.attribute_name}").between(
-                            self.sort_key.value, high_value.value
+                            low, high
                         )
 
             else:

boto3_assist/dynamodb/dynamodb_key.py

@@ -53,9 +53,10 @@ class DynamoDBKey:
         """
         parts = []
         for key, value in key_value_pairs:
+            prefix = f"{key}#" if key else ""
             if value is None:
-                parts.append(f"{key}#")
+                parts.append(f"{prefix}")
                 break
             else:
-                parts.append(f"{key}#{value}")
+                parts.append(f"{prefix}{value}")
         return "#".join(parts)

boto3_assist/version.py

@@ -1 +1 @@
-__version__ = '0.1.0'
+__version__ = '0.1.2'

{boto3_assist-0.1.0.dist-info → boto3_assist-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: boto3_assist
-Version: 0.1.0
+Version: 0.1.2
 Summary: Additional boto3 wrappers to make your life a little easier
 Author-email: Eric Wilson <boto3-assist@geekcafe.com>
 License-File: LICENSE-EXPLAINED.txt
@@ -40,7 +40,7 @@ environment vars first and then load your session.
 
 ## DyamoDB model mapping and Key Generation
 It's a light weight mapping tool to turn your python classes / object models to DynamoDB items that are ready
-for saving.  See the examples directory for more information.
+for saving.  See the [examples](https://github.com/geekcafe/boto3-assist/tree/main/examples) directory in the repo for more information.
 
 
 ```sh

{boto3_assist-0.1.0.dist-info → boto3_assist-0.1.2.dist-info}/RECORD

@@ -1,14 +1,14 @@
 boto3_assist/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 boto3_assist/boto3session.py,sha256=J20E2lkqJOaey4Ohi-xRe2xABj7QsA8DrggzK29-5es,6415
-boto3_assist/version.py,sha256=IMjkMO3twhQzluVTo8Z6rE7Eg-9U79_LGKMcsWLKBkY,22
+boto3_assist/version.py,sha256=mdp2CftfqYbdKtP-eWv1z7rAUycYv6X1ntXSMUf8Kss,22
 boto3_assist/dynamodb/dynamodb.py,sha256=jU4R__5jjI1CmH9xVNUeU8PICD2dtbQ2CYUFKMRw0P0,14561
 boto3_assist/dynamodb/dynamodb_connection.py,sha256=JMCmWOsMzy45rikGl3Z2xqlG2vUTEKSYqi6dpsfJ750,4418
 boto3_assist/dynamodb/dynamodb_connection_tracker.py,sha256=nTNQ99sIidDoLMhMbBju2umgLmcttsmnvmd_DMy_J9M,1582
-boto3_assist/dynamodb/dynamodb_helpers.py,sha256=LsoNixhinEwBT7hgWc7hT-5I2qdvEAiF59ZVb19jA7Y,11833
+boto3_assist/dynamodb/dynamodb_helpers.py,sha256=ajpTJ5bJOm9PDgE2Zx9p2zkTRFV4xswqJRS81SOTn1s,12198
 boto3_assist/dynamodb/dynamodb_importer.py,sha256=8SlT2W03Dvb3LIs6xqtzXP4IShyv655PgMCDNr4kmPk,2559
-boto3_assist/dynamodb/dynamodb_index.py,sha256=Uw2MmFivLp8VwDc3sNWgifc0yUvDcZD1TNawqvioi_8,5953
+boto3_assist/dynamodb/dynamodb_index.py,sha256=LRQgSci222s-pU-JXgnaAoOa71ABX9h3uJPeCVPl1GE,6315
 boto3_assist/dynamodb/dynamodb_iservice.py,sha256=2AuaKxt7DUZbB-GpBBtPtPMpAlgZkumkAldm8vy7-sg,701
-boto3_assist/dynamodb/dynamodb_key.py,sha256=HInymjT-NyJb21fuXnvFMxBBLr2HA4O8XOUSsU5Te1w,1726
+boto3_assist/dynamodb/dynamodb_key.py,sha256=X3I3gUPx2T858vjRDi9SN8qn8ez5UJUo0vZiKBeeUWg,1776
 boto3_assist/dynamodb/dynamodb_model_base.py,sha256=B8E4D2btjcIJjpzDnULlQk5Ccp5Qp3vN8vRdUHlshns,10949
 boto3_assist/dynamodb/dynamodb_model_base_interfaces.py,sha256=yT4zDRI8vP15WVOHnCvY3FsEy_QSIta5-bnUby70Xow,747
 boto3_assist/dynamodb/dynamodb_reindexer.py,sha256=_I-W7Ply-82fRHnhsRZuquRYxEIXubuWGq7E7B4Pa7I,6204
@@ -21,8 +21,8 @@ boto3_assist/utilities/datetime_utility.py,sha256=TbqGQkJDTahqvaZAIV550nhYnW1Bsq
 boto3_assist/utilities/logging_utility.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 boto3_assist/utilities/serialization_utility.py,sha256=s_QQRIhtwIE7xN5nU13mNk2wtWyErBX_Sg7n0gbHj-M,4308
 boto3_assist/utilities/string_utility.py,sha256=w8l063UT3GE48tuJopETyZrjG4CgAzWkyDWMAYMg5Og,7432
-boto3_assist-0.1.0.dist-info/METADATA,sha256=XqXrX9CBBG0trJGOs5W_AZ33u_1ccmEH6ddLt6-wyHc,1729
-boto3_assist-0.1.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-boto3_assist-0.1.0.dist-info/licenses/LICENSE-EXPLAINED.txt,sha256=WFREvTpfTjPjDHpOLADxJpCKpIla3Ht87RUUGii4ODU,606
-boto3_assist-0.1.0.dist-info/licenses/LICENSE.txt,sha256=PXDhFWS5L5aOTkVhNvoitHKbAkgxqMI2uUPQyrnXGiI,1105
-boto3_assist-0.1.0.dist-info/RECORD,,
+boto3_assist-0.1.2.dist-info/METADATA,sha256=m3h0jNmaoYo8ji85NGE8Bm5s6nss7Z8CsqyJMmBsf78,1804
+boto3_assist-0.1.2.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+boto3_assist-0.1.2.dist-info/licenses/LICENSE-EXPLAINED.txt,sha256=WFREvTpfTjPjDHpOLADxJpCKpIla3Ht87RUUGii4ODU,606
+boto3_assist-0.1.2.dist-info/licenses/LICENSE.txt,sha256=PXDhFWS5L5aOTkVhNvoitHKbAkgxqMI2uUPQyrnXGiI,1105
+boto3_assist-0.1.2.dist-info/RECORD,,