@autorest/python 6.41.3 → 6.42.0

package/generator/build/lib/pygen/__init__.py

@@ -3,6 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
+import shutil
 from collections.abc import ItemsView, KeysView, MutableMapping, ValuesView
 import logging
 from pathlib import Path
@@ -248,9 +249,23 @@ class ReaderAndWriter:
         except FileNotFoundError:
             pass
 
+    def remove_folder(self, foldername: Union[str, Path]) -> None:
+        try:
+            folder_path = self.output_folder / Path(foldername)
+            if folder_path.exists() and folder_path.is_dir():
+                shutil.rmtree(folder_path)
+        except FileNotFoundError:
+            pass
+
     def list_file(self) -> list[str]:
         return [str(f.relative_to(self.output_folder)) for f in self.output_folder.glob("**/*") if f.is_file()]
 
+    def list_file_of_folder(self, foldername: Union[str, Path]) -> list[str]:
+        folder_path = self.output_folder / Path(foldername)
+        if folder_path.exists() and folder_path.is_dir():
+            return [str(f.relative_to(self.output_folder)) for f in folder_path.glob("**/*") if f.is_file()]
+        return []
+
 
 class Plugin(ReaderAndWriter, ABC):
     """A base class for autorest plugin.

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

@@ -200,10 +200,10 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
         if isinstance(exception_schema, ModelType):
             pylint_disable = "  # pylint: disable=protected-access" if exception_schema.internal else ""
             return (
-                exception_schema.type_annotation(skip_quote=True, serialize_namespace=serialize_namespace)
-                + pylint_disable
+                f"{exception_schema.type_annotation(skip_quote=True, serialize_namespace=serialize_namespace)},"
+                f"{pylint_disable}"
             )
-        return None if self.code_model.options["models-mode"] == "dpg" else "'object'"
+        return None if self.code_model.options["models-mode"] == "dpg" else "'object',"
 
     @property
     def non_default_errors(self) -> list[Response]:

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

@@ -122,7 +122,21 @@ class JinjaSerializer(ReaderAndWriter):
             # If parsing the version fails, we assume the version file is not valid and overwrite.
             return False
 
+    # pylint: disable=too-many-branches
     def serialize(self) -> None:
+        # remove existing folders when generate from tsp
+        if self.code_model.is_tsp and self.code_model.is_azure_flavor:
+            # remove generated_samples and generated_tests folder
+            self.remove_folder(self._generated_tests_samples_folder("generated_samples"))
+            self.remove_folder(self._generated_tests_samples_folder("generated_tests"))
+
+            # remove generated sdk files
+            generation_path = self.code_model.get_generation_dir(self.code_model.namespace)
+            for file in self.list_file_of_folder(generation_path):
+                if file.endswith(".py") and "_patch.py" not in file:
+                    self.remove_file(file)
+
+        # serialize logic
         env = Environment(
             loader=PackageLoader("pygen.codegen", "templates"),
             keep_trailing_newline=True,
@@ -519,8 +533,11 @@ class JinjaSerializer(ReaderAndWriter):
             return Path("/".join(namespace_config.split(".")[num_of_package_namespace:]))
         return Path("")
 
+    def _generated_tests_samples_folder(self, folder_name: str) -> Path:
+        return self._root_of_sdk / folder_name
+
     def _serialize_and_write_sample(self, env: Environment):
-        out_path = self._root_of_sdk / "generated_samples"
+        out_path = self._generated_tests_samples_folder("generated_samples")
         for client in self.code_model.clients:
             for op_group in client.operation_groups:
                 for operation in op_group.operations:
@@ -549,7 +566,7 @@ class JinjaSerializer(ReaderAndWriter):
 
     def _serialize_and_write_test(self, env: Environment):
         self.code_model.for_test = True
-        out_path = self._root_of_sdk / "generated_tests"
+        out_path = self._generated_tests_samples_folder("generated_tests")
         general_serializer = TestGeneralSerializer(code_model=self.code_model, env=env)
         self.write_file(out_path / "conftest.py", general_serializer.serialize_conftest())
         if not self.code_model.options["azure-arm"]:

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

@@ -1053,10 +1053,13 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
                                 f"        error = _failsafe_deserialize({type_annotation},{pylint_disable}\n  response)"
                             )
                         else:
-                            retval.append(
-                                "        error = self._deserialize.failsafe_deserialize("
-                                f"{type_annotation},{pylint_disable}\n "
-                                "pipeline_response)"
+                            retval.extend(
+                                [
+                                    "        error = self._deserialize.failsafe_deserialize(",
+                                    f"            {type_annotation},{pylint_disable}",
+                                    "            pipeline_response,",
+                                    "        )",
+                                ]
                             )
                         # add build-in error type
                         # TODO: we should decide whether need to this wrapper for customized error type
@@ -1097,10 +1100,13 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
                                 f"{type_annotation},{pylint_disable}\n  response)"
                             )
                     else:
-                        retval.append(
-                            "        error = self._deserialize.failsafe_deserialize("
-                            f"{type_annotation},{pylint_disable}\n  "
-                            "pipeline_response)"
+                        retval.extend(
+                            [
+                                "        error = self._deserialize.failsafe_deserialize(",
+                                f"            {type_annotation},{pylint_disable}",
+                                "            pipeline_response,",
+                                "        )",
+                            ]
                         )
                     condition = "elif"
         # default error handling
@@ -1111,11 +1117,22 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
             if builder.non_default_errors:
                 retval.append("    else:")
             if self.code_model.options["models-mode"] == "dpg":
-                retval.append(f"{indent}error = _failsafe_deserialize({default_error_deserialization}, response)")
+                retval.extend(
+                    [
+                        f"{indent}error = _failsafe_deserialize(",
+                        f"{indent}    {default_error_deserialization}",
+                        f"{indent}    response,",
+                        f"{indent})",
+                    ]
+                )
             else:
-                retval.append(
-                    f"{indent}error = self._deserialize.failsafe_deserialize({default_error_deserialization}, "
-                    "pipeline_response)"
+                retval.extend(
+                    [
+                        f"{indent}error = self._deserialize.failsafe_deserialize(",
+                        f"{indent}    {default_error_deserialization}",
+                        f"{indent}    pipeline_response,",
+                        f"{indent})",
+                    ]
                 )
         retval.append(
             "    raise HttpResponseError(response=response{}{})".format(

package/generator/build/lib/pygen/codegen/serializers/parameter_serializer.py

@@ -202,9 +202,11 @@ class ParameterSerializer:
                 if is_content_type_optional and not type_annotation.startswith("Optional[")
                 else type_annotation
             )
-            if kwarg.client_default_value is not None or kwarg.optional:
+            if kwarg.client_default_value is not None or kwarg.optional or kwarg.constant:
                 if check_client_input and kwarg.check_client_input:
                     default_value = f"self._config.{kwarg.client_name}"
+                elif kwarg.constant:
+                    default_value = kwarg.type.get_declaration(None)
                 else:
                     default_value = kwarg.client_default_value_declaration
                 if check_kwarg_dict and (kwarg.location in [ParameterLocation.HEADER, ParameterLocation.QUERY]):

package/generator/build/lib/pygen/codegen/templates/macros.jinja2

@@ -1,21 +1,39 @@
 {% macro wrap_model_string(doc_string, wrap_string, suffix_string="") %}
-{%- set lines = doc_string.split('\n') -%}
-{%- set processed_lines = [] -%}
-{%- for line in lines -%}
-    {%- set stripped = line.strip() -%}
-    {%- if stripped.startswith('* ') -%}
-        {%- set bullet_with_indent = '    ' + stripped -%}
-        {%- set wrapped = bullet_with_indent | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring=wrap_string + '  ') -%}
-        {%- set _ = processed_lines.append(wrapped) -%}
-    {%- elif stripped -%}
-        {%- set wrapped = line | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring=wrap_string) -%}
-        {%- set _ = processed_lines.append(wrapped) -%}
-    {%- endif -%}
-{%- endfor -%}
-{%- set original_result = processed_lines | join('\n') -%}
+{# Check if this is a sphinx documentation line that should not have extra prefix spacing #}
+{%- set is_sphinx_doc = doc_string.strip().startswith(':ivar') or doc_string.strip().startswith(':vartype') or doc_string.strip().startswith(':param') or doc_string.strip().startswith(':type') -%}
+{# Custom handling for bullet points - normalization is now done in preprocessing #}
+{% set enable_custom_handling = "\n* " in doc_string or doc_string.startswith("* ") %}
+{%- if enable_custom_handling -%}
+    {%- set lines = doc_string.split('\n') -%}
+    {%- set result_lines = [] -%}
+    {%- for line in lines -%}
+        {%- if line.startswith('* ') -%}
+            {# Handle bullet points with proper continuation alignment #}
+            {%- set bullet_content = line[2:] -%}
+            {%- set base_indent = wrap_string.lstrip('\n') -%}
+            {%- set bullet_line = base_indent + ' * ' + bullet_content -%}
+            {%- set continuation_spaces = base_indent + '   ' -%}
+            {%- set wrapped = bullet_line | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring='\n' + continuation_spaces) -%}
+            {%- set _ = result_lines.append(wrapped) -%}
+        {%- elif line.strip() -%}
+            {%- set wrapped = line.strip() | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring=wrap_string) -%}
+            {%- set _ = result_lines.append(wrapped) -%}
+        {%- else -%}
+            {%- set _ = result_lines.append('') -%}
+        {%- endif -%}
+    {%- endfor -%}
+    {%- set original_result = result_lines | join('\n') -%}
+{%- else -%}
+    {# Regular text handling #}
+    {%- set original_result = doc_string | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring=wrap_string) -%}
+{%- endif -%}
 {% set list_result = original_result.split('\n') %}
 {% for line in list_result %}
-    {% set prefix = "" if loop.index == 1 else " " %}
+    {%- if is_sphinx_doc and enable_custom_handling -%}
+        {%- set prefix = "" -%}
+    {%- else -%}
+        {%- set prefix = "" if loop.index == 1 else " " -%}
+    {%- endif -%}
     {% set suffix = suffix_string if list_result | length == loop.index %}
 {{ prefix }}{{ line }}{{ suffix }}
 {% endfor %}

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

@@ -78,7 +78,7 @@
         if key in self.__flattened_items:
             if self.{{ flattened_property_attr }} is None:
                 self.{{ flattened_property_attr }} = self._attr_to_rest_field["{{ flattened_property_attr }}"]._class_type()
-            setattr(self.properties, key, value)
+            setattr(self.{{ flattened_property_attr }}, key, value)
         else:
             super().__setattr__(key, value)
         {% endif %}

package/generator/build/lib/pygen/codegen/templates/operation_tools.jinja2

@@ -1,18 +1,4 @@
-{% macro wrap_string(string, wrapstring, width=95) %}
-{%- set lines = string.split('\n') -%}
-{%- set processed_lines = [] -%}
-{%- for line in lines -%}
-    {%- set stripped = line.strip() -%}
-    {%- if stripped.startswith('* ') -%}
-        {%- set bullet_with_indent = stripped -%}
-        {%- set wrapped = bullet_with_indent | wordwrap(width=width, break_long_words=False, break_on_hyphens=False, wrapstring=wrapstring + '  ') -%}
-        {%- set _ = processed_lines.append(wrapped) -%}
-    {%- elif stripped -%}
-        {%- set wrapped = line | wordwrap(width=width, break_long_words=False, break_on_hyphens=False, wrapstring=wrapstring) -%}
-        {%- set _ = processed_lines.append(wrapped) -%}
-    {%- endif -%}
-{%- endfor -%}
-{{ processed_lines | join('\n') | replace("\\", "\\\\") }}{%- endmacro %}
+{% macro wrap_string(string, wrapstring, width=95) %}{{ string | replace("\\", "\\\\") | wordwrap(width=width, break_long_words=False, break_on_hyphens=False, wrapstring=wrapstring)}}{% endmacro %}
 
 {% macro description(builder, serializer) %}
 {% set example_template = serializer.example_template(builder) %}

package/generator/component-detection-pip-report.json

@@ -1,6 +1,6 @@
 {
   "version": "1",
-  "pip_version": "25.2",
+  "pip_version": "25.3",
   "install": [
     {
       "download_info": {
@@ -23,6 +23,7 @@
           "license-file"
         ],
         "summary": "Easily download, build, install, upgrade, and uninstall Python packages",
+        "description": ".. |pypi-version| image:: https://img.shields.io/pypi/v/setuptools.svg\n   :target: https://pypi.org/project/setuptools\n\n.. |py-version| image:: https://img.shields.io/pypi/pyversions/setuptools.svg\n\n.. |test-badge| image:: https://github.com/pypa/setuptools/actions/workflows/main.yml/badge.svg\n   :target: https://github.com/pypa/setuptools/actions?query=workflow%3A%22tests%22\n   :alt: tests\n\n.. |ruff-badge| image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json\n   :target: https://github.com/astral-sh/ruff\n   :alt: Ruff\n\n.. |docs-badge| image:: https://img.shields.io/readthedocs/setuptools/latest.svg\n   :target: https://setuptools.pypa.io\n\n.. |skeleton-badge| image:: https://img.shields.io/badge/skeleton-2025-informational\n   :target: https://blog.jaraco.com/skeleton\n\n.. |codecov-badge| image:: https://img.shields.io/codecov/c/github/pypa/setuptools/master.svg?logo=codecov&logoColor=white\n   :target: https://codecov.io/gh/pypa/setuptools\n\n.. |tidelift-badge| image:: https://tidelift.com/badges/github/pypa/setuptools?style=flat\n   :target: https://tidelift.com/subscription/pkg/pypi-setuptools?utm_source=pypi-setuptools&utm_medium=readme\n\n.. |discord-badge| image:: https://img.shields.io/discord/803025117553754132\n   :target: https://discord.com/channels/803025117553754132/815945031150993468\n   :alt: Discord\n\n|pypi-version| |py-version| |test-badge| |ruff-badge| |docs-badge| |skeleton-badge| |codecov-badge| |discord-badge|\n\nSee the `Quickstart <https://setuptools.pypa.io/en/latest/userguide/quickstart.html>`_\nand the `User's Guide <https://setuptools.pypa.io/en/latest/userguide/>`_ for\ninstructions on how to use Setuptools.\n\nQuestions and comments should be directed to `GitHub Discussions\n<https://github.com/pypa/setuptools/discussions>`_.\nBug reports and especially tested patches may be\nsubmitted directly to the `bug tracker\n<https://github.com/pypa/setuptools/issues>`_.\n\n\nCode of Conduct\n===============\n\nEveryone interacting in the setuptools project's codebases, issue trackers,\nchat rooms, and fora is expected to follow the\n`PSF Code of Conduct <https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md>`_.\n\n\nFor Enterprise\n==============\n\nAvailable as part of the Tidelift Subscription.\n\nSetuptools and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use.\n\n`Learn more <https://tidelift.com/subscription/pkg/pypi-setuptools?utm_source=pypi-setuptools&utm_medium=referral&utm_campaign=github>`_.\n",
         "description_content_type": "text/x-rst",
         "keywords": [
           "CPAN",
@@ -116,22 +117,21 @@
           "cover",
           "enabler",
           "type"
-        ],
-        "description": ".. |pypi-version| image:: https://img.shields.io/pypi/v/setuptools.svg\n   :target: https://pypi.org/project/setuptools\n\n.. |py-version| image:: https://img.shields.io/pypi/pyversions/setuptools.svg\n\n.. |test-badge| image:: https://github.com/pypa/setuptools/actions/workflows/main.yml/badge.svg\n   :target: https://github.com/pypa/setuptools/actions?query=workflow%3A%22tests%22\n   :alt: tests\n\n.. |ruff-badge| image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json\n   :target: https://github.com/astral-sh/ruff\n   :alt: Ruff\n\n.. |docs-badge| image:: https://img.shields.io/readthedocs/setuptools/latest.svg\n   :target: https://setuptools.pypa.io\n\n.. |skeleton-badge| image:: https://img.shields.io/badge/skeleton-2025-informational\n   :target: https://blog.jaraco.com/skeleton\n\n.. |codecov-badge| image:: https://img.shields.io/codecov/c/github/pypa/setuptools/master.svg?logo=codecov&logoColor=white\n   :target: https://codecov.io/gh/pypa/setuptools\n\n.. |tidelift-badge| image:: https://tidelift.com/badges/github/pypa/setuptools?style=flat\n   :target: https://tidelift.com/subscription/pkg/pypi-setuptools?utm_source=pypi-setuptools&utm_medium=readme\n\n.. |discord-badge| image:: https://img.shields.io/discord/803025117553754132\n   :target: https://discord.com/channels/803025117553754132/815945031150993468\n   :alt: Discord\n\n|pypi-version| |py-version| |test-badge| |ruff-badge| |docs-badge| |skeleton-badge| |codecov-badge| |discord-badge|\n\nSee the `Quickstart <https://setuptools.pypa.io/en/latest/userguide/quickstart.html>`_\nand the `User's Guide <https://setuptools.pypa.io/en/latest/userguide/>`_ for\ninstructions on how to use Setuptools.\n\nQuestions and comments should be directed to `GitHub Discussions\n<https://github.com/pypa/setuptools/discussions>`_.\nBug reports and especially tested patches may be\nsubmitted directly to the `bug tracker\n<https://github.com/pypa/setuptools/issues>`_.\n\n\nCode of Conduct\n===============\n\nEveryone interacting in the setuptools project's codebases, issue trackers,\nchat rooms, and fora is expected to follow the\n`PSF Code of Conduct <https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md>`_.\n\n\nFor Enterprise\n==============\n\nAvailable as part of the Tidelift Subscription.\n\nSetuptools and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use.\n\n`Learn more <https://tidelift.com/subscription/pkg/pypi-setuptools?utm_source=pypi-setuptools&utm_medium=referral&utm_campaign=github>`_.\n"
+        ]
       }
     }
   ],
   "environment": {
     "implementation_name": "cpython",
-    "implementation_version": "3.9.23",
+    "implementation_version": "3.11.13",
     "os_name": "posix",
     "platform_machine": "x86_64",
     "platform_release": "6.11.0-1018-azure",
     "platform_system": "Linux",
     "platform_version": "#18~24.04.1-Ubuntu SMP Sat Jun 28 04:46:03 UTC 2025",
-    "python_full_version": "3.9.23",
+    "python_full_version": "3.11.13",
     "platform_python_implementation": "CPython",
-    "python_version": "3.9",
+    "python_version": "3.11",
     "sys_platform": "linux"
   }
 }

package/generator/pygen/__init__.py

@@ -3,6 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
+import shutil
 from collections.abc import ItemsView, KeysView, MutableMapping, ValuesView
 import logging
 from pathlib import Path
@@ -248,9 +249,23 @@ class ReaderAndWriter:
         except FileNotFoundError:
             pass
 
+    def remove_folder(self, foldername: Union[str, Path]) -> None:
+        try:
+            folder_path = self.output_folder / Path(foldername)
+            if folder_path.exists() and folder_path.is_dir():
+                shutil.rmtree(folder_path)
+        except FileNotFoundError:
+            pass
+
     def list_file(self) -> list[str]:
         return [str(f.relative_to(self.output_folder)) for f in self.output_folder.glob("**/*") if f.is_file()]
 
+    def list_file_of_folder(self, foldername: Union[str, Path]) -> list[str]:
+        folder_path = self.output_folder / Path(foldername)
+        if folder_path.exists() and folder_path.is_dir():
+            return [str(f.relative_to(self.output_folder)) for f in folder_path.glob("**/*") if f.is_file()]
+        return []
+
 
 class Plugin(ReaderAndWriter, ABC):
     """A base class for autorest plugin.

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

