Skip to content

Commit 91ac9c5

Browse files
author
SDKAuto
committed
CodeGen from PR 22409 in Azure/azure-rest-api-specs
Merge 6cf6934d58a9cc9178eadbfa14140aa4a1b649d8 into dea4d453ca250eae677d69751d909df00d6b6b05
1 parent 150594c commit 91ac9c5

24 files changed

+1838
-428
lines changed
+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"commit": "7a54c1a83d14da431c0ae48c4315cba143084bce",
2+
"commit": "d70ccd27ce04c5ed8d39771762ae306bae5e8f95",
33
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
44
"autorest": "3.9.2",
55
"use": [
6-
"@autorest/[email protected].7",
6+
"@autorest/[email protected].16",
77
"@autorest/[email protected]"
88
],
9-
"autorest_command": "autorest specification/synapse/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/[email protected].7 --use=@autorest/[email protected] --version=3.9.2 --version-tolerant=False",
9+
"autorest_command": "autorest specification/synapse/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/[email protected].16 --use=@autorest/[email protected] --version=3.9.2 --version-tolerant=False",
1010
"readme": "specification/synapse/resource-manager/readme.md"
1111
}

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

+58-29
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,22 @@
3838
import re
3939
import sys
4040
import codecs
41-
from typing import Optional, Union, AnyStr, IO, Mapping
41+
from typing import (
42+
Dict,
43+
Any,
44+
cast,
45+
Optional,
46+
Union,
47+
AnyStr,
48+
IO,
49+
Mapping,
50+
Callable,
51+
TypeVar,
52+
MutableMapping,
53+
Type,
54+
List,
55+
Mapping,
56+
)
4257

4358
try:
4459
from urllib import quote # type: ignore
@@ -48,12 +63,14 @@
4863

4964
import isodate # type: ignore
5065

51-
from typing import Dict, Any, cast
52-
5366
from azure.core.exceptions import DeserializationError, SerializationError, raise_with_traceback
67+
from azure.core.serialization import NULL as AzureCoreNull
5468

5569
_BOM = codecs.BOM_UTF8.decode(encoding="utf-8")
5670

71+
ModelType = TypeVar("ModelType", bound="Model")
72+
JSON = MutableMapping[str, Any]
73+
5774

5875
class RawDeserializer:
5976

@@ -277,8 +294,8 @@ class Model(object):
277294
_attribute_map: Dict[str, Dict[str, Any]] = {}
278295
_validation: Dict[str, Dict[str, Any]] = {}
279296

280-
def __init__(self, **kwargs):
281-
self.additional_properties = {}
297+
def __init__(self, **kwargs: Any) -> None:
298+
self.additional_properties: Dict[str, Any] = {}
282299
for k in kwargs:
283300
if k not in self._attribute_map:
284301
_LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__)
@@ -287,25 +304,25 @@ def __init__(self, **kwargs):
287304
else:
288305
setattr(self, k, kwargs[k])
289306

290-
def __eq__(self, other):
307+
def __eq__(self, other: Any) -> bool:
291308
"""Compare objects by comparing all attributes."""
292309
if isinstance(other, self.__class__):
293310
return self.__dict__ == other.__dict__
294311
return False
295312

296-
def __ne__(self, other):
313+
def __ne__(self, other: Any) -> bool:
297314
"""Compare objects by comparing all attributes."""
298315
return not self.__eq__(other)
299316

300-
def __str__(self):
317+
def __str__(self) -> str:
301318
return str(self.__dict__)
302319

303320
@classmethod
304-
def enable_additional_properties_sending(cls):
321+
def enable_additional_properties_sending(cls) -> None:
305322
cls._attribute_map["additional_properties"] = {"key": "", "type": "{object}"}
306323

307324
@classmethod
308-
def is_xml_model(cls):
325+
def is_xml_model(cls) -> bool:
309326
try:
310327
cls._xml_map # type: ignore
311328
except AttributeError:
@@ -322,7 +339,7 @@ def _create_xml_node(cls):
322339

