@typespec/http-client-python 0.27.2 → 0.28.1

package/eng/scripts/Build-Packages.ps1

@@ -77,7 +77,7 @@ finally {
 }
 
 if ($PublishType -eq "internal") {
-    $feedUrl = "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js-test-autorest/npm/registry"
+    $feedUrl = "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js/npm/registry"
 
     $overrides = @{
         "@typespec/http-client-python" = "$feedUrl/@typespec/http-client-python/-/http-client-python-$emitterVersion.tgz"

package/eng/scripts/setup/package_manager.py

@@ -25,7 +25,7 @@ def _check_command_available(command: str) -> bool:
     try:
         subprocess.run([command, "--version"], capture_output=True, check=True)
         return True
-    except (subprocess.CalledProcessError, FileNotFoundError):
+    except (subprocess.CalledProcessError, FileNotFoundError, PermissionError):
         return False
 
 
@@ -50,7 +50,7 @@ def detect_package_manager() -> str:
     try:
         subprocess.run([sys.executable, "-m", "pip", "--version"], capture_output=True, check=True)
         return "python -m pip"
-    except (subprocess.CalledProcessError, FileNotFoundError):
+    except (subprocess.CalledProcessError, FileNotFoundError, PermissionError):
         pass
 
     raise PackageManagerNotFoundError("No suitable package manager found. Please install either uv or pip.")

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

@@ -109,10 +109,16 @@ class _ParameterBase(BaseModel, abc.ABC):  # pylint: disable=too-many-instance-a
         if type_description:
             base_description = add_to_description(base_description, type_description)
         if self.optional and isinstance(self.type, ConstantType):
-            base_description = add_to_description(
-                base_description,
-                f"Known values are {self.get_declaration()} and None.",
-            )
+            if self.is_api_version:
+                base_description = add_to_description(
+                    base_description,
+                    f"Known values are {self.get_declaration()}.",
+                )
+            else:
+                base_description = add_to_description(
+                    base_description,
+                    f"Known values are {self.get_declaration()} and None.",
+                )
         if not (self.optional or self.client_default_value):
             base_description = add_to_description(base_description, "Required.")
         if self.client_default_value is not None:

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

@@ -652,6 +652,9 @@ class Model(_MyMutableMapping):
                         if len(items) > 0:
                             existed_attr_keys.append(xml_name)
                             dict_to_pass[rf._rest_name] = _deserialize(rf._type, items)
+                        elif not rf._is_optional:
+                            existed_attr_keys.append(xml_name)
+                            dict_to_pass[rf._rest_name] = []
                         continue
 
                     # text element is primitive type
@@ -930,6 +933,8 @@ def _get_deserialize_callable_from_annotation(  # pylint: disable=too-many-retur
     # is it optional?
     try:
         if any(a is _NONE_TYPE for a in annotation.__args__):  # pyright: ignore
+            if rf:
+                rf._is_optional = True
             if len(annotation.__args__) <= 2:  # pyright: ignore
                 if_obj_deserializer = _get_deserialize_callable_from_annotation(
                     next(a for a in annotation.__args__ if a is not _NONE_TYPE), module, rf  # pyright: ignore
@@ -1090,9 +1095,7 @@ def _failsafe_deserialize_xml(
       return None
 
 
-{% if code_model.has_padded_model_property %}
 # pylint: disable=too-many-instance-attributes
-{% endif %}
 class _RestField:
     def __init__(
         self,
@@ -1115,6 +1118,7 @@ class _RestField:
         self._is_discriminator = is_discriminator
         self._visibility = visibility
         self._is_model = False
+        self._is_optional = False
         self._default = default
         self._format = format
         self._is_multipart_file_input = is_multipart_file_input

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

@@ -4,6 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 """The preprocessing autorest plugin."""
+
 import copy
 from typing import Callable, Any, Optional
 
@@ -21,7 +22,6 @@ from ..utils import (
     get_body_type_for_description,
     JSON_REGEXP,
     KNOWN_TYPES,
-    update_enum_value,
 )
 
 
@@ -267,30 +267,18 @@ class PreProcessPlugin(YamlUpdatePlugin):
                 add_redefined_builtin_info(property["clientName"], property)
             if type.get("name"):
                 pad_type = PadType.MODEL if type["type"] == "model" else PadType.ENUM_CLASS
-                name = self.pad_reserved_words(type["name"], pad_type, type)
-                type["name"] = name[0].upper() + name[1:]
+                if type["type"] != "enumvalue":
+                    name = self.pad_reserved_words(type["name"], pad_type, type)
+                    type["name"] = name[0].upper() + name[1:]
                 type["description"] = update_description(type.get("description", ""), type["name"])
                 type["snakeCaseName"] = to_snake_case(type["name"])
             if type.get("values"):
-                # we're enums
-                values_to_add = []
+                # we're enums - enum values are UPPER_CASE so no padding needed for reserved words
                 for value in type["values"]:
-                    padded_name = self.pad_reserved_words(value["name"].lower(), PadType.ENUM_VALUE, value).upper()
-                    if self.version_tolerant:
-                        if padded_name[0] in "0123456789":
-                            padded_name = "ENUM_" + padded_name
-                            value["name"] = padded_name
-                    else:
-                        if value["name"] != padded_name:
-                            values_to_add.append(
-                                update_enum_value(
-                                    name=padded_name,
-                                    value=value["value"],
-                                    description=value["description"],
-                                    enum_type=value["enumType"],
-                                )
-                            )
-                type["values"].extend(values_to_add)
+                    upper_name = value["name"].upper()
+                    if upper_name[0] in "0123456789":
+                        upper_name = "ENUM_" + upper_name
+                        value["name"] = upper_name
 
         # add type for reference
         for v in HEADERS_CONVERT_IN_METHOD.values():

package/generator/build/lib/pygen/preprocess/python_mappings.py

@@ -56,7 +56,6 @@ class PadType(str, Enum):
     ENUM_CLASS = "Enum"
     METHOD = "_method"
     PARAMETER = "_parameter"
-    ENUM_VALUE = "_enum"
     PROPERTY = "_property"
     OPERATION_GROUP = "Operations"
 
@@ -183,7 +182,6 @@ RESERVED_WORDS = {
     PadType.MODEL: ["enum", *_always_reserved],
     PadType.PROPERTY: ["self", *_always_reserved],
     PadType.ENUM_CLASS: ["enum", *_always_reserved],
-    PadType.ENUM_VALUE: ["mro", *_always_reserved],
     PadType.OPERATION_GROUP: [*_always_reserved],
 }
 

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

@@ -4,11 +4,11 @@
   "install": [
     {
       "download_info": {
-        "url": "https://files.pythonhosted.org/packages/e1/c6/76dc613121b793286a3f91621d7b75a2b493e0390ddca50f11993eadf192/setuptools-82.0.0-py3-none-any.whl",
+        "url": "https://files.pythonhosted.org/packages/9d/76/f789f7a86709c6b087c5a2f52f911838cad707cc613162401badc665acfe/setuptools-82.0.1-py3-none-any.whl",
         "archive_info": {
-          "hash": "sha256=70b18734b607bd1da571d097d236cfcfacaf01de45717d59e6e04b96877532e0",
+          "hash": "sha256=a59e362652f08dcd477c78bb6e7bd9d80a7995bc73ce773050228a348ce2e5bb",
           "hashes": {
-            "sha256": "70b18734b607bd1da571d097d236cfcfacaf01de45717d59e6e04b96877532e0"
+            "sha256": "a59e362652f08dcd477c78bb6e7bd9d80a7995bc73ce773050228a348ce2e5bb"
           }
         }
       },
@@ -18,11 +18,11 @@
       "metadata": {
         "metadata_version": "2.4",
         "name": "setuptools",
-        "version": "82.0.0",
+        "version": "82.0.1",
         "dynamic": [
           "license-file"
         ],
-        "summary": "Easily download, build, install, upgrade, and uninstall Python packages",
+        "summary": "Most extensible Python build backend with support for C/C++ extension modules",
         "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": [
@@ -88,7 +88,6 @@
           "importlib_metadata>=6; python_version < \"3.10\" and extra == \"core\"",
           "tomli>=2.0.1; python_version < \"3.11\" and extra == \"core\"",
           "wheel>=0.43.0; extra == \"core\"",
-          "platformdirs>=4.2.2; extra == \"core\"",
           "jaraco.functools>=4; extra == \"core\"",
           "more_itertools; extra == \"core\"",
           "pytest-checkdocs>=2.4; extra == \"check\"",

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

@@ -109,10 +109,16 @@ class _ParameterBase(BaseModel, abc.ABC):  # pylint: disable=too-many-instance-a
         if type_description:
             base_description = add_to_description(base_description, type_description)
         if self.optional and isinstance(self.type, ConstantType):
-            base_description = add_to_description(
-                base_description,
-                f"Known values are {self.get_declaration()} and None.",
-            )
+            if self.is_api_version:
+                base_description = add_to_description(
+                    base_description,
+                    f"Known values are {self.get_declaration()}.",
+                )
+            else:
+                base_description = add_to_description(
+                    base_description,
+                    f"Known values are {self.get_declaration()} and None.",
+                )
         if not (self.optional or self.client_default_value):
             base_description = add_to_description(base_description, "Required.")
         if self.client_default_value is not None:

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

@@ -652,6 +652,9 @@ class Model(_MyMutableMapping):
                         if len(items) > 0:
                             existed_attr_keys.append(xml_name)
                             dict_to_pass[rf._rest_name] = _deserialize(rf._type, items)
+                        elif not rf._is_optional:
+                            existed_attr_keys.append(xml_name)
+                            dict_to_pass[rf._rest_name] = []
                         continue
 
                     # text element is primitive type
@@ -930,6 +933,8 @@ def _get_deserialize_callable_from_annotation(  # pylint: disable=too-many-retur
     # is it optional?
     try:
         if any(a is _NONE_TYPE for a in annotation.__args__):  # pyright: ignore
+            if rf:
+                rf._is_optional = True
             if len(annotation.__args__) <= 2:  # pyright: ignore
                 if_obj_deserializer = _get_deserialize_callable_from_annotation(
                     next(a for a in annotation.__args__ if a is not _NONE_TYPE), module, rf  # pyright: ignore
@@ -1090,9 +1095,7 @@ def _failsafe_deserialize_xml(
       return None
 
 
-{% if code_model.has_padded_model_property %}
 # pylint: disable=too-many-instance-attributes
-{% endif %}
 class _RestField:
     def __init__(
         self,
@@ -1115,6 +1118,7 @@ class _RestField:
         self._is_discriminator = is_discriminator
         self._visibility = visibility
         self._is_model = False
+        self._is_optional = False
         self._default = default
         self._format = format
         self._is_multipart_file_input = is_multipart_file_input

package/generator/pygen/preprocess/__init__.py

@@ -4,6 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 """The preprocessing autorest plugin."""
+
 import copy
 from typing import Callable, Any, Optional
 
@@ -21,7 +22,6 @@ from ..utils import (
     get_body_type_for_description,
     JSON_REGEXP,
     KNOWN_TYPES,
-    update_enum_value,
 )
 
 
@@ -267,30 +267,18 @@ class PreProcessPlugin(YamlUpdatePlugin):
                 add_redefined_builtin_info(property["clientName"], property)
             if type.get("name"):
                 pad_type = PadType.MODEL if type["type"] == "model" else PadType.ENUM_CLASS
-                name = self.pad_reserved_words(type["name"], pad_type, type)
-                type["name"] = name[0].upper() + name[1:]
+                if type["type"] != "enumvalue":
+                    name = self.pad_reserved_words(type["name"], pad_type, type)
+                    type["name"] = name[0].upper() + name[1:]
                 type["description"] = update_description(type.get("description", ""), type["name"])
                 type["snakeCaseName"] = to_snake_case(type["name"])
             if type.get("values"):
-                # we're enums
-                values_to_add = []
+                # we're enums - enum values are UPPER_CASE so no padding needed for reserved words
                 for value in type["values"]:
-                    padded_name = self.pad_reserved_words(value["name"].lower(), PadType.ENUM_VALUE, value).upper()
-                    if self.version_tolerant:
-                        if padded_name[0] in "0123456789":
-                            padded_name = "ENUM_" + padded_name
-                            value["name"] = padded_name
-                    else:
-                        if value["name"] != padded_name:
-                            values_to_add.append(
-                                update_enum_value(
-                                    name=padded_name,
-                                    value=value["value"],
-                                    description=value["description"],
-                                    enum_type=value["enumType"],
-                                )
-                            )
-                type["values"].extend(values_to_add)
+                    upper_name = value["name"].upper()
+                    if upper_name[0] in "0123456789":
+                        upper_name = "ENUM_" + upper_name
+                        value["name"] = upper_name
 
         # add type for reference
         for v in HEADERS_CONVERT_IN_METHOD.values():

package/generator/pygen/preprocess/python_mappings.py

@@ -56,7 +56,6 @@ class PadType(str, Enum):
     ENUM_CLASS = "Enum"
     METHOD = "_method"
     PARAMETER = "_parameter"
-    ENUM_VALUE = "_enum"
     PROPERTY = "_property"
     OPERATION_GROUP = "Operations"
 
@@ -183,7 +182,6 @@ RESERVED_WORDS = {
     PadType.MODEL: ["enum", *_always_reserved],
     PadType.PROPERTY: ["self", *_always_reserved],
     PadType.ENUM_CLASS: ["enum", *_always_reserved],
-    PadType.ENUM_VALUE: ["mro", *_always_reserved],
     PadType.OPERATION_GROUP: [*_always_reserved],
 }
 

package/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_flatten_async.py

@@ -6,10 +6,13 @@
 import pytest
 from specs.azure.clientgenerator.core.flattenproperty.aio import FlattenPropertyClient
 from specs.azure.clientgenerator.core.flattenproperty.models import (
-    FlattenModel,
+    ChildFlattenModel,
     ChildModel,
+    FlattenModel,
+    FlattenUnknownModel,
     NestedFlattenModel,
-    ChildFlattenModel,
+    Solution,
+    SolutionProperties,
 )
 
 
@@ -46,6 +49,25 @@ async def test_put_nested_flatten_model(client: FlattenPropertyClient):
     )
 
 
+@pytest.mark.asyncio
+async def test_put_flatten_unknown_model(client: FlattenPropertyClient):
+    result = await client.put_flatten_unknown_model(FlattenUnknownModel(name="foo"))
+    assert result.name == "test"
+    assert result.properties == {"key1": "value1", "key2": "value2"}
+
+
+@pytest.mark.asyncio
+async def test_put_flatten_read_only_model(client: FlattenPropertyClient):
+    result = await client.put_flatten_read_only_model(Solution(name="foo"))
+    assert result == Solution(
+        name="foo",
+        properties=SolutionProperties(solution_id="solution1", title="Solution Title", content="Solution Content"),
+    )
+    assert result.solution_id == "solution1"
+    assert result.title == "Solution Title"
+    assert result.content == "Solution Content"
+
+
 @pytest.mark.asyncio  # ============test for compatibility ============
 async def test_dpg_model_common():
     flatten_model = FlattenModel(name="hello", properties=ChildModel(age=0, description="test"))

package/generator/test/azure/mock_api_tests/asynctests/test_client_naming_async.py

@@ -16,17 +16,17 @@ async def client():
 
 @pytest.mark.asyncio
 async def test_client(client: NamingClient):
-    await client.client(models.ClientNameModel(client_name=True))
+    await client.property.client(models.ClientNameModel(client_name=True))
 
 
 @pytest.mark.asyncio
 async def test_language(client: NamingClient):
-    await client.language(models.LanguageClientNameModel(python_name=True))
+    await client.property.language(models.LanguageClientNameModel(python_name=True))
 
 
 @pytest.mark.asyncio
 async def test_compatible_with_encoded_name(client: NamingClient):
-    await client.compatible_with_encoded_name(models.ClientNameAndJsonEncodedNameModel(client_name=True))
+    await client.property.compatible_with_encoded_name(models.ClientNameAndJsonEncodedNameModel(client_name=True))
 
 
 @pytest.mark.asyncio
@@ -41,12 +41,12 @@ async def test_parameter(client: NamingClient):
 
 @pytest.mark.asyncio
 async def test_header_request(client: NamingClient):
-    await client.request(client_name="true")
+    await client.header.request(client_name="true")
 
 
 @pytest.mark.asyncio
 async def test_header_response(client: NamingClient):
-    assert (await client.response(cls=lambda x, y, z: z))["default-name"] == "true"
+    assert (await client.header.response(cls=lambda x, y, z: z))["default-name"] == "true"
 
 
 @pytest.mark.asyncio

package/generator/test/azure/mock_api_tests/asynctests/test_client_structure_async.py

@@ -38,6 +38,7 @@ async def test_structure_multiclient():
     await client_b.renamed_six()
 
 
+@pytest.mark.skip(reason="will reopen the cases after upgrade `@azure-tools/typespec-client-generator-core` to 0.67.0")
 @pytest.mark.asyncio
 async def test_structure_renamed_operation():
     client = RenamedOperationClient(endpoint="http://localhost:3000", client=ClientType.RENAMED_OPERATION)
@@ -45,18 +46,19 @@ async def test_structure_renamed_operation():
     await client.renamed_three()
     await client.renamed_five()
 
-    await client.group.renamed_two()
-    await client.group.renamed_four()
-    await client.group.renamed_six()
+    await client.renamed_two()
+    await client.renamed_four()
+    await client.renamed_six()
 
 
+@pytest.mark.skip(reason="will reopen the cases after upgrade `@azure-tools/typespec-client-generator-core` to 0.67.0")
 @pytest.mark.asyncio
 async def test_structure_two_operation_group():
-    client = TwoOperationGroupClient(endpoint="http://localhost:3000", client=ClientType.RENAMED_OPERATION)
-    await client.group1.one()
-    await client.group1.three()
-    await client.group1.four()
-
-    await client.group2.two()
-    await client.group2.five()
-    await client.group2.six()
+    client = TwoOperationGroupClient(endpoint="http://localhost:3000", client=ClientType.TWO_OPERATION_GROUP)
+    await client.one()
+    await client.three()
+    await client.four()
+
+    await client.two()
+    await client.five()
+    await client.six()

package/generator/test/azure/mock_api_tests/asynctests/test_client_structure_clientoperationgroup_async.py

@@ -8,22 +8,24 @@ from client.structure.clientoperationgroup.models import ClientType
 from client.structure.clientoperationgroup.aio import FirstClient, SecondClient
 
 
+@pytest.mark.skip(reason="will reopen the cases after upgrade `@azure-tools/typespec-client-generator-core` to 0.67.0")
 @pytest.mark.asyncio
 async def test_first_client_operations():
     client = FirstClient(endpoint="http://localhost:3000", client=ClientType.CLIENT_OPERATION_GROUP)
 
     await client.one()
 
-    await client.group3.two()
-    await client.group3.three()
+    await client.two()
+    await client.three()
 
-    await client.group4.four()
+    await client.four()
 
 
+@pytest.mark.skip(reason="will reopen the cases after upgrade `@azure-tools/typespec-client-generator-core` to 0.67.0")
 @pytest.mark.asyncio
 async def test_second_client_operations():
     client = SecondClient(endpoint="http://localhost:3000", client=ClientType.CLIENT_OPERATION_GROUP)
 
     await client.five()
 
-    await client.group5.six()
+    await client.six()

package/generator/test/azure/mock_api_tests/asynctests/test_special_words_async.py

@@ -63,3 +63,9 @@ async def test_model_properties_dict_methods(client: SpecialWordsClient):
 @pytest.mark.asyncio
 async def test_model_properties_with_list(client: SpecialWordsClient):
     await client.model_properties.with_list(models.ModelWithList(list="ok"))
+
+
+@pytest.mark.asyncio
+async def test_extensible_strings(client: SpecialWordsClient):
+    for enum_value in models.ExtensibleString:
+        assert enum_value == await client.extensible_strings.put_extensible_string_value(body=enum_value)

package/generator/test/azure/mock_api_tests/test_azure_client_generator_core_flatten.py

@@ -6,10 +6,13 @@
 import pytest
 from specs.azure.clientgenerator.core.flattenproperty import FlattenPropertyClient
 from specs.azure.clientgenerator.core.flattenproperty.models import (
-    FlattenModel,
+    ChildFlattenModel,
     ChildModel,
+    FlattenModel,
+    FlattenUnknownModel,
     NestedFlattenModel,
-    ChildFlattenModel,
+    Solution,
+    SolutionProperties,
 )
 
 
@@ -41,6 +44,23 @@ def test_put_nested_flatten_model(client: FlattenPropertyClient):
     )
 
 
+def test_put_flatten_unknown_model(client: FlattenPropertyClient):
+    result = client.put_flatten_unknown_model(FlattenUnknownModel(name="foo"))
+    assert result.name == "test"
+    assert result.properties == {"key1": "value1", "key2": "value2"}
+
+
+def test_put_flatten_read_only_model(client: FlattenPropertyClient):
+    result = client.put_flatten_read_only_model(Solution(name="foo"))
+    assert result == Solution(
+        name="foo",
+        properties=SolutionProperties(solution_id="solution1", title="Solution Title", content="Solution Content"),
+    )
+    assert result.solution_id == "solution1"
+    assert result.title == "Solution Title"
+    assert result.content == "Solution Content"
+
+
 # ============test for compatibility ============
 def test_dpg_model_common():
     flatten_model = FlattenModel(name="hello", properties=ChildModel(age=0, description="test"))

package/generator/test/azure/mock_api_tests/test_client_naming.py

@@ -14,15 +14,15 @@ def client():
 
 
 def test_client(client: NamingClient):
-    client.client(models.ClientNameModel(client_name=True))
+    client.property.client(models.ClientNameModel(client_name=True))
 
 
 def test_language(client: NamingClient):
-    client.language(models.LanguageClientNameModel(python_name=True))
+    client.property.language(models.LanguageClientNameModel(python_name=True))
 
 
 def test_compatible_with_encoded_name(client: NamingClient):
-    client.compatible_with_encoded_name(models.ClientNameAndJsonEncodedNameModel(client_name=True))
+    client.property.compatible_with_encoded_name(models.ClientNameAndJsonEncodedNameModel(client_name=True))
 
 
 def test_operation(client: NamingClient):
@@ -34,11 +34,11 @@ def test_parameter(client: NamingClient):
 
 
 def test_header_request(client: NamingClient):
-    client.request(client_name="true")
+    client.header.request(client_name="true")
 
 
 def test_header_response(client: NamingClient):
-    assert client.response(cls=lambda x, y, z: z)["default-name"] == "true"
+    assert client.header.response(cls=lambda x, y, z: z)["default-name"] == "true"
 
 
 def test_model_client(client: NamingClient):

package/generator/test/azure/mock_api_tests/test_client_structure.py

@@ -3,6 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
+import pytest
 from client.structure.service.models import ClientType
 from client.structure.service import ServiceClient
 from client.structure.multiclient import ClientAClient, ClientBClient
@@ -35,23 +36,25 @@ def test_structure_multiclient():
     client_b.renamed_six()
 
 
+@pytest.mark.skip(reason="will reopen the cases after upgrade `@azure-tools/typespec-client-generator-core` to 0.67.0")
 def test_structure_renamed_operation():
     client = RenamedOperationClient(endpoint="http://localhost:3000", client=ClientType.RENAMED_OPERATION)
     client.renamed_one()
     client.renamed_three()
     client.renamed_five()
 
-    client.group.renamed_two()
-    client.group.renamed_four()
-    client.group.renamed_six()
+    client.renamed_two()
+    client.renamed_four()
+    client.renamed_six()
 
 
+@pytest.mark.skip(reason="will reopen the cases after upgrade `@azure-tools/typespec-client-generator-core` to 0.67.0")
 def test_structure_two_operation_group():
     client = TwoOperationGroupClient(endpoint="http://localhost:3000", client=ClientType.TWO_OPERATION_GROUP)
-    client.group1.one()
-    client.group1.three()
-    client.group1.four()
+    client.one()
+    client.three()
+    client.four()
 
-    client.group2.two()
-    client.group2.five()
-    client.group2.six()
+    client.two()
+    client.five()
+    client.six()

package/generator/test/azure/mock_api_tests/test_client_structure_clientoperationgroup.py

@@ -3,24 +3,27 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
+import pytest
 from client.structure.clientoperationgroup.models import ClientType
 from client.structure.clientoperationgroup import FirstClient, SecondClient
 
 
+@pytest.mark.skip(reason="will reopen the cases after upgrade `@azure-tools/typespec-client-generator-core` to 0.67.0")
 def test_first_client_operations():
     client = FirstClient(endpoint="http://localhost:3000", client=ClientType.CLIENT_OPERATION_GROUP)
 
     client.one()
 
-    client.group3.two()
-    client.group3.three()
+    client.two()
+    client.three()
 
-    client.group4.four()
+    client.four()
 
 
+@pytest.mark.skip(reason="will reopen the cases after upgrade `@azure-tools/typespec-client-generator-core` to 0.67.0")
 def test_second_client_operations():
     client = SecondClient(endpoint="http://localhost:3000", client=ClientType.CLIENT_OPERATION_GROUP)
 
     client.five()
 
-    client.group5.six()
+    client.six()