@autorest/python 5.11.0 → 5.12.1

package/autorest/codegen/serializers/builder_serializer.py

@@ -16,7 +16,6 @@ from ..models import (
     PagingOperation,
     LROOperation,
     LROPagingOperation,
-    BuilderType,
     ObjectSchema,
     DictionarySchema,
     ListSchema,
@@ -57,7 +56,7 @@ def _json_dumps_template(template_representation: Any) -> Any:
 def _serialize_files_or_data_dict(multipart_parameters: List[Parameter]) -> str:
     # only for template use
     template = {
-        param.serialized_name: param.schema.get_files_and_data_template_representation(
+        f'"{param.serialized_name}"': param.schema.get_files_and_data_template_representation(
             optional=not param.required,
             description=param.description,
         )
@@ -65,7 +64,7 @@ def _serialize_files_or_data_dict(multipart_parameters: List[Parameter]) -> str:
     }
     return _json_dumps_template(template)
 
-def _get_files_example_template(builder: BuilderType) -> List[str]:
+def _get_files_example_template(builder) -> List[str]:
     multipart_params = builder.parameters.multipart
     if multipart_params:
         retval = [
@@ -77,7 +76,7 @@ def _get_files_example_template(builder: BuilderType) -> List[str]:
         "You're trying to get a template for your multipart params, but you don't have multipart params"
     )
 
-def _get_data_example_template(builder: BuilderType) -> List[str]:
+def _get_data_example_template(builder) -> List[str]:
     data_inputs = builder.parameters.data_inputs
     if data_inputs:
         retval = [
@@ -89,7 +88,7 @@ def _get_data_example_template(builder: BuilderType) -> List[str]:
         "You're trying to get a template for your form-encoded params, but you don't have form-encoded params"
     )
 
-def _content_type_error_check(builder: BuilderType) -> List[str]:
+def _content_type_error_check(builder) -> List[str]:
     retval = ["else:"]
     retval.append("    raise ValueError(")
     retval.append("        \"The content_type '{}' is not one of the allowed values: \"")
@@ -97,7 +96,7 @@ def _content_type_error_check(builder: BuilderType) -> List[str]:
     retval.append("    )")
     return retval
 
-def _serialize_files_and_data_body(builder: BuilderType, param_name: str) -> List[str]:
+def _serialize_files_and_data_body(builder, param_name: str) -> List[str]:
     retval: List[str] = []
     # we have to construct our form data before passing to the request as well
     retval.append("# Construct form data")
@@ -113,7 +112,7 @@ def _pop_parameters_kwarg(
 ) -> str:
     return f'{function_name}_parameters = kwargs.pop("{kwarg_name}", {{}})  # type: Dict[str, Any]'
 
-def _serialize_grouped_body(builder: BuilderType) -> List[str]:
+def _serialize_grouped_body(builder) -> List[str]:
     retval: List[str] = []
     for grouped_parameter in builder.parameters.grouped:
         retval.append(f"{grouped_parameter.serialized_name} = None")
@@ -128,7 +127,7 @@ def _serialize_grouped_body(builder: BuilderType) -> List[str]:
             )
     return retval
 
-def _serialize_flattened_body(builder: BuilderType) -> List[str]:
+def _serialize_flattened_body(builder) -> List[str]:
     retval: List[str] = []
     if not builder.parameters.is_flattened:
         raise ValueError(
@@ -149,7 +148,7 @@ def _serialize_flattened_body(builder: BuilderType) -> List[str]:
     )
     return retval
 
-def _content_type_docstring(builder: BuilderType) -> str:
+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}". ' +
@@ -182,17 +181,17 @@ class _BuilderSerializerProtocol(ABC):
         ...
 
     @abstractmethod
-    def _method_signature(self, builder: BuilderType) -> str:
+    def _method_signature(self, builder) -> str:
         """Signature of the builder. Does not include return type annotation"""
         ...
 
     @abstractmethod
-    def _response_type_annotation(self, builder: BuilderType, modify_if_head_as_boolean: bool = True) -> str:
+    def _response_type_annotation(self, builder, modify_if_head_as_boolean: bool = True) -> str:
         """The mypy type annotation for the response"""
         ...
 
     @abstractmethod
-    def _response_type_annotation_wrapper(self, builder: BuilderType) -> List[str]:
+    def _response_type_annotation_wrapper(self, builder) -> List[str]:
         """Any wrappers that you want to go around the response type annotation"""
         ...
 
@@ -206,57 +205,57 @@ class _BuilderSerializerProtocol(ABC):
         ...
 
     @abstractmethod
-    def method_signature_and_response_type_annotation(self, builder: BuilderType) -> str:
+    def method_signature_and_response_type_annotation(self, builder) -> str:
         """Combines the method signature + the response type annotation together"""
         ...
 
     @abstractmethod
-    def description_and_summary(self, builder: BuilderType) -> List[str]:
+    def description_and_summary(self, builder) -> List[str]:
         """Description + summary from the swagger. Will be formatted into the overall operation description"""
         ...
 
     @abstractmethod
-    def response_docstring(self, builder: BuilderType) -> List[str]:
+    def response_docstring(self, builder) -> List[str]:
         """Response portion of the docstring"""
         ...
 
     @abstractmethod
-    def want_example_template(self, builder: BuilderType) -> bool:
+    def want_example_template(self, builder) -> bool:
         ...
 
     @abstractmethod
-    def get_example_template(self, builder: BuilderType) -> List[str]:
+    def get_example_template(self, builder) -> List[str]:
         ...
 
     @abstractmethod
-    def _get_json_example_template(self, builder: BuilderType) -> List[str]:
+    def _get_json_example_template(self, builder) -> List[str]:
         ...
 
     @abstractmethod
-    def _has_json_example_template(self, builder: BuilderType) -> bool:
+    def _has_json_example_template(self, builder) -> bool:
         ...
 
     @abstractmethod
-    def _has_files_example_template(self, builder: BuilderType) -> bool:
+    def _has_files_example_template(self, builder) -> bool:
         ...
     @abstractmethod
