@autorest/python 5.16.0 → 5.19.0

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

@@ -1,17 +1,26 @@
 {% 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 "" %}
+{% 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_empty_operation_group %}
+{% if not operation_group.is_mixin %}
     """
     .. warning::
         **DO NOT** instantiate this class directly.
 
         Instead, you should access the following operations through
-        :class:`{{ "~" + code_model.namespace + (".aio." if async_mode else ".") + code_model.class_name }}`'s
-        :attr:`{{ operation_group.name }}` attribute.
+        :class:`{{ "~" + code_model.namespace + (".aio." if async_mode else ".") + code_model.client.name }}`'s
+        :attr:`{{ operation_group.property_name }}` attribute.
     """
 
-{% if code_model.schemas and code_model.options["models_mode"] %}
+{% if code_model.public_model_types and code_model.options["models_mode"]%}
     models = _models
 
 {% endif %}
@@ -21,17 +30,21 @@ 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) %}
-    {% if is_lro(operation) and is_paging(operation) %}
+    {% if operation.operation_type == "lropaging" %}
     {%- macro someop() %}{% include "lro_paging_operation.py.jinja2" %}{% endmacro %}
-    {% elif is_lro(operation) %}
+    {% elif operation.operation_type == "lro" %}
     {%- macro someop() %}{% include "lro_operation.py.jinja2" %}{% endmacro %}
-    {% elif is_paging(operation) %}
+    {% elif operation.operation_type == "paging" %}
     {% macro someop() %}{% include "paging_operation.py.jinja2" %}{% endmacro %}
     {% else %}
     {% macro someop() %}{% include "operation.py.jinja2" %}{% endmacro %}

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

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

package/autorest/codegen/templates/operation_tools.jinja2

@@ -16,11 +16,11 @@
 
         {% endif %}
 {% endfor %}
-{% if serializer.want_example_template(builder) %}
+{% if serializer.example_template(builder) %}
 
 Example:
     .. code-block:: python
-    {% for template_line in serializer.get_example_template(builder) %}
+    {% for template_line in serializer.example_template(builder) %}
         {% if template_line %}
             {% set wrap_amount = (template_line | length) - (template_line.lstrip() | length) + 10 %}
         {{  wrap_string(template_line, wrapstring='\n' + " " * wrap_amount, width=(95 - wrap_amount)) }}
@@ -50,9 +50,17 @@ 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) %}
+{% for overload in operation.overloads %}
+{{ operation_serializer.method_signature_and_response_type_annotation(overload) }}
+    {{ description(overload, operation_serializer) | indent }}
+{% endfor %}{% endmacro %}

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

@@ -1,7 +1,7 @@
 {% import 'operation_tools.jinja2' as op_tools with context %}
 {# actual template starts here #}
-{{ operation_serializer.method_signature_and_response_type_annotation(operation, async_mode) }}
-{% if operation.want_description_docstring %}
+{{ operation_serializer.method_signature_and_response_type_annotation(operation) }}
+{% if operation.public %}
     {{ op_tools.description(operation, operation_serializer) | indent }}{% endif %}
     {% if not operation.abstract %}
         {% if operation.deprecated %}

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

@@ -1,33 +1,28 @@
 {% import 'keywords.jinja2' as keywords with context %}
 {% import 'operation_tools.jinja2' as op_tools with context %}
-{{ request_builder_serializer.method_signature_and_response_type_annotation(request_builder, False) }}
+{{ request_builder_serializer.method_signature_and_response_type_annotation(request_builder) }}
 {% if code_model.options["builders_visibility"] == "public" %}
     {{ op_tools.description(request_builder, request_builder_serializer) | indent }}
 {% endif %}
-{% 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) %}
+{% if not request_builder.is_overload %}
+        {% if request_builder_serializer.pop_kwargs_from_signature(request_builder) %}
     {{ op_tools.serialize(request_builder_serializer.pop_kwargs_from_signature(request_builder)) | indent }}
-    {%- endif -%}
+        {%- endif -%}
     {% if request_builder_serializer.declare_non_inputtable_constants(request_builder) %}
     {{ op_tools.serialize(request_builder_serializer.declare_non_inputtable_constants(request_builder)) | indent }}
-    {% endif %}
+        {% endif %}
     # Construct URL
     {{ request_builder_serializer.construct_url(request_builder) }}
     {% if request_builder.parameters.path %}
     {{ op_tools.serialize(request_builder_serializer.serialize_path(request_builder)) | indent }}
     _url = _format_url_section(_url, **path_format_arguments)
-    {% endif %}
+        {% endif %}
 
-    {% if request_builder.parameters.query %}
+        {% if request_builder.parameters.query %}
     {{ op_tools.serialize(request_builder_serializer.serialize_query(request_builder)) | indent }}
-    {% endif %}
-    {% if request_builder.parameters.headers %}
+        {% endif %}
+        {% if request_builder.parameters.headers %}
     {{ op_tools.serialize(request_builder_serializer.serialize_headers(request_builder)) | indent }}
-    {% endif %}
+        {% endif %}
     {{ op_tools.serialize(request_builder_serializer.create_http_request(request_builder)) | indent }}
 {% endif %}

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

@@ -3,7 +3,7 @@
 {{ code_model.options['license_header'] }}
 {{ imports }}
 
-{{ op_tools.declare_serializer(code_model) }}
+{{ op_tools.declare_serializer(code_model, request_builders) }}
 {% if not is_python3_file %}
 # fmt: off
 {% endif %}