Merge pull request yukinarit#122 from yukinarit/support-typing-any

feat: Support typing.any

Author: yukinarit

README.md

@@ -147,6 +147,7 @@ That's it! pyserde offers many more features. If you're interested, please read
 * [`Optional`](https://docs.python.org/3/library/typing.html#typing.Optional)
 * User defined class with [`@dataclass`](https://docs.python.org/3/library/dataclasses.html)
 * [`typing.NewType`](https://docs.python.org/3/library/typing.html#newtype) for primitive types
+* [`typing.Any`](https://docs.python.org/3/library/typing.html#the-any-type)
 * [Enum](https://docs.python.org/3/library/enum.html#enum.Enum) and [IntEnum](https://docs.python.org/3/library/enum.html#enum.IntEnum)
 * More types
     * [`pathlib.Path`](https://docs.python.org/3/library/pathlib.html)

examples/any.py

@@ -0,0 +1,37 @@
+from dataclasses import dataclass
+from typing import Any
+
+from serde import deserialize, serialize
+from serde.json import from_json, to_json
+
+
+@deserialize
+@serialize
+@dataclass
+class Bar:
+    v: float
+
+
+@deserialize
+@serialize
+@dataclass
+class Foo:
+    a: Any
+    b: Any
+    c: Any
+    d: Any
+
+
+def main():
+    # Bar is serialized into dict.
+    f = Foo(a=10, b=[1, 2], c={'foo': 'bar'}, d=Bar(100.0))
+    print(f"Into Json: {to_json(f)}")
+
+    # However, pyserde can't deserialize the dict into Bar.
+    # This is because there is no "Bar" annotation in "Foo" class.
+    s = '{"a": 10, "b": [1, 2], "c": {"foo": "bar"}, "d": {"v": 100.0}}'
+    print(f"From Json: {from_json(Foo, s)}")
+
+
+if __name__ == '__main__':
+    main()

examples/runner.py

@@ -1,5 +1,6 @@
 import sys
 
+import any
 import collection
 import default
 import env
@@ -15,6 +16,7 @@
 
 
 def run_all():
+    run(any)
     run(simple)
     run(newtype)
     run(collection)

serde/compat.py

@@ -6,7 +6,7 @@
 import typing
 from dataclasses import fields, is_dataclass
 from itertools import zip_longest
-from typing import Dict, Iterator, List, Optional, Set, Tuple, Type, TypeVar, Union
+from typing import Any, Dict, Iterator, List, Optional, Set, Tuple, Type, TypeVar, Union
 
 import typing_inspect
 
@@ -37,7 +37,7 @@ def get_args(typ):
 
 def typename(typ) -> str:
     """
-    >>> from typing import List, Dict, Set
+    >>> from typing import List, Dict, Set, Any
     >>> typename(int)
     'int'
     >>> class Foo: pass
@@ -55,6 +55,8 @@ def typename(typ) -> str:
     'Union[Optional[Foo], List[Foo], str, int]'
     >>> typename(Set[Foo])
     'Set[Foo]'
+    >>> typename(Any)
+    'Any'
     """
     if is_opt(typ):
         return f'Optional[{typename(type_args(typ)[0])}]'
@@ -84,8 +86,14 @@ def typename(typ) -> str:
             return 'Dict'
     elif is_tuple(typ):
         return f'Tuple[{", ".join([typename(e) for e in type_args(typ)])}]'
+    elif typ is Any:
+        return 'Any'
     else:
-        return typ.__name__
+        name = getattr(typ, '_name', None)
+        if name:
+            return name
+        else:
+            return typ.__name__
 
 
 def type_args(typ):

serde/de.py

@@ -125,6 +125,9 @@ def wrap(cls: Type):
             if typ is cls:
                 continue
 
+            if typ is Any:
+                continue
+
             if is_dataclass(typ) or is_enum(typ) or not is_primitive(typ):
                 scope.types[typ.__name__] = typ
 
@@ -413,6 +416,8 @@ def render(self, arg: DeField) -> str:
             res = f"({arg.data} if isinstance({arg.data}, {arg.type.__name__}) else {from_iso}) if reuse_instances else {from_iso}"
         elif is_none(arg.type):
             res = "None"
+        elif arg.type is Any:
+            res = arg.data
         else:
             return f"raise_unsupported_type({arg.data})"
 

serde/se.py

@@ -130,12 +130,16 @@ def wrap(cls: Type):
         g['is_dataclass'] = is_dataclass
         g['typename'] = typename  # used in union functions
         g['is_instance'] = is_instance  # used in union functions
+        g['to_obj'] = to_obj
 
         # Collect types used in the generated code.
         for typ in iter_types(cls):
             if typ is cls:
                 continue
 
+            if typ is Any:
+                continue
+
             if is_dataclass(typ) or is_enum(typ) or not is_primitive(typ):
                 scope.types[typ.__name__] = typ
 
@@ -473,6 +477,8 @@ def render(self, arg: SeField) -> str:
             return f"{arg.varname} if reuse_instances else {arg.varname}.isoformat()"
         elif is_none(arg.type):
             return "None"
+        elif arg.type is Any:
+            return f"to_obj({arg.varname}, True, False, False)"
         else:
             return f"raise_unsupported_type({arg.varname})"
 

tests/test_basics.py

@@ -10,7 +10,7 @@
 import uuid
 from dataclasses import dataclass, field
 from datetime import date, datetime
-from typing import Dict, List, NewType, Optional, Set, Tuple
+from typing import Any, Dict, List, NewType, Optional, Set, Tuple
 
 import more_itertools
 import pytest
@@ -75,6 +75,7 @@
     (Pri(10, 'foo', 100.0, True), Optional[Pri]),
     (None, Optional[Pri]),
     (10, NewType('Int', int)),  # NewType
+    ({'a': 1}, Any),  # Any
     (pathlib.Path('/tmp/foo'), pathlib.Path),  # Extended types
     (pathlib.Path('/tmp/foo'), Optional[pathlib.Path]),
     (None, Optional[pathlib.Path]),