-    def _has_data_example_template(self, builder: BuilderType) -> bool:
+    def _has_data_example_template(self, builder) -> bool:
         ...
 
     @abstractmethod
-    def _json_example_param_name(self, builder: BuilderType) -> str:
+    def _json_example_param_name(self, builder) -> str:
         ...
 
     @abstractmethod
-    def _get_json_response_template(self, builder: BuilderType) -> List[str]:
+    def _get_json_response_template(self, builder) -> List[str]:
         ...
 
     @abstractmethod
-    def _get_json_response_template_to_status_codes(self, builder: BuilderType) -> Dict[str, List[str]]:
+    def _get_json_response_template_to_status_codes(self, builder) -> Dict[str, List[str]]:
         ...
 
     @abstractmethod
-    def _get_kwargs_to_pop(self, builder: BuilderType) -> List[Parameter]:
+    def _get_kwargs_to_pop(self, builder) -> List[Parameter]:
         ...
 
 class _BuilderBaseSerializer(_BuilderSerializerProtocol):  # pylint: disable=abstract-method
@@ -267,7 +266,7 @@ class _BuilderBaseSerializer(_BuilderSerializerProtocol):  # pylint: disable=abs
     def _cls_docstring_rtype(self) -> str:
         return "" if self.code_model.options["version_tolerant"] else " or the result of cls(response)"
 
-    def _method_signature(self, builder: BuilderType) -> str:
+    def _method_signature(self, builder) -> str:
         return utils.serialize_method(
             function_def=self._function_definition,
             method_name=builder.name,
@@ -275,17 +274,17 @@ class _BuilderBaseSerializer(_BuilderSerializerProtocol):  # pylint: disable=abs
             method_param_signatures=builder.parameters.method_signature(self._want_inline_type_hints),
         )
 
-    def _response_type_annotation_wrapper(self, builder: BuilderType) -> List[str]:
+    def _response_type_annotation_wrapper(self, builder) -> List[str]:
         return []
 
-    def method_signature_and_response_type_annotation(self, builder: BuilderType) -> str:
+    def method_signature_and_response_type_annotation(self, builder) -> str:
         method_signature = self._method_signature(builder)
         response_type_annotation = self._response_type_annotation(builder)
         for wrapper in self._response_type_annotation_wrapper(builder)[::-1]:
             response_type_annotation = f"{wrapper}[{response_type_annotation}]"
         return self._method_signature_and_response_type_annotation_template(method_signature, response_type_annotation)
 
-    def description_and_summary(self, builder: BuilderType) -> List[str]:
+    def description_and_summary(self, builder) -> List[str]:
         description_list: List[str] = []
         description_list.append(f"{ builder.summary.strip() if builder.summary else builder.description.strip() }")
         if builder.summary and builder.description:
@@ -314,10 +313,10 @@ class _BuilderBaseSerializer(_BuilderSerializerProtocol):  # pylint: disable=abs
             description_list.append(_content_type_docstring(builder))
         return description_list
 
-    def param_description_and_response_docstring(self, builder: BuilderType) -> List[str]:
+    def param_description_and_response_docstring(self, builder) -> List[str]:
         return self.param_description(builder) + self.response_docstring(builder)
 
-    def _get_json_response_template_to_status_codes(self, builder: BuilderType) -> Dict[str, List[str]]:
+    def _get_json_response_template_to_status_codes(self, builder) -> Dict[str, List[str]]:
         # successful status codes of responses that have bodies
         responses = [
             response
@@ -338,7 +337,7 @@ class _BuilderBaseSerializer(_BuilderSerializerProtocol):  # pylint: disable=abs
             retval[response_json].extend(status_codes)
         return retval
 
-    def get_example_template(self, builder: BuilderType) -> List[str]:
+    def get_example_template(self, builder) -> List[str]:
         template = []
         if self._has_json_example_template(builder):
             template.append("")
@@ -354,7 +353,7 @@ class _BuilderBaseSerializer(_BuilderSerializerProtocol):  # pylint: disable=abs
             template += self._get_json_response_template(builder)
         return template
 
-    def _get_json_example_template(self, builder: BuilderType) -> List[str]:
+    def _get_json_example_template(self, builder) -> List[str]:
         template = []
         json_body = builder.parameters.json_body
         object_schema = cast(ObjectSchema, json_body)
@@ -417,7 +416,7 @@ class _BuilderBaseSerializer(_BuilderSerializerProtocol):  # pylint: disable=abs
             ]
         return retval
 
-    def _get_json_response_template(self, builder: BuilderType) -> List[str]:
+    def _get_json_response_template(self, builder) -> List[str]:
         template = []
         for response_body, status_codes in self._get_json_response_template_to_status_codes(builder).items():
             template.append("# response body for status code(s): {}".format(", ".join(status_codes)))
@@ -425,10 +424,10 @@ class _BuilderBaseSerializer(_BuilderSerializerProtocol):  # pylint: disable=abs
         return template
 
 
-    def pop_kwargs_from_signature(self, builder: BuilderType) -> List[str]:
+    def pop_kwargs_from_signature(self, builder) -> List[str]:
         return utils.pop_kwargs_from_signature(self._get_kwargs_to_pop(builder))
 
-    def serialize_path(self, builder: BuilderType) -> List[str]:
+    def serialize_path(self, builder) -> List[str]:
         return utils.serialize_path(builder.parameters.path, self.serializer_name)
 
     @property
@@ -440,7 +439,7 @@ class _BuilderBaseSerializer(_BuilderSerializerProtocol):  # pylint: disable=abs
 
 
 class _RequestBuilderBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstract-method