323340
return _create_xml_node(xml_map.get("name", cls.__name__), xml_map.get("prefix", None), xml_map.get("ns", None))
324341

325-
def serialize(self, keep_readonly=False, **kwargs):
342+
def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON:
326343
"""Return the JSON that would be sent to azure from this model.
327344
328345
This is an alias to `as_dict(full_restapi_key_transformer, keep_readonly=False)`.
@@ -336,8 +353,13 @@ def serialize(self, keep_readonly=False, **kwargs):
336353
serializer = Serializer(self._infer_class_models())
337354
return serializer._serialize(self, keep_readonly=keep_readonly, **kwargs)
338355

339-
def as_dict(self, keep_readonly=True, key_transformer=attribute_transformer, **kwargs):
340-
"""Return a dict that can be JSONify using json.dump.
356+
def as_dict(
357+
self,
358+
keep_readonly: bool = True,
359+
key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer,
360+
**kwargs: Any
361+
) -> JSON:
362+
"""Return a dict that can be serialized using json.dump.
341363
342364
Advanced usage might optionally use a callback as parameter:
343365
@@ -384,7 +406,7 @@ def _infer_class_models(cls):
384406
return client_models
385407

386408
@classmethod
387-
def deserialize(cls, data, content_type=None):
409+
def deserialize(cls: Type[ModelType], data: Any, content_type: Optional[str] = None) -> ModelType:
388410
"""Parse a str using the RestAPI syntax and return a model.
389411
390412
:param str data: A str using RestAPI structure. JSON by default.
@@ -396,7 +418,12 @@ def deserialize(cls, data, content_type=None):
396418
return deserializer(cls.__name__, data, content_type=content_type)
397419

