@autorest/python 5.17.0 → 6.0.0-rc.1

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

@@ -22,8 +22,8 @@ class {{ code_model.client.name }}Configuration(Configuration):  # pylint: disab
     {{ op_tools.serialize_with_wrap(serializer.property_descriptions(async_mode), "\n ") | indent }}
     {{ serializer.init_signature_and_response_type_annotation(async_mode) | indent }}
         super({{ code_model.client.name }}Configuration, self).__init__(**kwargs)
-    {% if code_model.config.parameters.kwargs_to_pop(async_mode) %}
-        {{ op_tools.serialize(serializer.pop_kwargs_from_signature(async_mode)) | indent(8) }}
+    {% if code_model.config.parameters.kwargs_to_pop %}
+        {{ op_tools.serialize(serializer.pop_kwargs_from_signature()) | indent(8) }}
     {% endif %}
 {% if serializer.check_required_parameters() %}
         {{ op_tools.serialize(serializer.check_required_parameters()) | indent(8) -}}

package/autorest/codegen/templates/metadata.json.jinja2

@@ -20,7 +20,7 @@
         "sync": {
             {% for gp in global_parameters.method | rejectattr("client_name", "equalto", "api_version") | rejectattr("is_host") %}
             {{ gp.client_name | tojson }}: {
-                "signature": {{ gp.method_signature(is_python3_file=False, async_mode=False) | tojson }},
+                "signature": {{ gp.method_signature(async_mode=False) | tojson }},
                 "description": {{ gp.description | tojson }},
                 "docstring_type": {{ gp.docstring_type(async_mode=False) | tojson }},
                 "required": {{ (not gp.optional) | tojson }}
@@ -30,7 +30,7 @@
         "async": {
             {% for gp in global_parameters.method | rejectattr("client_name", "equalto", "api_version") | rejectattr("is_host") %}
             {{ gp.client_name | tojson }}: {
-                "signature": {{ (gp.method_signature(is_python3_file=True, async_mode=True)) | tojson }},
+                "signature": {{ (gp.method_signature(async_mode=True)) | tojson }},
                 "description": {{ gp.description | tojson }},
                 "docstring_type": {{ gp.docstring_type(async_mode=True) | tojson }},
                 "required": {{ (not gp.optional) | tojson }}
@@ -53,7 +53,7 @@
                 },
                 {% if not client.has_parameterized_host %}
                 "base_url": {
-                    "signature": {{ client.parameters.host.method_signature(False, async_mode=False) | tojson }},
+                    "signature": {{ client.parameters.host.method_signature(async_mode=False) | tojson }},
                     "description": "Service URL",
                     "docstring_type": "str",
                     "required": false
@@ -75,7 +75,7 @@
                 },
                 {% if not client.has_parameterized_host %}
                 "base_url": {
-                    "signature": {{ client.parameters.host.method_signature(True, async_mode=True) | tojson }},
+                    "signature": {{ client.parameters.host.method_signature(async_mode=True) | tojson }},
                     "description": "Service URL",
                     "docstring_type": "str",
                     "required": false

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

@@ -45,7 +45,7 @@
     {% if model.discriminated_subtypes %}
 
     _subtype_map = {
-        '{{ model.discriminator.client_name }}': {{ str(model.discriminated_subtypes) }}
+        '{{ model.discriminator.client_name }}': {{ str(model.discriminated_subtypes_name_mapping) }}
     }
     {% endif %}
     {% if model.xml_map_content %}

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

@@ -3,21 +3,14 @@
 {{ code_model.options['license_header'] }}
 {% macro iterate_models_py3() %}
     {% for schema in schemas %}
-from .{{ code_model.get_models_filename(is_python3_file=True) }} import {{ schema }}
+from .{{ code_model.models_filename }} import {{ schema }}
     {% endfor %}
 {% endmacro %}
-
 {% if schemas %}
-    {% if code_model.options["python3_only"] %}
-{{ iterate_models_py3() }}
-    {% else %}
-try:
-    {{ iterate_models_py3() | indent-}}
-except (SyntaxError, ImportError):
-        {% for schema in schemas %}
-    from .{{ code_model.get_models_filename(is_python3_file=False) }} import {{ schema }}  # type: ignore
-        {% endfor %}
-    {% endif %}
+
+    {% for schema in schemas %}
+from .{{ code_model.models_filename }} import {{ schema }}
+    {% endfor %}
 {% endif %}
 {% if enums %}
 

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

@@ -1,5 +1,14 @@
 {% set disable = "  # pylint: disable=too-many-public-methods" if operation_group.operations | length > 20 else "" %}
-{% set base_class = ("(" + operation_group.base_class(async_mode) + ")") if operation_group.base_class(async_mode) else "" %}
+{% set base_class = ("(" + operation_group.base_class + ")") if operation_group.base_class else "" %}
+{% macro check_abstract_methods() %}
+{% if operation_group.has_abstract_operations %}
+        raise_if_not_implemented(self.__class__, [
+        {% for operation in operation_group.operations if operation.abstract %}
+            '{{operation.name}}',
+        {% endfor %}
+        ])
+{% endif %}
+{% endmacro %}
 class {{ operation_group.class_name }}{{ base_class }}:{{ disable }}
 {% if not operation_group.is_mixin %}
     """
@@ -11,7 +20,7 @@ class {{ operation_group.class_name }}{{ base_class }}:{{ disable }}
         :attr:`{{ operation_group.property_name }}` attribute.
     """
 
-{% if code_model.public_model_types and code_model.options["models_mode"] %}
+{% if code_model.public_model_types and code_model.options["models_mode"]%}
     models = _models
 
 {% endif %}
@@ -21,9 +30,13 @@ class {{ operation_group.class_name }}{{ base_class }}:{{ disable }}
         self._config = input_args.pop(0) if input_args else kwargs.pop("config")
         self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
         self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+{{ check_abstract_methods() }}
+{% elif operation_group.has_abstract_operations %}
 
+    def __init__(self){{ return_none_type_annotation }}:
+{{ check_abstract_methods() }}
 {% endif %}
-{% for operation in operation_group.operations %}
+{% for operation in operation_group.operations if not operation.abstract %}
 
 {% set request_builder = operation.request_builder %}
 {% set operation_serializer = get_operation_serializer(operation) %}

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

@@ -7,19 +7,13 @@
 {{ imports }}
 
 {% if code_model.options["builders_visibility"] == "embedded" and not async_mode %}
-{{ op_tools.declare_serializer(code_model) }}
-{%- if not is_python3_file %}
-# fmt: off
-{% endif %}
+{{ op_tools.declare_serializer(code_model, request_builders) }}
 {% for operation_group in operation_groups %}
-    {% for request_builder in code_model.request_builders | selectattr("group_name", "equalto", operation_group.property_name) | rejectattr("is_overload") %}
+    {% for request_builder in request_builders | selectattr("group_name", "equalto", operation_group.property_name) | rejectattr("is_overload") %}
 
         {% include "request_builder.py.jinja2" %}
     {% endfor %}
 {% endfor %}
-{% if not is_python3_file %}
-# fmt: on
-{% endif %}
 {% endif %}
 {% for operation_group in operation_groups %}
     {% include "operation_group.py.jinja2" %}

package/autorest/codegen/templates/operation_tools.jinja2

@@ -50,11 +50,13 @@ Example:
     {% endif %}
 {% endfor %}{% endmacro %}
 
-{% macro declare_serializer(code_model) %}
+{% macro declare_serializer(code_model, request_builders) %}
+{% if request_builders %}
 _SERIALIZER = Serializer()
     {% if not code_model.options["client_side_validation"] %}
 _SERIALIZER.client_side_validation = False
     {% endif %}
+{% endif %}
 {% endmacro %}
 
 {% macro generate_overloads(operation_serializer, operation) %}

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

@@ -8,8 +8,7 @@ Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python
 """
 {{ imports }}
 
-{% set type_annotation = ": List[str]" %}
-__all__{{ type_annotation if is_python3_file else "" }} = []{{ "" if is_python3_file else ("  # type" + type_annotation) }}  # Add all objects you want publicly available to users at this package level
+__all__: List[str] = []  # Add all objects you want publicly available to users at this package level
 
 def patch_sdk():
     """Do not remove from this file.

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

@@ -5,12 +5,6 @@
     {{ op_tools.description(request_builder, request_builder_serializer) | indent }}
 {% endif %}
 {% if not request_builder.is_overload %}
-    {% if request_builder.abstract %}
-    raise NotImplementedError(
-        "You need to write a custom operation for '{{ request_builder.name }}'. "
-        "Please refer to https://aka.ms/azsdk/python/dpcodegen/python/customize to learn how to customize."
-    )
-    {% else %}
         {% if request_builder_serializer.pop_kwargs_from_signature(request_builder) %}
     {{ op_tools.serialize(request_builder_serializer.pop_kwargs_from_signature(request_builder)) | indent }}
         {%- endif -%}
@@ -31,5 +25,4 @@
     {{ op_tools.serialize(request_builder_serializer.serialize_headers(request_builder)) | indent }}
         {% endif %}
     {{ op_tools.serialize(request_builder_serializer.create_http_request(request_builder)) | indent }}
-        {% endif %}
 {% endif %}

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

@@ -3,10 +3,7 @@
 {{ code_model.options['license_header'] }}
 {{ imports }}
 
-{{ op_tools.declare_serializer(code_model) }}
-{% if not is_python3_file %}
-# fmt: off
-{% endif %}
+{{ op_tools.declare_serializer(code_model, request_builders) }}
 {% for request_builder in request_builders %}
 
 {% include "request_builder.py.jinja2" %}

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

@@ -1,14 +1,9 @@
 # coding=utf-8
 {{ code_model.options['license_header'] }}
 
-try:
-    {% for request_builder in request_builders %}
-    from ._request_builders_py3 import {{ request_builder.name }}
-    {% endfor %}
-except (SyntaxError, ImportError):
-    {% for request_builder in request_builders %}
-    from ._request_builders import {{ request_builder.name }}  # type: ignore
-    {% endfor %}
+{% for request_builder in request_builders %}
+from ._request_builders import {{ request_builder.name }}
+{% endfor %}
 
 __all__ = [
     {% for request_builder in request_builders %}