@autorest/python 6.3.0 → 6.3.2

package/README.md

@@ -215,5 +215,5 @@ help-content:
 
 <!-- LINKS -->
 
-[python_docs]: https://github.com/Azure/autorest.python/tree/autorestv3/docs/readme.md
+[python_docs]: https://github.com/Azure/autorest.python/tree/main/docs/readme.md
 [main_docs]: https://github.com/Azure/autorest/tree/master/docs

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

@@ -33,5 +33,5 @@
         {{ keywords.await }}self._client.__{{ keywords.async_prefix }}enter__()
         return self
 
-    {{ keywords.def }} __{{ keywords.async_prefix }}exit__(self, *exc_details) -> None:
+    {{ keywords.def }} __{{ keywords.async_prefix }}exit__(self, *exc_details: Any) -> None:
         {{ keywords.await }}self._client.__{{ keywords.async_prefix }}exit__(*exc_details)

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

@@ -14,7 +14,6 @@ import base64
 import re
 import copy
 import typing
-from collections.abc import MutableMapping
 from datetime import datetime, date, time, timedelta, timezone
 from json import JSONEncoder
 import isodate
@@ -23,6 +22,11 @@ from azure.core import CaseInsensitiveEnumMeta
 from azure.core.pipeline import PipelineResponse
 from azure.core.serialization import NULL as AzureCoreNull
 
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping
+
 _LOGGER = logging.getLogger(__name__)
 
 __all__ = ["NULL", "AzureJSONEncoder", "Model", "rest_field", "rest_discriminator"]
@@ -276,7 +280,7 @@ def _get_model(module_name: str, model_name: str):
 _UNSET = object()
 
 
-class _MyMutableMapping(MutableMapping):
+class _MyMutableMapping(MutableMapping[str, typing.Any]):  # pylint: disable=unsubscriptable-object
     def __init__(self, data: typing.Dict[str, typing.Any]) -> None:
         self._data = copy.deepcopy(data)
 
@@ -301,13 +305,13 @@ class _MyMutableMapping(MutableMapping):
     def __ne__(self, other: typing.Any) -> bool:
         return not self.__eq__(other)
 
-    def keys(self) -> typing.KeysView:
+    def keys(self) -> typing.KeysView[str]:
         return self._data.keys()
 
-    def values(self) -> typing.ValuesView:
+    def values(self) -> typing.ValuesView[typing.Any]:
         return self._data.values()
 
-    def items(self) -> typing.ItemsView:
+    def items(self) -> typing.ItemsView[str, typing.Any]:
         return self._data.items()
 
     def get(self, key: str, default: typing.Any = None) -> typing.Any:
@@ -399,7 +403,7 @@ def _create_value(rf: typing.Optional["_RestField"], value: typing.Any) -> typin
 class Model(_MyMutableMapping):
     _is_model = True
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None:
         class_name = self.__class__.__name__
         if len(args) > 1:
             raise TypeError(f"{class_name}.__init__() takes 2 positional arguments but {len(args) + 1} were given")
@@ -420,10 +424,10 @@ class Model(_MyMutableMapping):
             dict_to_pass.update({self._attr_to_rest_field[k]._rest_name: _serialize(v) for k, v in kwargs.items()})
         super().__init__(dict_to_pass)
 
-    def copy(self):
+    def copy(self) -> "Model":
         return Model(self.__dict__)
 
-    def __new__(cls, *args: typing.Any, **kwargs: typing.Any):  # pylint: disable=unused-argument
+    def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> "Model":  # pylint: disable=unused-argument
         # we know the last three classes in mro are going to be 'Model', 'dict', and 'object'
         mros = cls.__mro__[:-3][::-1]  # ignore model, dict, and object parents, and reverse the mro order
         attr_to_rest_field: typing.Dict[str, _RestField] = {  # map attribute name to rest_field property
@@ -443,12 +447,12 @@ class Model(_MyMutableMapping):
                 rf._rest_name_input = attr
         cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items())
 
-        return super().__new__(cls)
+        return super().__new__(cls)  # pylint: disable=no-value-for-parameter
 