398420
@classmethod
399-
def from_dict(cls, data, key_extractors=None, content_type=None):
421+
def from_dict(
422+
cls: Type[ModelType],
423+
data: Any,
424+
key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None,
425+
content_type: Optional[str] = None,
426+
) -> ModelType:
400427
"""Parse a dict using given key extractor return a model.
401428
402429
By default consider key
@@ -409,8 +436,8 @@ def from_dict(cls, data, key_extractors=None, content_type=None):
409436
:raises: DeserializationError if something went wrong
410437
"""
411438
deserializer = Deserializer(cls._infer_class_models())
412-
deserializer.key_extractors = (
413-
[
439+
deserializer.key_extractors = ( # type: ignore
440+
[ # type: ignore
414441
attribute_key_case_insensitive_extractor,
415442
rest_key_case_insensitive_extractor,
416443
last_rest_key_case_insensitive_extractor,
@@ -518,7 +545,7 @@ class Serializer(object):
518545
"multiple": lambda x, y: x % y != 0,
519546
}
520547

521-
def __init__(self, classes=None):
548+
def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None):
522549
self.serialize_type = {
523550
"iso-8601": Serializer.serialize_iso,
524551
"rfc-1123": Serializer.serialize_rfc,
@@ -534,7 +561,7 @@ def __init__(self, classes=None):
534561
"[]": self.serialize_iter,
535562
"{}": self.serialize_dict,
536563
}
537-
self.dependencies = dict(classes) if classes else {}
564+
self.dependencies: Dict[str, Type[ModelType]] = dict(classes) if classes else {}
538565
self.key_transformer = full_restapi_key_transformer
539566
self.client_side_validation = True
540567

@@ -626,8 +653,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
626653
serialized.append(local_node) # type: ignore
627654
else: # JSON
628655
for k in reversed(keys): # type: ignore
629-
unflattened = {k: new_attr}
630-
new_attr = unflattened
656+
new_attr = {k: new_attr}
631657

632658
_new_attr = new_attr
633659
_serialized = serialized
@@ -656,8 +682,8 @@ def body(self, data, data_type, **kwargs):
656682
"""
657683

658684
# Just in case this is a dict
659-
internal_data_type = data_type.strip("[]{}")
660-
internal_data_type = self.dependencies.get(internal_data_type, None)
685+
internal_data_type_str = data_type.strip("[]{}")
686+
internal_data_type = self.dependencies.get(internal_data_type_str, None)
661687
try:
662688
is_xml_model_serialization = kwargs["is_xml"]
663689
except KeyError:
@@ -777,6 +803,8 @@ def serialize_data(self, data, data_type, **kwargs):
777803
raise ValueError("No value for given attribute")
778804

779805
try:
806+
if data is AzureCoreNull:
807+
return None
780808
if data_type in self.basic_types.values():
781809
return self.serialize_basic(data, data_type, **kwargs)
782810

@@ -1161,7 +1189,8 @@ def rest_key_extractor(attr, attr_desc, data):
11611189
working_data = data
11621190

11631191
while "." in key:
1164-
dict_keys = _FLATTEN.split(key)
1192+
# Need the cast, as for some reasons "split" is typed as list[str | Any]
1193+
dict_keys = cast(List[str], _FLATTEN.split(key))
11651194
if len(dict_keys) == 1:
11661195
key = _decode_attribute_map_key(dict_keys[0])
11671196
break
@@ -1332,7 +1361,7 @@ class Deserializer(object):
13321361

13331362
valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}" r"\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?")
13341363

1335-
def __init__(self, classes=None):
1364+
def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None):
13361365
self.deserialize_type = {
13371366
"iso-8601": Deserializer.deserialize_iso,
13381367
"rfc-1123": Deserializer.deserialize_rfc,
@@ -1352,7 +1381,7 @@ def __init__(self, classes=None):
13521381
"duration": (isodate.Duration, datetime.timedelta),
13531382
"iso-8601": (datetime.datetime),
13541383
}
1355-
self.dependencies = dict(classes) if classes else {}
1384+
self.dependencies: Dict[str, Type[ModelType]] = dict(classes) if classes else {}
13561385
self.key_extractors = [rest_key_extractor, xml_key_extractor]
13571386
# Additional properties only works if the "rest_key_extractor" is used to
13581387
# extract the keys. Making it to work whatever the key extractor is too much
@@ -1471,7 +1500,7 @@ def _classify_target(self, target, data):
14711500
Once classification has been determined, initialize object.
14721501
14731502
:param str target: The target object type to deserialize to.
1474-
:param str/dict data: The response data to deseralize.
1503+
:param str/dict data: The response data to deserialize.
14751504
"""
14761505
if target is None:
14771506
return None, None
@@ -1486,7 +1515,7 @@ def _classify_target(self, target, data):
14861515
target = target._classify(data, self.dependencies)
14871516
except AttributeError:
14881517
pass # Target is not a Model, no classify
1489-
return target, target.__class__.__name__
1518+
return target, target.__class__.__name__ # type: ignore
14901519

14911520
def failsafe_deserialize(self, target_obj, data, content_type=None):
14921521
"""Ignores any errors encountered in deserialization,
@@ -1496,7 +1525,7 @@ def failsafe_deserialize(self, target_obj, data, content_type=None):
14961525
a deserialization error.
14971526
14981527
:param str target_obj: The target object type to deserialize to.
1499-
:param str/dict data: The response data to deseralize.
1528+
:param str/dict data: The response data to deserialize.
15001529
:param str content_type: Swagger "produces" if available.
15011530
"""
15021531
try:

sdk/synapse/azure-mgmt-synapse/azure/mgmt/synapse/_synapse_management_client.py

+4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
DataMaskingPoliciesOperations,
2222
DataMaskingRulesOperations,
2323
ExtendedSqlPoolBlobAuditingPoliciesOperations,
24+
GetOperations,
2425
IntegrationRuntimeAuthKeysOperations,
2526
IntegrationRuntimeConnectionInfosOperations,
2627
IntegrationRuntimeCredentialsOperations,
@@ -286,6 +287,8 @@ class SynapseManagementClient: # pylint: disable=client-accepts-api-version-key
286287
:ivar integration_runtime_status: IntegrationRuntimeStatusOperations operations
287288
:vartype integration_runtime_status:
288289
azure.mgmt.synapse.operations.IntegrationRuntimeStatusOperations
290+
:ivar get: GetOperations operations
291+
:vartype get: azure.mgmt.synapse.operations.GetOperations
289292
:ivar spark_configuration: SparkConfigurationOperations operations
290293
:vartype spark_configuration: azure.mgmt.synapse.operations.SparkConfigurationOperations
291294
:ivar spark_configurations: SparkConfigurationsOperations operations
@@ -521,6 +524,7 @@ def __init__(
521524
self.integration_runtime_status = IntegrationRuntimeStatusOperations(
522525
self._client, self._config, self._serialize, self._deserialize
523526
)
527+
self.get = GetOperations(self._client, self._config, self._serialize, self._deserialize)
524528
self.spark_configuration = SparkConfigurationOperations(
525529
self._client, self._config, self._serialize, self._deserialize
526530
)

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
66
# --------------------------------------------------------------------------
77

8+
from typing import List, cast
9+
810
from azure.core.pipeline.transport import HttpRequest
911

1012

@@ -22,6 +24,7 @@ def _format_url_section(template, **kwargs):
2224
try:
2325
return template.format(**kwargs)
2426
except KeyError as key:
25-
formatted_components = template.split("/")
27+
# Need the cast, as for some reasons "split" is typed as list[str | Any]
28+
formatted_components = cast(List[str], template.split("/"))
2629
components = [c for c in formatted_components if "{}".format(key.args[0]) not in c]
2730
template = "/".join(components)

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

+1-1
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 = "2.1.0b6"
9+
VERSION = "1.0.0b1"

sdk/synapse/azure-mgmt-synapse/azure/mgmt/synapse/aio/_synapse_management_client.py

+4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
DataMaskingPoliciesOperations,
2222
DataMaskingRulesOperations,
2323
ExtendedSqlPoolBlobAuditingPoliciesOperations,
24+
GetOperations,
2425
IntegrationRuntimeAuthKeysOperations,
2526
IntegrationRuntimeConnectionInfosOperations,
2627
IntegrationRuntimeCredentialsOperations,
@@ -290,6 +291,8 @@ class SynapseManagementClient: # pylint: disable=client-accepts-api-version-key
290291
:ivar integration_runtime_status: IntegrationRuntimeStatusOperations operations
291292
:vartype integration_runtime_status:
292293
azure.mgmt.synapse.aio.operations.IntegrationRuntimeStatusOperations
294+
:ivar get: GetOperations operations
295+
:vartype get: azure.mgmt.synapse.aio.operations.GetOperations
293296
:ivar spark_configuration: SparkConfigurationOperations operations
294297
:vartype spark_configuration: azure.mgmt.synapse.aio.operations.SparkConfigurationOperations
295298
:ivar spark_configurations: SparkConfigurationsOperations operations
@@ -525,6 +528,7 @@ def __init__(
525528
self.integration_runtime_status = IntegrationRuntimeStatusOperations(
526529
self._client, self._config, self._serialize, self._deserialize
527530
)
531+
self.get = GetOperations(self._client, self._config, self._serialize, self._deserialize)
528532
self.spark_configuration = SparkConfigurationOperations(
529533
self._client, self._config, self._serialize, self._deserialize
530534
)

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

+2
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
from ._integration_runtime_auth_keys_operations import IntegrationRuntimeAuthKeysOperations
9090
from ._integration_runtime_monitoring_data_operations import IntegrationRuntimeMonitoringDataOperations
9191
from ._integration_runtime_status_operations import IntegrationRuntimeStatusOperations
92+
from ._get_operations import GetOperations
9293
from ._spark_configuration_operations import SparkConfigurationOperations
9394
from ._spark_configurations_operations import SparkConfigurationsOperations
9495
from ._kusto_operations_operations import KustoOperationsOperations
@@ -169,6 +170,7 @@
169170
"IntegrationRuntimeAuthKeysOperations",
170171
"IntegrationRuntimeMonitoringDataOperations",
171172
"IntegrationRuntimeStatusOperations",
173+
"GetOperations",
172174
"SparkConfigurationOperations",
173175
"SparkConfigurationsOperations",
174176
"KustoOperationsOperations",

0 commit comments

Comments
 (0)