@autorest/python 6.7.1 → 6.7.3

package/autorest/black/__init__.py

@@ -52,6 +52,9 @@ class BlackScriptPlugin(Plugin):  # pylint: disable=abstract-method
             )
         except NothingChanged:
             pass
+        except:  # pylint: disable=bare-except
+            _LOGGER.error("Error: failed to format %s", file)
+            raise
         self.write_file(file, file_content)
 
 

package/autorest/codegen/models/client.py

@@ -8,7 +8,7 @@ from typing import Any, Dict, TYPE_CHECKING, TypeVar, Generic, Union, List, Opti
 from .base import BaseModel
 from .parameter_list import ClientGlobalParameterList, ConfigGlobalParameterList
 from .imports import FileImport, ImportType, TypingSection, MsrestImportType
-from .utils import add_to_pylint_disable
+from .utils import add_to_pylint_disable, NAME_LENGTH_LIMIT
 from .operation_group import OperationGroup
 from .request_builder import (
     RequestBuilder,
@@ -148,6 +148,8 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
         retval = add_to_pylint_disable("", "client-accepts-api-version-keyword")
         if len(self.operation_groups) > 6:
             retval = add_to_pylint_disable(retval, "too-many-instance-attributes")
+        if len(self.name) > NAME_LENGTH_LIMIT:
+            retval = add_to_pylint_disable(retval, "name-too-long")
         return retval
 
     @property
@@ -371,6 +373,13 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
 class Config(_ClientConfigBase[ConfigGlobalParameterList]):
     """Model representing our Config type."""
 
+    @property
+    def pylint_disable(self) -> str:
+        retval = add_to_pylint_disable("", "too-many-instance-attributes")
+        if len(self.name) + len("Configuration") > NAME_LENGTH_LIMIT:
+            retval = add_to_pylint_disable(retval, "name-too-long")
+        return retval
+
     @property
     def description(self) -> str:
         return (

package/autorest/codegen/models/code_model.py

@@ -133,7 +133,7 @@ class CodeModel:  # pylint: disable=too-many-public-methods, disable=too-many-in
             return True
         if async_mode:
             return self.need_mixin_abc
-        return self.need_request_converter or self.need_mixin_abc
+        return self.need_request_converter or self.need_mixin_abc or self.has_etag
 
     @property
     def need_request_converter(self) -> bool:

package/autorest/codegen/models/operation.py

@@ -18,7 +18,7 @@ from typing import (
 
 from .request_builder_parameter import RequestBuilderParameter
 
-from .utils import OrderedSet, add_to_pylint_disable
+from .utils import OrderedSet, add_to_pylint_disable, NAME_LENGTH_LIMIT
 from .base_builder import BaseBuilder
 from .imports import FileImport, ImportType, TypingSection
 from .response import (
@@ -143,6 +143,8 @@ class OperationBase(  # pylint: disable=too-many-public-methods
                 retval = add_to_pylint_disable(retval, "protected-access")
         except ValueError:
             pass
+        if len(self.name) > NAME_LENGTH_LIMIT:
+            retval = add_to_pylint_disable(retval, "name-too-long")
         return retval
 
     def cls_type_annotation(self, *, async_mode: bool) -> str:

package/autorest/codegen/models/operation_group.py

@@ -10,7 +10,7 @@ from autorest.codegen.models.utils import OrderedSet
 from .base import BaseModel
 from .operation import get_operation
 from .imports import FileImport, ImportType, TypingSection
-from .utils import add_to_pylint_disable
+from .utils import add_to_pylint_disable, NAME_LENGTH_LIMIT
 
 if TYPE_CHECKING:
     from .code_model import CodeModel
@@ -67,6 +67,10 @@ class OperationGroup(BaseModel):
         retval: str = ""
         if self.has_abstract_operations:
             retval = add_to_pylint_disable(retval, "abstract-class-instantiated")
+        if len(self.operations) > 20:
+            retval = add_to_pylint_disable(retval, "too-many-public-methods")
+        if len(self.class_name) > NAME_LENGTH_LIMIT:
+            retval = add_to_pylint_disable(retval, "name-too-long")
         return retval
 
     @property

package/autorest/codegen/models/paging_operation.py

@@ -80,7 +80,7 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
 
     @property
     def continuation_token_name(self) -> Optional[str]:
-        wire_name = self.yaml_data["continuationTokenName"]
+        wire_name = self.yaml_data.get("continuationTokenName")
         if not wire_name:
             # That's an ok scenario, it just means no next page possible
             return None

package/autorest/codegen/models/primitive_types.py

@@ -358,6 +358,7 @@ class DatetimeType(PrimitiveType):
         self.format = (
             "rfc3339"
             if yaml_data.get("format", "date-time") == "date-time"
+            or yaml_data.get("format", "date-time") == "rfc3339"
             else "rfc7231"
         )
 

package/autorest/codegen/models/request_builder.py

@@ -16,6 +16,7 @@ from typing import (
 from abc import abstractmethod
 
 from .base_builder import BaseBuilder
+from .utils import add_to_pylint_disable, NAME_LENGTH_LIMIT
 from .parameter_list import (
     RequestBuilderParameterList,
     OverloadedRequestBuilderParameterList,
@@ -56,6 +57,12 @@ class RequestBuilderBase(BaseBuilder[ParameterListType]):
         self.method: str = yaml_data["method"]
         self.want_tracing = False
 
+    @property
+    def pylint_disable(self) -> str:
+        if len(self.name) > NAME_LENGTH_LIMIT:
+            return add_to_pylint_disable("", "name-too-long")
+        return ""
+
     def response_type_annotation(self, **kwargs) -> str:
         return "HttpRequest"
 

package/autorest/codegen/models/utils.py

@@ -8,6 +8,8 @@ from typing import TypeVar, Dict
 T = TypeVar("T")
 OrderedSet = Dict[T, None]
 
+NAME_LENGTH_LIMIT = 40
+
 
 def add_to_description(description: str, entry: str) -> str:
     if description:

package/autorest/codegen/serializers/client_serializer.py

@@ -164,7 +164,7 @@ class ClientSerializer:
                 api_version = ""
             retval.extend(
                 [
-                    f"self.{og.property_name} = {og.class_name}({og.pylint_disable}",
+                    f"self.{og.property_name} = {og.class_name}(",
                     f"    self._client, self._config, self._serialize, self._deserialize{api_version}",
                     ")",
                 ]

package/autorest/codegen/serializers/sample_serializer.py

@@ -125,7 +125,9 @@ class SampleSerializer:
             param_value = self.sample_params.get(name)
             if not param.optional:
                 if not param_value:
-                    raise Exception(failure_info.format(name))
+                    raise Exception(  # pylint: disable=broad-exception-raised
+                        failure_info.format(name)
+                    )
                 operation_params[param.client_name] = self.handle_param(
                     param, param_value
                 )

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

@@ -1,4 +1,6 @@
-class {{ client.name }}Configuration(Configuration):  # pylint: disable=too-many-instance-attributes
+class {{ client.name }}Configuration(  {{ client.config.pylint_disable }}
+    Configuration
+):
     """Configuration for {{ client.name }}.
 
     Note that all parameters used to create this instance are saved as instance

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

@@ -1,4 +1,3 @@
-{% set disable = "  # pylint: disable=too-many-public-methods" if operation_group.operations | length > 20 else "" %}
 {% set base_class = ("(" + operation_group.base_class + ")") if operation_group.base_class else "" %}
 {% macro check_abstract_methods() %}
 {% if operation_group.has_abstract_operations %}
@@ -9,7 +8,13 @@
         ])
 {% endif %}
 {% endmacro %}
-class {{ operation_group.class_name }}{{ base_class }}:{{ disable }}
+{% if operation_group.base_class %}
+class {{ operation_group.class_name }}( {{ operation_group.pylint_disable }}
+    {{ operation_group.base_class }}
+):
+{% else %}
+class {{ operation_group.class_name }}: {{ operation_group.pylint_disable }}
+{% endif %}
 {% if not operation_group.is_mixin %}
     """
     .. warning::

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

@@ -732,6 +732,8 @@ class Serializer(object):
 
             if kwargs.get("skip_quote") is True:
                 output = str(output)
+                # https://github.com/Azure/autorest.python/issues/2063
+                output = output.replace("{", quote("{")).replace("}", quote("}"))
             else:
                 output = quote(str(output), safe="")
         except SerializationError:

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

@@ -13,8 +13,10 @@ def _convert_request(request, files=None):
 {% endif %}
 {% if code_model.need_mixin_abc %}
     {% for client in clients | selectattr("has_mixin") %}
-
-class {{ client.name }}MixinABC(ABC):
+{% set pylint_disable = "# pylint: disable=name-too-long" if (client.name | length) + ("MixinABC" | length) > 40 else "" %}
+class {{ client.name }}MixinABC(  {{ pylint_disable }}
+    ABC
+):
     """DO NOT use this class. It is for internal typing use only."""
     _client: "{{ keywords.async_class }}PipelineClient"
     _config: {{ client.name }}Configuration

package/autorest/multiapi/__init__.py

@@ -6,7 +6,6 @@
 import sys
 import logging
 import json
-import shutil
 
 from collections import defaultdict
 from pathlib import Path
@@ -174,10 +173,6 @@ class MultiAPI(ReaderAndWriter):  # pylint: disable=abstract-method
             user_specified_default_api=self.user_specified_default_api,
         )
 
-        # In case we are transitioning from a single api generation, clean old folders
-        shutil.rmtree(str(self.output_folder / "operations"), ignore_errors=True)
-        shutil.rmtree(str(self.output_folder / "models"), ignore_errors=True)
-
         multiapi_serializer = self.serializer
         multiapi_serializer.serialize(code_model, self.no_async)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.7.1",
+  "version": "6.7.3",
   "description": "The Python extension for generators in AutoRest.",
   "main": "index.js",
   "repository": {