@autorest/python 5.16.0 → 5.17.0

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

@@ -1,17 +1,17 @@
 {% 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 "" %}
 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 %}
@@ -27,11 +27,11 @@ class {{ operation_group.class_name }}{{ base_class }}:{{ disable }}
 
 {% 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

@@ -12,7 +12,7 @@
 # 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 code_model.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)) }}
@@ -56,3 +56,9 @@ _SERIALIZER = Serializer()
 _SERIALIZER.client_side_validation = False
     {% 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,35 @@
 {% 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 %}
+{% 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) %}
+    {% 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 -%}
+        {%- 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 %}
 {% endif %}

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

@@ -7,7 +7,7 @@ import re
 {% endif -%}
 from setuptools import setup, find_packages
 
-{% set package_name_render = package_name or code_model.class_name %}
+{% set package_name_render = package_name or code_model.client.name %}
 
 PACKAGE_NAME = "{{ package_name_render|lower }}"
 {% if package_mode -%}
@@ -30,7 +30,7 @@ if not version:
 {% else %}
 version = "{{ code_model.options['package_version'] }}"
 {% set description = "%s"|format(package_name_render) %}
-{% set long_description = code_model.description %}
+{% set long_description = code_model.client.description %}
 {% set author_email = "" %}
 {% set url = "" %}
 {% endif -%}
@@ -65,12 +65,18 @@ setup(
     packages=find_packages(
         exclude=[
             "tests",
+            {% if pkgutil_names %}
             # Exclude packages that will be covered by PEP420 or nspkg
+            {% endif %}
             {%- for pkgutil_name in pkgutil_names %}
             "{{ pkgutil_name }}",
             {%- endfor %}
         ]
     ),
+    include_package_data=True,
+    package_data={
+        'pytyped': ['py.typed'],
+    },
     {% else %}
     packages=find_packages(),
     include_package_data=True,
@@ -87,7 +93,7 @@ setup(
     python_requires=">=3.6",
     {% else %}
     long_description="""\
-    {{ code_model.description }}
+    {{ code_model.client.description }}
     """
     {% endif %}
 )

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

@@ -30,7 +30,7 @@ def _format_url_section(template, **kwargs):
 class MixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
     _client: "{{ keywords.async_class }}PipelineClient"
-    _config: {{ code_model.class_name }}Configuration
+    _config: {{ code_model.client.name }}Configuration
     _serialize: "Serializer"
     _deserialize: "Deserializer"
 {% endif %}

package/autorest/jsonrpc/server.py

@@ -18,7 +18,15 @@ _LOGGER = logging.getLogger(__name__)
 
 @dispatcher.add_method
 def GetPluginNames():
-    return ["codegen", "m2r", "namer", "black", "multiapiscript"]
+    return [
+        "codegen",
+        "m2r",
+        "preprocess",
+        "m4reformatter",
+        "black",
+        "multiapiscript",
+        "postprocess",
+    ]
 
 
 @dispatcher.add_method
@@ -36,10 +44,14 @@ def Process(plugin_name: str, session_id: str) -> bool:
         )
         if plugin_name == "m2r":
             from ..m2r import M2R as PluginToLoad
-        elif plugin_name == "namer":
-            from ..namer import Namer as PluginToLoad  # type: ignore
+        elif plugin_name == "preprocess":
+            from ..preprocess import PreProcessPlugin as PluginToLoad  # type: ignore
+        elif plugin_name == "m4reformatter":
+            from ..m4reformatter import M4Reformatter as PluginToLoad  # type: ignore
         elif plugin_name == "codegen":
             from ..codegen import CodeGenerator as PluginToLoad  # type: ignore
+        elif plugin_name == "postprocess":
+            from ..postprocess import PostProcessPlugin as PluginToLoad  # type: ignore
         elif plugin_name == "black":
             from ..black import BlackScriptPlugin as PluginToLoad  # type: ignore
         elif plugin_name == "multiapiscript":