test: schema meta unknown respected

Signed-off-by: Daniel Bluhm <dbluhm@pm.me>

Author: dbluhm

aries_cloudagent/messaging/models/base.py

@@ -5,7 +5,8 @@
 
 from abc import ABC
 from collections import namedtuple
-from typing import Literal, Mapping, Optional, Type, TypeVar, Union, cast, overload
+from typing import Mapping, Optional, Type, TypeVar, Union, cast, overload
+from typing_extensions import Literal
 
 from marshmallow import Schema, post_dump, pre_load, post_load, ValidationError, EXCLUDE
 
@@ -57,7 +58,10 @@ def resolve_meta_property(obj, prop_name: str, defval=None):
         The meta property
 
     """
-    cls = obj.__class__
+    if isinstance(obj, type):
+        cls = obj
+    else:
+        cls = obj.__class__
     found = defval
     while cls:
         Meta = getattr(cls, "Meta", None)
@@ -184,7 +188,9 @@ def deserialize(
             return None
 
         schema_cls = cls._get_schema_class()
-        schema = schema_cls(unknown=unknown or schema_cls.Meta.unknown)
+        schema = schema_cls(
+            unknown=unknown or resolve_meta_property(schema_cls, "unknown", EXCLUDE)
+        )
 
         try:
             return cast(
@@ -229,7 +235,9 @@ def serialize(
 
         """
         schema_cls = self._get_schema_class()
-        schema = schema_cls(unknown=unknown or schema_cls.Meta.unknown)
+        schema = schema_cls(
+            unknown=unknown or resolve_meta_property(schema_cls, "unknown", EXCLUDE)
+        )
         try:
             return (
                 schema.dumps(self, separators=(",", ":"))
@@ -320,7 +328,6 @@ class Meta:
         model_class = None
         skip_values = [None]
         ordered = True
-        unknown = EXCLUDE
 
     def __init__(self, *args, **kwargs):
         """

aries_cloudagent/messaging/models/tests/test_base.py

@@ -1,15 +1,6 @@
-import json
-
 from asynctest import TestCase as AsyncTestCase, mock as async_mock
 
-from marshmallow import EXCLUDE, fields, validates_schema, ValidationError
-
-from ....cache.base import BaseCache
-from ....config.injection_context import InjectionContext
-from ....storage.base import BaseStorage, StorageRecord
-
-from ...responder import BaseResponder, MockResponder
-from ...util import time_now
+from marshmallow import EXCLUDE, INCLUDE, fields, validates_schema, ValidationError
 
 from ..base import BaseModel, BaseModelError, BaseModelSchema
 
@@ -35,6 +26,48 @@ def validate_fields(self, data, **kwargs):
             raise ValidationError("")
 
 
+class ModelImplWithUnknown(BaseModel):
+    class Meta:
+        schema_class = "SchemaImplWithUnknown"
+
+    def __init__(self, *, attr=None, **kwargs):
+        self.attr = attr
+        self.extra = kwargs
+
+
+class SchemaImplWithUnknown(BaseModelSchema):
+    class Meta:
+        model_class = ModelImplWithUnknown
+        unknown = INCLUDE
+
+    attr = fields.String(required=True)
+
+    @validates_schema
+    def validate_fields(self, data, **kwargs):
+        if data["attr"] != "succeeds":
+            raise ValidationError("")
+
+
+class ModelImplWithoutUnknown(BaseModel):
+    class Meta:
+        schema_class = "SchemaImplWithoutUnknown"
+
+    def __init__(self, *, attr=None):
+        self.attr = attr
+
+
+class SchemaImplWithoutUnknown(BaseModelSchema):
+    class Meta:
+        model_class = ModelImplWithoutUnknown
+
+    attr = fields.String(required=True)
+
+    @validates_schema
+    def validate_fields(self, data, **kwargs):
+        if data["attr"] != "succeeds":
+            raise ValidationError("")
+
+
 class TestBase(AsyncTestCase):
     def test_model_validate_fails(self):
         model = ModelImpl(attr="string")
@@ -63,3 +96,24 @@ def test_from_json_x(self):
         data = "{}{}"
         with self.assertRaises(BaseModelError):
             ModelImpl.from_json(data)
+
+    def test_model_with_unknown(self):
+        model = ModelImplWithUnknown(attr="succeeds")
+        model = model.validate()
+        assert model.attr == "succeeds"
+
+        model = ModelImplWithUnknown.deserialize(
+            {"attr": "succeeds", "another": "value"}
+        )
+        assert model.extra
+        assert model.extra["another"] == "value"
+        assert model.attr == "succeeds"
+
+    def test_model_without_unknown_default_exclude(self):
+        model = ModelImplWithoutUnknown(attr="succeeds")
+        model = model.validate()
+        assert model.attr == "succeeds"
+
+        assert ModelImplWithoutUnknown.deserialize(
+            {"attr": "succeeds", "another": "value"}
+        )