@@ -200,10 +200,10 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
         if isinstance(exception_schema, ModelType):
             pylint_disable = "  # pylint: disable=protected-access" if exception_schema.internal else ""
             return (
-                exception_schema.type_annotation(skip_quote=True, serialize_namespace=serialize_namespace)
-                + pylint_disable
+                f"{exception_schema.type_annotation(skip_quote=True, serialize_namespace=serialize_namespace)},"
+                f"{pylint_disable}"
             )
-        return None if self.code_model.options["models-mode"] == "dpg" else "'object'"
+        return None if self.code_model.options["models-mode"] == "dpg" else "'object',"
 
     @property
     def non_default_errors(self) -> list[Response]:

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

@@ -122,7 +122,21 @@ class JinjaSerializer(ReaderAndWriter):
             # If parsing the version fails, we assume the version file is not valid and overwrite.
             return False
 
+    # pylint: disable=too-many-branches
     def serialize(self) -> None:
+        # remove existing folders when generate from tsp
+        if self.code_model.is_tsp and self.code_model.is_azure_flavor:
+            # remove generated_samples and generated_tests folder
+            self.remove_folder(self._generated_tests_samples_folder("generated_samples"))
+            self.remove_folder(self._generated_tests_samples_folder("generated_tests"))
+
+            # remove generated sdk files
+            generation_path = self.code_model.get_generation_dir(self.code_model.namespace)
+            for file in self.list_file_of_folder(generation_path):
+                if file.endswith(".py") and "_patch.py" not in file:
+                    self.remove_file(file)
+
+        # serialize logic
         env = Environment(
             loader=PackageLoader("pygen.codegen", "templates"),
             keep_trailing_newline=True,
@@ -519,8 +533,11 @@ class JinjaSerializer(ReaderAndWriter):
             return Path("/".join(namespace_config.split(".")[num_of_package_namespace:]))
         return Path("")
 
+    def _generated_tests_samples_folder(self, folder_name: str) -> Path:
+        return self._root_of_sdk / folder_name
+
     def _serialize_and_write_sample(self, env: Environment):
-        out_path = self._root_of_sdk / "generated_samples"
+        out_path = self._generated_tests_samples_folder("generated_samples")
         for client in self.code_model.clients:
             for op_group in client.operation_groups:
                 for operation in op_group.operations:
@@ -549,7 +566,7 @@ class JinjaSerializer(ReaderAndWriter):
 
     def _serialize_and_write_test(self, env: Environment):
         self.code_model.for_test = True
-        out_path = self._root_of_sdk / "generated_tests"
+        out_path = self._generated_tests_samples_folder("generated_tests")
         general_serializer = TestGeneralSerializer(code_model=self.code_model, env=env)
         self.write_file(out_path / "conftest.py", general_serializer.serialize_conftest())
         if not self.code_model.options["azure-arm"]:

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

@@ -1053,10 +1053,13 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
                                 f"        error = _failsafe_deserialize({type_annotation},{pylint_disable}\n  response)"
                             )
                         else:
