@autorest/python 6.4.8 → 6.4.10

package/autorest/codegen/models/__init__.py

@@ -133,7 +133,7 @@ TYPE_TO_OBJECT = {
     "time": TimeType,
     "duration": DurationType,
     "date": DateType,
-    "byte-array": ByteArraySchema,
+    "bytes": ByteArraySchema,
     "boolean": BooleanType,
     "combined": CombinedType,
     "OAuth2": TokenCredentialType,

package/autorest/codegen/models/client.py

@@ -205,7 +205,11 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
             if gp.method_location == ParameterMethodLocation.KWARG:
                 continue
             file_import.merge(
-                gp.imports(async_mode, relative_path=".." if async_mode else ".")
+                gp.imports(
+                    async_mode,
+                    relative_path=".." if async_mode else ".",
+                    operation=True,
+                )
             )
         file_import.add_submodule_import(
             "._configuration",
@@ -422,7 +426,9 @@ class Config(_ClientConfigBase[ConfigGlobalParameterList]):
                 continue
             file_import.merge(
                 gp.imports(
-                    async_mode=async_mode, relative_path=".." if async_mode else "."
+                    async_mode=async_mode,
+                    relative_path=".." if async_mode else ".",
+                    operation=True,
                 )
             )
         return file_import
@@ -438,7 +444,9 @@ class Config(_ClientConfigBase[ConfigGlobalParameterList]):
                 continue
             file_import.merge(
                 gp.imports_for_multiapi(
-                    async_mode=async_mode, relative_path=".." if async_mode else "."
+                    async_mode=async_mode,
+                    relative_path=".." if async_mode else ".",
+                    operation=True,
                 )
             )
         return file_import

package/autorest/codegen/models/enum_type.py

@@ -173,13 +173,13 @@ class EnumType(BaseType):
         )
 
     def imports(self, **kwargs: Any) -> FileImport:
-        is_operation_file = kwargs.pop("is_operation_file", False)
+        operation = kwargs.pop("operation", False)
         file_import = FileImport()
         if self.code_model.options["models_mode"]:
             file_import.add_submodule_import(
                 "typing", "Union", ImportType.STDLIB, TypingSection.CONDITIONAL
             )
-            if not is_operation_file:
+            if not operation:
                 file_import.add_submodule_import(
                     "..",
                     "models",
@@ -187,9 +187,7 @@ class EnumType(BaseType):
                     TypingSection.TYPING,
                     alias="_models",
                 )
-        file_import.merge(
-            self.value_type.imports(is_operation_file=is_operation_file, **kwargs)
-        )
+        file_import.merge(self.value_type.imports(operation=operation, **kwargs))
         relative_path = kwargs.pop("relative_path", None)
         if self.code_model.options["models_mode"] and relative_path:
             # add import for enums in operations file

package/autorest/codegen/models/operation.py

@@ -223,7 +223,9 @@ class OperationBase(  # pylint: disable=too-many-public-methods
         )
 
         response_types = [
-            r.type_annotation(async_mode=async_mode) for r in self.responses if r.type
+            r.type_annotation(async_mode=async_mode, operation=self)
+            for r in self.responses
+            if r.type
         ]
         if len(set(response_types)) > 1:
             file_import.add_submodule_import(
@@ -245,17 +247,22 @@ class OperationBase(  # pylint: disable=too-many-public-methods
             file_import.merge(
                 param.imports_for_multiapi(
                     async_mode,
+                    operation=self,
                     **kwargs,
                 )
             )
         for response in self.responses:
             file_import.merge(
-                response.imports_for_multiapi(async_mode=async_mode, **kwargs)
+                response.imports_for_multiapi(
+                    async_mode=async_mode, operation=self, **kwargs
+                )
             )
         if self.code_model.options["models_mode"]:
             for exception in self.exceptions:
                 file_import.merge(
-                    exception.imports_for_multiapi(async_mode=async_mode, **kwargs)
+                    exception.imports_for_multiapi(
+                        async_mode=async_mode, operation=self, **kwargs
+                    )
                 )
         return file_import
 
@@ -323,17 +330,22 @@ class OperationBase(  # pylint: disable=too-many-public-methods
             file_import.merge(
                 param.imports(
                     async_mode,
+                    operation=self,
                     **kwargs,
                 )
             )
         for response in self.responses:
-            file_import.merge(response.imports(async_mode=async_mode, **kwargs))
+            file_import.merge(
+                response.imports(async_mode=async_mode, operation=self, **kwargs)
+            )
         if self.code_model.options["models_mode"]:
             for exception in self.exceptions:
                 file_import.merge(exception.imports(async_mode=async_mode, **kwargs))
 
         if self.parameters.has_body and self.parameters.body_parameter.flattened:
-            file_import.merge(self.parameters.body_parameter.type.imports(**kwargs))
+            file_import.merge(
+                self.parameters.body_parameter.type.imports(operation=self, **kwargs)
+            )
 
         # Exceptions
         errors = [

package/autorest/codegen/models/parameter.py

@@ -182,11 +182,7 @@ class _ParameterBase(
         file_import = self._imports_shared(async_mode, **kwargs)
         # special logic for api-version parameter
         if not self.is_api_version:
-            file_import.merge(
-                self.type.imports(
-                    is_operation_file=True, async_mode=async_mode, **kwargs
-                )
-            )
+            file_import.merge(self.type.imports(async_mode=async_mode, **kwargs))
         if self.default_to_unset_sentinel:
             file_import.add_submodule_import("typing", "Any", ImportType.STDLIB)
             file_import.define_mypy_type(
@@ -198,9 +194,7 @@ class _ParameterBase(
     def imports_for_multiapi(self, async_mode: bool, **kwargs: Any) -> FileImport:
         file_import = self._imports_shared(async_mode, **kwargs)
         file_import.merge(
-            self.type.imports_for_multiapi(
-                is_operation_file=True, async_mode=async_mode, **kwargs
-            )
+            self.type.imports_for_multiapi(async_mode=async_mode, **kwargs)
         )
         return file_import
 

package/autorest/codegen/models/primitive_types.py

@@ -105,13 +105,23 @@ class BinaryType(PrimitiveType):
         return self.get_declaration(b"bytes")
 
     def imports(self, **kwargs: Any) -> FileImport:
+        from .combined_type import CombinedType
+        from .operation import OperationBase
+
         file_import = FileImport()
         file_import.add_submodule_import("typing", "IO", ImportType.STDLIB)
+        operation = kwargs.get("operation")
+        if (
+            isinstance(operation, OperationBase)
+            and operation.parameters.has_body
+            and isinstance(operation.parameters.body_parameter.type, CombinedType)
+        ):
+            file_import.add_submodule_import("io", "IOBase", ImportType.STDLIB)
         return file_import
 
     @property
     def instance_check_template(self) -> str:
-        return "isinstance({}, (IO, bytes))"
+        return "isinstance({}, (IOBase, bytes))"
 
 
 class BinaryIteratorType(PrimitiveType):
@@ -346,7 +356,7 @@ class StringType(PrimitiveType):
 class DatetimeType(PrimitiveType):
     def __init__(self, yaml_data: Dict[str, Any], code_model: "CodeModel") -> None:
         super().__init__(yaml_data=yaml_data, code_model=code_model)
-        self.format = self.Formats(yaml_data["format"])
+        self.format = self.Formats(yaml_data.get("format", "date-time"))
 
     class Formats(str, Enum):
         datetime = "date-time"
@@ -578,7 +588,7 @@ class DurationType(PrimitiveType):
 class ByteArraySchema(PrimitiveType):
     def __init__(self, yaml_data: Dict[str, Any], code_model: "CodeModel") -> None:
         super().__init__(yaml_data=yaml_data, code_model=code_model)
-        self.format = yaml_data["format"]
+        self.format = yaml_data.get("format", "bytes")
 
     @property
     def serialization_type(self) -> str:

package/autorest/codegen/models/property.py

@@ -130,9 +130,7 @@ class Property(BaseModel):  # pylint: disable=too-many-instance-attributes
         return retval or None
 
     def imports(self, **kwargs) -> FileImport:
-        file_import = self.type.imports(
-            **kwargs, is_operation_file=False, relative_path="..", model_typing=True
-        )
+        file_import = self.type.imports(**kwargs, relative_path="..", model_typing=True)
         if self.optional and self.client_default_value is None:
             file_import.add_submodule_import("typing", "Optional", ImportType.STDLIB)
         if self.code_model.options["models_mode"] == "dpg":

package/autorest/codegen/models/request_builder.py

@@ -88,7 +88,9 @@ class RequestBuilderBase(BaseBuilder[ParameterListType]):
             return file_import
         for parameter in self.parameters.method:
             file_import.merge(
-                parameter.imports(async_mode=False, relative_path=relative_path)
+                parameter.imports(
+                    async_mode=False, relative_path=relative_path, operation=self
+                )
             )
 
         file_import.add_submodule_import(

package/autorest/codegen/models/response.py

@@ -103,7 +103,7 @@ class Response(BaseModel):
     def _imports_shared(self, **kwargs: Any) -> FileImport:
         file_import = FileImport()
         if self.type:
-            file_import.merge(self.type.imports(is_operation_file=True, **kwargs))
+            file_import.merge(self.type.imports(**kwargs))
         if self.nullable:
             file_import.add_submodule_import("typing", "Optional", ImportType.STDLIB)
         if isinstance(self.type, CombinedType) and self.type.name:

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

@@ -20,7 +20,7 @@ import isodate
 from azure.core.exceptions import DeserializationError
 from azure.core import CaseInsensitiveEnumMeta
 from azure.core.pipeline import PipelineResponse
-from azure.core.serialization import NULL as AzureCoreNull
+from azure.core.serialization import _Null  # pylint: disable=protected-access
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
@@ -29,24 +29,9 @@ else:
 
 _LOGGER = logging.getLogger(__name__)
 
-__all__ = ["NULL", "AzureJSONEncoder", "Model", "rest_field", "rest_discriminator"]
+__all__ = ["AzureJSONEncoder", "Model", "rest_field", "rest_discriminator"]
 
 
-class _Null(object):
-    """To create a Falsy object"""
-
-    def __bool__(self):
-        return False
-
-    __nonzero__ = __bool__  # Python2 compatibility
-
-
-NULL = _Null()
-"""
-A falsy sentinel object which is supposed to be used to specify attributes
-with no data. This gets serialized to `null` on the wire.
-"""
-
 TZ_UTC = timezone.utc
 
 def _timedelta_as_isostr(td: timedelta) -> str:
@@ -162,7 +147,7 @@ class AzureJSONEncoder(JSONEncoder):
             return {k: v for k, v in o.items() if k not in readonly_props}
         if isinstance(o, (bytes, bytearray)):
             return base64.b64encode(o).decode()
-        if o is AzureCoreNull:
+        if isinstance(o, _Null):
             return None
         try:
             return super(AzureJSONEncoder, self).default(o)

package/autorest/m4reformatter/__init__.py

@@ -234,7 +234,7 @@ def update_primitive(  # pylint: disable=too-many-return-statements
         base["format"] = yaml_data["format"]
         return base
     if type_group == "byte-array":
-        base = _update_type_base("byte-array", yaml_data)
+        base = _update_type_base("bytes", yaml_data)
         base["format"] = yaml_data["format"]
         return base
     return _update_type_base(type_group, yaml_data)

package/autorest/preprocess/__init__.py

@@ -220,7 +220,7 @@ class PreProcessPlugin(YamlUpdatePlugin):  # pylint: disable=abstract-method
             if type.get("name"):
                 type["name"] = self.pad_reserved_words(type["name"], PadType.MODEL)
                 type["description"] = update_description(
-                    type["description"], type["name"]
+                    type.get("description", ""), type["name"]
                 )
                 type["snakeCaseName"] = to_snake_case(type["name"])
             if type.get("values") and not self.version_tolerant:

package/package.json

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