Skip to content

Commit a504b10

Browse files
ChenxiJiang333ChenxiJiang333
authored
Merge branch 'main' into add-testcases
2 parents 26951b2 + fce885c commit a504b10

14 files changed

Lines changed: 117 additions & 39 deletions

File tree

‎.chronus/changes/upgrade_spector-2025-7-19-11-51-56.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
changeKind: dependencies
3+
packages:
4+
- "@azure-tools/typespec-python"
5+
---
6+
7+
Upgrade azure-http-specs version.

‎packages/typespec-python/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"@azure-tools/typespec-azure-rulesets": "~0.59.0",
8787
"@azure-tools/typespec-autorest": "~0.59.0",
8888
"@azure-tools/typespec-client-generator-core": "~0.59.0",
89-
"@azure-tools/azure-http-specs": "0.1.0-alpha.25",
89+
"@azure-tools/azure-http-specs": "0.1.0-alpha.27",
9090
"@typespec/http-specs": "0.1.0-alpha.25",
9191
"@typespec/spector": "0.1.0-alpha.17",
9292
"@typespec/spec-api": "0.1.0-alpha.8",
@@ -103,4 +103,4 @@
103103
"chalk": "5.3.0",
104104
"@types/fs-extra": "11.0.4"
105105
}
106-
}
106+
}

‎packages/typespec-python/test/azure/generated/client-naming/apiview-properties.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"client.naming.models.PythonModel": "Client.Naming.Model.ModelWithLanguageClientName",
99
"client.naming.models.ClientExtensibleEnum": "Client.Naming.UnionEnum.ServerExtensibleEnum",
1010
"client.naming.models.ExtensibleEnum": "Client.Naming.UnionEnum.ExtensibleEnum",
11-
"client.naming.operations.ClientModelOperations.client": "Client.Naming.Model.client",
12-
"client.naming.aio.operations.ClientModelOperations.client": "Client.Naming.Model.client",
13-
"client.naming.operations.ClientModelOperations.language": "Client.Naming.Model.language",
14-
"client.naming.aio.operations.ClientModelOperations.language": "Client.Naming.Model.language",
11+
"client.naming.operations.ModelClientOperations.client": "Client.Naming.Model.client",
12+
"client.naming.aio.operations.ModelClientOperations.client": "Client.Naming.Model.client",
13+
"client.naming.operations.ModelClientOperations.language": "Client.Naming.Model.language",
14+
"client.naming.aio.operations.ModelClientOperations.language": "Client.Naming.Model.language",
1515
"client.naming.operations.UnionEnumOperations.union_enum_name": "Client.Naming.UnionEnum.unionEnumName",
1616
"client.naming.aio.operations.UnionEnumOperations.union_enum_name": "Client.Naming.UnionEnum.unionEnumName",
1717
"client.naming.operations.UnionEnumOperations.union_enum_member_name": "Client.Naming.UnionEnum.unionEnumMemberName",

‎packages/typespec-python/test/azure/generated/client-naming/client/naming/_client.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616

1717
from ._configuration import NamingClientConfiguration
1818
from ._utils.serialization import Deserializer, Serializer
19-
from .operations import ClientModelOperations, UnionEnumOperations, _NamingClientOperationsMixin
19+
from .operations import ModelClientOperations, UnionEnumOperations, _NamingClientOperationsMixin
2020

2121

