boto3-assist 0.1.13__py3-none-any.whl → 0.1.14__py3-none-any.whl

boto3_assist/dynamodb/dynamodb_key.py

@@ -59,4 +59,6 @@ class DynamoDBKey:
                 break
             else:
                 parts.append(f"{prefix}{value}")
-        return "#".join(parts)
+        key_str = "#".join(parts)
+
+        return key_str

boto3_assist/dynamodb/dynamodb_model_base.py

@@ -64,13 +64,21 @@ class DynamoDBModelBase:
     @exclude_from_serialization
     def projection_expression(self) -> str | None:
         """Gets the projection expression"""
+        prop_list: List[str] = []
         if self.__projection_expression is None and self.auto_generate_projections:
             props = self.to_dictionary()
             # turn props to a list[str]
             prop_list = list(props.keys())
+        else:
+            if self.__projection_expression:
+                prop_list = self.__projection_expression.split(",")
+                prop_list = [p.strip() for p in prop_list]
+
+        if len(prop_list) == 0:
+            return None
 
-            transformed_list = self.__reserved_words.tranform_projections(prop_list)
-            self.projection_expression = ",".join(transformed_list)
+        transformed_list = self.__reserved_words.tranform_projections(prop_list)
+        self.projection_expression = ",".join(transformed_list)
 
         return self.__projection_expression
 
@@ -105,6 +113,12 @@ class DynamoDBModelBase:
             self.projection_expression_attribute_names = (
                 self.__reserved_words.transform_attributes(prop_list)
             )
+        else:
+            if self.projection_expression:
+                expression_list = self.projection_expression.replace("#", "").split(",")
+                self.projection_expression_attribute_names = (
+                    self.__reserved_words.transform_attributes(expression_list)
+                )
 
         return self.__projection_expression_attribute_names
 
@@ -325,6 +339,8 @@ class DynamoDBSerializer:
 
         # Add instance variables
         for attr, value in instance.__dict__.items():
+            if str(attr) == "T":
+                continue
             # don't get the private properties
             if not str(attr).startswith("_"):
                 if value is not None or include_none:
@@ -346,6 +362,10 @@ class DynamoDBSerializer:
                 if exclude:
                     continue
 
+                # Skip TypeVar T or instances of DynamoDBModelBase
+                if str(name) == "T":
+                    continue
+
                 # don't get the private properties
                 if not str(name).startswith("_"):
                     value = getattr(instance, name)

boto3_assist/dynamodb/dynamodb_reserved_words.py

@@ -31,7 +31,7 @@ class DynamoDBReservedWords:
         if isinstance(projections, str):
             projections = projections.split(",")
 
-        # any project that exists add a # infront of it
+        # any projection that exists add a # infront of it
         projections = ["#" + p if self.is_reserved_word(p) else p for p in projections]
         return projections
 

boto3_assist/version.py

@@ -1 +1 @@
-__version__ = '0.1.13'
+__version__ = '0.1.14'

