@autorest/python 6.47.0 → 6.48.1

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

@@ -448,7 +448,19 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
             elif self.need_deserialize:
                 file_import.add_submodule_import(relative_path, "_deserialize", ImportType.LOCAL)
             if self.default_error_deserialization(serialize_namespace) or self.non_default_errors:
-                file_import.add_submodule_import(relative_path, "_failsafe_deserialize", ImportType.LOCAL)
+                xml_non_default_errors = any(
+                    xml_serializable(str(e.default_content_type)) for e in self.non_default_errors
+                )
+                try:
+                    default_error = next(e for e in self.exceptions if "default" in e.status_codes and e.type)
+                except StopIteration:
+                    default_error = None
+                if xml_non_default_errors or (
+                    default_error and xml_serializable(str(default_error.default_content_type))
+                ):
+                    file_import.add_submodule_import(relative_path, "_failsafe_deserialize_xml", ImportType.LOCAL)
+                else:
+                    file_import.add_submodule_import(relative_path, "_failsafe_deserialize", ImportType.LOCAL)
         return file_import
 
     def get_response_from_status(self, status_code: Optional[Union[str, int]]) -> ResponseType:

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

@@ -73,6 +73,13 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
     def next_variable_name(self) -> str:
         return "_continuation_token" if self.has_continuation_token else "next_link"
 
+    @property
+    def is_xml_paging(self) -> bool:
+        try:
+            return bool(self.responses[0].item_type.xml_metadata)
+        except KeyError:
+            return False
+
     def _get_attr_name(self, wire_name: str) -> str:
         response_type = self.responses[0].type
         if not response_type:
@@ -176,6 +183,9 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
             file_import.merge(self.item_type.imports(**kwargs))
             if self.default_error_deserialization(serialize_namespace) or self.need_deserialize:
                 file_import.add_submodule_import(relative_path, "_deserialize", ImportType.LOCAL)
+            if self.is_xml_paging:
+                file_import.add_submodule_import("xml.etree", "ElementTree", ImportType.STDLIB, alias="ET")
+                file_import.add_submodule_import(relative_path, "_convert_element", ImportType.LOCAL)
         return file_import
 
 

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

@@ -1045,7 +1045,9 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
             retval.extend([f"    {l}" for l in response_read])
         retval.append("    map_error(status_code=response.status_code, response=response, error_map=error_map)")
         error_model = ""
-        if builder.non_default_errors and self.code_model.options["models-mode"]:
+        if (  # pylint: disable=too-many-nested-blocks
+            builder.non_default_errors and self.code_model.options["models-mode"]
+        ):
             error_model = ", model=error"
             condition = "if"
             retval.append("    error = None")
@@ -1062,9 +1064,11 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
                             is_operation_file=True, skip_quote=True, serialize_namespace=self.serialize_namespace
                         )
                         if self.code_model.options["models-mode"] == "dpg":
