@autorest/python 6.2.15 → 6.2.16

package/autorest/codegen/templates/model_base.py.jinja2

@@ -21,6 +21,7 @@ import isodate
 from azure.core.exceptions import DeserializationError
 from azure.core import CaseInsensitiveEnumMeta
 from azure.core.pipeline import PipelineResponse
+from azure.core.serialization import NULL as AzureCoreNull
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -157,6 +158,8 @@ class AzureJSONEncoder(JSONEncoder):
             return {k: v for k, v in o.items() if k not in readonly_props}
         if isinstance(o, (bytes, bytearray)):
             return base64.b64encode(o).decode()
+        if o is AzureCoreNull:
+            return None
         try:
             return super(AzureJSONEncoder, self).default(o)
         except TypeError:
@@ -263,7 +266,8 @@ def _get_model(module_name: str, model_name: str):
     module_end = module_name.rsplit(".", 1)[0]
     module = sys.modules[module_end]
     models.update({k: v for k, v in module.__dict__.items() if isinstance(v, type)})
-    model_name = model_name.split(".")[-1]
+    if isinstance(model_name, str):
+        model_name = model_name.split(".")[-1]
     if model_name not in models:
         return model_name
     return models[model_name]
@@ -465,13 +469,15 @@ class Model(_MyMutableMapping):
 
 
 def _get_deserialize_callable_from_annotation(  # pylint: disable=too-many-return-statements, too-many-statements
-        annotation: typing.Any, module: typing.Optional[str],
+        annotation: typing.Any, module: typing.Optional[str], rf: "_RestField" = None
     ) -> typing.Optional[typing.Callable[[typing.Any], typing.Any]]:
         if not annotation or annotation in [int, float]:
             return None
 
         try:
             if module and _is_model(_get_model(module, annotation)):
+                if rf:
+                    rf._is_model = True
                 def _deserialize_model(model_deserializer: typing.Optional[typing.Callable], obj):
                     if _is_model(obj):
                         return obj
@@ -510,7 +516,7 @@ def _get_deserialize_callable_from_annotation(  # pylint: disable=too-many-retur
             if any(a for a in annotation.__args__ if a == type(None)):
 
                 if_obj_deserializer = _get_deserialize_callable_from_annotation(
-                    next(a for a in annotation.__args__ if a != type(None)), module
+                    next(a for a in annotation.__args__ if a != type(None)), module, rf
                 )
 
                 def _deserialize_with_optional(if_obj_deserializer: typing.Optional[typing.Callable], obj):
@@ -533,8 +539,8 @@ def _get_deserialize_callable_from_annotation(  # pylint: disable=too-many-retur
 
         try:
             if annotation._name == "Dict":
-                key_deserializer = _get_deserialize_callable_from_annotation(annotation.__args__[0], module)
-                value_deserializer = _get_deserialize_callable_from_annotation(annotation.__args__[1], module)
+                key_deserializer = _get_deserialize_callable_from_annotation(annotation.__args__[0], module, rf)
+                value_deserializer = _get_deserialize_callable_from_annotation(annotation.__args__[1], module, rf)
 
                 def _deserialize_dict(
                     key_deserializer: typing.Optional[typing.Callable],
@@ -568,10 +574,10 @@ def _get_deserialize_callable_from_annotation(  # pylint: disable=too-many-retur
                         )
 
                     entry_deserializers = [
-                        _get_deserialize_callable_from_annotation(dt, module) for dt in annotation.__args__
+                        _get_deserialize_callable_from_annotation(dt, module, rf) for dt in annotation.__args__
                     ]
                     return functools.partial(_deserialize_multiple_sequence, entry_deserializers)
-                deserializer = _get_deserialize_callable_from_annotation(annotation.__args__[0], module)
+                deserializer = _get_deserialize_callable_from_annotation(annotation.__args__[0], module, rf)
 
                 def _deserialize_sequence(
                     deserializer: typing.Optional[typing.Callable],
@@ -673,7 +679,7 @@ class _RestField:
     def _get_deserialize_callable_from_annotation(
         self, annotation: typing.Any
     ) -> typing.Optional[typing.Callable[[typing.Any], typing.Any]]:
-        return _get_deserialize_callable_from_annotation(annotation, self._module)
+        return _get_deserialize_callable_from_annotation(annotation, self._module, self)
 
 
 def rest_field(

package/autorest/codegen/templates/serialization.py.jinja2

@@ -64,6 +64,7 @@ import xml.etree.ElementTree as ET
 import isodate  # type: ignore
 
 from azure.core.exceptions import DeserializationError, SerializationError, raise_with_traceback
+from azure.core.serialization import NULL as AzureCoreNull
 
 _BOM = codecs.BOM_UTF8.decode(encoding="utf-8")
 
@@ -804,6 +805,8 @@ class Serializer(object):
             raise ValueError("No value for given attribute")
 
         try:
+            if data is AzureCoreNull:
+                return None
             if data_type in self.basic_types.values():
                 return self.serialize_basic(data, data_type, **kwargs)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.2.15",
+  "version": "6.2.16",
   "description": "The Python extension for generators in AutoRest.",
   "main": "index.js",
   "repository": {