@autorest/python 6.9.9 → 6.10.0

package/autorest/codegen/models/__init__.py

@@ -29,6 +29,7 @@ from .primitive_types import (
     AnyObjectType,
     UnixTimeType,
     SdkCoreType,
+    DecimalType,
 )
 from .enum_type import EnumType, EnumValue
 from .base import BaseType
@@ -124,6 +125,7 @@ __all__ = [
 TYPE_TO_OBJECT = {
     "integer": IntegerType,
     "float": FloatType,
+    "decimal": DecimalType,
     "string": StringType,
     "list": ListType,
     "dict": DictionaryType,

package/autorest/codegen/models/primitive_types.py

@@ -4,6 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 import datetime
+import decimal
 from typing import Any, Dict, List, Optional, Union, TYPE_CHECKING
 
 from .base import BaseType
@@ -305,6 +306,37 @@ class FloatType(NumberType):
         return "isinstance({}, float)"
 
 
+class DecimalType(NumberType):
+    @property
+    def serialization_type(self) -> str:
+        return "decimal"
+
+    def docstring_type(self, **kwargs: Any) -> str:
+        return "~" + self.type_annotation()
+
+    def type_annotation(self, **kwargs: Any) -> str:
+        return "decimal.Decimal"
+
+    def docstring_text(self, **kwargs: Any) -> str:
+        return self.type_annotation()
+
+    def get_declaration(self, value: decimal.Decimal) -> str:
+        return str(value)
+
+    def imports(self, **kwargs: Any) -> FileImport:
+        file_import = FileImport(self.code_model)
+        file_import.add_import("decimal", ImportType.STDLIB)
+        return file_import
+
+    @property
+    def default_template_representation_declaration(self) -> str:
+        return self.get_declaration(decimal.Decimal("0.0"))
+
+    @property
+    def instance_check_template(self) -> str:
+        return "isinstance({}, decimal.Decimal)"
+
+
 class StringType(PrimitiveType):
     def __init__(self, yaml_data: Dict[str, Any], code_model: "CodeModel") -> None:
         super().__init__(yaml_data=yaml_data, code_model=code_model)

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

@@ -8,6 +8,7 @@
 # pyright: reportGeneralTypeIssues=false
 
 import calendar
+import decimal
 import functools
 import sys
 import logging
@@ -144,6 +145,8 @@ class SdkJSONEncoder(JSONEncoder):
         except TypeError:
             if isinstance(o, _Null):
                 return None
+            if isinstance(o, decimal.Decimal):
+                return float(o)
             if isinstance(o, (bytes, bytearray)):
                 return _serialize_bytes(o, self.format)
             try:
@@ -275,6 +278,12 @@ def _deserialize_duration(attr):
     return isodate.parse_duration(attr)
 
 
+def _deserialize_decimal(attr):
+    if isinstance(attr, decimal.Decimal):
+        return attr
+    return decimal.Decimal(str(attr))
+
+
 _DESERIALIZE_MAPPING = {
     datetime: _deserialize_datetime,
     date: _deserialize_date,
@@ -283,6 +292,7 @@ _DESERIALIZE_MAPPING = {
     bytearray: _deserialize_bytes,
     timedelta: _deserialize_duration,
     typing.Any: lambda x: x,
+    decimal.Decimal: _deserialize_decimal,
 }
 
 _DESERIALIZE_MAPPING_WITHFORMAT = {
@@ -434,6 +444,8 @@ def _serialize(o, format: typing.Optional[str] = None):  # pylint: disable=too-m
         return tuple(_serialize(x, format) for x in o)
     if isinstance(o, (bytes, bytearray)):
         return _serialize_bytes(o, format)
+    if isinstance(o, decimal.Decimal):
+        return float(o)
     try:
         # First try datetime.datetime
         return _serialize_datetime(o, format)
@@ -656,24 +668,21 @@ def _get_deserialize_callable_from_annotation(  # pylint: disable=R0911, R0915,
 
     try:
         if annotation._name == "Dict":
-            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],
                 value_deserializer: typing.Optional[typing.Callable],
                 obj: typing.Dict[typing.Any, typing.Any],
             ):
                 if obj is None:
                     return obj
                 return {
-                    _deserialize(key_deserializer, k, module): _deserialize(value_deserializer, v, module)
+                    k: _deserialize(value_deserializer, v, module)
                     for k, v in obj.items()
                 }
 
             return functools.partial(
                 _deserialize_dict,
-                key_deserializer,
                 value_deserializer,
             )
     except (AttributeError, IndexError):
@@ -712,19 +721,17 @@ def _get_deserialize_callable_from_annotation(  # pylint: disable=R0911, R0915,
         pass
 
     def _deserialize_default(
-        annotation,
-        deserializer_from_mapping,
+        deserializer,
         obj,
     ):
         if obj is None:
             return obj
-        try:
-            return _deserialize_with_callable(annotation, obj)
-        except Exception:
-            pass
-        return _deserialize_with_callable(deserializer_from_mapping, obj)
+        return _deserialize_with_callable(deserializer, obj)
+
+    if get_deserializer(annotation, rf):
+        return functools.partial(_deserialize_default, get_deserializer(annotation, rf))
 
-    return functools.partial(_deserialize_default, annotation, get_deserializer(annotation, rf))
+    return functools.partial(_deserialize_default, annotation)
 
 
 def _deserialize_with_callable(
@@ -732,7 +739,7 @@ def _deserialize_with_callable(
     value: typing.Any,
 ):
     try:
-        if value is None:
+        if value is None or isinstance(value, _Null):
             return None
         if deserializer is None:
             return value
@@ -760,7 +767,8 @@ def _deserialize(
         value = value.http_response.json()
     if rf is None and format:
         rf = _RestField(format=format)
-    deserializer = _get_deserialize_callable_from_annotation(deserializer, module, rf)
+    if not isinstance(deserializer, functools.partial):
+        deserializer = _get_deserialize_callable_from_annotation(deserializer, module, rf)
     return _deserialize_with_callable(deserializer, value)
 
 

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

@@ -747,7 +747,7 @@ class Serializer(object):
         :param str data_type: The type to be serialized from.
         :keyword bool skip_quote: Whether to skip quote the serialized result.
         Defaults to False.
-        :rtype: str
+        :rtype: str, list
         :raises: TypeError if serialization fails.
         :raises: ValueError if data is None
         """
@@ -1866,7 +1866,7 @@ class Deserializer(object):
         if isinstance(attr, ET.Element):
             attr = attr.text
         try:
-            return decimal.Decimal(attr)  # type: ignore
+            return decimal.Decimal(str(attr))  # type: ignore
         except decimal.DecimalException as err:
             msg = "Invalid decimal {}".format(attr)
             raise DeserializationError(msg) from err
@@ -2002,6 +2002,7 @@ class Deserializer(object):
         if isinstance(attr, ET.Element):
             attr = int(attr.text)  # type: ignore
         try:
+            attr = int(attr)
             date_obj = datetime.datetime.fromtimestamp(attr, TZ_UTC)
         except ValueError as err:
             msg = "Cannot deserialize to unix datetime object."

package/package.json

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

package/requirements.txt

@@ -8,5 +8,5 @@ MarkupSafe==2.1.2
 mistune==0.8.4
 pathspec==0.11.1
 platformdirs==3.2.0
-PyYAML==6.0
+PyYAML==6.0.1
 tomli==2.0.1