Skip to content

Commit 16ea8af

Browse files
author
SDKAuto
committed
CodeGen from PR 25378 in Azure/azure-rest-api-specs
Merge 658fb5c422a8caaffe413286e71c6a1a7722187d into 624dbc769880e5676ae8bb20d3c82ebd1783c64a
1 parent c69ff61 commit 16ea8af

File tree

68 files changed

+3817
-927
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+3817
-927
lines changed
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"commit": "f6d16956a7d5b75e125a88d81d7bc9b6fecfd41a",
2+
"commit": "e4f05ae0d0ec8fd2258803174f88602cd6ad31cb",
33
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
4-
"autorest": "3.9.2",
4+
"autorest": "3.9.7",
55
"use": [
6-
"@autorest/python@6.4.0",
7-
"@autorest/modelerfour@4.24.3"
6+
"@autorest/python@6.7.1",
7+
"@autorest/modelerfour@4.26.2"
88
],
9-
"autorest_command": "autorest specification/signalr/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.4.0 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
9+
"autorest_command": "autorest specification/signalr/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.7.1 --use=@autorest/modelerfour@4.26.2 --version=3.9.7 --version-tolerant=False",
1010
"readme": "specification/signalr/resource-manager/readme.md"
1111
}

sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/_configuration.py

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

9-
import sys
109
from typing import Any, TYPE_CHECKING
1110

1211
from azure.core.configuration import Configuration
@@ -15,11 +14,6 @@
1514

1615
from ._version import VERSION
1716

18-
if sys.version_info >= (3, 8):
19-
from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
20-
else:
21-
from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
22-
2317
if TYPE_CHECKING:
2418
# pylint: disable=unused-import,ungrouped-imports
2519
from azure.core.credentials import TokenCredential
@@ -33,17 +27,16 @@ class SignalRManagementClientConfiguration(Configuration): # pylint: disable=to
3327
3428
:param credential: Credential needed for the client to connect to Azure. Required.
3529
:type credential: ~azure.core.credentials.TokenCredential
36-
:param subscription_id: Gets subscription Id which uniquely identify the Microsoft Azure
37-
subscription. The subscription ID forms part of the URI for every service call. Required.
30+
:param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
3831
:type subscription_id: str
39-
:keyword api_version: Api Version. Default value is "2023-02-01". Note that overriding this
40-
default value may result in unsupported behavior.
32+
:keyword api_version: Api Version. Default value is "2023-08-01-preview". Note that overriding
33+
this default value may result in unsupported behavior.
4134
:paramtype api_version: str
4235
"""
4336

4437
def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
4538
super(SignalRManagementClientConfiguration, self).__init__(**kwargs)
46-
api_version: Literal["2023-02-01"] = kwargs.pop("api_version", "2023-02-01")
39+
api_version: str = kwargs.pop("api_version", "2023-08-01-preview")
4740

4841
if credential is None:
4942
raise ValueError("Parameter 'credential' must not be None.")

sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/_serialization.py

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
629629
if xml_desc.get("attr", False):
630630
if xml_ns:
631631
ET.register_namespace(xml_prefix, xml_ns)
632-
xml_name = "{}{}".format(xml_ns, xml_name)
632+
xml_name = "{{{}}}{}".format(xml_ns, xml_name)
633633
serialized.set(xml_name, new_attr) # type: ignore
634634
continue
635635
if xml_desc.get("text", False):
@@ -662,8 +662,9 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
662662
_serialized.update(_new_attr) # type: ignore
663663
_new_attr = _new_attr[k] # type: ignore
664664
_serialized = _serialized[k]
665-
except ValueError:
666-
continue
665+
except ValueError as err:
666+
if isinstance(err, SerializationError):
667+
raise
667668

668669
except (AttributeError, KeyError, TypeError) as err:
669670
msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj))
@@ -741,6 +742,8 @@ def query(self, name, data, data_type, **kwargs):
741742
742743
:param data: The data to be serialized.
743744
:param str data_type: The type to be serialized from.
745+
:keyword bool skip_quote: Whether to skip quote the serialized result.
746+
Defaults to False.
744747
:rtype: str
745748
:raises: TypeError if serialization fails.
746749
:raises: ValueError if data is None
@@ -749,10 +752,8 @@ def query(self, name, data, data_type, **kwargs):
749752
# Treat the list aside, since we don't want to encode the div separator
750753
if data_type.startswith("["):
751754
internal_data_type = data_type[1:-1]
752-
data = [self.serialize_data(d, internal_data_type, **kwargs) if d is not None else "" for d in data]
753-
if not kwargs.get("skip_quote", False):
754-
data = [quote(str(d), safe="") for d in data]
755-
return str(self.serialize_iter(data, internal_data_type, **kwargs))
755+
do_quote = not kwargs.get("skip_quote", False)
756+
return str(self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs))
756757

757758
# Not a list, regular serialization
758759
output = self.serialize_data(data, data_type, **kwargs)
@@ -891,6 +892,8 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
891892
not be None or empty.
892893
:param str div: If set, this str will be used to combine the elements
893894
in the iterable into a combined string. Default is 'None'.
895+
:keyword bool do_quote: Whether to quote the serialized result of each iterable element.
896+
Defaults to False.
894897
:rtype: list, str
895898
"""
896899
if isinstance(data, str):
@@ -903,9 +906,14 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
903906
for d in data:
904907
try:
905908
serialized.append(self.serialize_data(d, iter_type, **kwargs))
906-
except ValueError:
909+
except ValueError as err:
910+
if isinstance(err, SerializationError):
911+
raise
907912
serialized.append(None)
908913

