nuql 0.0.2__py3-none-any.whl → 0.0.3__py3-none-any.whl

nuql/fields/list.py

@@ -27,55 +27,17 @@ class List(FieldBase):
         )
         self.of = field_map['of']
 
-    def __call__(self, value: Any, action: 'types.SerialisationType', validator: 'resources.Validator') -> Any:
-        """
-        Encapsulates the internal serialisation logic to prepare for
-        sending the record to DynamoDB.
-
-        :arg value: Deserialised value.
-        :arg action: SerialisationType (`create`, `update`, `write` or `query`).
-        :arg validator: Validator instance.
-        :return: Serialised value.
-        """
-        has_value = not isinstance(value, resources.EmptyValue)
-
-        # Apply generators if applicable to the field to overwrite the value
-        if action in ['create', 'update', 'write']:
-            if action == 'create' and self.on_create:
-                value = self.on_create()
-
-            if action == 'update' and self.on_update:
-                value = self.on_update()
-
-            if self.on_write:
-                value = self.on_write()
-
-        # Set default value if applicable
-        if not has_value and not value:
-            value = self.default
-
-        # Serialise the value
+    def serialise_internal(
+            self,
+            value: Any,
+            action: 'types.SerialisationType',
+            validator: 'resources.Validator'
+    ) -> Any:
+        """Internal serialisation"""
         if not isinstance(value, list):
-            value = None
+            return None
         else:
