@autorest/python 6.4.9 → 6.4.11

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/code_model.py

@@ -184,7 +184,10 @@ class CodeModel:  # pylint: disable=too-many-public-methods
         """All of the model types in this class"""
         if not self._model_types:
             self._model_types = [
-                t for t in self.types_map.values() if isinstance(t, ModelType)
+                t
+                for t in self.types_map.values()
+                if isinstance(t, ModelType)
+                and not (self.options["models_mode"] == "dpg" and t.page_result_model)
             ]
         return self._model_types
 

package/autorest/codegen/models/model_type.py

@@ -74,6 +74,7 @@ class ModelType(  # pylint: disable=abstract-method
         self._got_polymorphic_subtypes = False
         self.internal: bool = self.yaml_data.get("internal", False)
         self.snake_case_name: str = self.yaml_data["snakeCaseName"]
+        self.page_result_model: bool = self.yaml_data.get("pageResultModel", False)
 
     @property
     def is_xml(self) -> bool:

package/autorest/codegen/models/paging_operation.py

@@ -156,7 +156,14 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
                 "azure.core.utils", "case_insensitive_dict", ImportType.AZURECORE
             )
         if self.code_model.options["models_mode"] == "dpg":
+            relative_path = "..." if async_mode else ".."
             file_import.merge(self.item_type.imports(**kwargs))
+            if self.default_error_deserialization or any(
+                r.type for r in self.responses
+            ):
+                file_import.add_submodule_import(
+                    f"{relative_path}_model_base", "_deserialize", ImportType.LOCAL
+                )
         return file_import
 
 

package/autorest/codegen/models/primitive_types.py

@@ -356,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"
@@ -588,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/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.9",
+  "version": "6.4.11",
   "description": "The Python extension for generators in AutoRest.",
   "main": "index.js",
   "repository": {