@autorest/python 5.12.6 → 5.13.0

package/ChangeLog.md

@@ -1,14 +1,43 @@
 # Change Log
 
+### 2022-03-03 - 5.13.0
+
+| Library                                                                 | Min Version |
+| ----------------------------------------------------------------------- | ----------- |
+| `@autorest/core`                                                        | `3.6.2`     |
+| `@autorest/modelerfour`                                                 | `4.19.1`    |
+| `azure-core` dep of generated code                                      | `1.20.1`    |
+| `msrest` dep of generated code                                          | `0.6.21`    |
+| `azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`     |
+
+**Breaking Changes in Version Tolerant Generation**
+
+- We now generate with optional constant parameters as None by defaulting `--default-optional-constants-to-none` to True #1171
+- Version tolerant paging does not reformat initial query parameters into the next link #1168
+
+**New Features**
+
+- Add flag `--default-optional-constants-to-none` with which optional constant parameters is default to None #1171
+- Add flag `--reformat-next-link`, determines whether we reformat initial query parameters into the next link. Defaults to `True` for the GA generator, forced to `False` for `--version-tolerant`.
+
+**Bug Fixes**
+
+- Add default value consistently for parameters #1164
+- Make `content_type` param keyword-only if there are multiple content types #1167
+
+**Other Changes**
+
+- Drop testing support for 2.7 packages #1175
+
 ### 2022-02-09 - 5.12.6
 
-| Library | Min Version
-| --------------- | -------
-|`@autorest/core` |  `3.6.2`
-|`@autorest/modelerfour` | `4.19.1`
-|`azure-core` dep of generated code | `1.20.1`
-|`msrest` dep of generated code | `0.6.21`
-|`azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`
+| Library                                                                 | Min Version |
+| ----------------------------------------------------------------------- | ----------- |
+| `@autorest/core`                                                        | `3.6.2`     |
+| `@autorest/modelerfour`                                                 | `4.19.1`    |
+| `azure-core` dep of generated code                                      | `1.20.1`    |
+| `msrest` dep of generated code                                          | `0.6.21`    |
+| `azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`     |
 
 **Bug Fixes**
 
@@ -18,57 +47,57 @@
 
 ### 2022-01-26 - 5.12.5
 
-| Library | Min Version
-| --------------- | -------
-|`@autorest/core` |  `3.6.2`
-|`@autorest/modelerfour` | `4.19.1`
-|`azure-core` dep of generated code | `1.20.1`
-|`msrest` dep of generated code | `0.6.21`
-|`azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`
+| Library                                                                 | Min Version |
+| ----------------------------------------------------------------------- | ----------- |
+| `@autorest/core`                                                        | `3.6.2`     |
+| `@autorest/modelerfour`                                                 | `4.19.1`    |
+| `azure-core` dep of generated code                                      | `1.20.1`    |
+| `msrest` dep of generated code                                          | `0.6.21`    |
+| `azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`     |
 
 **Bug Fixes**
 
-- Fix usage of `--black` flag outside of repo  #1126
-- Remove unused `metadata` value for `version-tolerant` generations  #1127
+- Fix usage of `--black` flag outside of repo #1126
+- Remove unused `metadata` value for `version-tolerant` generations #1127
 
 ### 2022-01-14 - 5.12.4
 
-| Library | Min Version
-| --------------- | -------
-|`@autorest/core` |  `3.6.2`
-|`@autorest/modelerfour` | `4.19.1`
-|`azure-core` dep of generated code | `1.20.1`
-|`msrest` dep of generated code | `0.6.21`
-|`azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`
+| Library                                                                 | Min Version |
+| ----------------------------------------------------------------------- | ----------- |
+| `@autorest/core`                                                        | `3.6.2`     |
+| `@autorest/modelerfour`                                                 | `4.19.1`    |
+| `azure-core` dep of generated code                                      | `1.20.1`    |
+| `msrest` dep of generated code                                          | `0.6.21`    |
+| `azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`     |
 
 **Bug Fixes**
 
-- Remove duplicate generation of properties in classes that inherit from multiple classes  #1120
+- Remove duplicate generation of properties in classes that inherit from multiple classes #1120
 
 ### 2022-01-13 - 5.12.3
 
-| Library | Min Version
-| --------------- | -------
-|`@autorest/core` |  `3.6.2`
-|`@autorest/modelerfour` | `4.19.1`
-|`azure-core` dep of generated code | `1.20.1`
-|`msrest` dep of generated code | `0.6.21`
-|`azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`
+| Library                                                                 | Min Version |
+| ----------------------------------------------------------------------- | ----------- |
+| `@autorest/core`                                                        | `3.6.2`     |
+| `@autorest/modelerfour`                                                 | `4.19.1`    |
+| `azure-core` dep of generated code                                      | `1.20.1`    |
+| `msrest` dep of generated code                                          | `0.6.21`    |
+| `azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`     |
 
 **Bug Fixes**
 
-- Unify multiapi constant behavior with single API version  #1119
-- Clean up docstrings by removing descriptions for client constants on methods and request builders  #1119
+- Unify multiapi constant behavior with single API version #1119
+- Clean up docstrings by removing descriptions for client constants on methods and request builders #1119
 
 ### 2022-01-11 - 5.12.2
 
-| Library | Min Version
-| --------------- | -------
-|`@autorest/core` |  `3.6.2`
-|`@autorest/modelerfour` | `4.19.1`
-|`azure-core` dep of generated code | `1.20.1`
-|`msrest` dep of generated code | `0.6.21`
-|`azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`
+| Library                                                                 | Min Version |
+| ----------------------------------------------------------------------- | ----------- |
+| `@autorest/core`                                                        | `3.6.2`     |
+| `@autorest/modelerfour`                                                 | `4.19.1`    |
+| `azure-core` dep of generated code                                      | `1.20.1`    |
+| `msrest` dep of generated code                                          | `0.6.21`    |
+| `azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`     |
 
 **Bug Fixes**
 
@@ -76,81 +105,81 @@
 
 ### 2022-01-10 - 5.12.1
 
-| Library | Min Version
-| --------------- | -------
-|`@autorest/core` |  `3.6.2`
-|`@autorest/modelerfour` | `4.19.1`
-|`azure-core` dep of generated code | `1.20.1`
-|`msrest` dep of generated code | `0.6.21`
-|`azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`
+| Library                                                                 | Min Version |
+| ----------------------------------------------------------------------- | ----------- |
+| `@autorest/core`                                                        | `3.6.2`     |
+| `@autorest/modelerfour`                                                 | `4.19.1`    |
+| `azure-core` dep of generated code                                      | `1.20.1`    |
+| `msrest` dep of generated code                                          | `0.6.21`    |
+| `azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`     |
 
 **Bug Fixes**
 