-    def description_and_summary(self, builder: BuilderType) -> List[str]:
+    def description_and_summary(self, builder) -> List[str]:
         retval = super().description_and_summary(builder)
         retval += [
             "See https://aka.ms/azsdk/python/protocol/quickstart for how to incorporate this "
@@ -453,7 +452,7 @@ class _RequestBuilderBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=
     def serializer_name(self) -> str:
         return "_SERIALIZER"
 
-    def want_example_template(self, builder: BuilderType) -> bool:
+    def want_example_template(self, builder) -> bool:
         if self.code_model.options["builders_visibility"] != "public":
             return False  # if we're not exposing rest layer, don't need to generate
         if builder.parameters.has_body:
@@ -469,10 +468,10 @@ class _RequestBuilderBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=
     def _is_in_class(self) -> bool:
         return False
 
-    def _response_type_annotation(self, builder: BuilderType, modify_if_head_as_boolean: bool = True) -> str:
+    def _response_type_annotation(self, builder, modify_if_head_as_boolean: bool = True) -> str:
         return "HttpRequest"
 
-    def response_docstring(self, builder: BuilderType) -> List[str]:
+    def response_docstring(self, builder) -> List[str]:
         response_str = (
             f":return: Returns an :class:`~azure.core.rest.HttpRequest` that you will pass to the client's "
             + "`send_request` method. See https://aka.ms/azsdk/python/protocol/quickstart for how to "
@@ -481,23 +480,23 @@ class _RequestBuilderBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=
         rtype_str = f":rtype: ~azure.core.rest.HttpRequest"
         return [response_str, rtype_str]
 
-    def _json_example_param_name(self, builder: BuilderType) -> str:
+    def _json_example_param_name(self, builder) -> str:
         return "json"
 
-    def _has_json_example_template(self, builder: BuilderType) -> bool:
+    def _has_json_example_template(self, builder) -> bool:
         return "json" in builder.parameters.body_kwarg_names
 
-    def _has_files_example_template(self, builder: BuilderType) -> bool:
+    def _has_files_example_template(self, builder) -> bool:
         return "files" in builder.parameters.body_kwarg_names
 
-    def _has_data_example_template(self, builder: BuilderType) -> bool:
+    def _has_data_example_template(self, builder) -> bool:
         return "data" in builder.parameters.body_kwarg_names
 
     @abstractmethod
-    def _body_params_to_pass_to_request_creation(self, builder: BuilderType) -> List[str]:
+    def _body_params_to_pass_to_request_creation(self, builder) -> List[str]:
         ...
 
-    def create_http_request(self, builder: BuilderType) -> List[str]:
+    def create_http_request(self, builder) -> List[str]:
         retval = ["return HttpRequest("]
         retval.append(f'    method="{builder.method}",')
         retval.append("    url=url,")
@@ -514,7 +513,7 @@ class _RequestBuilderBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=
         retval.append(")")
         return retval
 
-    def serialize_headers(self, builder: BuilderType) -> List[str]:
+    def serialize_headers(self, builder) -> List[str]:
         retval = ["# Construct headers"]
         retval.append(_pop_parameters_kwarg("header", "headers"))
         for parameter in builder.parameters.headers:
@@ -524,7 +523,7 @@ class _RequestBuilderBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=
             ))
         return retval
 
-    def serialize_query(self, builder: BuilderType) -> List[str]:
+    def serialize_query(self, builder) -> List[str]:
         retval = ["# Construct parameters"]
         retval.append(_pop_parameters_kwarg("query", "params"))
         for parameter in builder.parameters.query:
@@ -542,13 +541,13 @@ class RequestBuilderGenericSerializer(_RequestBuilderBaseSerializer):
     @staticmethod
     def _method_signature_and_response_type_annotation_template(method_signature: str, response_type_annotation: str):
         return utils.method_signature_and_response_type_annotation_template(
-            is_python_3_file=False, method_signature=method_signature, response_type_annotation=response_type_annotation
+            is_python3_file=False, method_signature=method_signature, response_type_annotation=response_type_annotation
         )
 
-    def _get_kwargs_to_pop(self, builder: BuilderType):
-        return builder.parameters.kwargs_to_pop(is_python_3_file=False)
+    def _get_kwargs_to_pop(self, builder):
+        return builder.parameters.kwargs_to_pop(is_python3_file=False)
 
-    def _body_params_to_pass_to_request_creation(self, builder: BuilderType) -> List[str]:
+    def _body_params_to_pass_to_request_creation(self, builder) -> List[str]:
         if builder.parameters.has_body and not builder.parameters.body_kwarg_names:
             # this means we have a constant body
             # only doing json body in this case
@@ -564,13 +563,13 @@ class RequestBuilderPython3Serializer(_RequestBuilderBaseSerializer):
     @staticmethod
     def _method_signature_and_response_type_annotation_template(method_signature: str, response_type_annotation: str):
         return utils.method_signature_and_response_type_annotation_template(
-            is_python_3_file=True, method_signature=method_signature, response_type_annotation=response_type_annotation
+            is_python3_file=True, method_signature=method_signature, response_type_annotation=response_type_annotation
         )
 
-    def _get_kwargs_to_pop(self, builder: BuilderType):
-        return builder.parameters.kwargs_to_pop(is_python_3_file=True)
+    def _get_kwargs_to_pop(self, builder):
+        return builder.parameters.kwargs_to_pop(is_python3_file=True)
 
-    def _body_params_to_pass_to_request_creation(self, builder: BuilderType) -> List[str]:
+    def _body_params_to_pass_to_request_creation(self, builder) -> List[str]:
         body_kwargs = list(builder.parameters.body_kwarg_names.keys())
         if body_kwargs:
             return body_kwargs
@@ -585,7 +584,7 @@ class RequestBuilderPython3Serializer(_RequestBuilderBaseSerializer):
 
 
 class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstract-method
-    def description_and_summary(self, builder: BuilderType) -> List[str]:
+    def description_and_summary(self, builder) -> List[str]:
         retval = super().description_and_summary(builder)
         if builder.deprecated:
             retval.append(".. warning::")
@@ -601,10 +600,10 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
     def serializer_name(self) -> str:
         return "self._serialize"
 
-    def _response_docstring_type_wrapper(self, builder: BuilderType) -> List[str]:  # pylint: disable=unused-argument, no-self-use
+    def _response_docstring_type_wrapper(self, builder) -> List[str]:  # pylint: disable=unused-argument, no-self-use
         return []
 
