@autorest/python 6.10.1 → 6.10.2

package/autorest/codegen/models/combined_type.py

@@ -3,15 +3,14 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from typing import Any, Dict, List, Optional, TYPE_CHECKING
+from typing import Any, Dict, List, Optional, TYPE_CHECKING, Type, Tuple, Union
 import re
 from autorest.codegen.models.imports import FileImport, ImportType, TypingSection
 from .base import BaseType
-from .model_type import JSONModelType
+from .model_type import ModelType
 
 if TYPE_CHECKING:
     from .code_model import CodeModel
-    from .model_type import ModelType
 
 
 class CombinedType(BaseType):
@@ -129,19 +128,14 @@ class CombinedType(BaseType):
             [build_type(t, code_model) for t in yaml_data["types"]],
         )
 
-    @staticmethod
-    def _get_json_model_type(t: BaseType) -> Optional[JSONModelType]:
-        if isinstance(t, JSONModelType):
-            return t
-        if isinstance(t, CombinedType):
-            try:
-                return next(
-                    CombinedType._get_json_model_type(sub_t) for sub_t in t.types
-                )
-            except StopIteration:
-                pass
+    def target_model_subtype(
+        self,
+        target_types: Union[
+            Tuple[Type[ModelType]],
+            Tuple[Type[ModelType], Type[ModelType]],
+        ],
+    ) -> Optional[ModelType]:
+        for sub_t in self.types:
+            if isinstance(sub_t, target_types):
+                return sub_t  # type: ignore
         return None
-
-    @property
-    def json_subtype(self) -> Optional[JSONModelType]:
-        return CombinedType._get_json_model_type(self)

package/autorest/codegen/models/parameter.py

@@ -271,7 +271,7 @@ class BodyParameter(_ParameterBase):
     @property
     def has_json_model_type(self) -> bool:
         if isinstance(self.type, CombinedType):
-            return self.type.json_subtype is not None
+            return self.type.target_model_subtype((JSONModelType,)) is not None
         return isinstance(self.type, JSONModelType)
 
     @classmethod

package/autorest/codegen/serializers/builder_serializer.py

@@ -30,6 +30,8 @@ from ..models import (
     Property,
     RequestBuilderType,
     CombinedType,
+    JSONModelType,
+    DPGModelType,
     ParameterListType,
     ByteArraySchema,
 )
@@ -181,8 +183,10 @@ def _serialize_json_model_body(
         for property_name, parameter_name in body_parameter.property_to_parameter_name.items()
     )
     model_type = cast(ModelType, body_parameter.type)
-    if isinstance(model_type, CombinedType) and model_type.json_subtype:
-        model_type = model_type.json_subtype
+    if isinstance(model_type, CombinedType) and model_type.target_model_subtype(
+        (JSONModelType,)
+    ):
+        model_type = model_type.target_model_subtype((JSONModelType,))
     retval.append(f"    {body_parameter.client_name} = {{{parameter_string}}}")
     retval.append(f"    {body_parameter.client_name} =  {{")
     retval.append(
@@ -320,6 +324,10 @@ class _BuilderBaseSerializer(Generic[BuilderType]):  # pylint: disable=abstract-
         description_list.append("")
         return description_list
 
+    @staticmethod
+    def line_too_long(docs: List[str]) -> bool:
+        return any(len(line) > 120 for line in docs)
+
     def example_template(self, builder: BuilderType) -> List[str]:
         template = []
         if builder.abstract:
@@ -376,18 +384,21 @@ class _BuilderBaseSerializer(Generic[BuilderType]):  # pylint: disable=abstract-
 
         if (
             isinstance(body_param.type, (ListType, DictionaryType))
-            and self.code_model.options["models_mode"]
+            and self.code_model.options["models_mode"] == "msrest"
         ):
             return template
 
-        if isinstance(body_param.type, ModelType) and body_param.type.base != "json":
+        if isinstance(body_param.type, ModelType) and body_param.type.base == "msrest":
             return template
 
         json_type = body_param.type
         if isinstance(body_param.type, CombinedType):
-            if body_param.type.json_subtype is None:
+            target_model_type = body_param.type.target_model_subtype(
+                (JSONModelType, DPGModelType)
+            )
+            if target_model_type is None:
                 return template
-            json_type = body_param.type.json_subtype
+            json_type = target_model_type
 
         polymorphic_subtypes: List[ModelType] = []
         json_type.get_polymorphic_subtypes(polymorphic_subtypes)
@@ -597,7 +608,7 @@ class _OperationSerializer(
 
     def example_template(self, builder: OperationType) -> List[str]:
         retval = super().example_template(builder)
-        if self.code_model.options["models_mode"]:
+        if self.code_model.options["models_mode"] == "msrest":
             return retval
         for response in builder.responses:
             polymorphic_subtypes: List[ModelType] = []

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

@@ -1,7 +1,7 @@
 {% import 'operation_tools.jinja2' as op_tools %}
 {% set operations_description = "async operations" if async_mode else "operations" %}
 {% set return_none_type_annotation = " -> None" if async_mode else "" %}
-# pylint: disable=too-many-lines
+# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 {{ code_model.options['license_header'] }}
 {{ imports }}

package/autorest/codegen/templates/operation_tools.jinja2

@@ -1,9 +1,13 @@
 {% macro wrap_string(string, wrapstring, width=95) %}{{ string | wordwrap(width=width, break_long_words=False, break_on_hyphens=False, wrapstring=wrapstring)}}{% endmacro %}
 
 {% macro description(builder, serializer) %}
+{% set example_template = serializer.example_template(builder) %}
     {% for description in serializer.description_and_summary(builder) %}
         {% if description %}
 {% set description = wrap_string(description, wrapstring='\n') %}
+            {% if serializer.line_too_long(example_template) and loop.first %}
+# pylint: disable=line-too-long
+            {% endif %}
 {{ '"""' + description if loop.first else description }}
         {% else %}
 
@@ -16,11 +20,11 @@
 
         {% endif %}
 {% endfor %}
-{% if serializer.example_template(builder) %}
+{% if example_template %}
 
 Example:
     .. code-block:: python
-    {% for template_line in serializer.example_template(builder) %}
+    {% for template_line in example_template %}
         {% if template_line %}
             {% set wrap_amount = (template_line | length) - (template_line.lstrip() | length) + 10 %}
         {{  wrap_string(template_line, wrapstring='\n' + " " * wrap_amount, width=(95 - wrap_amount)) }}

package/package.json

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

package/requirements.txt

@@ -10,3 +10,4 @@ pathspec==0.11.1
 platformdirs==3.2.0
 PyYAML==6.0.1
 tomli==2.0.1
+setuptools==58.3.0