Merge pull request #14 from RSS-Engineering/allow-multiple-field-inputs

Add the ability to injest a field through multiple names

Author: explorigin

pydanticrud/backends/dynamodb.py

@@ -117,7 +117,10 @@ def __init__(self, schema):
         self.definitions = schema.get("definitions")
 
     def _get_type_possibilities(self, field_name) -> Set[tuple]:
-        field_properties = self.properties[field_name]
+        field_properties = self.properties.get(field_name)
+
+        if not field_properties:
+            return set()
 
         possible_types = []
         if "anyOf" in field_properties:
@@ -154,6 +157,8 @@ def _serialize_field(self, field_name, value):
                 except (ValueError, TypeError, KeyError):
                     pass
 
+        # If we got a value that is not part of the schema, pass it
+        # through and let pydantic sort it out.
         return value
 
     def serialize_record(self, data_dict) -> dict:

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pydanticrud"
-version = "0.2.0"
+version = "0.3.0"
 description = "Supercharge your Pydantic models with CRUD methods and a pluggable backend"
 authors = ["Timothy Farrell <[email protected]>"]
 license = "MIT"

tests/test_dynamodb.py

@@ -5,7 +5,7 @@
 import random
 
 import docker
-from pydantic import BaseModel as PydanticBaseModel, Field
+from pydantic import BaseModel as PydanticBaseModel, Field, root_validator, ValidationError
 from pydanticrud import BaseModel, DynamoDbBackend, ConditionCheckFailed
 import pytest
 from pydanticrud.exceptions import DoesNotExist
@@ -46,6 +46,12 @@ class AliasKeyModel(BaseModel):
     name: str
     type_: str = Field(alias="type")
 
+    @root_validator(pre=True)
+    def type_from_typ(cls, values):
+        if 'typ' in values:
+            values['type'] = values.pop('typ')
+        return values
+
     class Config:
         title = "AliasTitle123"
         hash_key = "name"
@@ -504,3 +510,13 @@ def test_get_alias_model_data(dynamo, alias_query_data):
     data = alias_model_data_generator()
     res = AliasKeyModel.get(alias_query_data[0]['name'])
     assert res.dict(by_alias=True) == alias_query_data[0]
+
+
+def test_alias_model_validator_ingest(dynamo):
+    data = alias_model_data_generator()
+    AliasKeyModel(**data)
+    data["typ"] = data.pop("type")
+    AliasKeyModel(**data)
+    data.pop("typ")
+    with pytest.raises(ValidationError):
+        AliasKeyModel(**data)