-                            retval.append(
-                                f"        error = _failsafe_deserialize({type_annotation},{pylint_disable}\n  response)"
-                            )
+                            if xml_serializable(str(e.default_content_type)):
+                                fn = "_failsafe_deserialize_xml"
+                            else:
+                                fn = "_failsafe_deserialize"
+                            retval.append(f"        error = {fn}({type_annotation},{pylint_disable}\n  response)")
                         else:
                             retval.extend(
                                 [
@@ -1130,9 +1134,14 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
             if builder.non_default_errors:
                 retval.append("    else:")
             if self.code_model.options["models-mode"] == "dpg":
+                default_exception = next(e for e in builder.exceptions if "default" in e.status_codes and e.type)
+                if xml_serializable(str(default_exception.default_content_type)):
+                    fn = "_failsafe_deserialize_xml"
+                else:
+                    fn = "_failsafe_deserialize"
                 retval.extend(
                     [
-                        f"{indent}error = _failsafe_deserialize(",
+                        f"{indent}error = {fn}(",
                         f"{indent}    {default_error_deserialization}",
                         f"{indent}    response,",
                         f"{indent})",
@@ -1372,10 +1381,15 @@ class _PagingOperationSerializer(_OperationSerializer[PagingOperationType]):
     def _function_def(self) -> str:
         return "def"
 
-    def _extract_data_callback(self, builder: PagingOperationType) -> list[str]:  # pylint: disable=too-many-statements
+    def _extract_data_callback(  # pylint: disable=too-many-statements,too-many-branches
+        self, builder: PagingOperationType
+    ) -> list[str]:
         retval = [f"{'async ' if self.async_mode else ''}def extract_data(pipeline_response):"]
         response = builder.responses[0]
-        deserialized = "pipeline_response.http_response.json()"
+        if builder.is_xml_paging:
+            deserialized = "ET.fromstring(pipeline_response.http_response.text())"
+        else:
+            deserialized = "pipeline_response.http_response.json()"
         if self.code_model.options["models-mode"] == "msrest":
             suffix = ".http_response" if hasattr(builder, "initial_operation") else ""
             deserialize_type = response.serialization_type(serialize_namespace=self.serialize_namespace)
@@ -1395,6 +1409,10 @@ class _PagingOperationSerializer(_OperationSerializer[PagingOperationType]):
         item_name = builder.item_name
         if self.code_model.options["models-mode"] == "msrest":
             access = f".{item_name}"
+        elif builder.is_xml_paging:
+            # For XML, use .find() to navigate the element tree
+            item_name_array = item_name.split(".")
+            access = "".join([f'.find("{i}")' for i in item_name_array])
         else:
             item_name_array = item_name.split(".")
             access = (
@@ -1412,11 +1430,17 @@ class _PagingOperationSerializer(_OperationSerializer[PagingOperationType]):
         retval.append("    if cls:")
         retval.append("        list_of_elem = cls(list_of_elem) # type: ignore")
 
+        cont_token_expr: Optional[str] = None  # For XML, we need to extract find() result first
         if builder.has_continuation_token:
             location = builder.continuation_token.get("output", {}).get("location")
             wire_name = builder.continuation_token.get("output", {}).get("wireName") or ""
             if location == "header":
                 cont_token_property = f'pipeline_response.http_response.headers.get("{wire_name}") or None'
+            elif builder.is_xml_paging:
+                wire_name_array = wire_name.split(".")
+                wire_name_call = "".join([f'.find("{i}")' for i in wire_name_array])
+                cont_token_expr = f"deserialized{wire_name_call}"
+                cont_token_property = "_cont_token_elem.text if _cont_token_elem is not None else None"
             else:
                 wire_name_array = wire_name.split(".")
                 wire_name_call = (
@@ -1429,6 +1453,11 @@ class _PagingOperationSerializer(_OperationSerializer[PagingOperationType]):
                 cont_token_property = "None"
             elif self.code_model.options["models-mode"] == "msrest":
                 cont_token_property = f"deserialized.{next_link_name} or None"
+            elif builder.is_xml_paging:
+                next_link_name_array = next_link_name.split(".")
+                access = "".join([f'.find("{i}")' for i in next_link_name_array])
+                cont_token_expr = f"deserialized{access}"
+                cont_token_property = "_cont_token_elem.text if _cont_token_elem is not None else None"
             elif builder.next_link_is_nested:
                 next_link_name_array = next_link_name.split(".")
                 access = (
@@ -1439,6 +1468,8 @@ class _PagingOperationSerializer(_OperationSerializer[PagingOperationType]):
             else:
                 cont_token_property = f'deserialized.get("{next_link_name}") or None'
         list_type = "AsyncList" if self.async_mode else "iter"
+        if cont_token_expr:
+            retval.append(f"    _cont_token_elem = {cont_token_expr}")
         retval.append(f"    return {cont_token_property}, {list_type}(list_of_elem)")
         return retval
 

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

@@ -75,9 +75,11 @@ class GeneralSerializer(BaseSerializer):
             # If parsing the pyproject.toml fails, we assume the it does not exist or is incorrectly formatted.
             return result
 
-        # Keep "azure-sdk-build" and "packaging" configuration
-        if "tool" in loaded_pyproject_toml and "azure-sdk-build" in loaded_pyproject_toml["tool"]:
-            result["KEEP_FIELDS"]["tool.azure-sdk-build"] = loaded_pyproject_toml["tool"]["azure-sdk-build"]
+        # Keep "azure-sdk-*" and "packaging" configuration
+        if "tool" in loaded_pyproject_toml:
+            for key in loaded_pyproject_toml["tool"]:
+                if key.startswith("azure-sdk"):
+                    result["KEEP_FIELDS"][f"tool.{key}"] = loaded_pyproject_toml["tool"][key]
         if "packaging" in loaded_pyproject_toml:
             result["KEEP_FIELDS"]["packaging"] = loaded_pyproject_toml["packaging"]
 

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

@@ -3,24 +3,69 @@
 {%- 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("* ") %}
+{# Normalize multi-line descriptions by collapsing internal new_lines to spaces, but preserve special blocks #}
+{%- if not enable_custom_handling -%}
+    {%- if '.. code-block::' in doc_string -%}
+        {# Split at code block and only normalize the prose before it #}
+        {%- set parts = doc_string.split('.. code-block::') -%}
+        {%- set prose = parts[0].rstrip() -%}
+        {%- set code_block = '.. code-block::' + parts[1:] | join('.. code-block::') -%}
+        {%- if '\n\n' not in prose -%}
+            {%- set normalized_lines = [] -%}
+            {%- for line in prose.split('\n') -%}
+                {%- set stripped = line.strip() -%}
+                {%- if stripped -%}
+                    {%- set _ = normalized_lines.append(stripped) -%}
+                {%- endif -%}
+            {%- endfor -%}
+            {%- set doc_string = normalized_lines | join(' ') + '\n\n' + code_block -%}
+        {%- endif -%}
+    {%- elif '\n\n' not in doc_string -%}
+        {%- set normalized_lines = [] -%}
+        {%- for line in doc_string.split('\n') -%}
+            {%- set stripped = line.strip() -%}
+            {%- if stripped -%}
+                {%- set _ = normalized_lines.append(stripped) -%}
+            {%- endif -%}
+        {%- endfor -%}
+        {%- set doc_string = normalized_lines | join(' ') -%}
+    {%- endif -%}
+{%- endif -%}
 {%- if enable_custom_handling -%}
-    {%- set lines = doc_string.split('\n') -%}
+    {# First, normalize prose before bullet points by splitting at first bullet #}
+    {%- set normalized_doc = doc_string -%}
+    {%- if '\n* ' in doc_string -%}
+        {%- set parts = doc_string.split('\n* ', 1) -%}
+        {%- set prose_part = parts[0] -%}
+        {%- set bullet_part = '* ' + parts[1] -%}
+        {# Normalize the prose part #}
+        {%- set prose_lines = [] -%}
+        {%- for line in prose_part.split('\n') -%}
+            {%- set stripped = line.strip() -%}
+            {%- if stripped -%}
+                {%- set _ = prose_lines.append(stripped) -%}
+            {%- endif -%}
+        {%- endfor -%}
+        {%- set normalized_doc = prose_lines | join(' ') + '\n\n' + bullet_part -%}
+    {%- endif -%}
+    {%- set lines = normalized_doc.split('\n') -%}
     {%- set base_indent = wrap_string.lstrip('\n') -%}
     {%- set result_lines = [] -%}
     {%- for line in lines -%}
-        {%- if line.startswith('* ') -%}
+        {%- if line.strip().startswith('* ') -%}
             {# Handle bullet points with proper continuation alignment #}
-            {%- set bullet_content = line[2:] -%}
+            {%- set bullet_content = line.strip()[2:] -%}
             {%- 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 line_indent = '' if line.strip().startswith(':') or loop.index == 1 else (base_indent + ' ') -%}
-            {%- set wrapped = (line_indent + line) | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring=wrap_string) -%}
-            {%- for line in wrapped.split('\n') -%}
-            {%- set prefix = "" if loop.index == 1 else " " -%}
-            {%- set _ = result_lines.append(prefix + line) -%}
+            {%- set stripped_line = line.strip() -%}
+            {%- set line_indent = '' if stripped_line.startswith(':') or loop.index == 1 else (base_indent + ' ') -%}
+            {%- set wrapped = (line_indent + stripped_line) | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring=wrap_string) -%}
+            {%- for w_line in wrapped.split('\n') -%}
+                {%- set prefix = "" if loop.index == 1 else " " -%}
+                {%- set _ = result_lines.append(prefix + w_line) -%}
             {%- endfor -%}
         {%- else -%}
             {# Do not add continuous blank lines #}
@@ -44,4 +89,4 @@
     {% set suffix = suffix_string if list_result | length == loop.index %}
 {{ prefix }}{{ line }}{{ suffix }}
 {% endfor %}
-{% endmacro %}
+{% endmacro %}

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

@@ -1,4 +1,35 @@
-{% macro wrap_string(string, wrapstring, width=95) %}{{ string | replace("\\", "\\\\") | wordwrap(width=width, break_long_words=False, break_on_hyphens=False, wrapstring=wrapstring)}}{% endmacro %}
+{% macro wrap_string(string, wrapstring, width=95) %}
+{%- set normalized_string = string -%}
+{# Normalize multi-line descriptions by collapsing internal newlines to spaces, but preserve special blocks #}
+{# Skip normalization for pre-formatted content (strings starting with whitespace like code examples) #}
+{%- if '\n* ' not in string and string == string.lstrip() -%}
+    {%- if '.. code-block::' in string -%}
+        {# Split at code block and only normalize the prose before it #}
+        {%- set parts = string.split('.. code-block::') -%}
+        {%- set prose = parts[0].rstrip() -%}
+        {%- set code_block = '.. code-block::' + parts[1:] | join('.. code-block::') -%}
+        {%- if '\n\n' not in prose -%}
+            {%- set normalized_lines = [] -%}
+            {%- for line in prose.split('\n') -%}
+                {%- set stripped = line.strip() -%}
+                {%- if stripped -%}
+                    {%- set _ = normalized_lines.append(stripped) -%}
+                {%- endif -%}
+            {%- endfor -%}
+            {%- set normalized_string = normalized_lines | join(' ') + '\n\n' + code_block -%}
+        {%- endif -%}
+    {%- elif '\n\n' not in string -%}
+        {%- set normalized_lines = [] -%}
+        {%- for line in string.split('\n') -%}
+            {%- set stripped = line.strip() -%}
+            {%- if stripped -%}
+                {%- set _ = normalized_lines.append(stripped) -%}
+            {%- endif -%}
+        {%- endfor -%}
+        {%- set normalized_string = normalized_lines | join(' ') -%}
+    {%- endif -%}
+{%- endif -%}
+{{ normalized_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/build/lib/pygen/codegen/templates/packaging_templates/pyproject.toml.jinja2

@@ -109,13 +109,17 @@ exclude = [
 [tool.setuptools.package-data]
 pytyped = ["py.typed"]
 {% endif %}
-{% if KEEP_FIELDS and KEEP_FIELDS.get('tool.azure-sdk-build') %}
+{% if KEEP_FIELDS %}
+{% for field_key, field_val in KEEP_FIELDS.items() %}
+{% if field_key.startswith('tool.azure-sdk') %}
 
-[tool.azure-sdk-build]
-{% for key, val in KEEP_FIELDS.get('tool.azure-sdk-build').items() %}
+[{{ field_key }}]
+{% for key, val in field_val.items() %}
 {{ key }} = {{ val|tojson }}
 {% endfor %}
 {% endif %}
+{% endfor %}
+{% endif %}
 {% if KEEP_FIELDS and KEEP_FIELDS.get('packaging') %}
 
 [packaging]

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

@@ -4,11 +4,11 @@
   "install": [
     {
       "download_info": {
-        "url": "https://files.pythonhosted.org/packages/e0/76/f963c61683a39084aa575f98089253e1e852a4417cb8a3a8a422923a5246/setuptools-80.10.1-py3-none-any.whl",
+        "url": "https://files.pythonhosted.org/packages/94/b8/f1f62a5e3c0ad2ff1d189590bfa4c46b4f3b6e49cef6f26c6ee4e575394d/setuptools-80.10.2-py3-none-any.whl",
         "archive_info": {
-          "hash": "sha256=fc30c51cbcb8199a219c12cc9c281b5925a4978d212f84229c909636d9f6984e",
+          "hash": "sha256=95b30ddfb717250edb492926c92b5221f7ef3fbcc2b07579bcd4a27da21d0173",
           "hashes": {
-            "sha256": "fc30c51cbcb8199a219c12cc9c281b5925a4978d212f84229c909636d9f6984e"
+            "sha256": "95b30ddfb717250edb492926c92b5221f7ef3fbcc2b07579bcd4a27da21d0173"
           }
         }
       },
@@ -18,7 +18,7 @@
       "metadata": {
         "metadata_version": "2.4",
         "name": "setuptools",
-        "version": "80.10.1",
+        "version": "80.10.2",
         "dynamic": [
           "license-file"
         ],
@@ -63,7 +63,6 @@
           "tomli-w>=1.0.0; extra == \"test\"",
           "pytest-timeout; extra == \"test\"",
           "pytest-perf; sys_platform != \"cygwin\" and extra == \"test\"",
-          "pyobjc<12; (sys_platform == \"darwin\" and python_version <= \"3.9\") and extra == \"test\"",
           "jaraco.develop>=7.21; (python_version >= \"3.9\" and sys_platform != \"cygwin\") and extra == \"test\"",
           "pytest-home>=0.5; extra == \"test\"",
           "pytest-subprocess; extra == \"test\"",

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

@@ -448,7 +448,19 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
             elif self.need_deserialize:
                 file_import.add_submodule_import(relative_path, "_deserialize", ImportType.LOCAL)
             if self.default_error_deserialization(serialize_namespace) or self.non_default_errors:
-                file_import.add_submodule_import(relative_path, "_failsafe_deserialize", ImportType.LOCAL)
+                xml_non_default_errors = any(
+                    xml_serializable(str(e.default_content_type)) for e in self.non_default_errors
+                )
+                try:
+                    default_error = next(e for e in self.exceptions if "default" in e.status_codes and e.type)
+                except StopIteration:
+                    default_error = None
+                if xml_non_default_errors or (
+                    default_error and xml_serializable(str(default_error.default_content_type))
+                ):
+                    file_import.add_submodule_import(relative_path, "_failsafe_deserialize_xml", ImportType.LOCAL)
+                else:
+                    file_import.add_submodule_import(relative_path, "_failsafe_deserialize", ImportType.LOCAL)
         return file_import
 
     def get_response_from_status(self, status_code: Optional[Union[str, int]]) -> ResponseType:

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

@@ -73,6 +73,13 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
     def next_variable_name(self) -> str:
         return "_continuation_token" if self.has_continuation_token else "next_link"
 
+    @property
+    def is_xml_paging(self) -> bool:
+        try:
+            return bool(self.responses[0].item_type.xml_metadata)
+        except KeyError:
+            return False
+
     def _get_attr_name(self, wire_name: str) -> str:
         response_type = self.responses[0].type
         if not response_type:
@@ -176,6 +183,9 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
             file_import.merge(self.item_type.imports(**kwargs))
             if self.default_error_deserialization(serialize_namespace) or self.need_deserialize:
                 file_import.add_submodule_import(relative_path, "_deserialize", ImportType.LOCAL)
+            if self.is_xml_paging:
+                file_import.add_submodule_import("xml.etree", "ElementTree", ImportType.STDLIB, alias="ET")
+                file_import.add_submodule_import(relative_path, "_convert_element", ImportType.LOCAL)
         return file_import
 
 

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

@@ -1045,7 +1045,9 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
             retval.extend([f"    {l}" for l in response_read])
         retval.append("    map_error(status_code=response.status_code, response=response, error_map=error_map)")
         error_model = ""
-        if builder.non_default_errors and self.code_model.options["models-mode"]:
+        if (  # pylint: disable=too-many-nested-blocks
+            builder.non_default_errors and self.code_model.options["models-mode"]
+        ):
             error_model = ", model=error"
             condition = "if"
             retval.append("    error = None")
@@ -1062,9 +1064,11 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
                             is_operation_file=True, skip_quote=True, serialize_namespace=self.serialize_namespace
                         )
                         if self.code_model.options["models-mode"] == "dpg":
-                            retval.append(
-                                f"        error = _failsafe_deserialize({type_annotation},{pylint_disable}\n  response)"
-                            )
+                            if xml_serializable(str(e.default_content_type)):
+                                fn = "_failsafe_deserialize_xml"
+                            else:
+                                fn = "_failsafe_deserialize"
+                            retval.append(f"        error = {fn}({type_annotation},{pylint_disable}\n  response)")
                         else:
                             retval.extend(
                                 [
@@ -1130,9 +1134,14 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
             if builder.non_default_errors:
                 retval.append("    else:")
             if self.code_model.options["models-mode"] == "dpg":
+                default_exception = next(e for e in builder.exceptions if "default" in e.status_codes and e.type)
+                if xml_serializable(str(default_exception.default_content_type)):
+                    fn = "_failsafe_deserialize_xml"
+                else:
+                    fn = "_failsafe_deserialize"
                 retval.extend(
                     [
-                        f"{indent}error = _failsafe_deserialize(",
+                        f"{indent}error = {fn}(",
                         f"{indent}    {default_error_deserialization}",
                         f"{indent}    response,",
                         f"{indent})",
@@ -1372,10 +1381,15 @@ class _PagingOperationSerializer(_OperationSerializer[PagingOperationType]):
     def _function_def(self) -> str:
         return "def"
 
-    def _extract_data_callback(self, builder: PagingOperationType) -> list[str]:  # pylint: disable=too-many-statements
+    def _extract_data_callback(  # pylint: disable=too-many-statements,too-many-branches
+        self, builder: PagingOperationType
+    ) -> list[str]:
         retval = [f"{'async ' if self.async_mode else ''}def extract_data(pipeline_response):"]
         response = builder.responses[0]
-        deserialized = "pipeline_response.http_response.json()"
+        if builder.is_xml_paging:
+            deserialized = "ET.fromstring(pipeline_response.http_response.text())"
+        else:
+            deserialized = "pipeline_response.http_response.json()"
         if self.code_model.options["models-mode"] == "msrest":
             suffix = ".http_response" if hasattr(builder, "initial_operation") else ""
             deserialize_type = response.serialization_type(serialize_namespace=self.serialize_namespace)
@@ -1395,6 +1409,10 @@ class _PagingOperationSerializer(_OperationSerializer[PagingOperationType]):
         item_name = builder.item_name
         if self.code_model.options["models-mode"] == "msrest":
             access = f".{item_name}"
+        elif builder.is_xml_paging:
+            # For XML, use .find() to navigate the element tree
+            item_name_array = item_name.split(".")
+            access = "".join([f'.find("{i}")' for i in item_name_array])
         else:
             item_name_array = item_name.split(".")
             access = (
@@ -1412,11 +1430,17 @@ class _PagingOperationSerializer(_OperationSerializer[PagingOperationType]):
         retval.append("    if cls:")
         retval.append("        list_of_elem = cls(list_of_elem) # type: ignore")
 
+        cont_token_expr: Optional[str] = None  # For XML, we need to extract find() result first
         if builder.has_continuation_token:
             location = builder.continuation_token.get("output", {}).get("location")
             wire_name = builder.continuation_token.get("output", {}).get("wireName") or ""
             if location == "header":
                 cont_token_property = f'pipeline_response.http_response.headers.get("{wire_name}") or None'
+            elif builder.is_xml_paging:
+                wire_name_array = wire_name.split(".")
+                wire_name_call = "".join([f'.find("{i}")' for i in wire_name_array])
+                cont_token_expr = f"deserialized{wire_name_call}"
+                cont_token_property = "_cont_token_elem.text if _cont_token_elem is not None else None"
             else:
                 wire_name_array = wire_name.split(".")
                 wire_name_call = (
@@ -1429,6 +1453,11 @@ class _PagingOperationSerializer(_OperationSerializer[PagingOperationType]):
                 cont_token_property = "None"
             elif self.code_model.options["models-mode"] == "msrest":
                 cont_token_property = f"deserialized.{next_link_name} or None"
+            elif builder.is_xml_paging:
+                next_link_name_array = next_link_name.split(".")
+                access = "".join([f'.find("{i}")' for i in next_link_name_array])
+                cont_token_expr = f"deserialized{access}"
+                cont_token_property = "_cont_token_elem.text if _cont_token_elem is not None else None"
             elif builder.next_link_is_nested:
                 next_link_name_array = next_link_name.split(".")
                 access = (
@@ -1439,6 +1468,8 @@ class _PagingOperationSerializer(_OperationSerializer[PagingOperationType]):
             else:
                 cont_token_property = f'deserialized.get("{next_link_name}") or None'
         list_type = "AsyncList" if self.async_mode else "iter"
+        if cont_token_expr:
+            retval.append(f"    _cont_token_elem = {cont_token_expr}")
         retval.append(f"    return {cont_token_property}, {list_type}(list_of_elem)")
         return retval
 

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

@@ -75,9 +75,11 @@ class GeneralSerializer(BaseSerializer):
             # If parsing the pyproject.toml fails, we assume the it does not exist or is incorrectly formatted.
             return result
 
-        # Keep "azure-sdk-build" and "packaging" configuration
-        if "tool" in loaded_pyproject_toml and "azure-sdk-build" in loaded_pyproject_toml["tool"]:
-            result["KEEP_FIELDS"]["tool.azure-sdk-build"] = loaded_pyproject_toml["tool"]["azure-sdk-build"]
+        # Keep "azure-sdk-*" and "packaging" configuration
+        if "tool" in loaded_pyproject_toml:
+            for key in loaded_pyproject_toml["tool"]:
+                if key.startswith("azure-sdk"):
+                    result["KEEP_FIELDS"][f"tool.{key}"] = loaded_pyproject_toml["tool"][key]
         if "packaging" in loaded_pyproject_toml:
             result["KEEP_FIELDS"]["packaging"] = loaded_pyproject_toml["packaging"]
 

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

@@ -3,24 +3,69 @@
 {%- 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("* ") %}
+{# Normalize multi-line descriptions by collapsing internal new_lines to spaces, but preserve special blocks #}
+{%- if not enable_custom_handling -%}
+    {%- if '.. code-block::' in doc_string -%}
+        {# Split at code block and only normalize the prose before it #}
+        {%- set parts = doc_string.split('.. code-block::') -%}
+        {%- set prose = parts[0].rstrip() -%}
+        {%- set code_block = '.. code-block::' + parts[1:] | join('.. code-block::') -%}
+        {%- if '\n\n' not in prose -%}
+            {%- set normalized_lines = [] -%}
+            {%- for line in prose.split('\n') -%}
+                {%- set stripped = line.strip() -%}
+                {%- if stripped -%}
+                    {%- set _ = normalized_lines.append(stripped) -%}
+                {%- endif -%}
+            {%- endfor -%}
+            {%- set doc_string = normalized_lines | join(' ') + '\n\n' + code_block -%}
+        {%- endif -%}
+    {%- elif '\n\n' not in doc_string -%}
+        {%- set normalized_lines = [] -%}
+        {%- for line in doc_string.split('\n') -%}
+            {%- set stripped = line.strip() -%}
+            {%- if stripped -%}
+                {%- set _ = normalized_lines.append(stripped) -%}
+            {%- endif -%}
+        {%- endfor -%}
+        {%- set doc_string = normalized_lines | join(' ') -%}
+    {%- endif -%}
+{%- endif -%}
 {%- if enable_custom_handling -%}
-    {%- set lines = doc_string.split('\n') -%}
+    {# First, normalize prose before bullet points by splitting at first bullet #}
+    {%- set normalized_doc = doc_string -%}
+    {%- if '\n* ' in doc_string -%}
+        {%- set parts = doc_string.split('\n* ', 1) -%}
+        {%- set prose_part = parts[0] -%}
+        {%- set bullet_part = '* ' + parts[1] -%}
+        {# Normalize the prose part #}
+        {%- set prose_lines = [] -%}
+        {%- for line in prose_part.split('\n') -%}
+            {%- set stripped = line.strip() -%}
+            {%- if stripped -%}
+                {%- set _ = prose_lines.append(stripped) -%}
+            {%- endif -%}
+        {%- endfor -%}
+        {%- set normalized_doc = prose_lines | join(' ') + '\n\n' + bullet_part -%}
+    {%- endif -%}
+    {%- set lines = normalized_doc.split('\n') -%}
     {%- set base_indent = wrap_string.lstrip('\n') -%}
     {%- set result_lines = [] -%}
     {%- for line in lines -%}
-        {%- if line.startswith('* ') -%}
+        {%- if line.strip().startswith('* ') -%}
             {# Handle bullet points with proper continuation alignment #}
-            {%- set bullet_content = line[2:] -%}
+            {%- set bullet_content = line.strip()[2:] -%}
             {%- 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 line_indent = '' if line.strip().startswith(':') or loop.index == 1 else (base_indent + ' ') -%}
-            {%- set wrapped = (line_indent + line) | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring=wrap_string) -%}
-            {%- for line in wrapped.split('\n') -%}
-            {%- set prefix = "" if loop.index == 1 else " " -%}
-            {%- set _ = result_lines.append(prefix + line) -%}
+            {%- set stripped_line = line.strip() -%}
+            {%- set line_indent = '' if stripped_line.startswith(':') or loop.index == 1 else (base_indent + ' ') -%}
+            {%- set wrapped = (line_indent + stripped_line) | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring=wrap_string) -%}
+            {%- for w_line in wrapped.split('\n') -%}
+                {%- set prefix = "" if loop.index == 1 else " " -%}
+                {%- set _ = result_lines.append(prefix + w_line) -%}
             {%- endfor -%}
         {%- else -%}
             {# Do not add continuous blank lines #}
@@ -44,4 +89,4 @@
     {% set suffix = suffix_string if list_result | length == loop.index %}
 {{ prefix }}{{ line }}{{ suffix }}
 {% endfor %}
-{% endmacro %}
+{% endmacro %}

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

@@ -1,4 +1,35 @@
-{% macro wrap_string(string, wrapstring, width=95) %}{{ string | replace("\\", "\\\\") | wordwrap(width=width, break_long_words=False, break_on_hyphens=False, wrapstring=wrapstring)}}{% endmacro %}
+{% macro wrap_string(string, wrapstring, width=95) %}
+{%- set normalized_string = string -%}
+{# Normalize multi-line descriptions by collapsing internal newlines to spaces, but preserve special blocks #}
+{# Skip normalization for pre-formatted content (strings starting with whitespace like code examples) #}
+{%- if '\n* ' not in string and string == string.lstrip() -%}
+    {%- if '.. code-block::' in string -%}
+        {# Split at code block and only normalize the prose before it #}
+        {%- set parts = string.split('.. code-block::') -%}
+        {%- set prose = parts[0].rstrip() -%}
+        {%- set code_block = '.. code-block::' + parts[1:] | join('.. code-block::') -%}
+        {%- if '\n\n' not in prose -%}
+            {%- set normalized_lines = [] -%}
+            {%- for line in prose.split('\n') -%}
+                {%- set stripped = line.strip() -%}
+                {%- if stripped -%}
+                    {%- set _ = normalized_lines.append(stripped) -%}
+                {%- endif -%}
+            {%- endfor -%}
+            {%- set normalized_string = normalized_lines | join(' ') + '\n\n' + code_block -%}
+        {%- endif -%}
+    {%- elif '\n\n' not in string -%}
+        {%- set normalized_lines = [] -%}
+        {%- for line in string.split('\n') -%}
+            {%- set stripped = line.strip() -%}
+            {%- if stripped -%}
+                {%- set _ = normalized_lines.append(stripped) -%}
+            {%- endif -%}
+        {%- endfor -%}
+        {%- set normalized_string = normalized_lines | join(' ') -%}
+    {%- endif -%}
+{%- endif -%}
+{{ normalized_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/pygen/codegen/templates/packaging_templates/pyproject.toml.jinja2

@@ -109,13 +109,17 @@ exclude = [
 [tool.setuptools.package-data]
 pytyped = ["py.typed"]
 {% endif %}
-{% if KEEP_FIELDS and KEEP_FIELDS.get('tool.azure-sdk-build') %}
+{% if KEEP_FIELDS %}
+{% for field_key, field_val in KEEP_FIELDS.items() %}
+{% if field_key.startswith('tool.azure-sdk') %}
 
-[tool.azure-sdk-build]
-{% for key, val in KEEP_FIELDS.get('tool.azure-sdk-build').items() %}
+[{{ field_key }}]
+{% for key, val in field_val.items() %}
 {{ key }} = {{ val|tojson }}
 {% endfor %}
 {% endif %}
+{% endfor %}
+{% endif %}
 {% if KEEP_FIELDS and KEEP_FIELDS.get('packaging') %}
 
 [packaging]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.47.0",
+  "version": "6.48.1",
   "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.25.0",
+    "@typespec/http-client-python": "~0.26.1",
     "@autorest/system-requirements": "~1.0.2",
     "fs-extra": "~11.2.0",
     "tsx": "~4.19.1"