-            value = [self.of(item, action, validator) for item in value]
-
-        # Validate required field
-        if self.required and action == 'create' and value is None:
-            validator.add(name=self.name, message='Field is required')
-
-        # Validate against enum
-        if self.enum and has_value and action in ['create', 'update', 'write'] and value not in self.enum:
-            validator.add(name=self.name, message=f'Value must be one of: {", ".join(self.enum)}')
-
-        # Run internal validation
-        self.internal_validation(value, action, validator)
-
-        # Run custom validation logic
-        if self.validator and action in ['create', 'update', 'write']:
-            self.validator(value, validator)
-
-        return value
+            return [self.of(item, action, validator) for item in value]
 
     def deserialise(self, value: _List[Any] | None) -> _List[Any] | None:
         """

nuql/fields/map.py

@@ -22,46 +22,16 @@ class Map(resources.FieldBase):
         self.fields = resources.create_field_map(self.config['fields'], self.parent, self.parent.provider.fields)
         self.serialiser = resources.Serialiser(self)
 
-    def __call__(self, value: Any, action: 'types.SerialisationType', validator: 'resources.Validator') -> Any:
-        """
-        Encapsulates the internal serialisation logic to prepare for
-        sending the record to DynamoDB.
-
-        :arg value: Deserialised value.
-        :arg action: SerialisationType (`create`, `update`, `write` or `query`).
-        :arg validator: Validator instance.
-        :return: Serialised value.
-        """
-        has_value = not isinstance(value, resources.EmptyValue)
-
-        # Apply generators if applicable to the field to overwrite the value
-        if action in ['create', 'update', 'write']:
-            if action == 'create' and self.on_create:
-                value = self.on_create()
-
-            if action == 'update' and self.on_update:
-                value = self.on_update()
-
-            if self.on_write:
-                value = self.on_write()
-
-        # Set default value if applicable
-        if not has_value and not value:
-            value = self.default
-
-        # Serialise the value
+    def serialise_internal(
+            self,
+            value: Any,
+            action: 'types.SerialisationType',
+            validator: 'resources.Validator'
+    ) -> Any:
+        """Serialises the Map value"""
         if value:
-            value = self.serialiser.serialise(action, value, validator)
-
-        # Validate required field
-        if self.required and action == 'create' and value is None:
-            validator.add(name=self.name, message='Field is required')
-
-        # Run internal validation
-        self.internal_validation(value, action, validator)
-
-        # Run custom validation logic
-        if self.validator and action in ['create', 'update', 'write']:
-            self.validator(value, validator)
+            return self.serialiser.serialise(action, value, validator)
 
-        return value
+    def deserialise(self, value: Any) -> Any:
+        """Deserialises the Map value"""
+        return self.serialiser.deserialise(value)

nuql/resources/fields/field_map.py

@@ -62,10 +62,10 @@ def get_field_types(field_types: List[Type['types.FieldType']] | None = None) ->
 
     def is_valid(_obj: Any) -> bool:
         """Check the provided object is a valid field type."""
-        if not inspect.isclass(obj):
+        if not inspect.isclass(_obj):
             return False
 
-        if not issubclass(obj, resources.FieldBase):
+        if not issubclass(_obj, resources.FieldBase):
             return False
 
         return True

{nuql-0.0.2.dist-info → nuql-0.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nuql
-Version: 0.0.2
+Version: 0.0.3
 Summary: Nuql (pronounced 'nuckle') is a lightweight DynamoDB library for implementing the single table model pattern.
 License: MIT License
         

{nuql-0.0.2.dist-info → nuql-0.0.3.dist-info}/RECORD

@@ -32,8 +32,8 @@ nuql/fields/datetime_timestamp.py,sha256=drJLpmGhL8ANrfGsArKeVLb4v7maiignhzC4qpQ
 nuql/fields/float.py,sha256=x48Spo_GNku0djO0Ogs8usZTfwOY-27Mh5OPOQBO3OY,1316
 nuql/fields/integer.py,sha256=pHs3CJM4xKN60IYg5aTe4QjSQQBR4jp08HyANtidHgs,1312
 nuql/fields/key.py,sha256=r2Q4qVlAS51dOUI7Zk_OTr08VKkMBXNyUJb3ieY-nnY,6621
-nuql/fields/list.py,sha256=EJI4wlqg8H2FsaB0jAhjnESAeHxX-dt9a-jb3ezFWEM,3067
-nuql/fields/map.py,sha256=dlKA2c9wLupr2soIig5-TYHfNkm05VF2svCfkRv2G1w,2340
+nuql/fields/list.py,sha256=m7wTIb4-VRRKO5C8XZJFeGOPHIqrvc3xNbWw-vHppQM,1508
+nuql/fields/map.py,sha256=jFbJ9YhvVMrkLlzktMEQOrZw7uqOLgdfmwxuw9Zue-Y,1169
 nuql/fields/string.py,sha256=-7yk6T3HrKn52KdAyqoXqgtPdzpZKCCcbYR-TTtTjfk,5519
 nuql/fields/ulid.py,sha256=mcwTztzIqE_3q1cRa2pf6pN8s0322NQlfQcky9xAWkI,971
 nuql/fields/uuid.py,sha256=fhwAcMUHuih2NgPh7QOs4hcCwrl8Cu2CqSpvLMBAV-c,1041
@@ -44,7 +44,7 @@ nuql/generators/uuid.py,sha256=MoEQVxgEsqGlhpf4W-OuRiLKqNwRtE2NtS3eFTOc5lo,394
 nuql/resources/__init__.py,sha256=8HRJ_H5yTdQtfeVZ29ikdbLQSPKiZRyNkoocQd5QtZ8,92
 nuql/resources/fields/__init__.py,sha256=bajUBAvrK8kIMyb2vD_0NCwibRHOLo4Yoq1sac0Dobc,70
 nuql/resources/fields/field.py,sha256=NSynnwHwrKk7SaCvzpb2Zsjeu1LFNCfk0QR6cIKVvHo,5473
-nuql/resources/fields/field_map.py,sha256=tDDoXdyXnxRJWJ9Il7-uu81R_zSOUXiwrY5mllS3jYU,2517
+nuql/resources/fields/field_map.py,sha256=bOzoBFbB2XOyLfnqaVEL_BDwt3S9_oUGIl1N0awgZ7g,2519
 nuql/resources/fields/value.py,sha256=CG3PnGeSMHDQciIMR6jkMhogCJZhpEfipLdyk9gnjJw,59
 nuql/resources/records/__init__.py,sha256=gD8-xt4uIOpx_ZTnw1QTzOiwUpjKhR3nhkZw4AmEvaI,81
 nuql/resources/records/projections.py,sha256=PTwoc8-XXieXsYw0H-3Fv7G8SzSN__j35QsqempXBj8,1618
@@ -60,7 +60,7 @@ nuql/types/__init__.py,sha256=Ea4KR4mUs1RNUEskKF9sXfGpoQw2V9cnIYeE20wkChs,76
 nuql/types/config.py,sha256=lFfPPe62l4DkfLXR8ecw5AiSRAFzsTYy_3a0d_1M7hY,659
 nuql/types/fields.py,sha256=LjGgXM84WO54gRDkgvnwF3pjFvFxErdGYOvs0BskF_o,883
 nuql/types/serialisation.py,sha256=XAy_gARcwYmfEuxWAJox2ClWK9ow0F5WXKVbMUVBq9w,242
-nuql-0.0.2.dist-info/METADATA,sha256=6ssfY-pyeYyxkXwz-aFFV7i7eZGb929QN5EPSvKPOjM,1735
-nuql-0.0.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-nuql-0.0.2.dist-info/licenses/LICENSE,sha256=AS8DF6oGYsvk781m40Nec9eCkj_S_oUVAWaFakB2LMs,1097
-nuql-0.0.2.dist-info/RECORD,,
+nuql-0.0.3.dist-info/METADATA,sha256=roZu3DYVIpe27JIm0RzEKQTbzk6jEqu7ofEcAhCmhbc,1735
+nuql-0.0.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+nuql-0.0.3.dist-info/licenses/LICENSE,sha256=AS8DF6oGYsvk781m40Nec9eCkj_S_oUVAWaFakB2LMs,1097
+nuql-0.0.3.dist-info/RECORD,,