-- Fix support for json merge patch  #1117
+- Fix support for json merge patch #1117
 
 ### 2021-12-06 - 5.12.0
 
-| Library | Min Version
-| --------------- | -------
-|`@autorest/core` |  `3.6.2`
-|`@autorest/modelerfour` | `4.19.1`
-|`azure-core` dep of generated code | `1.20.1`
-|`msrest` dep of generated code | `0.6.21`
-|`azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`
+| Library                                                                 | Min Version |
+| ----------------------------------------------------------------------- | ----------- |
+| `@autorest/core`                                                        | `3.6.2`     |
+| `@autorest/modelerfour`                                                 | `4.19.1`    |
+| `azure-core` dep of generated code                                      | `1.20.1`    |
+| `msrest` dep of generated code                                          | `0.6.21`    |
+| `azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`     |
 
 **Breaking Changes in Version Tolerant Generation**
 
 - Remove metadata property for version tolerant and low level client generations #1090
-- Generate SDKs with `--python3-only` defaulting to `True` for version tolerant and low level client  #1087
+- Generate SDKs with `--python3-only` defaulting to `True` for version tolerant and low level client #1087
 
 **New Features**
 
-- Generate a `_patch.py` file if one does not exist. These files are used to customize the generated code  #1092
+- Generate a `_patch.py` file if one does not exist. These files are used to customize the generated code #1092
 
 **Bug Fixes**
 
 - Can now handle body params with names `json`, `content`, `data`, and `files` #1081
-- Improve generated templates for `data` and `files` input body params by adding quotes around the keys  #1082
-- Using flag `--python3-only` will get you typed sync client and config files  #1085
-- Pin `mistune` dependency to less than `2.x.x` so autorest can be successfully installed  #1106
+- Improve generated templates for `data` and `files` input body params by adding quotes around the keys #1082
+- Using flag `--python3-only` will get you typed sync client and config files #1085
+- Pin `mistune` dependency to less than `2.x.x` so autorest can be successfully installed #1106
 
 ### 2021-11-05 - 5.11.2
 
-| Library | Min Version
-| --------------- | -------
-|`@autorest/core` |  `3.6.2`
-|`@autorest/modelerfour` | `4.19.1`
-|`azure-core` dep of generated code | `1.20.0`
-|`msrest` dep of generated code | `0.6.21`
-|`azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`
+| Library                                                                 | Min Version |
+| ----------------------------------------------------------------------- | ----------- |
+| `@autorest/core`                                                        | `3.6.2`     |
+| `@autorest/modelerfour`                                                 | `4.19.1`    |
+| `azure-core` dep of generated code                                      | `1.20.0`    |
+| `msrest` dep of generated code                                          | `0.6.21`    |
+| `azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`     |
 
 **Bug Fixes**
 
-- Respect no client side validation for low level client generations  #1080
+- Respect no client side validation for low level client generations #1080
 
 ### 2021-11-05 - 5.11.1
 
-| Library | Min Version
-| --------------- | -------
-|`@autorest/core` |  `3.6.2`
-|`@autorest/modelerfour` | `4.19.1`
-|`azure-core` dep of generated code | `1.20.0`
-|`msrest` dep of generated code | `0.6.21`
-|`azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`
+| Library                                                                 | Min Version |
+| ----------------------------------------------------------------------- | ----------- |
+| `@autorest/core`                                                        | `3.6.2`     |
+| `@autorest/modelerfour`                                                 | `4.19.1`    |
+| `azure-core` dep of generated code                                      | `1.20.0`    |
+| `msrest` dep of generated code                                          | `0.6.21`    |
+| `azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`     |
 
 **Bug Fixes**
 
-- Hide mixin operations for version tolerant generation  #1071
+- Hide mixin operations for version tolerant generation #1071
 
 ### 2021-11-04 - 5.11.0
 
-| Library | Min Version
-| --------------- | -------
-|`@autorest/core` |  `3.6.2`
-|`@autorest/modelerfour` | `4.19.1`
-|`azure-core` dep of generated code | `1.20.0`
-|`msrest` dep of generated code | `0.6.21`
-|`azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`
+| Library                                                                 | Min Version |
+| ----------------------------------------------------------------------- | ----------- |
+| `@autorest/core`                                                        | `3.6.2`     |
+| `@autorest/modelerfour`                                                 | `4.19.1`    |
+| `azure-core` dep of generated code                                      | `1.20.0`    |
+| `msrest` dep of generated code                                          | `0.6.21`    |
+| `azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`     |
 
 **New Features**
 
@@ -164,68 +193,69 @@
 
 ### 2021-11-01 - 5.10.0
 
-| Library | Min Version
-| --------------- | -------
-|`@autorest/core` |  `3.6.2`
-|`@autorest/modelerfour` | `4.19.1`
-|`azure-core` dep of generated code | `1.19.1`
-|`msrest` dep of generated code | `0.6.21`
-|`azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`
+| Library                                                                 | Min Version |
+| ----------------------------------------------------------------------- | ----------- |
+| `@autorest/core`                                                        | `3.6.2`     |
+| `@autorest/modelerfour`                                                 | `4.19.1`    |
+| `azure-core` dep of generated code                                      | `1.19.1`    |
+| `msrest` dep of generated code                                          | `0.6.21`    |
+| `azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`     |
 
 **New Features**
 
-- Allow users to override constant swagger params with kwarg input  #1060
+- Allow users to override constant swagger params with kwarg input #1060
 
 ### 2021-10-15 - 5.9.3
 
-| Library | Min Version
-| --------------- | -------
-|`@autorest/core` |  `3.6.2`
-|`@autorest/modelerfour` | `4.19.1`
-|`azure-core` dep of generated code | `1.19.0`
-|`msrest` dep of generated code | `0.6.21`
-|`azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`
+| Library                                                                 | Min Version |
+| ----------------------------------------------------------------------- | ----------- |
+| `@autorest/core`                                                        | `3.6.2`     |
+| `@autorest/modelerfour`                                                 | `4.19.1`    |
+| `azure-core` dep of generated code                                      | `1.19.0`    |
+| `msrest` dep of generated code                                          | `0.6.21`    |
+| `azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`     |
 
 **Bug Fixes**
 
-- Fix generation of form-data inputs  #1061
+- Fix generation of form-data inputs #1061
 
 ### 2021-10-05 - 5.9.2
 