914+
if kwargs.get("do_quote", False):
915+
serialized = ["" if s is None else quote(str(s), safe="") for s in serialized]
916+
909917
if div:
910918
serialized = ["" if s is None else str(s) for s in serialized]
911919
serialized = div.join(serialized)
@@ -950,7 +958,9 @@ def serialize_dict(self, attr, dict_type, **kwargs):
950958
for key, value in attr.items():
951959
try:
952960
serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs)
953-
except ValueError:
961+
except ValueError as err:
962+
if isinstance(err, SerializationError):
963+
raise
954964
serialized[self.serialize_unicode(key)] = None
955965

956966
if "xml" in serialization_ctxt:
@@ -1271,7 +1281,7 @@ def _extract_name_from_internal_type(internal_type):
12711281
xml_name = internal_type_xml_map.get("name", internal_type.__name__)
12721282
xml_ns = internal_type_xml_map.get("ns", None)
12731283
if xml_ns:
1274-
xml_name = "{}{}".format(xml_ns, xml_name)
1284+
xml_name = "{{{}}}{}".format(xml_ns, xml_name)
12751285
return xml_name
12761286

12771287

@@ -1295,7 +1305,7 @@ def xml_key_extractor(attr, attr_desc, data):
12951305
# Integrate namespace if necessary
12961306
xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None))
12971307
if xml_ns:
1298-
xml_name = "{}{}".format(xml_ns, xml_name)
1308+
xml_name = "{{{}}}{}".format(xml_ns, xml_name)
12991309

13001310
# If it's an attribute, that's simple
13011311
if xml_desc.get("attr", False):

sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/_signal_rmanagement_client.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
SignalROperations,
2323
SignalRPrivateEndpointConnectionsOperations,
2424
SignalRPrivateLinkResourcesOperations,
25+
SignalRReplicasOperations,
2526
SignalRSharedPrivateLinkResourcesOperations,
2627
UsagesOperations,
2728
)
@@ -52,19 +53,20 @@ class SignalRManagementClient: # pylint: disable=client-accepts-api-version-key
5253
:ivar signal_rprivate_link_resources: SignalRPrivateLinkResourcesOperations operations
5354
:vartype signal_rprivate_link_resources:
5455
azure.mgmt.signalr.operations.SignalRPrivateLinkResourcesOperations
56+
:ivar signal_rreplicas: SignalRReplicasOperations operations
57+
:vartype signal_rreplicas: azure.mgmt.signalr.operations.SignalRReplicasOperations
5558
:ivar signal_rshared_private_link_resources: SignalRSharedPrivateLinkResourcesOperations
5659
operations
5760
:vartype signal_rshared_private_link_resources:
5861
azure.mgmt.signalr.operations.SignalRSharedPrivateLinkResourcesOperations
5962
:param credential: Credential needed for the client to connect to Azure. Required.
6063
:type credential: ~azure.core.credentials.TokenCredential
61-
:param subscription_id: Gets subscription Id which uniquely identify the Microsoft Azure
62-
subscription. The subscription ID forms part of the URI for every service call. Required.
64+
:param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
6365
:type subscription_id: str
6466
:param base_url: Service URL. Default value is "https://management.azure.com".
6567
:type base_url: str
66-
:keyword api_version: Api Version. Default value is "2023-02-01". Note that overriding this
67-
default value may result in unsupported behavior.
68+
:keyword api_version: Api Version. Default value is "2023-08-01-preview". Note that overriding
69+
this default value may result in unsupported behavior.
6870
:paramtype api_version: str
6971
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
7072
Retry-After header is present.
@@ -80,7 +82,7 @@ def __init__(
8082
self._config = SignalRManagementClientConfiguration(
8183
credential=credential, subscription_id=subscription_id, **kwargs
8284
)
83-
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
85+
self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
8486

8587
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
8688
self._serialize = Serializer(client_models)
@@ -101,6 +103,9 @@ def __init__(
101103
self.signal_rprivate_link_resources = SignalRPrivateLinkResourcesOperations(
102104
self._client, self._config, self._serialize, self._deserialize
103105
)
106+
self.signal_rreplicas = SignalRReplicasOperations(
107+
self._client, self._config, self._serialize, self._deserialize
108+
)
104109
self.signal_rshared_private_link_resources = SignalRSharedPrivateLinkResourcesOperations(
105110
self._client, self._config, self._serialize, self._deserialize
106111
)

sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/_vendor.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
66
# --------------------------------------------------------------------------
77

8-
from typing import List, cast
9-
108
from azure.core.pipeline.transport import HttpRequest
119

1210

@@ -16,15 +14,3 @@ def _convert_request(request, files=None):
1614
if files:
1715
request.set_formdata_body(files)
1816
return request
19-
20-
21-
def _format_url_section(template, **kwargs):
22-
components = template.split("/")
23-
while components:
24-
try:
25-
return template.format(**kwargs)
26-
except KeyError as key:
27-
# Need the cast, as for some reasons "split" is typed as list[str | Any]
28-
formatted_components = cast(List[str], template.split("/"))
29-
components = [c for c in formatted_components if "{}".format(key.args[0]) not in c]
30-
template = "/".join(components)

sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

9-
VERSION = "1.2.0"
9+
VERSION = "1.0.0b1"

sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/aio/_configuration.py

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

9-
import sys
109
from typing import Any, TYPE_CHECKING
1110

1211
from azure.core.configuration import Configuration
@@ -15,11 +14,6 @@
1514

1615
from .._version import VERSION
1716

18-
if sys.version_info >= (3, 8):
19-
from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
20-
else:
21-
from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
22-
2317
if TYPE_CHECKING:
2418
# pylint: disable=unused-import,ungrouped-imports
2519
from azure.core.credentials_async import AsyncTokenCredential
@@ -33,17 +27,16 @@ class SignalRManagementClientConfiguration(Configuration): # pylint: disable=to
3327
3428
:param credential: Credential needed for the client to connect to Azure. Required.
3529
:type credential: ~azure.core.credentials_async.AsyncTokenCredential
36-
:param subscription_id: Gets subscription Id which uniquely identify the Microsoft Azure
37-
subscription. The subscription ID forms part of the URI for every service call. Required.
30+
:param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
3831
:type subscription_id: str
39-
:keyword api_version: Api Version. Default value is "2023-02-01". Note that overriding this
40-
default value may result in unsupported behavior.
32+
:keyword api_version: Api Version. Default value is "2023-08-01-preview". Note that overriding
33+
this default value may result in unsupported behavior.
4134
:paramtype api_version: str
4235
"""
4336

4437
def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
4538
super(SignalRManagementClientConfiguration, self).__init__(**kwargs)
46-
api_version: Literal["2023-02-01"] = kwargs.pop("api_version", "2023-02-01")
39+
api_version: str = kwargs.pop("api_version", "2023-08-01-preview")
4740

4841
if credential is None:
4942
raise ValueError("Parameter 'credential' must not be None.")

sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/aio/_signal_rmanagement_client.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
SignalROperations,
2323
SignalRPrivateEndpointConnectionsOperations,
2424
SignalRPrivateLinkResourcesOperations,
25+
SignalRReplicasOperations,
2526
SignalRSharedPrivateLinkResourcesOperations,
2627
UsagesOperations,
2728
)
@@ -53,19 +54,20 @@ class SignalRManagementClient: # pylint: disable=client-accepts-api-version-key
5354
:ivar signal_rprivate_link_resources: SignalRPrivateLinkResourcesOperations operations
5455
:vartype signal_rprivate_link_resources:
5556
azure.mgmt.signalr.aio.operations.SignalRPrivateLinkResourcesOperations
57+
:ivar signal_rreplicas: SignalRReplicasOperations operations
58+
:vartype signal_rreplicas: azure.mgmt.signalr.aio.operations.SignalRReplicasOperations
5659
:ivar signal_rshared_private_link_resources: SignalRSharedPrivateLinkResourcesOperations
5760
operations
5861
:vartype signal_rshared_private_link_resources:
5962
azure.mgmt.signalr.aio.operations.SignalRSharedPrivateLinkResourcesOperations
6063
:param credential: Credential needed for the client to connect to Azure. Required.
6164
:type credential: ~azure.core.credentials_async.AsyncTokenCredential
62-
:param subscription_id: Gets subscription Id which uniquely identify the Microsoft Azure
63-
subscription. The subscription ID forms part of the URI for every service call. Required.
65+
:param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
6466
:type subscription_id: str
6567
:param base_url: Service URL. Default value is "https://management.azure.com".
6668
:type base_url: str
67-
:keyword api_version: Api Version. Default value is "2023-02-01". Note that overriding this
68-
default value may result in unsupported behavior.
69+
:keyword api_version: Api Version. Default value is "2023-08-01-preview". Note that overriding
70+
this default value may result in unsupported behavior.
6971
:paramtype api_version: str
7072
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
7173
Retry-After header is present.
@@ -81,7 +83,7 @@ def __init__(
8183
self._config = SignalRManagementClientConfiguration(
8284
credential=credential, subscription_id=subscription_id, **kwargs
8385
)
84-
self._client = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
86+
self._client: AsyncARMPipelineClient = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
8587

8688
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
8789
self._serialize = Serializer(client_models)
@@ -102,6 +104,9 @@ def __init__(
102104
self.signal_rprivate_link_resources = SignalRPrivateLinkResourcesOperations(
103105
self._client, self._config, self._serialize, self._deserialize
104106
)
107+
self.signal_rreplicas = SignalRReplicasOperations(
108+
self._client, self._config, self._serialize, self._deserialize
109+
)
105110
self.signal_rshared_private_link_resources = SignalRSharedPrivateLinkResourcesOperations(
106111
self._client, self._config, self._serialize, self._deserialize
107112
)

sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/aio/operations/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from ._signal_rcustom_domains_operations import SignalRCustomDomainsOperations
1414
from ._signal_rprivate_endpoint_connections_operations import SignalRPrivateEndpointConnectionsOperations
1515
from ._signal_rprivate_link_resources_operations import SignalRPrivateLinkResourcesOperations
16+
from ._signal_rreplicas_operations import SignalRReplicasOperations
1617
from ._signal_rshared_private_link_resources_operations import SignalRSharedPrivateLinkResourcesOperations
1718

1819
from ._patch import __all__ as _patch_all
@@ -27,6 +28,7 @@
2728
"SignalRCustomDomainsOperations",
2829
"SignalRPrivateEndpointConnectionsOperations",
2930
"SignalRPrivateLinkResourcesOperations",
31+
"SignalRReplicasOperations",
3032
"SignalRSharedPrivateLinkResourcesOperations",
3133
]
3234
__all__.extend([p for p in _patch_all if p not in __all__])

sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/aio/operations/_operations.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
# Code generated by Microsoft (R) AutoRest Code Generator.
77
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
88
# --------------------------------------------------------------------------
9-
import sys
109
from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
1110
import urllib.parse
1211

@@ -30,10 +29,6 @@
3029
from ..._vendor import _convert_request
3130
from ...operations._operations import build_list_request
3231

33-
if sys.version_info >= (3, 8):
34-
from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
35-
else:
36-
from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
3732
T = TypeVar("T")
3833
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
3934

@@ -69,9 +64,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
6964
_headers = kwargs.pop("headers", {}) or {}
7065
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
7166

72-
api_version: Literal["2023-02-01"] = kwargs.pop(
73-
"api_version", _params.pop("api-version", self._config.api_version)
74-
)
67+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
7568
cls: ClsType[_models.OperationList] = kwargs.pop("cls", None)
7669

7770
error_map = {
@@ -122,8 +115,9 @@ async def extract_data(pipeline_response):
122115
async def get_next(next_link=None):
123116
request = prepare_request(next_link)
124117

118+
_stream = False
125119
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
126-
request, stream=False, **kwargs
120+
request, stream=_stream, **kwargs
127121
)
128122
response = pipeline_response.http_response
129123

0 commit comments

Comments
 (0)