-                            retval.append(
-                                "        error = self._deserialize.failsafe_deserialize("
-                                f"{type_annotation},{pylint_disable}\n "
-                                "pipeline_response)"
+                            retval.extend(
+                                [
+                                    "        error = self._deserialize.failsafe_deserialize(",
+                                    f"            {type_annotation},{pylint_disable}",
+                                    "            pipeline_response,",
+                                    "        )",
+                                ]
                             )
                         # add build-in error type
                         # TODO: we should decide whether need to this wrapper for customized error type
@@ -1097,10 +1100,13 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
                                 f"{type_annotation},{pylint_disable}\n  response)"
                             )
                     else:
-                        retval.append(
-                            "        error = self._deserialize.failsafe_deserialize("
-                            f"{type_annotation},{pylint_disable}\n  "
-                            "pipeline_response)"
+                        retval.extend(
+                            [
+                                "        error = self._deserialize.failsafe_deserialize(",
+                                f"            {type_annotation},{pylint_disable}",
+                                "            pipeline_response,",
+                                "        )",
+                            ]
                         )
                     condition = "elif"
         # default error handling
@@ -1111,11 +1117,22 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
             if builder.non_default_errors:
                 retval.append("    else:")
             if self.code_model.options["models-mode"] == "dpg":
-                retval.append(f"{indent}error = _failsafe_deserialize({default_error_deserialization}, response)")
+                retval.extend(
+                    [
+                        f"{indent}error = _failsafe_deserialize(",
+                        f"{indent}    {default_error_deserialization}",
+                        f"{indent}    response,",
+                        f"{indent})",
+                    ]
+                )
             else:
-                retval.append(
-                    f"{indent}error = self._deserialize.failsafe_deserialize({default_error_deserialization}, "
-                    "pipeline_response)"
+                retval.extend(
+                    [
+                        f"{indent}error = self._deserialize.failsafe_deserialize(",
+                        f"{indent}    {default_error_deserialization}",
+                        f"{indent}    pipeline_response,",
+                        f"{indent})",
+                    ]
                 )
         retval.append(
             "    raise HttpResponseError(response=response{}{})".format(

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

@@ -202,9 +202,11 @@ class ParameterSerializer:
                 if is_content_type_optional and not type_annotation.startswith("Optional[")
                 else type_annotation
             )
-            if kwarg.client_default_value is not None or kwarg.optional:
+            if kwarg.client_default_value is not None or kwarg.optional or kwarg.constant:
                 if check_client_input and kwarg.check_client_input:
                     default_value = f"self._config.{kwarg.client_name}"
+                elif kwarg.constant:
+                    default_value = kwarg.type.get_declaration(None)
                 else:
                     default_value = kwarg.client_default_value_declaration
                 if check_kwarg_dict and (kwarg.location in [ParameterLocation.HEADER, ParameterLocation.QUERY]):

package/generator/pygen/codegen/templates/macros.jinja2

@@ -1,21 +1,39 @@
 {% macro wrap_model_string(doc_string, wrap_string, suffix_string="") %}
-{%- set lines = doc_string.split('\n') -%}
-{%- set processed_lines = [] -%}
-{%- for line in lines -%}
-    {%- set stripped = line.strip() -%}
-    {%- if stripped.startswith('* ') -%}
-        {%- set bullet_with_indent = '    ' + stripped -%}
-        {%- set wrapped = bullet_with_indent | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring=wrap_string + '  ') -%}
-        {%- set _ = processed_lines.append(wrapped) -%}
-    {%- elif stripped -%}
-        {%- set wrapped = line | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring=wrap_string) -%}
-        {%- set _ = processed_lines.append(wrapped) -%}
-    {%- endif -%}
-{%- endfor -%}
-{%- set original_result = processed_lines | join('\n') -%}
+{# Check if this is a sphinx documentation line that should not have extra prefix spacing #}
+{%- set is_sphinx_doc = doc_string.strip().startswith(':ivar') or doc_string.strip().startswith(':vartype') or doc_string.strip().startswith(':param') or doc_string.strip().startswith(':type') -%}
+{# Custom handling for bullet points - normalization is now done in preprocessing #}
+{% set enable_custom_handling = "\n* " in doc_string or doc_string.startswith("* ") %}
+{%- if enable_custom_handling -%}
+    {%- set lines = doc_string.split('\n') -%}
+    {%- set result_lines = [] -%}
+    {%- for line in lines -%}
+        {%- if line.startswith('* ') -%}
+            {# Handle bullet points with proper continuation alignment #}
+            {%- set bullet_content = line[2:] -%}
+            {%- set base_indent = wrap_string.lstrip('\n') -%}
+            {%- set bullet_line = base_indent + ' * ' + bullet_content -%}
+            {%- set continuation_spaces = base_indent + '   ' -%}
+            {%- set wrapped = bullet_line | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring='\n' + continuation_spaces) -%}
+            {%- set _ = result_lines.append(wrapped) -%}
+        {%- elif line.strip() -%}
+            {%- set wrapped = line.strip() | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring=wrap_string) -%}
+            {%- set _ = result_lines.append(wrapped) -%}
+        {%- else -%}
+            {%- set _ = result_lines.append('') -%}
+        {%- endif -%}
+    {%- endfor -%}
+    {%- set original_result = result_lines | join('\n') -%}
+{%- else -%}
+    {# Regular text handling #}
+    {%- set original_result = doc_string | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring=wrap_string) -%}
+{%- endif -%}
 {% set list_result = original_result.split('\n') %}
 {% for line in list_result %}
-    {% set prefix = "" if loop.index == 1 else " " %}
+    {%- if is_sphinx_doc and enable_custom_handling -%}
+        {%- set prefix = "" -%}
+    {%- else -%}
+        {%- set prefix = "" if loop.index == 1 else " " -%}
+    {%- endif -%}
     {% set suffix = suffix_string if list_result | length == loop.index %}
 {{ prefix }}{{ line }}{{ suffix }}
 {% endfor %}

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

@@ -78,7 +78,7 @@
         if key in self.__flattened_items:
             if self.{{ flattened_property_attr }} is None:
                 self.{{ flattened_property_attr }} = self._attr_to_rest_field["{{ flattened_property_attr }}"]._class_type()
-            setattr(self.properties, key, value)
+            setattr(self.{{ flattened_property_attr }}, key, value)
         else:
             super().__setattr__(key, value)
         {% endif %}

package/generator/pygen/codegen/templates/operation_tools.jinja2

@@ -1,18 +1,4 @@
-{% macro wrap_string(string, wrapstring, width=95) %}
-{%- set lines = string.split('\n') -%}
-{%- set processed_lines = [] -%}
-{%- for line in lines -%}
-    {%- set stripped = line.strip() -%}
-    {%- if stripped.startswith('* ') -%}
-        {%- set bullet_with_indent = stripped -%}
-        {%- set wrapped = bullet_with_indent | wordwrap(width=width, break_long_words=False, break_on_hyphens=False, wrapstring=wrapstring + '  ') -%}
-        {%- set _ = processed_lines.append(wrapped) -%}
-    {%- elif stripped -%}
-        {%- set wrapped = line | wordwrap(width=width, break_long_words=False, break_on_hyphens=False, wrapstring=wrapstring) -%}
-        {%- set _ = processed_lines.append(wrapped) -%}
-    {%- endif -%}
-{%- endfor -%}
-{{ processed_lines | join('\n') | replace("\\", "\\\\") }}{%- endmacro %}
+{% macro wrap_string(string, wrapstring, width=95) %}{{ string | replace("\\", "\\\\") | wordwrap(width=width, break_long_words=False, break_on_hyphens=False, wrapstring=wrapstring)}}{% endmacro %}
 
 {% macro description(builder, serializer) %}
 {% set example_template = serializer.example_template(builder) %}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.41.3",
+  "version": "6.42.0",
   "description": "The Python extension for generators in AutoRest.",
   "main": "index.js",
   "repository": {
@@ -19,7 +19,7 @@
   },
   "homepage": "https://github.com/Azure/autorest.python/blob/main/README.md",
   "dependencies": {
-    "@typespec/http-client-python": "~0.19.1",
+    "@typespec/http-client-python": "~0.20.0",
     "@autorest/system-requirements": "~1.0.2",
     "fs-extra": "~11.2.0",
     "tsx": "~4.19.1"