{boto3_assist-0.1.13.dist-info → boto3_assist-0.1.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: boto3_assist
-Version: 0.1.13
+Version: 0.1.14
 Summary: Additional boto3 wrappers to make your life a little easier
 Author-email: Eric Wilson <boto3-assist@geekcafe.com>
 License-File: LICENSE-EXPLAINED.txt

{boto3_assist-0.1.13.dist-info → boto3_assist-0.1.14.dist-info}/RECORD

@@ -1,7 +1,7 @@
 boto3_assist/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 boto3_assist/boto3session.py,sha256=J20E2lkqJOaey4Ohi-xRe2xABj7QsA8DrggzK29-5es,6415
 boto3_assist/connection_tracker.py,sha256=ggCp2gQ7Y-2fHSGFk8QCHJz-Rq1yVNO4aRYgrYTP178,2987
-boto3_assist/version.py,sha256=Vx7xxEndWksf5h9xRevQfOixX-CU35SwBXGCh74SioU,23
+boto3_assist/version.py,sha256=jS25etd3hy2cHfgFEhE4FguVWmkMUkiK9f6J-pRm10o,23
 boto3_assist/dynamodb/dynamodb.py,sha256=vV0HvFCESnVK6BcAfcrWsMsNxIIsctvDX_3xdzOVCT0,14623
 boto3_assist/dynamodb/dynamodb_connection.py,sha256=JMCmWOsMzy45rikGl3Z2xqlG2vUTEKSYqi6dpsfJ750,4418
 boto3_assist/dynamodb/dynamodb_connection_tracker.py,sha256=0BWHRfi5_vjkJLuCSX6sYwvA6wc7BSYCQnGrzbhfyKA,404
@@ -9,11 +9,11 @@ boto3_assist/dynamodb/dynamodb_helpers.py,sha256=ajpTJ5bJOm9PDgE2Zx9p2zkTRFV4xsw
 boto3_assist/dynamodb/dynamodb_importer.py,sha256=nCKsyRQeMqDSf0Q5mQ_X_oVIg4PRnu0hcUzZnBli610,3471
 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=X3I3gUPx2T858vjRDi9SN8qn8ez5UJUo0vZiKBeeUWg,1776
-boto3_assist/dynamodb/dynamodb_model_base.py,sha256=x4jrH10-uooeQfdKhWQ6htXhA95bvCBET8jKrM7TQD0,13492
+boto3_assist/dynamodb/dynamodb_key.py,sha256=YD7o1EUlwVBQ55p9YCTKqAUU_np4nqtLIHnmp-BeolM,1803
+boto3_assist/dynamodb/dynamodb_model_base.py,sha256=WOEQiwEWEVndWIXiBk7_hTaRWb-KyKWPpT5-2xKCCxI,14260
 boto3_assist/dynamodb/dynamodb_model_base_interfaces.py,sha256=yT4zDRI8vP15WVOHnCvY3FsEy_QSIta5-bnUby70Xow,747
 boto3_assist/dynamodb/dynamodb_reindexer.py,sha256=bCj6KIU0fQOgjkkiq9yF51PFZZr4Y9Lu3-hPlmsPG0Y,6164
-boto3_assist/dynamodb/dynamodb_reserved_words.py,sha256=iiud7ijpER5MgKHIP_NIgkDmHVy_57VRQzNHRipv0as,1786
+boto3_assist/dynamodb/dynamodb_reserved_words.py,sha256=g89wImXxxOYodCJN7g4NkZPYPdXMCsRUBgA7A2KoFZw,1789
 boto3_assist/dynamodb/dynamodb_reserved_words.txt,sha256=CanugFPh7rpgJ_jH9k4t8ANycrZJWTjT09sWiW4LC68,4137
 boto3_assist/dynamodb/readme.md,sha256=wNMzdRwk0qRV0kE88UUYnJos3pEK0HNjEIVkq2PATf8,1490
 boto3_assist/dynamodb/troubleshooting.md,sha256=uGpBaBUt_MyzjzwFOLOe0udTgcvaOpiTFxfj7ilLNkM,136
@@ -25,8 +25,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.13.dist-info/METADATA,sha256=1Cg2vIjtiWjlTFmAqEhIhKUSrW3fUtW1DztU6FGRZp4,1805
-boto3_assist-0.1.13.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-boto3_assist-0.1.13.dist-info/licenses/LICENSE-EXPLAINED.txt,sha256=WFREvTpfTjPjDHpOLADxJpCKpIla3Ht87RUUGii4ODU,606
-boto3_assist-0.1.13.dist-info/licenses/LICENSE.txt,sha256=PXDhFWS5L5aOTkVhNvoitHKbAkgxqMI2uUPQyrnXGiI,1105
-boto3_assist-0.1.13.dist-info/RECORD,,
+boto3_assist-0.1.14.dist-info/METADATA,sha256=UKvxqMxon3FMzhMXZ0OLPqHQ7aV6IEFiMdc_F7DvjMA,1805
+boto3_assist-0.1.14.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+boto3_assist-0.1.14.dist-info/licenses/LICENSE-EXPLAINED.txt,sha256=WFREvTpfTjPjDHpOLADxJpCKpIla3Ht87RUUGii4ODU,606
+boto3_assist-0.1.14.dist-info/licenses/LICENSE.txt,sha256=PXDhFWS5L5aOTkVhNvoitHKbAkgxqMI2uUPQyrnXGiI,1105
+boto3_assist-0.1.14.dist-info/RECORD,,