@autorest/python 6.16.0 → 6.17.1

package/generator/pygen/__init__.py

@@ -54,7 +54,7 @@ class ReaderAndWriter:
             fd.write(file_content)
 
     def list_file(self) -> List[str]:
-        return [str(f) for f in self.output_folder.glob("**/*") if f.is_file()]
+        return [str(f.relative_to(self.output_folder)) for f in self.output_folder.glob("**/*") if f.is_file()]
 
 
 class Plugin(ReaderAndWriter, ABC):

package/generator/pygen/black.py

@@ -37,15 +37,14 @@ class BlackScriptPlugin(Plugin):  # pylint: disable=abstract-method
                 [
                     Path(f)
                     for f in self.list_file()
-                    if all(
-                        item not in f
-                        for item in (
-                            "__pycache__",
-                            "node_modules",
-                            ".tox",
-                            ".mypy_cache",
-                        )
+                    if Path(f).parts[0]
+                    not in (
+                        "__pycache__",
+                        "node_modules",
+                        "venv",
+                        "env",
                     )
+                    and not Path(f).parts[0].startswith(".")
                     and Path(f).suffix == ".py"
                 ],
             )

package/generator/pygen/codegen/models/model_type.py

@@ -32,6 +32,10 @@ class UsageFlags(Enum):
     ApiVersionEnum = 8
     JsonMergePatch = 16
     MultipartFormData = 32
+    Spread = 64
+    Error = 128
+    Json = 256
+    Xml = 512
 
 
 def _get_properties(type: "ModelType", properties: List[Property]) -> List[Property]:
@@ -86,7 +90,7 @@ class ModelType(  # pylint: disable=abstract-method
 
     @property
     def is_usage_output(self) -> bool:
-        return self.usage == UsageFlags.Output.value
+        return self.usage & UsageFlags.Output.value
 
     @property
     def flattened_property(self) -> Optional[Property]:

package/generator/pygen/codegen/models/operation.py

@@ -495,7 +495,9 @@ class Operation(OperationBase[Response]):
         relative_path = "..." if async_mode else ".."
         if self.code_model.options["models_mode"] == "dpg":
             if self.parameters.has_body:
-                if not self.has_form_data_body:
+                if self.has_form_data_body:
+                    file_import.add_submodule_import(relative_path, "_model_base", ImportType.LOCAL)
+                else:
                     file_import.add_submodule_import(
                         f"{relative_path}_model_base",
                         "SdkJSONEncoder",

package/generator/pygen/codegen/models/operation_group.py

@@ -114,7 +114,7 @@ class OperationGroup(BaseModel):
             and not self.is_mixin
         ):
             file_import.add_submodule_import(relative_path, "models", ImportType.LOCAL, alias="_models")
-        if self.code_model.need_mixin_abc:
+        if self.is_mixin:
             file_import.add_submodule_import(".._vendor", f"{self.client.name}MixinABC", ImportType.LOCAL)
         if self.has_abstract_operations:
             file_import.add_submodule_import(".._vendor", "raise_if_not_implemented", ImportType.LOCAL)

package/generator/pygen/codegen/serializers/builder_serializer.py

@@ -58,6 +58,10 @@ OperationType = TypeVar(
 )
 
 
+def _all_same(data: List[List[str]]) -> bool:
+    return len(data) > 1 and all(sorted(data[0]) == sorted(data[i]) for i in range(1, len(data)))
+
+
 def _json_serializable(content_type: str) -> bool:
     return bool(JSON_REGEXP.match(content_type.split(";")[0].strip().lower()))
 
@@ -905,6 +909,9 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):  # pylint: di
         builder: OperationType,
         response: Response,
     ) -> List[str]:
+        return self.response_headers(response) + self.response_deserialization(builder, response)
+
+    def response_headers(self, response: Response) -> List[str]:
         retval: List[str] = [
             (
                 f"response_headers['{response_header.wire_name}']=self._deserialize("
@@ -914,6 +921,14 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):  # pylint: di
         ]
         if response.headers:
             retval.append("")
+        return retval
+
+    def response_deserialization(
+        self,
+        builder: OperationType,
+        response: Response,
+    ) -> List[str]:
+        retval: List[str] = []
         deserialize_code: List[str] = []
         stream_logic = True
         if builder.has_stream_response:
