@typespec/http-client-python 0.19.1 → 0.19.2

package/eng/scripts/ci/conf.py

@@ -0,0 +1,57 @@
+#!/usr/bin/env python
+
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+
+# Central Sphinx configuration for all generated packages
+
+import sys
+from pathlib import Path
+
+# Basic project information
+project = "Generated Python SDK"
+copyright = "Microsoft Corporation"
+author = "Microsoft Corporation"
+
+# Sphinx extensions
+extensions = [
+    "sphinx.ext.autodoc",
+    "sphinx.ext.napoleon",
+    "sphinx.ext.viewcode",
+]
+
+# Napoleon settings for Google and NumPy style docstrings
+napoleon_google_docstring = True
+napoleon_numpy_docstring = True
+napoleon_include_init_with_doc = True
+napoleon_include_private_with_doc = False
+napoleon_include_special_with_doc = True
+napoleon_use_admonition_for_examples = False
+napoleon_use_admonition_for_notes = False
+napoleon_use_admonition_for_references = False
+napoleon_use_ivar = True
+napoleon_use_param = True
+napoleon_use_rtype = True
+napoleon_use_keyword = True
+
+# Autodoc settings
+autodoc_default_options = {
+    "members": True,
+    "undoc-members": True,
+    "show-inheritance": True,
+    "special-members": "__init__",
+}
+
+# HTML theme and output
+html_theme = "basic"
+html_static_path = []
+html_show_sourcelink = False
+html_show_sphinx = False
+
+# Suppress warnings for missing references
+suppress_warnings = []
+
+# Master document
+master_doc = "index"

package/eng/scripts/ci/run_sphinx_build.py

@@ -0,0 +1,117 @@
+#!/usr/bin/env python
+
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+
+# This script is used to execute sphinx documentation build within a tox environment.
+# It uses a central sphinx configuration and validates docstrings by running sphinx-build.
+
+from subprocess import check_call, CalledProcessError
+import os
+import logging
+import sys
+from pathlib import Path
+from util import run_check
+
+logging.getLogger().setLevel(logging.INFO)
+
+# Get the central Sphinx config directory
+SPHINX_CONF_DIR = os.path.abspath(os.path.dirname(__file__))
+
+
+def _create_minimal_index_rst(docs_dir, package_name, module_names):
+    """Create a minimal index.rst file for sphinx to process."""
+    index_rst_content = f"""{package_name}
+{"=" * len(package_name)}
+
+"""
+
+    for module_name in module_names:
+        index_rst_content += f"""
+{module_name}
+{"-" * len(module_name)}
+
+.. automodule:: {module_name}
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+"""
+
+    index_rst_path = docs_dir / "index.rst"
+    with open(index_rst_path, "w") as f:
+        f.write(index_rst_content)
+
+
+def _single_dir_sphinx(mod):
+    """Run sphinx-build on a single package directory."""
+
+    # Find the actual Python package directories
+    package_dirs = [
+        d for d in mod.iterdir() if d.is_dir() and not d.name.startswith("_") and (d / "__init__.py").exists()
+    ]
+
+    if not package_dirs:
+        logging.info(f"No Python package found in {mod}, skipping sphinx build")
+        return True
+
+    # Get the main package directory
+    main_package = package_dirs[0]
+
+    # Find submodules
+    module_names = []
+    for item in main_package.iterdir():
+        if item.is_dir() and (item / "__init__.py").exists():
+            module_names.append(f"{main_package.name}.{item.name}")
+
+    # If no submodules, just use the main package
+    if not module_names:
+        module_names = [main_package.name]
+
+    # Create docs directory structure
+    docs_dir = mod / "docs"
+    docs_dir.mkdir(exist_ok=True)
+
+    # Create index.rst with the correct module names
+    _create_minimal_index_rst(docs_dir, mod.stem, module_names)
+
+    # Set up output directory
+    output_dir = mod / "_build" / "html"
+    output_dir.mkdir(parents=True, exist_ok=True)
+
+    # Add the package to sys.path so sphinx can import it
+    sys.path.insert(0, str(mod.absolute()))
+
+    try:
+        result = check_call(
+            [
+                sys.executable,
+                "-m",
+                "sphinx",
+                "-b",
+                "html",  # Build HTML output
+                "-c",
+                SPHINX_CONF_DIR,  # Use central config
+                "-W",  # Treat warnings as errors
+                "--keep-going",  # Continue to get all errors
+                "-E",  # Don't use cached environment
+                "-q",  # Quiet mode (only show warnings/errors)
+                str(docs_dir.absolute()),  # Source directory
+                str(output_dir.absolute()),  # Output directory
+            ]
+        )
+        logging.info(f"Sphinx build completed successfully for {mod.stem}")
+        return True
+    except CalledProcessError as e:
+        logging.error(f"{mod.stem} exited with sphinx build error {e.returncode}")
+        return False
+    finally:
+        # Remove from sys.path
+        if str(mod.absolute()) in sys.path:
+            sys.path.remove(str(mod.absolute()))
+
+
+if __name__ == "__main__":
+    run_check("sphinx", _single_dir_sphinx, "Sphinx documentation build")

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/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 = "* " in doc_string %}
+{%- 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/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/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/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 = "* " in doc_string %}
+{%- 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/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/test/azure/mock_api_tests/asynctests/test_azure_versioning_previewversion_async.py

@@ -0,0 +1,53 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+import pytest
+from specs.azure.versioning.previewversion.aio import PreviewVersionClient
+from specs.azure.versioning.previewversion.models import UpdateWidgetColorRequest
+
+
+@pytest.fixture
+async def client():
+    async with PreviewVersionClient() as client:
+        yield client
+
+
+@pytest.fixture
+async def stable_client():
+    async with PreviewVersionClient(api_version="2024-06-01") as client:
+        yield client
+
+
+@pytest.mark.asyncio
+async def test_get_widget(client: PreviewVersionClient):
+    result = await client.get_widget(id="widget-123")
+    assert result.id == "widget-123"
+    assert result.name == "Sample Widget"
+    assert result.color == "blue"
+
+
+@pytest.mark.asyncio
+async def test_update_widget_color(client: PreviewVersionClient):
+    color_update = UpdateWidgetColorRequest(color="red")
+    result = await client.update_widget_color(id="widget-123", color_update=color_update)
+    assert result.id == "widget-123"
+    assert result.name == "Sample Widget"
+    assert result.color == "red"
+
+    with pytest.raises(ValueError):
+        async with PreviewVersionClient(api_version="2024-06-01") as stable_client:
+            await stable_client.update_widget_color(id="widget-123", color_update=color_update)
+
+
+@pytest.mark.asyncio
+async def test_list_widgets(stable_client: PreviewVersionClient):
+    result = await stable_client.list_widgets(name="test")
+    assert len(result.widgets) == 1
+    assert result.widgets[0].id == "widget-1"
+    assert result.widgets[0].name == "test"
+
+    with pytest.raises(ValueError):
+        async with PreviewVersionClient(api_version="2024-06-01") as client:
+            await client.list_widgets(name="test", color="test")