-    def __init_subclass__(cls, discriminator=None):
+    def __init_subclass__(cls, discriminator: typing.Optional[str] = None) -> None:
         for base in cls.__bases__:
             if hasattr(base, "__mapping__"):  # pylint: disable=no-member
-                base.__mapping__[discriminator or cls.__name__] = cls  # pylint: disable=no-member
+                base.__mapping__[discriminator or cls.__name__] = cls  # type: ignore  # pylint: disable=no-member
 
     @classmethod
     def _get_discriminator(cls) -> typing.Optional[str]:
@@ -469,7 +473,7 @@ class Model(_MyMutableMapping):
 
 
 def _get_deserialize_callable_from_annotation(  # pylint: disable=too-many-return-statements, too-many-statements
-        annotation: typing.Any, module: typing.Optional[str], rf: "_RestField" = None
+        annotation: typing.Any, module: typing.Optional[str], rf: typing.Optional["_RestField"] = None
     ) -> typing.Optional[typing.Callable[[typing.Any], typing.Any]]:
         if not annotation or annotation in [int, float]:
             return None
@@ -620,8 +624,8 @@ def _deserialize_with_callable(deserializer: typing.Optional[typing.Callable[[ty
                 # for unknown value, return raw value
                 return value
         if isinstance(deserializer, type) and issubclass(deserializer, Model):
-            return deserializer._deserialize(value)  # type: ignore
-        return deserializer(value)
+            return deserializer._deserialize(value)
+        return typing.cast(typing.Callable[[typing.Any], typing.Any], deserializer)(value)
     except Exception as e:
         raise DeserializationError() from e
 

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

@@ -56,7 +56,7 @@
     {% endif %}
     {% set initialize_properties = serializer.initialize_properties(model) %}
     {% if model.is_public and serializer.init_line(model) or initialize_properties %}
-    def __init__(self, *args, **kwargs):{{ '# pylint: disable=useless-super-delegation' if not initialize_properties else '' }}
+    def __init__(self, *args: Any, **kwargs: Any) -> None:{{ '# pylint: disable=useless-super-delegation' if not initialize_properties else '' }}
         super().__init__(*args, **kwargs)
     {% for initialize_property in initialize_properties %}
         {{ initialize_property }}

package/autorest/preprocess/__init__.py

@@ -178,9 +178,9 @@ def update_parameter(yaml_data: Dict[str, Any]) -> None:
     if yaml_data.get("propertyToParameterName"):
         # need to create a new one with padded keys and values
         yaml_data["propertyToParameterName"] = {
-            pad_reserved_words(prop, PadType.PROPERTY): pad_reserved_words(
-                param_name, PadType.PARAMETER
-            )
+            pad_reserved_words(prop, PadType.PROPERTY)
+            .lower(): pad_reserved_words(param_name, PadType.PARAMETER)
+            .lower()
             for prop, param_name in yaml_data["propertyToParameterName"].items()
         }
 

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@autorest/python",
-  "version": "6.3.0",
+  "version": "6.3.2",
   "description": "The Python extension for generators in AutoRest.",
   "main": "index.js",
   "repository": {
     "type": "git",
-    "url": "https://github.com/Azure/autorest.python/tree/autorestv3"
+    "url": "https://github.com/Azure/autorest.python/tree/main"
   },
-  "readme": "https://github.com/Azure/autorest.python/blob/autorestv3/README.md",
+  "readme": "https://github.com/Azure/autorest.python/blob/main/README.md",
   "keywords": [
     "autorest",
     "python"
@@ -17,7 +17,7 @@
   "bugs": {
     "url": "https://github.com/Azure/autorest.python/issues"
   },
-  "homepage": "https://github.com/Azure/autorest.python/blob/autorestv3/README.md",
+  "homepage": "https://github.com/Azure/autorest.python/blob/main/README.md",
   "dependencies": {
     "@autorest/system-requirements": "~1.0.0"
   },

package/requirements.txt

@@ -6,7 +6,6 @@ json-rpc==1.14.0
 m2r2==0.3.3
 MarkupSafe==2.1.2
 mistune==0.8.4
-mypy-extensions==0.4.3
 pathspec==0.10.3
 platformdirs==2.6.2
 PyYAML==6.0