@autorest/python 6.7.7 → 6.7.8

package/autorest/codegen/models/dictionary_type.py

@@ -31,8 +31,8 @@ class DictionaryType(BaseType):
         self.element_type = element_type
 
     @property
-    def format(self) -> Optional[str]:
-        return self.element_type.format if hasattr(self.element_type, "format") else None  # type: ignore
+    def encode(self) -> Optional[str]:
+        return self.element_type.encode if hasattr(self.element_type, "encode") else None  # type: ignore
 
     @property
     def serialization_type(self) -> str:

package/autorest/codegen/models/list_type.py

@@ -26,8 +26,8 @@ class ListType(BaseType):
         self.unique_items: bool = yaml_data.get("uniqueItems", False)
 
     @property
-    def format(self) -> Optional[str]:
-        return self.element_type.format if hasattr(self.element_type, "format") else None  # type: ignore
+    def encode(self) -> Optional[str]:
+        return self.element_type.encode if hasattr(self.element_type, "encode") else None  # type: ignore
 
     @property
     def serialization_type(self) -> str:

package/autorest/codegen/models/primitive_types.py

@@ -355,10 +355,10 @@ class StringType(PrimitiveType):
 class DatetimeType(PrimitiveType):
     def __init__(self, yaml_data: Dict[str, Any], code_model: "CodeModel") -> None:
         super().__init__(yaml_data=yaml_data, code_model=code_model)
-        self.format = (
+        self.encode = (
             "rfc3339"
-            if yaml_data.get("format", "date-time") == "date-time"
-            or yaml_data.get("format", "date-time") == "rfc3339"
+            if yaml_data.get("encode", "date-time") == "date-time"
+            or yaml_data.get("encode", "date-time") == "rfc3339"
             else "rfc7231"
         )
 
@@ -368,7 +368,7 @@ class DatetimeType(PrimitiveType):
             "rfc3339": "iso-8601",
             "rfc7231": "rfc-1123",
         }
-        return formats_to_attribute_type[self.format]
+        return formats_to_attribute_type[self.encode]
 
     def docstring_type(self, **kwargs: Any) -> str:
         return "~" + self.type_annotation()
@@ -455,7 +455,7 @@ class TimeType(PrimitiveType):
 
 class UnixTimeType(PrimitiveType):
     @property
-    def format(self) -> str:
+    def encode(self) -> str:
         return "unix-timestamp"
 
     @property
@@ -592,11 +592,11 @@ class DurationType(PrimitiveType):
 class ByteArraySchema(PrimitiveType):
     def __init__(self, yaml_data: Dict[str, Any], code_model: "CodeModel") -> None:
         super().__init__(yaml_data=yaml_data, code_model=code_model)
-        self.format = yaml_data.get("format", "base64")
+        self.encode = yaml_data.get("encode", "base64")
 
     @property
     def serialization_type(self) -> str:
-        if self.format == "base64url":
+        if self.encode == "base64url":
             return "base64"
         return "bytearray"
 

package/autorest/codegen/serializers/builder_serializer.py

@@ -32,6 +32,7 @@ from ..models import (
     RequestBuilderType,
     CombinedType,
     ParameterListType,
+    ByteArraySchema,
 )
 from .parameter_serializer import ParameterSerializer, PopKwargType
 from ..models.parameter_list import ParameterType
@@ -749,10 +750,17 @@ class _OperationSerializer(
                 f"'{body_param.type.serialization_type}'{is_xml_cmd}{serialization_ctxt_cmd})"
             )
         elif self.code_model.options["models_mode"] == "dpg":
