@autorest/python 6.17.0 → 6.18.0

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

@@ -55,7 +55,7 @@ class BaseType(BaseModel, ABC):  # pylint: disable=too-many-public-methods
         return self.imports(**kwargs)
 
     def imports_for_sample(self) -> FileImport:
-        return self.imports()
+        return FileImport(self.code_model)
 
     @staticmethod
     def serialize_sample_value(value: Any) -> str:

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/models/parameter.py

@@ -381,6 +381,12 @@ class ClientParameter(Parameter):
         ):
             # this means i am the base url
             return ParameterMethodLocation.KEYWORD_ONLY
+        if (
+            self.client_default_value is not None
+            and self.code_model.options["from_typespec"]
+            and not self.code_model.options["azure_arm"]
+        ):
+            return ParameterMethodLocation.KEYWORD_ONLY
         return ParameterMethodLocation.POSITIONAL
 
 

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

@@ -516,7 +516,7 @@ class JinjaSerializer(ReaderAndWriter):  # pylint: disable=abstract-method
                         and operation.api_versions[0] != self.code_model.options["default_api_version"]
                     ):
                         continue
-                    samples = operation.yaml_data["samples"]
+                    samples = operation.yaml_data.get("samples")
                     if not samples or operation.name.startswith("_"):
                         continue
                     for value in samples.values():

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_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.17.0",
+  "version": "6.18.0",
   "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.27.0"
+    "@azure-tools/typespec-python": "^0.28.0"
   },
   "files": [
     "autorest/**/*.py",