-    def param_description(self, builder: BuilderType) -> List[str]:  # pylint: disable=no-self-use
+    def param_description(self, builder) -> List[str]:  # pylint: disable=no-self-use
         description_list = super().param_description(builder)
         if not self.code_model.options["version_tolerant"]:
             description_list.append(
@@ -612,13 +611,13 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
             )
         return description_list
 
-    def _response_docstring_type_template(self, builder: BuilderType) -> str:
+    def _response_docstring_type_template(self, builder) -> str:
         retval = "{}"
         for wrapper in self._response_docstring_type_wrapper(builder)[::-1]:
             retval = f"{wrapper}[{retval}]"
         return retval
 
-    def _response_type_annotation(self, builder: BuilderType, modify_if_head_as_boolean: bool = True) -> str:
+    def _response_type_annotation(self, builder, modify_if_head_as_boolean: bool = True) -> str:
         if (
             modify_if_head_as_boolean
             and builder.request_builder.method.lower() == "head"
@@ -635,14 +634,14 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
             response_str = f"Optional[{response_str}]"
         return response_str
 
-    def cls_type_annotation(self, builder: BuilderType) -> str:
+    def cls_type_annotation(self, builder) -> str:
         return f"# type: ClsType[{self._response_type_annotation(builder, modify_if_head_as_boolean=False)}]"
 
-    def _response_docstring_text_template(self, builder: BuilderType) -> str:  # pylint: disable=no-self-use, unused-argument
+    def _response_docstring_text_template(self, builder) -> str:  # pylint: disable=no-self-use, unused-argument
         cls_str = f",{self._cls_docstring_rtype}" if self._cls_docstring_rtype else ""
         return "{}" + cls_str
 
-    def response_docstring(self, builder: BuilderType) -> List[str]:
+    def response_docstring(self, builder) -> List[str]:
         responses_with_body = [r for r in builder.responses if r.has_body]
         if builder.request_builder.method.lower() == "head" and self.code_model.options["head_as_boolean"]:
             response_docstring_text = "bool"
@@ -665,7 +664,7 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
         rtype_str = f":rtype: {self._response_docstring_type_template(builder).format(rtype)}"
         return [response_str, rtype_str, ":raises: ~azure.core.exceptions.HttpResponseError"]
 
-    def want_example_template(self, builder: BuilderType) -> bool:
+    def want_example_template(self, builder) -> bool:
         if self.code_model.options['models_mode']:
             return False
         if builder.parameters.has_body:
@@ -675,35 +674,35 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
             return any([b for b in body_params if isinstance(b.schema, (DictionarySchema, ListSchema, ObjectSchema))])
         return bool(self._get_json_response_template_to_status_codes(builder))
 
-    def _json_example_param_name(self, builder: BuilderType) -> str:
+    def _json_example_param_name(self, builder) -> str:
         return builder.parameters.body[0].serialized_name
 
-    def _has_json_example_template(self, builder: BuilderType) -> bool:
+    def _has_json_example_template(self, builder) -> bool:
         return (
             builder.parameters.has_body and
             not (builder.parameters.multipart or builder.parameters.data_inputs)
         )
 
-    def _has_files_example_template(self, builder: BuilderType) -> bool:
+    def _has_files_example_template(self, builder) -> bool:
         return bool(builder.parameters.multipart)
 
-    def _has_data_example_template(self, builder: BuilderType) -> bool:
+    def _has_data_example_template(self, builder) -> bool:
         return bool(builder.parameters.data_inputs)
 
     def _serialize_body_call(
-        self, builder: BuilderType, body_param: Parameter, send_xml: bool, ser_ctxt: Optional[str], ser_ctxt_name: str
+        self, builder, body_param: Parameter, send_xml: bool, ser_ctxt: Optional[str], ser_ctxt_name: str
     ) -> str:
         body_is_xml = ", is_xml=True" if send_xml else ""
         pass_ser_ctxt = f", {ser_ctxt_name}={ser_ctxt_name}" if ser_ctxt else ""
         body_kwarg_to_pass = builder.body_kwargs_to_pass_to_request_builder[0]
         if self.code_model.options["models_mode"]:
             return (
-                f"{body_kwarg_to_pass} = self._serialize.body({body_param.serialized_name}, "
+                f"_{body_kwarg_to_pass} = self._serialize.body({body_param.serialized_name}, "
                 f"'{ body_param.serialization_type }'{body_is_xml}{ pass_ser_ctxt })"
             )
-        return f"{body_kwarg_to_pass} = {body_param.serialized_name}"
+        return f"_{body_kwarg_to_pass} = {body_param.serialized_name}"
 
-    def _serialize_body(self, builder: BuilderType, body_param: Parameter, body_kwarg: str) -> List[str]:
+    def _serialize_body(self, builder, body_param: Parameter, body_kwarg: str) -> List[str]:
         retval = []
         send_xml = bool(
             builder.parameters.has_body and
@@ -728,11 +727,11 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
             retval.append("    " + serialize_body_call)
             if len(builder.body_kwargs_to_pass_to_request_builder) == 1:
                 retval.append("else:")
-                retval.append(f"    {body_kwarg} = None")
+                retval.append(f"    _{body_kwarg} = None")
         return retval
 
     def _set_body_content_kwarg(
-        self, builder: BuilderType, body_param: Parameter, body_kwarg: Parameter
+        self, builder, body_param: Parameter, body_kwarg: Parameter
     ) -> List[str]:
         retval: List[str] = []
         if body_kwarg.serialized_name == "data" or body_kwarg.serialized_name == "files":
@@ -743,12 +742,12 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
                 return retval
         except AttributeError:
             pass
-        retval.append(f"{body_kwarg.serialized_name} = {body_param.serialized_name}")
+        retval.append(f"_{body_kwarg.serialized_name} = {body_param.serialized_name}")
         return retval
 
 
     def _serialize_body_parameters(
-        self, builder: BuilderType,
+        self, builder,
     ) -> List[str]:
         retval = []
         body_kwargs = [
@@ -779,7 +778,7 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
 
     def _call_request_builder_helper(
         self,
-        builder: BuilderType,
+        builder,
         request_builder: RequestBuilder,
         template_url: Optional[str] = None,
     ) -> List[str]:
@@ -790,7 +789,7 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
             if self.code_model.options["version_tolerant"]:
                 body_params_to_initialize = [p for p in body_params_to_initialize if p != "files"]
             for k in body_params_to_initialize:
-                retval.append(f"{k} = None")
+                retval.append(f"_{k} = None")
         if builder.parameters.grouped:
             # request builders don't allow grouped parameters, so we group them before making the call
             retval.extend(_serialize_grouped_body(builder))
@@ -799,8 +798,8 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
             # unflatten before passing to request builder as well
             retval.extend(_serialize_flattened_body(builder))
         if request_builder.multipart or request_builder.parameters.data_inputs:
-            param_name = "files" if request_builder.multipart else "data"
             if not self.code_model.options["version_tolerant"]:
+                param_name = "_files" if request_builder.multipart else "_data"
                 retval.extend(_serialize_files_and_data_body(builder, param_name))
         elif builder.parameters.has_body and not builder.parameters.body[0].constant:
             retval.extend(self._serialize_body_parameters(builder))
@@ -823,24 +822,29 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
                 continue
             high_level_name = cast(RequestBuilderParameter, parameter).name_in_high_level_operation
             retval.append(f"    {parameter.serialized_name}={high_level_name},")
-        template_url = template_url or f"self.{builder.name}.metadata['url']"
-        retval.append(f"    template_url={template_url},")
+        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(f")")
         if not self.code_model.options["version_tolerant"]:
             pass_files = ""
             if "files" in builder.body_kwargs_to_pass_to_request_builder:
-                pass_files = ", files"
+                pass_files = ", _files"
             retval.append(f"request = _convert_request(request{pass_files})")
         if builder.parameters.path:
             retval.extend(self.serialize_path(builder))
+        url_to_format = "request.url"
+        if self.code_model.options["version_tolerant"] and template_url:
+            url_to_format = template_url
         retval.append(
-            "request.url = self._client.format_url(request.url{})".format(
+            "request.url = self._client.format_url({}{})".format(
+                url_to_format,
                 ", **path_format_arguments" if builder.parameters.path else ""
             )
         )
         return retval
 
-    def call_request_builder(self, builder: BuilderType) -> List[str]:
+    def call_request_builder(self, builder) -> List[str]:
         return self._call_request_builder_helper(builder, builder.request_builder)
 
     def response_headers_and_deserialization(
@@ -881,7 +885,7 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
     def _call_method(self) -> str:
         ...
 
-    def handle_error_response(self, builder: BuilderType) -> List[str]:
+    def handle_error_response(self, builder) -> List[str]:
         retval = [f"if response.status_code not in {str(builder.success_status_code)}:"]
         retval.append("    map_error(status_code=response.status_code, response=response, error_map=error_map)")
         error_model = ""
@@ -896,7 +900,7 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
         ))
         return retval
 
-    def handle_response(self, builder: BuilderType) -> List[str]:
+    def handle_response(self, builder) -> List[str]:
         retval: List[str] = ["response = pipeline_response.http_response"]
         retval.append("")
         retval.extend(self.handle_error_response(builder))
@@ -933,7 +937,7 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
             retval.append("return 200 <= response.status_code <= 299")
         return retval
 
-    def error_map(self, builder: BuilderType) -> List[str]:
+    def error_map(self, builder) -> List[str]:
         retval = ["error_map = {"]
         if builder.status_code_exceptions:
             if not 401 in builder.status_code_exceptions_status_codes:
@@ -981,7 +985,7 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
         return retval
 
     @staticmethod
-    def get_metadata_url(builder: BuilderType) -> str:
+    def get_metadata_url(builder) -> str:
         return f"{builder.python_name}.metadata = {{'url': '{ builder.request_builder.url }'}}  # type: ignore"
 
 class _SyncOperationBaseSerializer(_OperationBaseSerializer):  # pylint: disable=abstract-method
@@ -1005,11 +1009,11 @@ class SyncOperationGenericSerializer(_SyncOperationBaseSerializer):
     @staticmethod
     def _method_signature_and_response_type_annotation_template(method_signature: str, response_type_annotation: str):
         return utils.method_signature_and_response_type_annotation_template(
-            is_python_3_file=False, method_signature=method_signature, response_type_annotation=response_type_annotation
+            is_python3_file=False, method_signature=method_signature, response_type_annotation=response_type_annotation
         )
 
-    def _get_kwargs_to_pop(self, builder: BuilderType):
-        return builder.parameters.kwargs_to_pop(is_python_3_file=False)
+    def _get_kwargs_to_pop(self, builder):
+        return builder.parameters.kwargs_to_pop(is_python3_file=False)
 
 
 class SyncOperationPython3Serializer(_SyncOperationBaseSerializer):
@@ -1020,11 +1024,11 @@ class SyncOperationPython3Serializer(_SyncOperationBaseSerializer):
     @staticmethod
     def _method_signature_and_response_type_annotation_template(method_signature: str, response_type_annotation: str):
         return utils.method_signature_and_response_type_annotation_template(
-            is_python_3_file=True, method_signature=method_signature, response_type_annotation=response_type_annotation
+            is_python3_file=True, method_signature=method_signature, response_type_annotation=response_type_annotation
         )
 
-    def _get_kwargs_to_pop(self, builder: BuilderType):
-        return builder.parameters.kwargs_to_pop(is_python_3_file=True)
+    def _get_kwargs_to_pop(self, builder):
+        return builder.parameters.kwargs_to_pop(is_python3_file=True)
 
 class AsyncOperationSerializer(SyncOperationPython3Serializer):
 
@@ -1045,19 +1049,19 @@ class AsyncOperationSerializer(SyncOperationPython3Serializer):
 
 
 class _PagingOperationBaseSerializer(_OperationBaseSerializer):  # pylint: disable=abstract-method
-    def _response_docstring_text_template(self, builder: BuilderType) -> str:  # pylint: disable=no-self-use, unused-argument
+    def _response_docstring_text_template(self, builder) -> str:  # pylint: disable=no-self-use, unused-argument
         if self._cls_docstring_rtype:
             return "An iterator like instance of either {}" + self._cls_docstring_rtype
         return "An iterator like instance of {}"
 
-    def cls_type_annotation(self, builder: BuilderType) -> str:
+    def cls_type_annotation(self, builder) -> str:
         interior = super()._response_type_annotation(builder, modify_if_head_as_boolean=False)
         return f"# type: ClsType[{interior}]"
 
-    def call_next_link_request_builder(self, builder: BuilderType) -> List[str]:
+    def call_next_link_request_builder(self, builder) -> List[str]:
         if builder.next_request_builder:
             request_builder = builder.next_request_builder
-            template_url = f"'{request_builder.url}'"
+            template_url = None if self.code_model.options["version_tolerant"] else f"'{request_builder.url}'"
         else:
             request_builder = builder.request_builder
             template_url = "next_link"
@@ -1068,7 +1072,7 @@ class _PagingOperationBaseSerializer(_OperationBaseSerializer):  # pylint: disab
             template_url=template_url,
         )
 
-    def _prepare_request_callback(self, builder: BuilderType) -> List[str]:
+    def _prepare_request_callback(self, builder) -> List[str]:
         retval = ["def prepare_request(next_link=None):"]
         retval.append("    if not next_link:")
         retval.extend([
@@ -1101,10 +1105,10 @@ class _PagingOperationBaseSerializer(_OperationBaseSerializer):  # pylint: disab
 
     @staticmethod
     @abstractmethod
-    def _pager(builder: BuilderType) -> str:
+    def _pager(builder) -> str:
         ...
 
-    def _extract_data_callback(self, builder: BuilderType) -> List[str]:
+    def _extract_data_callback(self, builder) -> List[str]:
         retval = [f"{self._def} extract_data(pipeline_response):"]
         response = builder.responses[0]
         deserialized = (
@@ -1129,7 +1133,7 @@ class _PagingOperationBaseSerializer(_OperationBaseSerializer):  # pylint: disab
         retval.append(f"    return {next_link_property}, {self._list_type_returned_to_users}(list_of_elem)")
         return retval
 
-    def _get_next_callback(self, builder: BuilderType) -> List[str]:
+    def _get_next_callback(self, builder) -> List[str]:
         retval = [f"{self._def} get_next(next_link=None):"]
         retval.append("    request = prepare_request(next_link)")
         retval.append("")
@@ -1147,7 +1151,7 @@ class _PagingOperationBaseSerializer(_OperationBaseSerializer):  # pylint: disab
         retval.append("    return pipeline_response")
         return retval
 
-    def set_up_params_for_pager(self, builder: BuilderType) -> List[str]:
+    def set_up_params_for_pager(self, builder) -> List[str]:
         retval = [f"cls = kwargs.pop('cls', None)  {self.cls_type_annotation(builder)}"]
         retval.extend(self.error_map(builder))
         retval.extend(self._prepare_request_callback(builder))
@@ -1158,10 +1162,10 @@ class _PagingOperationBaseSerializer(_OperationBaseSerializer):  # pylint: disab
         return retval
 
 class _SyncPagingOperationBaseSerializer(_PagingOperationBaseSerializer, _SyncOperationBaseSerializer):  # pylint: disable=abstract-method
-    def _response_docstring_type_wrapper(self, builder: BuilderType) -> List[str]:  # pylint: no-self-use
+    def _response_docstring_type_wrapper(self, builder) -> List[str]:  # pylint: no-self-use
         return [f"~{builder.get_pager_path(async_mode=False)}"]
 
-    def _response_type_annotation_wrapper(self, builder: BuilderType) -> List[str]:
+    def _response_type_annotation_wrapper(self, builder) -> List[str]:
         return ["Iterable"]
 
     @property
@@ -1169,7 +1173,7 @@ class _SyncPagingOperationBaseSerializer(_PagingOperationBaseSerializer, _SyncOp
         return "iter"
 
     @staticmethod
-    def _pager(builder: BuilderType) -> str:
+    def _pager(builder) -> str:
         return builder.get_pager(async_mode=False)
 
 class SyncPagingOperationGenericSerializer(_SyncPagingOperationBaseSerializer, SyncOperationGenericSerializer):
@@ -1179,14 +1183,14 @@ class SyncPagingOperationPython3Serializer(_SyncPagingOperationBaseSerializer, S
     pass
 
 class AsyncPagingOperationSerializer(_PagingOperationBaseSerializer, AsyncOperationSerializer):
-    def _response_docstring_type_wrapper(self, builder: BuilderType) -> List[str]:  # pylint: no-self-use
+    def _response_docstring_type_wrapper(self, builder) -> List[str]:  # pylint: no-self-use
         return [f"~{builder.get_pager_path(async_mode=True)}"]
 
     @property
     def _function_definition(self) -> str:
         return "def"
 
-    def _response_type_annotation_wrapper(self, builder: BuilderType) -> List[str]:
+    def _response_type_annotation_wrapper(self, builder) -> List[str]:
         return ["AsyncIterable"]
 
     @property
@@ -1194,7 +1198,7 @@ class AsyncPagingOperationSerializer(_PagingOperationBaseSerializer, AsyncOperat
         return "AsyncList"
 
     @staticmethod
-    def _pager(builder: BuilderType) -> str:
+    def _pager(builder) -> str:
         return builder.get_pager(async_mode=True)
 
 
@@ -1202,19 +1206,19 @@ class AsyncPagingOperationSerializer(_PagingOperationBaseSerializer, AsyncOperat
 
 
 class _LROOperationBaseSerializer(_OperationBaseSerializer):  # pylint: disable=abstract-method
-    def cls_type_annotation(self, builder: BuilderType) -> str:
+    def cls_type_annotation(self, builder) -> str:
         return f"# type: ClsType[{super()._response_type_annotation(builder, modify_if_head_as_boolean=False)}]"
 
     @abstractmethod
-    def _default_polling_method(self, builder: BuilderType) -> str:
+    def _default_polling_method(self, builder) -> str:
         ...
 
     @abstractmethod
-    def _default_no_polling_method(self, builder: BuilderType) -> str:
+    def _default_no_polling_method(self, builder) -> str:
         ...
 
     @abstractmethod
-    def _poller(self, builder: BuilderType) -> str:
+    def _poller(self, builder) -> str:
         ...
 
     @property
@@ -1222,7 +1226,7 @@ class _LROOperationBaseSerializer(_OperationBaseSerializer):  # pylint: disable=
     def _polling_method_type(self):
         ...
 
-    def param_description(self, builder: BuilderType) -> List[str]:
+    def param_description(self, builder) -> List[str]:
         retval = super().param_description(builder)
         retval.append(":keyword str continuation_token: A continuation token to restart a poller from a saved state.")
         retval.append(
@@ -1237,7 +1241,7 @@ class _LROOperationBaseSerializer(_OperationBaseSerializer):  # pylint: disable=
         )
         return retval
 
-    def initial_call(self, builder: BuilderType) -> List[str]:
+    def initial_call(self, builder) -> List[str]:
         retval = [f"polling = kwargs.pop('polling', True)  # type: Union[bool, {self._polling_method_type}]"]
         retval.append(f"cls = kwargs.pop('cls', None)  {self.cls_type_annotation(builder)}")
         retval.append("lro_delay = kwargs.pop(")
@@ -1257,7 +1261,7 @@ class _LROOperationBaseSerializer(_OperationBaseSerializer):  # pylint: disable=
         retval.append("kwargs.pop('error_map', None)")
         return retval
 
-    def return_lro_poller(self, builder: BuilderType) -> List[str]:
+    def return_lro_poller(self, builder) -> List[str]:
         retval = []
         lro_options_str = (
             ", lro_options={'final-state-via': '" + builder.lro_options['final-state-via'] + "'}"
@@ -1290,7 +1294,7 @@ class _LROOperationBaseSerializer(_OperationBaseSerializer):  # pylint: disable=
         )
         return retval
 
-    def get_long_running_output(self, builder: BuilderType) -> List[str]:
+    def get_long_running_output(self, builder) -> List[str]:
         retval = ["def get_long_running_output(pipeline_response):"]
         if builder.lro_response:
             if builder.lro_response.has_headers:
@@ -1311,29 +1315,29 @@ class _LROOperationBaseSerializer(_OperationBaseSerializer):  # pylint: disable=
 
 
 class _SyncLROOperationBaseSerializer(_LROOperationBaseSerializer, _SyncOperationBaseSerializer):  # pylint: disable=abstract-method
-    def _response_docstring_text_template(self, builder: BuilderType) -> str:  # pylint: disable=no-self-use
+    def _response_docstring_text_template(self, builder) -> str:  # pylint: disable=no-self-use
         lro_section = f"An instance of {builder.get_poller(async_mode=False)} "
         if self._cls_docstring_rtype:
             return lro_section + "that returns either {}" + self._cls_docstring_rtype
         return lro_section + "that returns {}"
 
-    def _response_docstring_type_wrapper(self, builder: BuilderType) -> List[str]:  # pylint: no-self-use
+    def _response_docstring_type_wrapper(self, builder) -> List[str]:  # pylint: no-self-use
         return [f"~{builder.get_poller_path(async_mode=False)}"]
 
-    def _response_type_annotation_wrapper(self, builder: BuilderType) -> List[str]:
+    def _response_type_annotation_wrapper(self, builder) -> List[str]:
         return [builder.get_poller(async_mode=False)]
 
-    def _default_polling_method(self, builder: BuilderType) -> str:
+    def _default_polling_method(self, builder) -> str:
         return builder.get_default_polling_method(async_mode=False, azure_arm=self.code_model.options["azure_arm"])
 
-    def _default_no_polling_method(self, builder: BuilderType) -> str:
+    def _default_no_polling_method(self, builder) -> str:
         return builder.get_default_no_polling_method(async_mode=False)
 
     @property
     def _polling_method_type(self):
         return "azure.core.polling.PollingMethod"
 
-    def _poller(self, builder: BuilderType) -> str:
+    def _poller(self, builder) -> str:
         return builder.get_poller(async_mode=False)
 
 class SyncLROOperationGenericSerializer(_SyncLROOperationBaseSerializer, SyncOperationGenericSerializer):
@@ -1344,29 +1348,29 @@ class SyncLROOperationPython3Serializer(_SyncLROOperationBaseSerializer, SyncOpe
 
 class AsyncLROOperationSerializer(_LROOperationBaseSerializer, AsyncOperationSerializer):
 
-    def _response_docstring_text_template(self, builder: BuilderType) -> str:  # pylint: disable=no-self-use
+    def _response_docstring_text_template(self, builder) -> str:  # pylint: disable=no-self-use
         lro_section = f"An instance of {builder.get_poller(async_mode=True)} "
         if self._cls_docstring_rtype:
             return lro_section + "that returns either {}" + self._cls_docstring_rtype
         return lro_section + "that returns {}"
 
-    def _response_docstring_type_wrapper(self, builder: BuilderType) -> List[str]:  # pylint: no-self-use
+    def _response_docstring_type_wrapper(self, builder) -> List[str]:  # pylint: no-self-use
         return [f"~{builder.get_poller_path(async_mode=True)}"]
 
-    def _response_type_annotation_wrapper(self, builder: BuilderType) -> List[str]:
+    def _response_type_annotation_wrapper(self, builder) -> List[str]:
         return [builder.get_poller(async_mode=True)]
 
-    def _default_polling_method(self, builder: BuilderType) -> str:
+    def _default_polling_method(self, builder) -> str:
         return builder.get_default_polling_method(async_mode=True, azure_arm=self.code_model.options["azure_arm"])
 
-    def _default_no_polling_method(self, builder: BuilderType) -> str:
+    def _default_no_polling_method(self, builder) -> str:
         return builder.get_default_no_polling_method(async_mode=True)
 
     @property
     def _polling_method_type(self):
         return "azure.core.polling.AsyncPollingMethod"
 
-    def _poller(self, builder: BuilderType) -> str:
+    def _poller(self, builder) -> str:
         return builder.get_poller(async_mode=True)
 
 
@@ -1374,7 +1378,7 @@ class AsyncLROOperationSerializer(_LROOperationBaseSerializer, AsyncOperationSer
 
 class _LROPagingOperationBaseSerializer(_LROOperationBaseSerializer, _PagingOperationBaseSerializer):  # pylint: disable=abstract-method
 
-    def get_long_running_output(self, builder: BuilderType) -> List[str]:
+    def get_long_running_output(self, builder) -> List[str]:
         retval = ["def get_long_running_output(pipeline_response):"]
         retval.append(f"    {self._def} internal_get_next(next_link=None):")
         retval.append("        if next_link is None:")
@@ -1392,23 +1396,23 @@ class _SyncLROPagingOperationBaseSerializer(  # pylint: disable=abstract-method
     _SyncLROOperationBaseSerializer, _SyncPagingOperationBaseSerializer, _LROPagingOperationBaseSerializer
 ):
 
-    def _response_docstring_type_wrapper(self, builder: BuilderType) -> List[str]:
+    def _response_docstring_type_wrapper(self, builder) -> List[str]:
         return _SyncLROOperationBaseSerializer._response_docstring_type_wrapper(
             self, builder
         ) + _SyncPagingOperationBaseSerializer._response_docstring_type_wrapper(self, builder)
 
-    def _response_type_annotation_wrapper(self, builder: BuilderType) -> List[str]:
+    def _response_type_annotation_wrapper(self, builder) -> List[str]:
         return _SyncLROOperationBaseSerializer._response_type_annotation_wrapper(self, builder) + [
             builder.get_pager(async_mode=False)
         ]
 
-    def _response_docstring_text_template(self, builder: BuilderType) -> str:
+    def _response_docstring_text_template(self, builder) -> str:
         lro_doc = _SyncLROOperationBaseSerializer._response_docstring_text_template(self, builder)
         paging_doc = _SyncPagingOperationBaseSerializer._response_docstring_text_template(self, builder)
         paging_doc = paging_doc.replace(paging_doc[0], paging_doc[0].lower(), 1)
         return lro_doc.format(paging_doc).replace(self._cls_docstring_rtype, "", 1).replace("either ", "", 1)
 
-    def cls_type_annotation(self, builder: BuilderType) -> str:
+    def cls_type_annotation(self, builder) -> str:
         return f"# type: ClsType[{self._response_type_annotation(builder, modify_if_head_as_boolean=False)}]"
 
 class SyncLROPagingOperationGenericSerializer(_SyncLROPagingOperationBaseSerializer, SyncOperationGenericSerializer):
@@ -1424,17 +1428,17 @@ class AsyncLROPagingOperationSerializer(
     def _function_definition(self) -> str:
         return "async def"
 
-    def _response_docstring_type_wrapper(self, builder: BuilderType) -> List[str]:
+    def _response_docstring_type_wrapper(self, builder) -> List[str]:
         return AsyncLROOperationSerializer._response_docstring_type_wrapper(
             self, builder
         ) + AsyncPagingOperationSerializer._response_docstring_type_wrapper(self, builder)
 
-    def _response_type_annotation_wrapper(self, builder: BuilderType) -> List[str]:
+    def _response_type_annotation_wrapper(self, builder: LROPagingOperation) -> List[str]:
         return AsyncLROOperationSerializer._response_type_annotation_wrapper(self, builder) + [
             builder.get_pager(async_mode=True)
         ]
 
-    def _response_docstring_text_template(self, builder: BuilderType) -> str:
+    def _response_docstring_text_template(self, builder) -> str:
         lro_doc = AsyncLROOperationSerializer._response_docstring_text_template(self, builder)
         paging_doc = AsyncPagingOperationSerializer._response_docstring_text_template(self, builder)
         paging_doc = paging_doc.replace(paging_doc[0], paging_doc[0].lower(), 1)
@@ -1442,17 +1446,17 @@ class AsyncLROPagingOperationSerializer(
 
 
 def get_operation_serializer(
-    builder: BuilderType,
+    builder,
     code_model,
     async_mode: bool,
-    is_python_3_file: bool,
+    is_python3_file: bool,
 ) -> _OperationBaseSerializer:
     retcls = _OperationBaseSerializer
     if isinstance(builder, LROPagingOperation):
         retcls = (
             AsyncLROPagingOperationSerializer if async_mode
             else (
-                SyncLROPagingOperationPython3Serializer if is_python_3_file
+                SyncLROPagingOperationPython3Serializer if is_python3_file
                 else SyncLROPagingOperationGenericSerializer
             )
         )
@@ -1460,22 +1464,22 @@ def get_operation_serializer(
     if isinstance(builder, LROOperation):
         retcls = (
             AsyncLROOperationSerializer if async_mode
-            else (SyncLROOperationPython3Serializer if is_python_3_file else SyncLROOperationGenericSerializer)
+            else (SyncLROOperationPython3Serializer if is_python3_file else SyncLROOperationGenericSerializer)
         )
         return retcls(code_model)
     if isinstance(builder, PagingOperation):
         retcls = (
             AsyncPagingOperationSerializer if async_mode
-            else (SyncPagingOperationPython3Serializer if is_python_3_file else SyncPagingOperationGenericSerializer)
+            else (SyncPagingOperationPython3Serializer if is_python3_file else SyncPagingOperationGenericSerializer)
         )
         return retcls(code_model)
     retcls = (
         AsyncOperationSerializer if async_mode
-        else (SyncOperationPython3Serializer if is_python_3_file else SyncOperationGenericSerializer)
+        else (SyncOperationPython3Serializer if is_python3_file else SyncOperationGenericSerializer)
     )
     return retcls(code_model)
 
 
-def get_request_builder_serializer(code_model, is_python_3_file: bool) -> _RequestBuilderBaseSerializer:
-    retcls = RequestBuilderPython3Serializer if is_python_3_file else RequestBuilderGenericSerializer
+def get_request_builder_serializer(code_model, is_python3_file: bool) -> _RequestBuilderBaseSerializer:
+    retcls = RequestBuilderPython3Serializer if is_python3_file else RequestBuilderGenericSerializer
     return retcls(code_model)