@@ -1018,13 +1033,34 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):  # pylint: di
             retval.append("response_headers = {}")
         if builder.has_response_body or builder.any_response_has_headers:
             if len(builder.responses) > 1:
+                status_codes, res_headers, res_deserialization = [], [], []
                 for status_code in builder.success_status_codes:
                     response = builder.get_response_from_status(status_code)
                     if response.headers or response.type:
+                        status_codes.append(status_code)
+                        res_headers.append(self.response_headers(response))
+                        res_deserialization.append(self.response_deserialization(builder, response))
+
+                is_headers_same = _all_same(res_headers)
+                is_deserialization_same = _all_same(res_deserialization)
+                if is_deserialization_same:
+                    if is_headers_same:
+                        retval.extend(res_headers[0])
+                        retval.extend(res_deserialization[0])
+                        retval.append("")
+                    else:
+                        for status_code, headers in zip(status_codes, res_headers):
+                            if headers:
+                                retval.append(f"if response.status_code == {status_code}:")
+                                retval.extend([f"    {line}" for line in headers])
+                                retval.append("")
+                        retval.extend(res_deserialization[0])
+                        retval.append("")
+                else:
+                    for status_code, headers, deserialization in zip(status_codes, res_headers, res_deserialization):
                         retval.append(f"if response.status_code == {status_code}:")
-                        retval.extend(
-                            [f"    {line}" for line in self.response_headers_and_deserialization(builder, response)]
-                        )
+                        retval.extend([f"    {line}" for line in headers])
+                        retval.extend([f"    {line}" for line in deserialization])
                         retval.append("")
             else:
                 retval.extend(self.response_headers_and_deserialization(builder, builder.responses[0]))

package/generator/pygen/codegen/serializers/general_serializer.py

@@ -105,11 +105,12 @@ class GeneralSerializer(BaseSerializer):
                 typing_section=TypingSection.TYPING,
             )
             for client in clients:
-                file_import.add_submodule_import(
-                    "._configuration",
-                    f"{client.name}Configuration",
-                    ImportType.LOCAL,
-                )
+                if client.has_mixin:
+                    file_import.add_submodule_import(
+                        "._configuration",
+                        f"{client.name}Configuration",
+                        ImportType.LOCAL,
+                    )
         if self.code_model.has_etag:
             file_import.add_submodule_import("typing", "Optional", ImportType.STDLIB)
             file_import.add_submodule_import(

package/generator/pygen/codegen/templates/model_base.py.jinja2

@@ -576,6 +576,7 @@ class Model(_MyMutableMapping):
         """
 
         result = {}
+        readonly_props = []
         if exclude_readonly:
             readonly_props = [p._rest_name for p in self._attr_to_rest_field.values() if _is_readonly(p)]
         for k, v in self.items():

package/generator/pygen/codegen/templates/model_dpg.py.jinja2

@@ -45,7 +45,8 @@
     __flattened_items = ["{{ model.flattened_items|join('\", \"') }}"]
     {% endif %}
 
-    {% if not model.internal and serializer.init_line(model) %}
+    {% set need_init = (not model.internal) and (serializer.init_line(model) or model.discriminator)%}
+    {% if need_init %}
     @overload
     def __init__(
         self,
@@ -64,7 +65,7 @@
 
     {% endif %}
     {% set initialize_properties = serializer.initialize_properties(model) %}
-    {% if not model.internal and serializer.init_line(model) or initialize_properties %}
+    {% if need_init or initialize_properties %}
     def __init__(self, *args: Any, **kwargs: Any) -> None:{{ '# pylint: disable=useless-super-delegation' if not initialize_properties else '' }}
         {% for line in serializer.super_call(model) %}
         {{ line }}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.16.0",
+  "version": "6.17.1",
   "description": "The Python extension for generators in AutoRest.",
   "main": "index.js",
   "repository": {
@@ -25,7 +25,7 @@
   "devDependencies": {
     "@microsoft.azure/autorest.testserver": "^3.3.46",
     "typescript": "~5.1.3",
-    "@azure-tools/typespec-python": "^0.26.0"
+    "@azure-tools/typespec-python": "^0.27.1"
   },
   "files": [
     "autorest/**/*.py",