@autorest/python 6.7.6 → 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/enum_type.py

@@ -65,7 +65,7 @@ class EnumType(BaseType):
         value_type: BaseType,
     ) -> None:
         super().__init__(yaml_data=yaml_data, code_model=code_model)
-        self.name: str = yaml_data["name"]
+        self.name: str = yaml_data["name"][0].upper() + yaml_data["name"][1:]
         self.values = values
         self.value_type = value_type
 

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
@@ -889,7 +901,6 @@ class _OperationSerializer(
         self,
         builder: OperationType,
         request_builder: RequestBuilderType,
-        template_url: Optional[str] = None,
         is_next_request: bool = False,
     ) -> List[str]:
         retval: List[str] = []
@@ -949,9 +960,6 @@ class _OperationSerializer(
             retval.append(
                 f"    {body_param.client_name}={body_param.name_in_high_level_operation},"
             )
-        if not self.code_model.options["version_tolerant"]:
-            template_url = template_url or f"self.{builder.name}.metadata['url']"
-            retval.append(f"    template_url={template_url},")
         retval.append("    headers=_headers,")
         retval.append("    params=_params,")
         retval.append(")")
@@ -1011,9 +1019,7 @@ class _OperationSerializer(
             retval.extend(self._create_body_parameter(builder))
         retval.append("")
         retval.extend(
-            self._create_request_builder_call(
-                builder, request_builder, template_url, is_next_request
-            )
+            self._create_request_builder_call(builder, request_builder, is_next_request)
         )
         retval.extend(self._postprocess_http_request(builder, template_url))
         return retval
@@ -1275,11 +1281,6 @@ class _OperationSerializer(
         retval.append("error_map.update(kwargs.pop('error_map', {}) or {})")
         return retval
 
-    @staticmethod
-    def get_metadata_url(builder: OperationType) -> str:
-        url = _escape_str(builder.request_builder.url)
-        return f"{builder.name}.metadata = {{'url': {url}}}"
-
     @property
     def _call_method(self) -> str:
         return "await " if self.async_mode else ""
@@ -1326,11 +1327,7 @@ class _PagingOperationSerializer(
     def call_next_link_request_builder(self, builder: PagingOperationType) -> List[str]:
         if builder.next_request_builder:
             request_builder = builder.next_request_builder
-            template_url = (
-                None
-                if self.code_model.options["version_tolerant"]
-                else f"'{request_builder.url}'"
-            )
+            template_url = None
         else:
             request_builder = builder.request_builder
             template_url = "next_link"

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/lro_operation.py.jinja2

@@ -14,6 +14,3 @@
 
     {{ op_tools.serialize(operation_serializer.return_lro_poller(operation)) | indent }}
     {% endif %}
-{% if not code_model.options["version_tolerant"] %}
-{{ operation_serializer.get_metadata_url(operation) -}}
-{% endif %}

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

@@ -16,6 +16,3 @@
     {{ op_tools.serialize(operation_serializer.get_long_running_output(operation)) | indent }}
     {{ op_tools.serialize(operation_serializer.return_lro_poller(operation)) | indent }}
     {% endif %}
-{% if not code_model.options["version_tolerant"] %}
-{{ operation_serializer.get_metadata_url(operation) }}
-{% endif %}

package/autorest/codegen/templates/macros.jinja2

@@ -0,0 +1,12 @@
+{% macro wrap_model_string(doc_string, wrap_string, suffix_string="") %}
+{% set orignal_result = doc_string | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring=wrap_string) %}
+{% set list_result = orignal_result.split('\n') %}
+{% for line in list_result %}
+    {% set suffix = suffix_string if list_result | length == loop.index %}
+    {% if line | length > 120 %}
+{{ line + "  # pylint: disable=line-too-long" }}{{ suffix }}
+    {% else %}
+{{ line }}{{ suffix }}
+    {% endif %}
+{% endfor %}
+{% endmacro %}

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/codegen/templates/model_dpg.py.jinja2

@@ -1,4 +1,5 @@
 {# actual template starts here #}
+{% import "macros.jinja2" as macros %}
 
 
 {{ serializer.declare_model(model) }}
@@ -20,7 +21,7 @@
         {% for p in model.properties %}
             {% for line in serializer.variable_documentation_string(p) %}
                 {% for doc_string in line.replace('\n', '\n ').split('\n') %}
-    {{ doc_string | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring='\n     ') }}
+    {{ macros.wrap_model_string(doc_string, '\n     ') -}}
                 {% endfor %}
             {% endfor %}
         {% endfor %}
@@ -34,7 +35,7 @@
     {{ serializer.declare_property(p) }}
         {% set prop_description = p.description(is_operation_file=False).replace('"', '\\"') %}
         {% if prop_description %}
-    """{{ prop_description | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring='\n     ') }}"""
+    """{{ macros.wrap_model_string(prop_description, '\n     ', '\"\"\"') -}}
         {% endif %}
     {% endfor %}
 

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

@@ -1,5 +1,7 @@
 {# actual template starts here #}
-
+{% import "macros.jinja2" as macros %}
+{% set initialize_properties = serializer.initialize_properties(model) %}
+{% set exist_constant = (model.properties | selectattr('constant') | first) is defined %}
 
 {{ serializer.declare_model(model) }}
     """{{ model.description(is_operation_file=False) | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring='\n    ') }}
@@ -20,12 +22,13 @@
         {% for p in model.properties %}
             {% for line in serializer.variable_documentation_string(p) %}
                 {% for doc_string in line.replace('\n', '\n ').split('\n') %}
-    {{ doc_string | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring='\n     ') }}
+    {{ macros.wrap_model_string(doc_string, '\n     ') -}}
                 {% endfor %}
             {% endfor %}
         {% endfor %}
     {% endif %}
     """
+{% if initialize_properties or exist_constant %}
     {% if (model.properties | selectattr('validation') ) | first %}
 
     _validation = {
@@ -53,7 +56,7 @@
         {{ model.xml_map_content }}
     }
     {% endif %}
-    {% if (model.properties | selectattr('constant') | first) is defined %}
+    {% if exist_constant %}
 
         {% for p in model.properties | selectattr('constant')%}
     {{ p.client_name }} = {{ p.type.get_declaration() }}
@@ -73,7 +76,7 @@
             {% if p.is_input %}
                 {% for line in serializer.input_documentation_string(p) %}
                     {% for doc_string in line.replace('\n', '\n ').split('\n') %}
-        {{ doc_string | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring='\n         ') }}
+        {{ macros.wrap_model_string(doc_string, '\n         ') -}}
                     {% endfor %}
                 {% endfor %}
             {% endif %}
@@ -81,6 +84,7 @@
     {% endif %}
         """
         {{ serializer.super_call(model) }}
-    {% for initialize_property in serializer.initialize_properties(model) %}
+    {% for initialize_property in initialize_properties %}
         {{ initialize_property }}
     {% endfor %}
+{% endif %}

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

@@ -19,6 +19,3 @@
     {{ op_tools.serialize(operation_serializer.make_pipeline_call(operation)) | indent }}
     {{ op_tools.serialize(operation_serializer.handle_response(operation)) | indent }}
     {% endif %}
-{% if not code_model.options["version_tolerant"] %}
-{{ operation_serializer.get_metadata_url(operation) }}
-{% endif %}

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

@@ -19,6 +19,3 @@
         get_next, extract_data
     )
     {% endif %}
-{% if not code_model.options["version_tolerant"] %}
-{{ operation_serializer.get_metadata_url(operation) -}}
-{% endif %}

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

@@ -39,6 +39,8 @@ def raise_if_not_implemented(cls, abstract_methods):
 def quote_etag(etag: Optional[str]) -> Optional[str]:
     if not etag or etag == "*":
         return etag
+    if etag.startswith("W/"):
+        return etag
     if etag.startswith('"') and etag.endswith('"'):
         return etag
     if etag.startswith("'") and etag.endswith("'"):

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.6",
+  "version": "6.7.8",
   "description": "The Python extension for generators in AutoRest.",
   "main": "index.js",
   "repository": {