@autorest/python 6.9.2 → 6.9.4

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

@@ -295,7 +295,7 @@ class Model(object):
     _validation: Dict[str, Dict[str, Any]] = {}
 
     def __init__(self, **kwargs: Any) -> None:
-        self.additional_properties: Dict[str, Any] = {}
+        self.additional_properties: Optional[Dict[str, Any]] = {}
         for k in kwargs:
             if k not in self._attribute_map:
                 _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__)
@@ -351,7 +351,7 @@ class Model(object):
         :rtype: dict
         """
         serializer = Serializer(self._infer_class_models())
-        return serializer._serialize(self, keep_readonly=keep_readonly, **kwargs)
+        return serializer._serialize(self, keep_readonly=keep_readonly, **kwargs)  # type: ignore
 
     def as_dict(
         self,
@@ -392,7 +392,7 @@ class Model(object):
         :rtype: dict
         """
         serializer = Serializer(self._infer_class_models())
-        return serializer._serialize(self, key_transformer=key_transformer, keep_readonly=keep_readonly, **kwargs)
+        return serializer._serialize(self, key_transformer=key_transformer, keep_readonly=keep_readonly, **kwargs)  # type: ignore
 
     @classmethod
     def _infer_class_models(cls):
@@ -417,7 +417,7 @@ class Model(object):
         :raises: DeserializationError if something went wrong
         """
         deserializer = Deserializer(cls._infer_class_models())
-        return deserializer(cls.__name__, data, content_type=content_type)
+        return deserializer(cls.__name__, data, content_type=content_type)  # type: ignore
 
     @classmethod
     def from_dict(
@@ -447,7 +447,7 @@ class Model(object):
             if key_extractors is None
             else key_extractors
         )
-        return deserializer(cls.__name__, data, content_type=content_type)
+        return deserializer(cls.__name__, data, content_type=content_type)  # type: ignore
 
     @classmethod
     def _flatten_subtype(cls, key, objects):

package/autorest/jsonrpc/server.py

@@ -3,12 +3,14 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
+import typing
 import contextlib
 import os
 import sys
 import logging
 
 from jsonrpc import dispatcher, JSONRPCResponseManager
+from jsonrpc.jsonrpc2 import JSONRPC20Response
 
 from .stdstream import read_message, write_message
 
@@ -99,7 +101,9 @@ def main() -> None:
         _LOGGER.debug("Trying to read")
         message = read_message()
 
-        response = JSONRPCResponseManager.handle(message, dispatcher).json
+        response = typing.cast(
+            JSONRPC20Response, JSONRPCResponseManager.handle(message, dispatcher)
+        ).json
         _LOGGER.debug("Produced: %s", response)
         write_message(response)
         _LOGGER.debug("Message processed")

package/autorest/m4reformatter/__init__.py

@@ -16,6 +16,7 @@ from .._utils import (
     KNOWN_TYPES,
     get_body_type_for_description,
     JSON_REGEXP,
+    update_enum_value,
 )
 from .. import YamlUpdatePluginAutorest
 
@@ -88,24 +89,25 @@ def update_constant(yaml_data: Dict[str, Any]) -> Dict[str, Any]:
     return base
 
 
-def update_enum_value(yaml_data: Dict[str, Any]) -> Dict[str, Any]:
-    return {
-        "name": yaml_data["language"]["default"]["name"],
-        "value": yaml_data["value"],
-        "description": yaml_data["language"]["default"]["description"],
-    }
-
-
 def update_enum(yaml_data: Dict[str, Any]) -> Dict[str, Any]:
     base = _update_type_base("enum", yaml_data)
     base.update(
         {
             "name": yaml_data["language"]["default"]["name"],
             "valueType": update_type(yaml_data["choiceType"]),
-            "values": [update_enum_value(v) for v in yaml_data["choices"]],
+            "values": [],
             "description": yaml_data["language"]["default"]["description"],
         }
     )
+    for v in yaml_data["choices"]:
+        base["values"].append(
+            update_enum_value(
+                name=v["language"]["default"]["name"],
+                value=v["value"],
+                description=v["language"]["default"]["description"],
+                enum_type=base,
+            )
+        )
     return base
 
 

package/autorest/multiapi/models/imports.py

@@ -4,7 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 from enum import Enum
-from typing import Dict, Optional, Set, Union, Tuple
+from typing import Dict, Optional, Set, Union, Tuple, cast
 from ..utils import convert_list_to_tuple
 
 
@@ -108,21 +108,23 @@ class FileImport:
         ] = None,
         typing_section: TypingSection = TypingSection.REGULAR,
     ) -> None:
-        name_input: Optional[
-            Union[
-                str,
-                Tuple[
+        name_input = cast(
+            Optional[
+                Union[
                     str,
-                    str,
-                ],
-                Tuple[
-                    str,
-                    Optional[str],
-                    Tuple[Tuple[Tuple[int, int], str, Optional[str]]],
-                ],
-            ]
-        ] = None
-        name_input = convert_list_to_tuple(name_import)
+                    Tuple[
+                        str,
+                        str,
+                    ],
+                    Tuple[
+                        str,
+                        Optional[str],
+                        Tuple[Tuple[Tuple[int, int], str, Optional[str]]],
+                    ],
+                ]
+            ],
+            convert_list_to_tuple(name_import),
+        )
         self._imports.setdefault(typing_section, {}).setdefault(
             import_type, {}
         ).setdefault(from_section, set()).add(name_input)

package/autorest/preprocess/__init__.py

@@ -8,7 +8,7 @@
 import copy
 from typing import Callable, Dict, Any, List, Optional
 
-from .._utils import to_snake_case
+from .._utils import to_snake_case, update_enum_value
 from .helpers import (
     add_redefined_builtin_info,
     pad_builtin_namespaces,
@@ -264,11 +264,12 @@ class PreProcessPlugin(YamlUpdatePlugin):  # pylint: disable=abstract-method
                     ).upper()
                     if value["name"] != padded_name:
                         values_to_add.append(
-                            {
-                                "description": value["description"],
-                                "name": padded_name,
-                                "value": value["value"],
-                            }
+                            update_enum_value(
+                                name=padded_name,
+                                value=value["value"],
+                                description=value["description"],
+                                enum_type=value["enumType"],
+                            )
                         )
                 type["values"].extend(values_to_add)
 

package/package.json

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