@autorest/python 5.12.2 → 5.12.6

package/autorest/codegen/serializers/metadata_serializer.py

@@ -62,7 +62,7 @@ def _mixin_imports(mixin_operation_group: Optional[OperationGroup]) -> Tuple[Opt
     sync_mixin_imports = mixin_operation_group.imports_for_multiapi(async_mode=False)
     async_mixin_imports = mixin_operation_group.imports_for_multiapi(async_mode=True)
 
-    return _json_serialize_imports(sync_mixin_imports.imports), _json_serialize_imports(async_mixin_imports.imports)
+    return _json_serialize_imports(sync_mixin_imports.to_dict()), _json_serialize_imports(async_mixin_imports.to_dict())
 
 
 class MetadataSerializer:
@@ -102,20 +102,22 @@ class MetadataSerializer:
         file_import = FileImport()
         for gp in global_parameters:
             file_import.merge(gp.imports())
-        file_import.add_from_import("azure.profiles", "KnownProfiles", import_type=ImportType.AZURECORE)
-        file_import.add_from_import("azure.profiles", "ProfileDefinition", import_type=ImportType.AZURECORE)
-        file_import.add_from_import(
+        file_import.add_submodule_import("azure.profiles", "KnownProfiles", import_type=ImportType.AZURECORE)
+        file_import.add_submodule_import("azure.profiles", "ProfileDefinition", import_type=ImportType.AZURECORE)
+        file_import.add_submodule_import(
             "azure.profiles.multiapiclient", "MultiApiClientMixin", import_type=ImportType.AZURECORE
         )
-        file_import.add_from_import("._configuration", f"{self.code_model.class_name}Configuration", ImportType.LOCAL)
+        file_import.add_submodule_import(
+            "._configuration", f"{self.code_model.class_name}Configuration", ImportType.LOCAL
+        )
         # api_version and potentially endpoint require Optional typing
-        file_import.add_from_import("typing", "Optional", ImportType.STDLIB, TypingSection.CONDITIONAL)
+        file_import.add_submodule_import("typing", "Optional", ImportType.STDLIB, TypingSection.CONDITIONAL)
         if mixin_operation_group:
-            file_import.add_from_import(
+            file_import.add_submodule_import(
                 "._operations_mixin", f"{self.code_model.class_name}OperationsMixin", ImportType.LOCAL
             )
         file_import.merge(self.code_model.service_client.imports_for_multiapi(async_mode=async_mode))
-        return _json_serialize_imports(file_import.imports)
+        return _json_serialize_imports(file_import.to_dict())
 
     def serialize(self) -> str:
         def _is_lro(operation):
@@ -179,10 +181,10 @@ class MetadataSerializer:
             sync_client_imports=sync_client_imports,
             async_client_imports=async_client_imports,
             sync_config_imports=_json_serialize_imports(
-                config_imports(self.code_model, self.code_model.global_parameters, async_mode=False).imports
+                config_imports(self.code_model, self.code_model.global_parameters, async_mode=False).to_dict()
             ),
             async_config_imports=_json_serialize_imports(
-                config_imports(self.code_model, async_global_parameters, async_mode=True).imports
+                config_imports(self.code_model, async_global_parameters, async_mode=True).to_dict()
             ),
             get_async_operation_serializer=functools.partial(
                 get_operation_serializer, code_model=self.code_model, async_mode=True, is_python3_file=True

package/autorest/codegen/serializers/model_base_serializer.py

@@ -52,12 +52,12 @@ class ModelBaseSerializer:
     @staticmethod
     def get_properties_to_initialize(model: ObjectSchema) -> List[Property]:
         if model.base_models:
-            properties_to_initialize = []
-            for uncast_base_model in model.base_models:
-                base_model = cast(ObjectSchema, uncast_base_model)
-                for prop in model.properties:
-                    if prop not in base_model.properties or prop.is_discriminator or prop.constant:
-                        properties_to_initialize.append(prop)
+            properties_to_initialize = list({
+                p.name: p
+                for bm in model.base_models
+                for p in model.properties
+                if p not in cast(ObjectSchema, bm).properties or p.is_discriminator or p.constant
+            }.values())
         else:
             properties_to_initialize = model.properties
         return properties_to_initialize

package/autorest/codegen/serializers/utils.py

@@ -13,9 +13,13 @@ def serialize_method(
     method_name: str,
     is_in_class: bool,
     method_param_signatures: List[str],
+    ignore_inconsistent_return_statements: bool = False,
 ):
     lines: List[str] = []
-    lines.append(f"{function_def} {method_name}(")
+    first_line = f"{function_def} {method_name}("
+    if ignore_inconsistent_return_statements:
+        first_line += "  # pylint: disable=inconsistent-return-statements"
+    lines.append(first_line)
     if is_in_class:
         lines.append("    self,")
     lines.extend([

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

@@ -11,7 +11,7 @@
 VERSION = "unknown"
 {% endif %}
 
-class {{ code_model.class_name }}Configuration(Configuration):
+class {{ code_model.class_name }}Configuration(Configuration):  # pylint: disable=too-many-instance-attributes
     """Configuration for {{ code_model.class_name }}.
 
     Note that all parameters used to create this instance are saved as instance
@@ -19,12 +19,7 @@ class {{ code_model.class_name }}Configuration(Configuration):
 {% if code_model.global_parameters.config_method | first %}
 
 {% endif %}
-{% for parameter in code_model.global_parameters.config_method %}
-    :{{ parameter.description_keyword }} {{ parameter.serialized_name }}: {{ parameter.description }}
-    :{{ parameter.docstring_type_keyword }} {{ parameter.serialized_name }}: {{ parameter.docstring_type }}
-{% endfor %}
-    """
-
+    {{ op_tools.serialize_with_wrap(serializer.property_descriptions(), "\n ") | indent }}
     {{ serializer.init_signature_and_response_type_annotation(async_mode) | indent }}
         super({{ code_model.class_name }}Configuration, self).__init__(**kwargs)
     {% if code_model.service_client.parameters.config_kwargs_to_pop(async_mode) %}

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

@@ -13,4 +13,6 @@
     {{ op_tools.serialize(operation_serializer.get_long_running_output(operation)) | indent }}
 
     {{ op_tools.serialize(operation_serializer.return_lro_poller(operation)) | indent }}
-{{ operation_serializer.get_metadata_url(operation) }}
+{% if not code_model.options["version_tolerant"] %}
+{{ operation_serializer.get_metadata_url(operation) -}}
+{% endif %}

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

@@ -15,4 +15,6 @@
     {{ op_tools.serialize(operation_serializer.initial_call(operation)) | indent }}
     {{ op_tools.serialize(operation_serializer.get_long_running_output(operation)) | indent }}
     {{ op_tools.serialize(operation_serializer.return_lro_poller(operation)) | indent }}
+{% if not code_model.options["version_tolerant"] %}
 {{ operation_serializer.get_metadata_url(operation) }}
+{% endif %}

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

@@ -18,7 +18,7 @@
     },
     "global_parameters": {
         "sync": {
-            {% for gp in sync_global_parameters.config_method %}
+            {% for gp in sync_global_parameters.config_method | rejectattr("serialized_name", "equalto", "api_version") %}
             {{ gp.serialized_name | tojson }}: {
                 "signature": {{ gp.method_signature(is_python3_file=False) | tojson }},
                 "description": {{ gp.description | tojson }},
@@ -28,7 +28,7 @@
             {% endfor %}
         },
         "async": {
-            {% for gp in async_global_parameters.config_method %}
+            {% for gp in async_global_parameters.config_method | rejectattr("serialized_name", "equalto", "api_version") %}
             {{ gp.serialized_name | tojson }}: {
                 "signature": {{ (gp.method_signature(is_python3_file=True)) | tojson }},
                 "description": {{ gp.description | tojson }},
@@ -42,7 +42,7 @@
             {{ gp.serialized_name | tojson }}: {{ gp.constant_declaration | tojson }}{{ "," if not loop.last else "" }}
             {% endfor %}
         },
-        "call": {{ code_model.global_parameters.config_method | map(attribute="serialized_name") | join(', ') | tojson }},
+        "call": {{ code_model.global_parameters.config_method | rejectattr("serialized_name", "equalto", "api_version") | map(attribute="serialized_name") | join(', ') | tojson }},
         "service_client_specific": {
             "sync": {
                 "api_version": {

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

@@ -18,6 +18,12 @@
     {{ op_tools.serialize(operation_serializer.pop_kwargs_from_signature(operation)) | indent }}
     {% endif %}
     {{ op_tools.serialize(operation_serializer.call_request_builder(operation)) | indent }}
-    pipeline_response = {{ keywords.await }}self._client._pipeline.run(request, {{ stream_request_parameter }}, **kwargs)
+    pipeline_response = {{ keywords.await }}self._client._pipeline.run(  # pylint: disable=protected-access
+        request,
+        {{ stream_request_parameter }},
+        **kwargs
+    )
     {{ op_tools.serialize(operation_serializer.handle_response(operation)) | indent }}
-{{ operation.python_name }}.metadata = {'url': {{ keywords.escape_str(request_builder.url) }}}  # type: ignore
+{% if not code_model.options["version_tolerant"] %}
+{{ operation_serializer.get_metadata_url(operation) }}
+{% endif %}

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

@@ -1,4 +1,5 @@
-class {{ operation_group.class_name }}{{ object_base_class }}:
+{% set disable = "  # pylint: disable=too-many-public-methods" if operation_group.operations | length > 20 else "" %}
+class {{ operation_group.class_name }}{{ object_base_class }}:{{ disable }}
 {% if not operation_group.is_empty_operation_group %}
     """{{ operation_group.class_name }} {{ operations_description }}.
 

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

@@ -2,6 +2,7 @@
 {% set object_base_class = "" if async_mode else "(object)" %}
 {% set operations_description = "async operations" if async_mode else "operations" %}
 {% set return_none_type_annotation = " -> None" if async_mode else "" %}
+# pylint: disable=too-many-lines
 # coding=utf-8
 {{ code_model.options['license_header'] }}
 {{ imports }}

package/autorest/codegen/templates/operation_tools.jinja2

@@ -1,4 +1,4 @@
-{% macro wrap_string(string, wrapstring) %}{{ string | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring=wrapstring)}}{% endmacro %}
+{% macro wrap_string(string, wrapstring, width=95) %}{{ string | wordwrap(width=width, break_long_words=False, break_on_hyphens=False, wrapstring=wrapstring)}}{% endmacro %}
 
 {% macro description(builder, serializer) %}
     {% for description in serializer.description_and_summary(builder) %}
@@ -22,7 +22,8 @@ Example:
     .. code-block:: python
     {% for template_line in serializer.get_example_template(builder) %}
         {% if template_line %}
-        {{ 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)) }}
         {% else %}
 
         {% endif %}

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

@@ -17,4 +17,6 @@
     return {{ operation.get_pager(async_mode) }}(
         get_next, extract_data
     )
-{{ operation.python_name }}.metadata = {'url': '{{ request_builder.url|replace("'", "\\'") }}'}  # type: ignore
+{% if not code_model.options["version_tolerant"] %}
+{{ operation_serializer.get_metadata_url(operation) -}}
+{% endif %}

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

@@ -13,15 +13,10 @@
     {% endfor %}
 {% endif %}
     # Construct URL
-{% if code_model.options["version_tolerant"] or code_model.options["low_level_client"] %}
-    {% set url_value = keywords.escape_str(request_builder.url) %}
-{% else %}
-    {% set url_value = 'kwargs.pop("template_url", ' + keywords.escape_str(request_builder.url) + ')' %}
-{% endif %}
-    url = {{ url_value }}
+    {{ 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)
+    _url = _format_url_section(_url, **path_format_arguments)
 {% endif %}
 
 {% if request_builder.parameters.query %}

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

@@ -7,7 +7,7 @@
 {{ imports }}
 
 {{ serializer.class_definition(async_mode) }}
-    """{{ code_model.description }}
+    """{{ op_tools.wrap_string(code_model.description, "\n") | indent }}
 
     {{ op_tools.serialize_with_wrap(serializer.property_descriptions(async_mode), "\n ") | indent }}
     {{ serializer.init_signature_and_response_type_annotation(async_mode) | indent }}

package/autorest/multiapi/models/imports.py

@@ -45,7 +45,7 @@ class FileImport:
                 from_section, set()
             ).add(name_import)
 
-    def add_from_import(
+    def add_submodule_import(
         self,
         from_section: str,
         name_import: str,

package/autorest/multiapi/serializers/import_serializer.py

@@ -62,7 +62,7 @@ class FileImportSerializer:
             self._file_import.imports.get(TypingSection.TYPING) or
             (not self.is_python3_file and self._file_import.imports.get(TypingSection.CONDITIONAL))
         ):
-            self._file_import.add_from_import("typing", "TYPE_CHECKING", ImportType.STDLIB)
+            self._file_import.add_submodule_import("typing", "TYPE_CHECKING", ImportType.STDLIB)
 
     def __str__(self) -> str:
         self._add_type_checking_import()

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@autorest/python",
-    "version": "5.12.2",
+    "version": "5.12.6",
     "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.11"
+        "@microsoft.azure/autorest.testserver": "^3.1.13"
     },
     "files": [
         "autorest/**/*.py",