2222
class NamingClient(_NamingClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword
2323
"""Describe changing names of types in a client with ``@clientName``.
2424
25-
:ivar client_model: ClientModelOperations operations
26-
:vartype client_model: client.naming.operations.ClientModelOperations
25+
:ivar model_client: ModelClientOperations operations
26+
:vartype model_client: client.naming.operations.ModelClientOperations
2727
:ivar union_enum: UnionEnumOperations operations
2828
:vartype union_enum: client.naming.operations.UnionEnumOperations
2929
:keyword endpoint: Service host. Default value is "http://localhost:3000".
@@ -58,7 +58,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential
5858
self._serialize = Serializer()
5959
self._deserialize = Deserializer()
6060
self._serialize.client_side_validation = False
61-
self.client_model = ClientModelOperations(self._client, self._config, self._serialize, self._deserialize)
61+
self.model_client = ModelClientOperations(self._client, self._config, self._serialize, self._deserialize)
6262
self.union_enum = UnionEnumOperations(self._client, self._config, self._serialize, self._deserialize)
6363

6464
def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:

‎packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/_client.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616

1717
from .._utils.serialization import Deserializer, Serializer
1818
from ._configuration import NamingClientConfiguration
19-
from .operations import ClientModelOperations, UnionEnumOperations, _NamingClientOperationsMixin
19+
from .operations import ModelClientOperations, UnionEnumOperations, _NamingClientOperationsMixin
2020

2121

2222
class NamingClient(_NamingClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword
2323
"""Describe changing names of types in a client with ``@clientName``.
2424
25-
:ivar client_model: ClientModelOperations operations
26-
:vartype client_model: client.naming.aio.operations.ClientModelOperations
25+
:ivar model_client: ModelClientOperations operations
26+
:vartype model_client: client.naming.aio.operations.ModelClientOperations
2727
:ivar union_enum: UnionEnumOperations operations
2828
:vartype union_enum: client.naming.aio.operations.UnionEnumOperations
2929
:keyword endpoint: Service host. Default value is "http://localhost:3000".
@@ -58,7 +58,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential
5858
self._serialize = Serializer()
5959
self._deserialize = Deserializer()
6060
self._serialize.client_side_validation = False
61-
self.client_model = ClientModelOperations(self._client, self._config, self._serialize, self._deserialize)
61+
self.model_client = ModelClientOperations(self._client, self._config, self._serialize, self._deserialize)
6262
self.union_enum = UnionEnumOperations(self._client, self._config, self._serialize, self._deserialize)
6363

6464
def send_request(

‎packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/operations/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
if TYPE_CHECKING:
1313
from ._patch import * # pylint: disable=unused-wildcard-import
1414

15-
from ._operations import ClientModelOperations # type: ignore
15+
from ._operations import ModelClientOperations # type: ignore
1616
from ._operations import UnionEnumOperations # type: ignore
1717
from ._operations import _NamingClientOperationsMixin # type: ignore # pylint: disable=unused-import
1818

@@ -21,7 +21,7 @@
2121
from ._patch import patch_sdk as _patch_sdk
2222

2323
__all__ = [
24-
"ClientModelOperations",
24+
"ModelClientOperations",
2525
"UnionEnumOperations",
2626
]
2727
__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore

‎packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/operations/_operations.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
from ..._utils.serialization import Deserializer, Serializer
3131
from ..._utils.utils import ClientMixinABC
3232
from ...operations._operations import (
33-
build_client_model_client_request,
34-
build_client_model_language_request,
33+
build_model_client_client_request,
34+
build_model_client_language_request,
3535
build_naming_client_name_request,
3636
build_naming_client_request,
3737
build_naming_compatible_with_encoded_name_request,
@@ -49,14 +49,14 @@
4949
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
5050

5151

52-
class ClientModelOperations:
52+
class ModelClientOperations:
5353
"""
5454
.. warning::
5555
**DO NOT** instantiate this class directly.
5656
5757
Instead, you should access the following operations through
5858
:class:`~client.naming.aio.NamingClient`'s
59-
:attr:`client_model` attribute.
59+
:attr:`model_client` attribute.
6060
"""
6161

6262
def __init__(self, *args, **kwargs) -> None:
@@ -139,7 +139,7 @@ async def client(self, body: Union[_models.ClientModel, JSON, IO[bytes]], **kwar
139139
else:
140140
_content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore
141141

142-
_request = build_client_model_client_request(
142+
_request = build_model_client_client_request(
143143
content_type=content_type,
144144
content=_content,
145145
headers=_headers,
@@ -239,7 +239,7 @@ async def language(self, body: Union[_models.PythonModel, JSON, IO[bytes]], **kw
239239
else:
240240
_content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore
241241

242-
_request = build_client_model_language_request(
242+
_request = build_model_client_language_request(
243243
content_type=content_type,
244244
content=_content,
245245
headers=_headers,

‎packages/typespec-python/test/azure/generated/client-naming/client/naming/operations/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
if TYPE_CHECKING:
1313
from ._patch import * # pylint: disable=unused-wildcard-import
1414

15-
from ._operations import ClientModelOperations # type: ignore
15+
from ._operations import ModelClientOperations # type: ignore
1616
from ._operations import UnionEnumOperations # type: ignore
1717
from ._operations import _NamingClientOperationsMixin # type: ignore # pylint: disable=unused-import
1818

@@ -21,7 +21,7 @@
2121
from ._patch import patch_sdk as _patch_sdk
2222

2323
__all__ = [
24-
"ClientModelOperations",
24+
"ModelClientOperations",
2525
"UnionEnumOperations",
2626
]
2727
__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore

‎packages/typespec-python/test/azure/generated/client-naming/client/naming/operations/_operations.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
_SERIALIZER.client_side_validation = False
4040

4141

42-
def build_client_model_client_request(**kwargs: Any) -> HttpRequest:
42+
def build_model_client_client_request(**kwargs: Any) -> HttpRequest:
4343
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
4444

4545
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
@@ -53,7 +53,7 @@ def build_client_model_client_request(**kwargs: Any) -> HttpRequest:
5353
return HttpRequest(method="POST", url=_url, headers=_headers, **kwargs)
5454

5555

56-
def build_client_model_language_request(**kwargs: Any) -> HttpRequest:
56+
def build_model_client_language_request(**kwargs: Any) -> HttpRequest:
5757
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
5858

5959
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
@@ -173,14 +173,14 @@ def build_naming_response_request(**kwargs: Any) -> HttpRequest:
173173
return HttpRequest(method="GET", url=_url, **kwargs)
174174

175175

176-
class ClientModelOperations:
176+
class ModelClientOperations:
177177
"""
178178
.. warning::
179179
**DO NOT** instantiate this class directly.
180180
181181
Instead, you should access the following operations through
182182
:class:`~client.naming.NamingClient`'s
183-
:attr:`client_model` attribute.
183+
:attr:`model_client` attribute.
184184
"""
185185

186186
def __init__(self, *args, **kwargs) -> None:
@@ -265,7 +265,7 @@ def client( # pylint: disable=inconsistent-return-statements
265265
else:
266266
_content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore
267267

268-
_request = build_client_model_client_request(
268+
_request = build_model_client_client_request(
269269
content_type=content_type,
270270
content=_content,
271271
headers=_headers,
@@ -365,7 +365,7 @@ def language( # pylint: disable=inconsistent-return-statements
365365
else:
366366
_content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore
367367

368-
_request = build_client_model_language_request(
368+
_request = build_model_client_language_request(
369369
content_type=content_type,
370370
content=_content,
371371
headers=_headers,

‎packages/typespec-python/test/azure/generated/client-naming/generated_tests/test_naming_model_client_operations.py‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
# Copyright (c) Microsoft Corporation. All rights reserved.
4+
# Licensed under the MIT License. See License.txt in the project root for license information.
5+
# Code generated by Microsoft (R) Python Code Generator.
6+
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
7+
# --------------------------------------------------------------------------
8+
import pytest
9+
from devtools_testutils import recorded_by_proxy
10+
from testpreparer import NamingClientTestBase, NamingPreparer
11+
12+
13+
@pytest.mark.skip("you may need to update the auto-generated test case before run it")
14+
class TestNamingModelClientOperations(NamingClientTestBase):
15+
@NamingPreparer()
16+
@recorded_by_proxy
17+
def test_model_client_client(self, naming_endpoint):
18+
client = self.create_client(endpoint=naming_endpoint)
19+
response = client.model_client.client(
20+
body={"defaultName": bool},
21+
)
22+
23+
# please add some check logic here by yourself
24+
# ...
25+
26+
@NamingPreparer()
27+
@recorded_by_proxy
28+
def test_model_client_language(self, naming_endpoint):
29+
client = self.create_client(endpoint=naming_endpoint)
30+
response = client.model_client.language(
31+
body={"defaultName": bool},
32+
)
33+
34+
# please add some check logic here by yourself
35+
# ...

0 commit comments

Comments
 (0)