-| Library | Min Version
-| --------------- | -------
-|`@autorest/core` |  `3.6.2`
-|`@autorest/modelerfour` | `4.19.1`
-|`azure-core` dep of generated code | `1.19.0`
-|`msrest` dep of generated code | `0.6.21`
-|`azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`
+| Library                                                                 | Min Version |
+| ----------------------------------------------------------------------- | ----------- |
+| `@autorest/core`                                                        | `3.6.2`     |
+| `@autorest/modelerfour`                                                 | `4.19.1`    |
+| `azure-core` dep of generated code                                      | `1.19.0`    |
+| `msrest` dep of generated code                                          | `0.6.21`    |
+| `azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`     |
 
 **New Features**
+
 - Updating generated code for `azure-core` release `1.19.0`.
 
 ### 2021-09-27 - 5.9.1
 
-| Library | Min Version
-| --------------- | -------
-|`@autorest/core` |  `3.6.2`
-|`@autorest/modelerfour` | `4.19.1`
-|`azure-core` dep of generated code | `1.18.0`
-|`msrest` dep of generated code | `0.6.21`
-|`azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`
+| Library                                                                 | Min Version |
+| ----------------------------------------------------------------------- | ----------- |
+| `@autorest/core`                                                        | `3.6.2`     |
+| `@autorest/modelerfour`                                                 | `4.19.1`    |
+| `azure-core` dep of generated code                                      | `1.18.0`    |
+| `msrest` dep of generated code                                          | `0.6.21`    |
+| `azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`     |
 
 **New Features**
 
 - We have added a **provisional** `rest` layer to our generated code. We have also added the following **provisional** flags listed [here](https://github.com/Azure/autorest.python/wiki/Generating-Low-Level-Client#generate-a-low-level-client). #875
-- With this new release, we are also dropping support for Python 3.5 + async.  #875
+- With this new release, we are also dropping support for Python 3.5 + async. #875
 - For mgmt plan SDK, default policy changes from `BearerTokenCredentialPolicy` to `ARMChallengeAuthenticationPolicy`.
 - We now add tracing by default, the flag `--trace` now defaults to `True` if you have operations.
-- Added flag `--python3-only` for users looking to generate SDKs that only support Python 3  #1044
+- Added flag `--python3-only` for users looking to generate SDKs that only support Python 3 #1044
 
 **Bug Fixes**
 
-- Correctly pad operation groups with reserved names with `Operations`  #1005
-- Fix the generated docstrings for input kwargs of models  #1026
-- Pass pipeline context to `msrest` in `failsafe_deserialize` so `msrest` has access to the context  #1030
+- Correctly pad operation groups with reserved names with `Operations` #1005
+- Fix the generated docstrings for input kwargs of models #1026
+- Pass pipeline context to `msrest` in `failsafe_deserialize` so `msrest` has access to the context #1030
 
 ### 2021-09-27 - 5.9.0
 
@@ -260,7 +290,7 @@ min Modelerfour version: 4.19.1
 
 **Bug Fixes**
 
-- We are now more lenient with our checks for the content type parameter  #956
+- We are now more lenient with our checks for the content type parameter #956
 
 ### 2021-06-16 - 5.8.1
 
@@ -271,7 +301,7 @@ min Modelerfour version: 4.19.1
 **Bug Fixes**
 
 - Fix optional properties with constant schemas. Now, properties that have constant schemas but are optional will not have the hardcoded constant value,
-but will default to its `x-ms-client-default` or `None`  #952
+  but will default to its `x-ms-client-default` or `None` #952
 
 ### 2021-05-17 - 5.8.0
 
@@ -281,7 +311,7 @@ min Modelerfour version: 4.19.1
 
 **New Features**
 
-- Add support for parameters and properties that can be of type "Anything".  #946
+- Add support for parameters and properties that can be of type "Anything". #946
 
 ### 2021-04-20 - 5.7.0
 
@@ -301,7 +331,7 @@ min Modelerfour version: 4.15.456
 
 **Bug Fixes**
 
-- Fix docstrings so they don't get split on hyphens  #931
+- Fix docstrings so they don't get split on hyphens #931
 
 ### 2021-04-07 - 5.6.5
 
@@ -311,7 +341,7 @@ min Modelerfour version: 4.15.456
 
 **Bug Fixes**
 
-- Fix regression in multiapi generation for multiapi versions without mixin operations  #928
+- Fix regression in multiapi generation for multiapi versions without mixin operations #928
 
 ### 2021-03-01 - 5.6.4
 
@@ -320,6 +350,7 @@ min Autorest core version: 3.1.0
 min Modelerfour version: 4.15.456
 
 **Bug Fixes**
+
 - Bump `Autorest core` minimum version to be able to deal with indented `python` blocks in config files
 
 ### 2021-02-10 - 5.6.3
@@ -329,7 +360,8 @@ min Autorest core version: 3.0.6372
 min Modelerfour version: 4.15.456
 
 **Bug Fixes**
-- Bump `Autorest core` minimum version to [correctly deal with](https://github.com/Azure/autorest/pull/3860) overriding configs. Fixes submodule-specific code in our multiapi client  #880
+
+- Bump `Autorest core` minimum version to [correctly deal with](https://github.com/Azure/autorest/pull/3860) overriding configs. Fixes submodule-specific code in our multiapi client #880
 
 ### 2021-02-04 - 5.6.2
 
@@ -338,7 +370,8 @@ Autorest core version: 3.0.6318
 Modelerfour version: 4.15.456
 
 **Bug Fixes**
-- Bump `Modelerfour` minimum version to [correctly deal with](https://github.com/Azure/autorest.modelerfour/pull/385) parameters specified as `'required': false` in swagger  #877
+
+- Bump `Modelerfour` minimum version to [correctly deal with](https://github.com/Azure/autorest.modelerfour/pull/385) parameters specified as `'required': false` in swagger #877
 
 ### 2021-01-27 - 5.6.1
 

package/autorest/black/__init__.py

@@ -5,6 +5,7 @@
 # --------------------------------------------------------------------------
 import logging
 from pathlib import Path
+import os
 import black
 
 from .. import Plugin
@@ -21,6 +22,8 @@ class BlackScriptPlugin(Plugin):
         output_folder_uri = self._autorestapi.get_value("outputFolderUri")
         if output_folder_uri.startswith("file:"):
             output_folder_uri = output_folder_uri[5:]
+        if os.name == 'nt' and output_folder_uri.startswith("///"):
+            output_folder_uri = output_folder_uri[3:]
         self.output_folder = Path(output_folder_uri)
 
     def process(self) -> bool:

package/autorest/codegen/__init__.py

@@ -76,6 +76,12 @@ def _validate_code_model_options(options: Dict[str, Any]) -> None:
             "If you want operation files, pass in flag --show-operations"
         )
 
+    if options["reformat_next_link"] and options["version_tolerant"]:
+        raise ValueError(
+            "--reformat-next-link can not be true for version tolerant generations. "
+            "Please remove --reformat-next-link from your call for version tolerant generations."
+        )
+
 _LOGGER = logging.getLogger(__name__)
 class CodeGenerator(Plugin):
     @staticmethod
@@ -289,6 +295,10 @@ class CodeGenerator(Plugin):
             "low_level_client": low_level_client,
             "combine_operation_files": self._autorestapi.get_boolean_value("combine-operation-files", version_tolerant),
             "python3_only": python3_only,
+            "default_optional_constants_to_none": self._autorestapi.get_boolean_value(
+                "default-optional-constants-to-none", low_level_client or version_tolerant
+            ),
+            "reformat_next_link": self._autorestapi.get_boolean_value("reformat-next-link", not version_tolerant)
         }
 
         if options["builders_visibility"] is None:
@@ -327,8 +337,8 @@ class CodeGenerator(Plugin):
 
         code_model = self._create_code_model(yaml_data=yaml_data, options=options)
 
-        serializer = JinjaSerializer(self._autorestapi)
-        serializer.serialize(code_model)
+        serializer = JinjaSerializer(self._autorestapi, code_model)
+        serializer.serialize()
 
         return True
 

package/autorest/codegen/models/__init__.py

@@ -17,7 +17,7 @@ from .constant_schema import ConstantSchema
 from .imports import FileImport, ImportType, TypingSection
 from .lro_operation import LROOperation
 from .paging_operation import PagingOperation
-from .parameter import Parameter, ParameterStyle
+from .parameter import Parameter, ParameterStyle, ParameterLocation
 from .operation import Operation
 from .property import Property
 from .operation_group import OperationGroup
@@ -50,6 +50,7 @@ __all__ = [
     "PagingOperation",
     "Parameter",
     "ParameterList",
+    "ParameterLocation",
     "OperationGroup",
     "Property",
     "RequestBuilder",

package/autorest/codegen/models/constant_schema.py

@@ -39,10 +39,6 @@ class ConstantSchema(BaseSchema):
             return "None"
         return self.schema.get_declaration(self.value)
 
-    @property
-    def extra_description_information(self) -> str:
-        return f"The default value is {self.get_declaration(self.value)}."
-
     @property
     def serialization_type(self) -> str:
         """Returns the serialization value for msrest.

package/autorest/codegen/models/operation.py

@@ -303,6 +303,15 @@ class Operation(BaseBuilder):  # pylint: disable=too-many-public-methods, too-ma
         parameters, multiple_content_type_parameters = create_parameters(
             yaml_data, code_model, parameter_creator
         )
+        parameter_list = parameter_list_creator(code_model, parameters, schema_requests)
+        multiple_content_type_parameter_list = parameter_list_creator(
+            code_model, multiple_content_type_parameters, schema_requests
+        )
+
+        if len(parameter_list.content_types) > 1:
+            for p in parameter_list.parameters:
+                if p.rest_api_name == "Content-Type":
+                    p.is_keyword_only = True
 
         return cls(
             code_model=code_model,
@@ -310,10 +319,8 @@ class Operation(BaseBuilder):  # pylint: disable=too-many-public-methods, too-ma
             name=name,
             description=yaml_data["language"]["python"]["description"],
             api_versions=set(value_dict["version"] for value_dict in yaml_data["apiVersions"]),
-            parameters=parameter_list_creator(code_model, parameters, schema_requests),
-            multiple_content_type_parameters=parameter_list_creator(
-                code_model, multiple_content_type_parameters, schema_requests
-            ),
+            parameters=parameter_list,
+            multiple_content_type_parameters=multiple_content_type_parameter_list,
             schema_requests=schema_requests,
             summary=yaml_data["language"]["python"].get("summary"),
             responses=[SchemaResponse.from_yaml(yaml) for yaml in yaml_data.get("responses", [])],

package/autorest/codegen/models/parameter.py

@@ -68,7 +68,7 @@ class Parameter(BaseModel):  # pylint: disable=too-many-instance-attributes, too
         grouped_by: Optional["Parameter"] = None,
         original_parameter: Optional["Parameter"] = None,
         client_default_value: Optional[Any] = None,
-        keyword_only: bool = False,
+        keyword_only: Optional[bool] = None,
         content_types: Optional[List[str]] = None,
     ) -> None:
         super().__init__(yaml_data)
@@ -99,6 +99,7 @@ class Parameter(BaseModel):  # pylint: disable=too-many-instance-attributes, too
         self.body_kwargs: List[Parameter] = []
         self.is_body_kwarg = False
         self.need_import = True
+        self.is_kwarg = (self.rest_api_name == "Content-Type" or (self.constant and self.rest_api_name != "Accept"))
 
     def __hash__(self) -> int:
         return hash(self.serialized_name)
@@ -111,6 +112,14 @@ class Parameter(BaseModel):  # pylint: disable=too-many-instance-attributes, too
                 if description:
                     description += " "
                 description += f"{self.schema.extra_description_information}"
+            if isinstance(self.schema, ConstantSchema) and not self.constant:
+                if description:
+                    description += " "
+                description += f"Possible values are {self.schema.get_declaration(self.schema.value)} or {None}."
+            if self.has_default_value and not any(
+                l for l in ["default value is", "default is"] if l in description.lower()
+            ):
+                description += f" Default value is {self.default_value_declaration}."
             if self.constant:
                 description += " Note that overriding this default value may result in unsupported behavior."
             return description
@@ -232,7 +241,12 @@ class Parameter(BaseModel):  # pylint: disable=too-many-instance-attributes, too
             default_value_declaration = "None"
         else:
             if isinstance(self.schema, ConstantSchema):
-                default_value = self.schema.get_declaration(self.schema.value)
+                if (self.required or
+                    self.is_content_type or
+                    not self.code_model.options["default_optional_constants_to_none"]):
+                    default_value = self.schema.get_declaration(self.schema.value)
+                else:
+                    default_value = None
                 default_value_declaration = default_value
             else:
                 default_value = self.schema.default_value
@@ -298,22 +312,26 @@ class Parameter(BaseModel):  # pylint: disable=too-many-instance-attributes, too
             origin_name = f"self._config.{self.serialized_name}"
         return origin_name
 
-    @property
-    def is_kwarg(self) -> bool:
-        # this means "am I in **kwargs?"
-        return self.rest_api_name == "Content-Type" or (self.constant and self.rest_api_name != "Accept")
-
     @property
     def is_keyword_only(self) -> bool:
         # this means in async mode, I am documented like def hello(positional_1, *, me!)
-        return self._keyword_only
+        return self._keyword_only or False
+
+    @is_keyword_only.setter
+    def is_keyword_only(self, val: bool) -> None:
+        self._keyword_only = val
+        self.is_kwarg = False
 
     @property
     def is_hidden(self) -> bool:
-        return self.serialized_name in _HIDDEN_KWARGS or (
+        return self.serialized_name in _HIDDEN_KWARGS and self.is_kwarg or (
             self.yaml_data["implementation"] == "Client" and self.constant
         )
 
+    @property
+    def is_content_type(self) -> bool:
+        return self.rest_api_name == "Content-Type" and self.location == ParameterLocation.Header
+
     @property
     def is_positional(self) -> bool:
         return self.in_method_signature and not (self.is_keyword_only or self.is_kwarg)
@@ -365,6 +383,8 @@ class ParameterOnlyPathAndBodyPositional(Parameter):
 
     @property
     def is_keyword_only(self) -> bool:
+        if self._keyword_only is not None:
+            return self._keyword_only
         return self.in_method_signature and not (
             self.is_hidden or
             self.location == ParameterLocation.Path or
@@ -373,6 +393,11 @@ class ParameterOnlyPathAndBodyPositional(Parameter):
             self.is_kwarg
         )
 
+    @is_keyword_only.setter
+    def is_keyword_only(self, val: bool) -> None:
+        self._keyword_only = val
+        self.is_kwarg = False
+
 def get_parameter(code_model):
     if code_model.options["only_path_and_body_params_positional"]:
         return ParameterOnlyPathAndBodyPositional

package/autorest/codegen/models/parameter_list.py

@@ -207,7 +207,9 @@ class ParameterList(MutableSequence):  # pylint: disable=too-many-public-methods
             lambda parameter: parameter.implementation == self.implementation
         )
         positional = [p for p in parameters_of_this_implementation if p.is_positional]
-        keyword_only = [p for p in parameters_of_this_implementation if p.is_keyword_only]
+        keyword_only = self._filter_out_multiple_content_type(
+            [p for p in parameters_of_this_implementation if p.is_keyword_only]
+        )
         kwargs = self._filter_out_multiple_content_type(
             [p for p in parameters_of_this_implementation if p.is_kwarg]
         )
@@ -315,7 +317,9 @@ class ParameterOnlyPathAndBodyPositionalList(ParameterList):
             file_and_data_params.append(data_param)
         method_params = [p for p in method_params if not p.is_multipart and not p.is_data_input]
         positional = [p for p in method_params if p.is_positional]
-        keyword_only = [p for p in method_params if p.is_keyword_only]
+        keyword_only = self._filter_out_multiple_content_type(
+            [p for p in method_params if p.is_keyword_only]
+        )
         kwargs = self._filter_out_multiple_content_type(
             [p for p in method_params if p.is_kwarg]
         )
@@ -338,7 +342,9 @@ class GlobalParameterList(ParameterList):
         """
         # Client level should not be on Method, etc.
         positional = [p for p in self.parameters if p.is_positional]
-        keyword_only = [p for p in self.parameters if p.is_keyword_only]
+        keyword_only = self._filter_out_multiple_content_type(
+            [p for p in self.parameters if p.is_keyword_only]
+        )
         kwargs = self._filter_out_multiple_content_type(
             [p for p in self.parameters if p.is_kwarg]
         )
@@ -384,7 +390,7 @@ class GlobalParameterList(ParameterList):
             schema=StringSchema(namespace="", yaml_data={"type": "str"}),
             rest_api_name=self.host_variable_name,
             serialized_name=self.host_variable_name,
-            description=f"Service URL. Default value is '{host_value}'.",
+            description=f"Service URL.",
             implementation="Client",
             required=True,
             location=ParameterLocation.Other,

package/autorest/codegen/models/request_builder_parameter.py

@@ -62,6 +62,11 @@ class RequestBuilderParameter(ParameterOnlyPathAndBodyPositional):
     def is_keyword_only(self) -> bool:
         return not self.location == ParameterLocation.Path and not self.is_kwarg
 
+    @is_keyword_only.setter
+    def is_keyword_only(self, val: bool) -> None:
+        self._keyword_only = val
+        self.is_kwarg = False
+
     @property
     def full_serialized_name(self) -> str:
         return self.serialized_name

package/autorest/codegen/serializers/__init__.py

@@ -30,10 +30,11 @@ __all__ = [
 ]
 
 class JinjaSerializer:
-    def __init__(self, autorestapi: AutorestAPI) -> None:
+    def __init__(self, autorestapi: AutorestAPI, code_model: CodeModel) -> None:
         self._autorestapi = autorestapi
+        self.code_model = code_model
 
-    def serialize(self, code_model: CodeModel) -> None:
+    def serialize(self) -> None:
         env = Environment(
             loader=PackageLoader("autorest.codegen", "templates"),
             keep_trailing_newline=True,
@@ -44,32 +45,34 @@ class JinjaSerializer:
         )
 
         namespace_path = (
-            Path(".") if code_model.options["no_namespace_folders"] else Path(*(code_model.namespace.split(".")))
+            Path(".")
+            if self.code_model.options["no_namespace_folders"]
+            else Path(*(self.code_model.namespace.split(".")))
         )
 
         # if there was a patch file before, we keep it
         self._keep_patch_file(namespace_path / Path("_patch.py"), env)
         self._keep_patch_file(namespace_path / Path("aio") / Path("_patch.py"), env)
 
-        self._serialize_and_write_top_level_folder(code_model=code_model, env=env, namespace_path=namespace_path)
+        self._serialize_and_write_top_level_folder(env=env, namespace_path=namespace_path)
 
-        if code_model.rest.request_builders:
-            if code_model.options["builders_visibility"] != "embedded":
-                self._serialize_and_write_rest_layer(code_model=code_model, env=env, namespace_path=namespace_path)
-            if not code_model.options["no_async"]:
+        if self.code_model.rest.request_builders:
+            if self.code_model.options["builders_visibility"] != "embedded":
+                self._serialize_and_write_rest_layer(env=env, namespace_path=namespace_path)
+            if not self.code_model.options["no_async"]:
                 self._serialize_and_write_aio_top_level_folder(
-                    code_model=code_model, env=env, namespace_path=namespace_path,
+                    env=env, namespace_path=namespace_path,
                 )
 
-        if code_model.options["show_operations"] and code_model.operation_groups:
-            self._serialize_and_write_operations_folder(code_model=code_model, env=env, namespace_path=namespace_path)
-            if code_model.options["multiapi"]:
+        if self.code_model.options["show_operations"] and self.code_model.operation_groups:
+            self._serialize_and_write_operations_folder(env=env, namespace_path=namespace_path)
+            if self.code_model.options["multiapi"]:
                 self._serialize_and_write_metadata(
-                    code_model, env=env, namespace_path=namespace_path
+                    env=env, namespace_path=namespace_path
                 )
 
-        if code_model.options["models_mode"] and (code_model.schemas or code_model.enums):
-            self._serialize_and_write_models_folder(code_model=code_model, env=env, namespace_path=namespace_path)
+        if self.code_model.options["models_mode"] and (self.code_model.schemas or self.code_model.enums):
+            self._serialize_and_write_models_folder(env=env, namespace_path=namespace_path)
 
 
 
@@ -80,49 +83,51 @@ class JinjaSerializer:
             self._autorestapi.write_file(path_file, PatchSerializer(env=env).serialize())
 
 
-    def _serialize_and_write_models_folder(self, code_model: CodeModel, env: Environment, namespace_path: Path) -> None:
+    def _serialize_and_write_models_folder(self, env: Environment, namespace_path: Path) -> None:
         # Write the models folder
         models_path = namespace_path / Path("models")
-        if code_model.schemas:
-            if not code_model.options['python3_only']:
+        if self.code_model.schemas:
+            if not self.code_model.options['python3_only']:
                 self._autorestapi.write_file(
-                    models_path / Path("_models.py"), ModelGenericSerializer(code_model=code_model, env=env).serialize()
+                    models_path / Path("_models.py"),
+                    ModelGenericSerializer(code_model=self.code_model, env=env).serialize()
                 )
             self._autorestapi.write_file(
-                models_path / Path("_models_py3.py"), ModelPython3Serializer(code_model=code_model, env=env).serialize()
+                models_path / Path("_models_py3.py"),
+                ModelPython3Serializer(code_model=self.code_model, env=env).serialize()
             )
-        if code_model.enums:
+        if self.code_model.enums:
             self._autorestapi.write_file(
-                models_path / Path(f"_{code_model.module_name}_enums.py"),
-                EnumSerializer(code_model=code_model, env=env).serialize(),
+                models_path / Path(f"_{self.code_model.module_name}_enums.py"),
+                EnumSerializer(code_model=self.code_model, env=env).serialize(),
             )
         self._autorestapi.write_file(
-            models_path / Path("__init__.py"), ModelInitSerializer(code_model=code_model, env=env).serialize()
+            models_path / Path("__init__.py"), ModelInitSerializer(code_model=self.code_model, env=env).serialize()
         )
 
     def _serialize_and_write_rest_layer(
-        self, code_model: CodeModel, env: Environment, namespace_path: Path
+        self, env: Environment, namespace_path: Path
     ) -> None:
-        rest_path = namespace_path / Path(code_model.rest_layer_name)
+        rest_path = namespace_path / Path(self.code_model.rest_layer_name)
         operation_group_names = {
-            rb.operation_group_name for rb in code_model.rest.request_builders
+            rb.operation_group_name for rb in self.code_model.rest.request_builders
         }
 
         for operation_group_name in operation_group_names:
             request_builders = [
-                r for r in code_model.rest.request_builders if r.operation_group_name == operation_group_name
+                r for r in self.code_model.rest.request_builders if r.operation_group_name == operation_group_name
             ]
             self._serialize_and_write_single_rest_layer(
-                code_model, env, rest_path, request_builders
+                env, rest_path, request_builders
             )
         if not "" in operation_group_names:
             self._autorestapi.write_file(
-                rest_path / Path("__init__.py"), code_model.options['license_header']
+                rest_path / Path("__init__.py"), self.code_model.options['license_header']
             )
 
 
     def _serialize_and_write_single_rest_layer(
-        self, code_model: CodeModel, env: Environment, rest_path: Path, request_builders: List[RequestBuilder]
+        self, env: Environment, rest_path: Path, request_builders: List[RequestBuilder]
     ) -> None:
         builder_group_name = request_builders[0].builder_group_name
         output_path = rest_path / Path(builder_group_name) if builder_group_name else rest_path
@@ -130,7 +135,7 @@ class JinjaSerializer:
         self._autorestapi.write_file(
             output_path / Path("_request_builders.py"),
             RestGenericSerializer(
-                code_model=code_model, env=env, request_builders=request_builders
+                code_model=self.code_model, env=env, request_builders=request_builders
             ).serialize_request_builders()
         )
 
@@ -138,20 +143,19 @@ class JinjaSerializer:
         self._autorestapi.write_file(
             output_path / Path("_request_builders_py3.py"),
             RestPython3Serializer(
-                code_model=code_model, env=env, request_builders=request_builders
+                code_model=self.code_model, env=env, request_builders=request_builders
             ).serialize_request_builders()
         )
 
         # write rest init file
         self._autorestapi.write_file(
             output_path / Path("__init__.py"), RestSerializer(
-                code_model=code_model, env=env, request_builders=request_builders
+                code_model=self.code_model, env=env, request_builders=request_builders
             ).serialize_init()
         )
 
     def _serialize_and_write_operations_file(
         self,
-        code_model: CodeModel,
         env: Environment,
         namespace_path: Path,
         operation_group: Optional[OperationGroup] = None
@@ -159,35 +163,35 @@ class JinjaSerializer:
         filename = operation_group.filename if operation_group else "_operations"
         # write first sync file
         operation_group_serializer = OperationGroupsSerializer(
-            code_model=code_model,
+            code_model=self.code_model,
             env=env,
             async_mode=False,
-            is_python3_file=code_model.options['python3_only'],
+            is_python3_file=self.code_model.options['python3_only'],
             operation_group=operation_group
         )
         self._autorestapi.write_file(
-            namespace_path / Path(code_model.operations_folder_name) / Path(f"{filename}.py"),
+            namespace_path / Path(self.code_model.operations_folder_name) / Path(f"{filename}.py"),
             operation_group_serializer.serialize(),
         )
 
-        if not code_model.options['python3_only'] and code_model.options["add_python3_operation_files"]:
+        if not self.code_model.options['python3_only'] and self.code_model.options["add_python3_operation_files"]:
             # write typed second file if not python 3 only
             operation_group_serializer = OperationGroupsSerializer(
-                code_model=code_model,
+                code_model=self.code_model,
                 env=env,
                 async_mode=False,
                 is_python3_file=True,
 
             )
             self._autorestapi.write_file(
-                namespace_path / Path(code_model.operations_folder_name) / Path(f"{filename}_py3.py"),
+                namespace_path / Path(self.code_model.operations_folder_name) / Path(f"{filename}_py3.py"),
                 operation_group_serializer.serialize(),
             )
 
-        if not code_model.options["no_async"]:
+        if not self.code_model.options["no_async"]:
             # write async operation group and operation files
             operation_group_async_serializer = OperationGroupsSerializer(
-                code_model=code_model,
+                code_model=self.code_model,
                 env=env,
                 async_mode=True,
                 is_python3_file=True,
@@ -197,47 +201,47 @@ class JinjaSerializer:
                 (
                     namespace_path
                     / Path("aio")
-                    / Path(code_model.operations_folder_name)
+                    / Path(self.code_model.operations_folder_name)
                     / Path(f"{filename}.py")
                 ),
                 operation_group_async_serializer.serialize(),
             )
 
     def _serialize_and_write_operations_folder(
-        self, code_model: CodeModel, env: Environment, namespace_path: Path
+        self, env: Environment, namespace_path: Path
     ) -> None:
         # write sync operations init file
-        operations_init_serializer = OperationsInitSerializer(code_model=code_model, env=env, async_mode=False)
+        operations_init_serializer = OperationsInitSerializer(code_model=self.code_model, env=env, async_mode=False)
         self._autorestapi.write_file(
-            namespace_path / Path(code_model.operations_folder_name) / Path("__init__.py"),
+            namespace_path / Path(self.code_model.operations_folder_name) / Path("__init__.py"),
             operations_init_serializer.serialize(),
         )
 
         # write async operations init file
-        if not code_model.options["no_async"]:
-            operations_async_init_serializer = OperationsInitSerializer(code_model=code_model, env=env, async_mode=True)
+        if not self.code_model.options["no_async"]:
+            operations_async_init_serializer = OperationsInitSerializer(
+                code_model=self.code_model, env=env, async_mode=True
+            )
             self._autorestapi.write_file(
-                namespace_path / Path("aio") / Path(code_model.operations_folder_name) / Path("__init__.py"),
+                namespace_path / Path("aio") / Path(self.code_model.operations_folder_name) / Path("__init__.py"),
                 operations_async_init_serializer.serialize(),
             )
 
-        if code_model.options["combine_operation_files"]:
+        if self.code_model.options["combine_operation_files"]:
             self._serialize_and_write_operations_file(
-                code_model=code_model,
                 env=env,
                 namespace_path=namespace_path,
             )
         else:
-            for operation_group in code_model.operation_groups:
+            for operation_group in self.code_model.operation_groups:
                 self._serialize_and_write_operations_file(
-                    code_model=code_model,
                     env=env,
                     namespace_path=namespace_path,
                     operation_group=operation_group,
                 )
 
     def _serialize_and_write_version_file(
-        self, code_model: CodeModel, namespace_path: Path, general_serializer: GeneralSerializer
+        self, namespace_path: Path, general_serializer: GeneralSerializer
     ):
         def _read_version_file(original_version_file_name: str) -> str:
             return self._autorestapi.read_file(namespace_path / original_version_file_name)
@@ -247,23 +251,23 @@ class JinjaSerializer:
                 namespace_path / Path("_version.py"),
                 _read_version_file(original_version_file_name)
             )
-        keep_version_file = code_model.options['keep_version_file']
+        keep_version_file = self.code_model.options['keep_version_file']
         if keep_version_file and _read_version_file("_version.py"):
             _write_version_file(original_version_file_name="_version.py")
         elif keep_version_file and _read_version_file("version.py"):
             _write_version_file(original_version_file_name="version.py")
-        elif code_model.options['package_version']:
+        elif self.code_model.options['package_version']:
             self._autorestapi.write_file(
                 namespace_path / Path("_version.py"),
                 general_serializer.serialize_version_file()
             )
 
     def _serialize_and_write_top_level_folder(
-        self, code_model: CodeModel, env: Environment, namespace_path: Path
+        self, env: Environment, namespace_path: Path
     ) -> None:
-        general_serializer = GeneralSerializer(code_model=code_model, env=env, async_mode=False)
+        general_serializer = GeneralSerializer(code_model=self.code_model, env=env, async_mode=False)
 
-        if code_model.rest.request_builders:
+        if self.code_model.rest.request_builders:
             self._autorestapi.write_file(
                 namespace_path / Path("__init__.py"), general_serializer.serialize_init_file()
             )
@@ -280,37 +284,37 @@ class JinjaSerializer:
             p = p.parent
 
         # Write the service client
-        if code_model.rest.request_builders:
+        if self.code_model.rest.request_builders:
             self._autorestapi.write_file(
-                namespace_path / Path(f"_{code_model.module_name}.py"),
+                namespace_path / Path(f"_{self.code_model.module_name}.py"),
                 general_serializer.serialize_service_client_file()
             )
 
-        if code_model.need_vendored_code:
+        if self.code_model.need_vendored_code:
             self._autorestapi.write_file(
                 namespace_path / Path("_vendor.py"),
                 general_serializer.serialize_vendor_file()
             )
 
-        self._serialize_and_write_version_file(code_model, namespace_path, general_serializer)
+        self._serialize_and_write_version_file(namespace_path, general_serializer)
 
         # write the empty py.typed file
         self._autorestapi.write_file(namespace_path / Path("py.typed"), "# Marker file for PEP 561.")
 
         # Write the config file
-        if code_model.rest.request_builders:
+        if self.code_model.rest.request_builders:
             self._autorestapi.write_file(
                 namespace_path / Path("_configuration.py"), general_serializer.serialize_config_file()
             )
 
         # Write the setup file
-        if code_model.options["basic_setup_py"]:
+        if self.code_model.options["basic_setup_py"]:
             self._autorestapi.write_file(Path("setup.py"), general_serializer.serialize_setup_file())
 
     def _serialize_and_write_aio_top_level_folder(
-        self, code_model: CodeModel, env: Environment, namespace_path: Path
+        self, env: Environment, namespace_path: Path
     ) -> None:
-        aio_general_serializer = GeneralSerializer(code_model=code_model, env=env, async_mode=True)
+        aio_general_serializer = GeneralSerializer(code_model=self.code_model, env=env, async_mode=True)
 
         aio_path = namespace_path / Path("aio")
 
@@ -319,7 +323,7 @@ class JinjaSerializer:
 
         # Write the service client
         self._autorestapi.write_file(
-            aio_path / Path(f"_{code_model.module_name}.py"),
+            aio_path / Path(f"_{self.code_model.module_name}.py"),
             aio_general_serializer.serialize_service_client_file(),
         )
 
@@ -329,6 +333,6 @@ class JinjaSerializer:
         )
 
 
-    def _serialize_and_write_metadata(self, code_model: CodeModel, env: Environment, namespace_path: Path) -> None:
-        metadata_serializer = MetadataSerializer(code_model, env)
+    def _serialize_and_write_metadata(self, env: Environment, namespace_path: Path) -> None:
+        metadata_serializer = MetadataSerializer(self.code_model, env)
         self._autorestapi.write_file(namespace_path / Path("_metadata.json"), metadata_serializer.serialize())

package/autorest/codegen/serializers/builder_serializer.py

@@ -27,6 +27,7 @@ from ..models import (
     SchemaResponse,
     IOSchema,
     ParameterStyle,
+    ParameterLocation
 )
 from . import utils
 
@@ -152,12 +153,21 @@ def _serialize_flattened_body(builder) -> List[str]:
     return retval
 
 def _content_type_docstring(builder) -> str:
-    content_type_str = (
-        ":keyword str content_type: Media type of the body sent to the API. " +
-        f'Default value is "{builder.parameters.default_content_type}". ' +
-        'Allowed values are: "{}."'.format('", "'.join(builder.parameters.content_types))
+    content_types = [f'"{c}"' for c in builder.parameters.content_types]
+    if len(content_types) == 2:
+        possible_values_str = " or ".join(content_types)
+    else:
+        possible_values_str = ", ".join(
+            content_types[: len(content_types) - 1]
+        ) + f", and {content_types[-1]}"
+    default_value = next(
+        p for p in builder.parameters.method if p.rest_api_name == "Content-Type"
+    ).default_value_declaration
+    return (
+        ":keyword content_type: Media type of the body sent to the API. " +
+        f"Possible values are: {possible_values_str}. " +
+        f"Default value is {default_value}."
     )
-    return content_type_str
 
 class _BuilderSerializerProtocol(ABC):
     @property
@@ -304,13 +314,14 @@ class _BuilderBaseSerializer(_BuilderSerializerProtocol):  # pylint: disable=abs
             description_list.append(
                 f":{param.docstring_type_keyword} { param.serialized_name }: { param.docstring_type }"
             )
-        try:
-            request_builder: RequestBuilder = cast(Operation, builder).request_builder
-        except AttributeError:
-            request_builder = cast(RequestBuilder, builder)
 
-        if len(request_builder.schema_requests) > 1:
-            description_list.append(_content_type_docstring(builder))
+        if len(builder.parameters.content_types) > 1:
+            description_list = [
+                _content_type_docstring(builder) if l.startswith(":keyword content_type:") else l
+                for l in description_list
+            ]
+            if not any(l for l in description_list if l.startswith(":keyword content_type:")):
+                description_list.append(_content_type_docstring(builder))
         return description_list
 
     def param_description_and_response_docstring(self, builder) -> List[str]:
@@ -788,6 +799,7 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
         builder,
         request_builder: RequestBuilder,
         template_url: Optional[str] = None,
+        is_next_request: bool = False,
     ) -> List[str]:
         retval = []
         if len(builder.body_kwargs_to_pass_to_request_builder) > 1:
@@ -827,6 +839,16 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
                 parameter.serialized_name not in builder.body_kwargs_to_pass_to_request_builder
             ):
                 continue
+            if (
+                is_next_request and
+                not bool(builder.next_request_builder) and
+                not self.code_model.options["reformat_next_link"] and
+                parameter.location == ParameterLocation.Query
+            ):
+                # if we don't want to reformat query parameters for next link calls
+                # in paging operations with a single swagger operation defintion,
+                # we skip passing query params when building the next request
+                continue
             high_level_name = cast(RequestBuilderParameter, parameter).name_in_high_level_operation
             retval.append(f"    {parameter.serialized_name}={high_level_name},")
         if not self.code_model.options["version_tolerant"]:
@@ -1073,11 +1095,13 @@ class _PagingOperationBaseSerializer(_OperationBaseSerializer):  # pylint: disab
         else:
             request_builder = builder.request_builder
             template_url = "next_link"
+
         request_builder = builder.next_request_builder or builder.request_builder
         return self._call_request_builder_helper(
             builder,
             request_builder,
             template_url=template_url,
+            is_next_request=True
         )
 
     def _prepare_request_callback(self, builder) -> List[str]:

package/autorest/namer/name_converter.py

@@ -373,7 +373,7 @@ class NameConverter:
             # check to see if name is reserved for the type of name we are converting
             pad_string = cast(PadType, pad_string)
             # there are some private variables, such as grouped parameters
-            # that are private. We still want to escape them for LLC
+            # that are private. We still want to escape them for DPG
             name_prefix = ""
             if name[0] == "_":
                 # i am private

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@autorest/python",
-    "version": "5.12.6",
+    "version": "5.13.0",
     "description": "The Python extension for generators in AutoRest.",
     "scripts": {
         "prepare": "node run-python3.js prepare.py",
@@ -27,7 +27,7 @@
         "@azure-tools/extension": "~3.2.1"
     },
     "devDependencies": {
-        "@microsoft.azure/autorest.testserver": "^3.1.13"
+        "@microsoft.azure/autorest.testserver": "^3.3.20"
     },
     "files": [
         "autorest/**/*.py",

package/run-python3.js

@@ -18,12 +18,6 @@ async function runPython3(scriptName, debug = "") {
 }
 
 runPython3(...process.argv.slice(2)).catch(err => {
-  const error = err.toString();
-
-  // Python script errors are already written out via stderr so don't
-  // write them twice.  Write out all other errors to stderr.
-  if (!error.startsWith("Error: Command failed")) {
-    console.error(error);
-  }
+  console.error(err.toString());
   process.exit(1);
 });

package/venvtools.py

@@ -62,13 +62,13 @@ def python_run(venv_context, module, command=None, *, additional_dir=".", error_
             venv_context.env_exe,
             "-m", module
         ] + (command if command else [])
-        print("Executing: {}".format(" ".join(cmd_line)), file=sys.stderr)
+        print("Executing: {}".format(" ".join(cmd_line)))
         subprocess.run(
             cmd_line,
             cwd=_ROOT_DIR / additional_dir,
             check=True,
         )
     except subprocess.CalledProcessError as err:
-        print(err, file=sys.stderr)
+        print(err)
         if not error_ok:
             sys.exit(1)