expose TypedpyDefaults. version 2.27.6 . Ensure handling of compact s…

…erialization correctly.

setup.py

@@ -46,9 +46,9 @@
     license="MIT",
     long_description=long_description,
     url="http://github.com/loyada/typedpy",
-    download_url="https://github.com/loyada/typedpy/archive/v2.27.5.tar.gz",
+    download_url="https://github.com/loyada/typedpy/archive/v2.27.6.tar.gz",
     keywords=["testing", "type-safe", "strict", "schema", "validation"],
-    version="2.27.5",
+    version="2.27.6",
 )
 
 # coverage run --source=typedpy/ setup.py test

tests/conftest.py

@@ -19,7 +19,6 @@ def fixture_fail_on_additional_props_in_deserialization():
     TypedPyDefaults.ignore_invalid_additional_properties_in_deserialization = True
 
 
-
 @pytest.fixture(name="compact_serialization")
 def fixture_compact_serialization():
     Structure.set_compact_serialization_default(True)

tests/test_deserialization.py

@@ -1509,7 +1509,14 @@ class Foo(Structure):
         b: int
         _required = []
 
-    Deserializer(Foo).deserialize({"c": 1, "a": 2})
+    assert Deserializer(Foo).deserialize({"c": 1, "a": 2}) == Foo(a=2)
+
+
+def test_additional_properties_turned_off_input_is_not_dict(additional_props_default_is_false, compact_serialization):
+    class Foo(Structure):
+        a: list[int]
+
+    assert Deserializer(Foo).deserialize([1,2]) == Foo(a=[1,2])
 
 
 def test_additional_properties_turned_off_err_throw(

typedpy/__init__.py

@@ -21,6 +21,7 @@
     Extend,
     keys_of,
 )
+from typedpy.structures.defaults import TypedPyDefaults
 
 from .json_schema import (
     structure_to_schema,

typedpy/serialization/serialization.py

@@ -804,14 +804,14 @@ class reference field. Users are not supposed to use this argument.
 
     ignore_none = getattr(cls, IGNORE_NONE_VALUES, False)
     field_by_name = cls.get_all_fields_by_name()
-
+    props = cls.__dict__
+    additional_props = props.get(
+        ADDITIONAL_PROPERTIES, TypedPyDefaults.additional_properties_default
+    )
     if not isinstance(input_dict, dict):
-        props = cls.__dict__
         fields = list(field_by_name.keys())
         required = props.get(REQUIRED_FIELDS, fields)
-        additional_props = props.get(
-            ADDITIONAL_PROPERTIES, TypedPyDefaults.additional_properties_default
-        )
+
         if (
             len(fields) == 1
             and required == fields
@@ -833,7 +833,8 @@ class reference field. Users are not supposed to use this argument.
         k: v
         for k, v in input_dict.items()
         if k not in field_by_name
-        and keep_undefined
+        and keep_undefined and
+        (additional_props is True or not TypedPyDefaults.ignore_invalid_additional_properties_in_deserialization)
         and k not in getattr(cls, "_constants", [])
     }
 

typedpy/serialization/serialization_wrappers.py

@@ -95,7 +95,7 @@ def deserialize(
         adjusted_keep_undefined = (
             keep_undefined
             if keep_undefined is not None or additional_props_allowed
-            else not TypedPyDefaults.ignore_invalid_additional_properties_in_deserialization
+            else True
         )
         return deserialize_structure(
             self.target_class,