-            create_body_call = (
-                f"_{body_kwarg_name} = json.dumps({body_param.client_name}, "
-                "cls=AzureJSONEncoder, exclude_readonly=True)  # type: ignore"
-            )
+            if hasattr(body_param.type, "encode") and body_param.type.encode:  # type: ignore
+                create_body_call = (
+                    f"_{body_kwarg_name} = json.dumps({body_param.client_name}, "
+                    "cls=AzureJSONEncoder, exclude_readonly=True, "
+                    f"format='{body_param.type.encode}')  # type: ignore"  # type: ignore
+                )
+            else:
+                create_body_call = (
+                    f"_{body_kwarg_name} = json.dumps({body_param.client_name}, "
+                    "cls=AzureJSONEncoder, exclude_readonly=True)  # type: ignore"
+                )
         else:
             create_body_call = f"_{body_kwarg_name} = {body_param.client_name}"
         if body_param.optional:
@@ -774,7 +782,11 @@ class _OperationSerializer(
         if hasattr(body_param, "entries"):
             return _serialize_multipart_body(builder)
         body_kwarg_name = builder.request_builder.parameters.body_parameter.client_name
-        if isinstance(body_param.type, BinaryType):
+        body_param_type = body_param.type
+        if isinstance(body_param_type, BinaryType) or (
+            isinstance(body_param.type, ByteArraySchema)
+            and body_param.default_content_type != "application/json"
+        ):
             retval.append(f"_{body_kwarg_name} = {body_param.client_name}")
             if (
                 not body_param.default_content_type

package/autorest/codegen/serializers/model_serializer.py

@@ -260,8 +260,8 @@ class DpgModelSerializer(_ModelSerializer):
             args.append(f"visibility=[{v_list}]")
         if prop.client_default_value is not None:
             args.append(f"default={prop.client_default_value_declaration}")
-        if hasattr(prop.type, "format") and prop.type.format:  # type: ignore
-            args.append(f'format="{prop.type.format}"')  # type: ignore
+        if hasattr(prop.type, "encode") and prop.type.encode:  # type: ignore
+            args.append(f'format="{prop.type.encode}"')  # type: ignore
 
         field = "rest_discriminator" if prop.is_discriminator else "rest_field"
         type_ignore = (

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

@@ -128,9 +128,10 @@ def _is_readonly(p):
 class AzureJSONEncoder(JSONEncoder):
     """A JSON encoder that's capable of serializing datetime objects and bytes."""
 
-    def __init__(self, *args, exclude_readonly: bool = False, **kwargs):
+    def __init__(self, *args, exclude_readonly: bool = False, format: typing.Optional[str] = None, **kwargs):
         super().__init__(*args, **kwargs)
         self.exclude_readonly = exclude_readonly
+        self.format = format
 
     def default(self, o):  # pylint: disable=too-many-return-statements
         if _is_model(o):
@@ -138,18 +139,16 @@ class AzureJSONEncoder(JSONEncoder):
                 readonly_props = [p._rest_name for p in o._attr_to_rest_field.values() if _is_readonly(p)]
                 return {k: v for k, v in o.items() if k not in readonly_props}
             return dict(o.items())
-        if isinstance(o, (bytes, bytearray)):
-            return base64.b64encode(o).decode()
-        if isinstance(o, _Null):
-            return None
         try:
             return super(AzureJSONEncoder, self).default(o)
         except TypeError:
+            if isinstance(o, _Null):
+                return None
             if isinstance(o, (bytes, bytearray)):
-                return _serialize_bytes(o)
+                return _serialize_bytes(o, self.format)
             try:
                 # First try datetime.datetime
-                return _serialize_datetime(o)
+                return _serialize_datetime(o, self.format)
             except AttributeError:
                 pass
             # Last, try datetime.timedelta

package/autorest/m4reformatter/__init__.py

@@ -232,11 +232,11 @@ def update_primitive(  # pylint: disable=too-many-return-statements
         return KNOWN_TYPES["binary"]
     if type_group == "date-time":
         base = _update_type_base("datetime", yaml_data)
-        base["format"] = yaml_data["format"]
+        base["encode"] = yaml_data["format"]
         return base
     if type_group == "byte-array":
         base = _update_type_base("bytes", yaml_data)
-        base["format"] = yaml_data["format"]
+        base["encode"] = yaml_data["format"]
         return base
     return _update_type_base(type_group, yaml_data)
 

package/package.json

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