Skip to content

Commit 5711466

Browse files
author
SDKAuto
committed
CodeGen from PR 34659 in Azure/azure-rest-api-specs
Merge fff39c84516f040d6e6933f4fa4a78607c098bad into 778b6f8c84f4d62e66f054e3876acff30e5bd4f9
1 parent 67455e4 commit 5711466

23 files changed

+846
-607
lines changed

sdk/connectedcache/azure-mgmt-connectedcache/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Release History
22

3+
## 1.0.0b2 (2025-05-13)
4+
5+
### Features Added
6+
7+
- Method `Operation.__init__` has a new overload `def __init__(self: None, display: Optional[_models.OperationDisplay])`
8+
39
## 1.0.0b1 (2024-11-21)
410

511
### Other Changes

sdk/connectedcache/azure-mgmt-connectedcache/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Microsoft Azure SDK for Python
22

33
This is the Microsoft Azure Connectedcache Management Client Library.
4-
This package has been tested with Python 3.8+.
4+
This package has been tested with Python 3.9+.
55
For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all).
66

77
## _Disclaimer_
@@ -12,7 +12,7 @@ _Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For
1212

1313
### Prerequisites
1414

15-
- Python 3.8+ is required to use this package.
15+
- Python 3.9+ is required to use this package.
1616
- [Azure subscription](https://azure.microsoft.com/free/)
1717

1818
### Install the package
@@ -24,7 +24,7 @@ pip install azure-identity
2424

2525
### Authentication
2626

27-
By default, [Azure Active Directory](https://aka.ms/awps/aad) token authentication depends on correct configure of following environment variables.
27+
By default, [Azure Active Directory](https://aka.ms/awps/aad) token authentication depends on correct configuration of the following environment variables.
2828

2929
- `AZURE_CLIENT_ID` for Azure client ID.
3030
- `AZURE_TENANT_ID` for Azure tenant ID.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"commit": "14f4f6b25fe74f90f4ee74fdac5cd7e05d419245",
2+
"commit": "b9a8c9e8eb8998a222f126a005d1ab633f1daad9",
33
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
44
"typespec_src": "specification/connectedcache/ConnectedCache.Management",
5-
"@azure-tools/typespec-python": "0.36.4"
5+
"@azure-tools/typespec-python": "0.44.2"
66
}

sdk/connectedcache/azure-mgmt-connectedcache/apiview-properties.json

Lines changed: 121 additions & 0 deletions
Large diffs are not rendered by default.

sdk/connectedcache/azure-mgmt-connectedcache/azure/mgmt/connectedcache/_client.py

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,18 @@
77
# --------------------------------------------------------------------------
88

99
from copy import deepcopy
10-
from typing import Any, TYPE_CHECKING
10+
from typing import Any, Optional, TYPE_CHECKING, cast
1111
from typing_extensions import Self
1212

1313
from azure.core.pipeline import policies
1414
from azure.core.rest import HttpRequest, HttpResponse
15+
from azure.core.settings import settings
1516
from azure.mgmt.core import ARMPipelineClient
1617
from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy
18+
from azure.mgmt.core.tools import get_arm_endpoints
1719

1820
from ._configuration import ConnectedCacheMgmtClientConfiguration
19-
from ._serialization import Deserializer, Serializer
21+
from ._utils.serialization import Deserializer, Serializer
2022
from .operations import (
2123
CacheNodesOperationsOperations,
2224
EnterpriseCustomerOperationsOperations,
@@ -58,7 +60,7 @@ class ConnectedCacheMgmtClient: # pylint: disable=too-many-instance-attributes
5860
:type credential: ~azure.core.credentials.TokenCredential
5961
:param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
6062
:type subscription_id: str
61-
:param base_url: Service host. Default value is "https://management.azure.com".
63+
:param base_url: Service host. Default value is None.
6264
:type base_url: str
6365
:keyword api_version: The API version to use for this operation. Default value is
6466
"2023-05-01-preview". Note that overriding this default value may result in unsupported
@@ -69,16 +71,22 @@ class ConnectedCacheMgmtClient: # pylint: disable=too-many-instance-attributes
6971
"""
7072

7173
def __init__(
72-
self,
73-
credential: "TokenCredential",
74-
subscription_id: str,
75-
base_url: str = "https://management.azure.com",
76-
**kwargs: Any
74+
self, credential: "TokenCredential", subscription_id: str, base_url: Optional[str] = None, **kwargs: Any
7775
) -> None:
7876
_endpoint = "{endpoint}"
77+
_cloud = kwargs.pop("cloud_setting", None) or settings.current.azure_cloud # type: ignore
78+
_endpoints = get_arm_endpoints(_cloud)
79+
if not base_url:
80+
base_url = _endpoints["resource_manager"]
81+
credential_scopes = kwargs.pop("credential_scopes", _endpoints["credential_scopes"])
7982
self._config = ConnectedCacheMgmtClientConfiguration(
80-
credential=credential, subscription_id=subscription_id, base_url=base_url, **kwargs
83+
credential=credential,
84+
subscription_id=subscription_id,
85+
base_url=cast(str, base_url),
86+
credential_scopes=credential_scopes,
87+
**kwargs
8188
)
89+
8290
_policies = kwargs.pop("policies", None)
8391
if _policies is None:
8492
_policies = [
@@ -97,7 +105,7 @@ def __init__(
97105
policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
98106
self._config.http_logging_policy,
99107
]
100-
self._client: ARMPipelineClient = ARMPipelineClient(base_url=_endpoint, policies=_policies, **kwargs)
108+
self._client: ARMPipelineClient = ARMPipelineClient(base_url=cast(str, _endpoint), policies=_policies, **kwargs)
101109

102110
self._serialize = Serializer()
103111
self._deserialize = Deserializer()

sdk/connectedcache/azure-mgmt-connectedcache/azure/mgmt/connectedcache/_patch.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
# ------------------------------------
2-
# Copyright (c) Microsoft Corporation.
3-
# Licensed under the MIT License.
4-
# ------------------------------------
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+
# --------------------------------------------------------------------------
56
"""Customize generated code here.
67
78
Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# --------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See License.txt in the project root for license information.
4+
# Code generated by Microsoft (R) Python Code Generator.
5+
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
6+
# --------------------------------------------------------------------------

sdk/connectedcache/azure-mgmt-connectedcache/azure/mgmt/connectedcache/_model_base.py renamed to sdk/connectedcache/azure-mgmt-connectedcache/azure/mgmt/connectedcache/_utils/model_base.py

Lines changed: 89 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
# coding=utf-8
33
# --------------------------------------------------------------------------
44
# Copyright (c) Microsoft Corporation. All rights reserved.
5-
# Licensed under the MIT License. See License.txt in the project root for
6-
# license information.
5+
# Licensed under the MIT License. See License.txt in the project root for license information.
6+
# Code generated by Microsoft (R) Python Code Generator.
7+
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
78
# --------------------------------------------------------------------------
89
# pylint: disable=protected-access, broad-except
910

@@ -21,18 +22,14 @@
2122
from datetime import datetime, date, time, timedelta, timezone
2223
from json import JSONEncoder
2324
import xml.etree.ElementTree as ET
25+
from collections.abc import MutableMapping
2426
from typing_extensions import Self
2527
import isodate
2628
from azure.core.exceptions import DeserializationError
2729
from azure.core import CaseInsensitiveEnumMeta
2830
from azure.core.pipeline import PipelineResponse
2931
from azure.core.serialization import _Null
3032

31-
if sys.version_info >= (3, 9):
32-
from collections.abc import MutableMapping
33-
else:
34-
from typing import MutableMapping
35-
3633
_LOGGER = logging.getLogger(__name__)
3734

3835
__all__ = ["SdkJSONEncoder", "Model", "rest_field", "rest_discriminator"]
@@ -347,7 +344,7 @@ def _get_model(module_name: str, model_name: str):
347344
_UNSET = object()
348345

349346

350-
class _MyMutableMapping(MutableMapping[str, typing.Any]): # pylint: disable=unsubscriptable-object
347+
class _MyMutableMapping(MutableMapping[str, typing.Any]):
351348
def __init__(self, data: typing.Dict[str, typing.Any]) -> None:
352349
self._data = data
353350

@@ -373,50 +370,97 @@ def __ne__(self, other: typing.Any) -> bool:
373370
return not self.__eq__(other)
374371

375372
def keys(self) -> typing.KeysView[str]:
373+
"""
374+
:returns: a set-like object providing a view on D's keys
375+
:rtype: ~typing.KeysView
376+
"""
376377
return self._data.keys()
377378

378379
def values(self) -> typing.ValuesView[typing.Any]:
380+
"""
381+
:returns: an object providing a view on D's values
382+
:rtype: ~typing.ValuesView
383+
"""
379384
return self._data.values()
380385

381386
def items(self) -> typing.ItemsView[str, typing.Any]:
387+
"""
388+
:returns: set-like object providing a view on D's items
389+
:rtype: ~typing.ItemsView
390+
"""
382391
return self._data.items()
383392

384393
def get(self, key: str, default: typing.Any = None) -> typing.Any:
394+
"""
395+
Get the value for key if key is in the dictionary, else default.
396+
:param str key: The key to look up.
397+
:param any default: The value to return if key is not in the dictionary. Defaults to None
398+
:returns: D[k] if k in D, else d.
399+
:rtype: any
400+
"""
385401
try:
386402
return self[key]
387403
except KeyError:
388404
return default
389405

390406
@typing.overload
391-
def pop(self, key: str) -> typing.Any: ...
407+
def pop(self, key: str) -> typing.Any: ... # pylint: disable=arguments-differ
392408

393409
@typing.overload
394-
def pop(self, key: str, default: _T) -> _T: ...
410+
def pop(self, key: str, default: _T) -> _T: ... # pylint: disable=signature-differs
395411

396412
@typing.overload
397-
def pop(self, key: str, default: typing.Any) -> typing.Any: ...
413+
def pop(self, key: str, default: typing.Any) -> typing.Any: ... # pylint: disable=signature-differs
398414

399415
def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any:
416+
"""
417+
Removes specified key and return the corresponding value.
418+
:param str key: The key to pop.
419+
:param any default: The value to return if key is not in the dictionary
420+
:returns: The value corresponding to the key.
421+
:rtype: any
422+
:raises KeyError: If key is not found and default is not given.
423+
"""
400424
if default is _UNSET:
401425
return self._data.pop(key)
402426
return self._data.pop(key, default)
403427

404428
def popitem(self) -> typing.Tuple[str, typing.Any]:
429+
"""
430+
Removes and returns some (key, value) pair
431+
:returns: The (key, value) pair.
432+
:rtype: tuple
433+
:raises KeyError: if D is empty.
434+
"""
405435
return self._data.popitem()
406436

407437
def clear(self) -> None:
438+
"""
439+
Remove all items from D.
440+
"""
408441
self._data.clear()
409442

410-
def update(self, *args: typing.Any, **kwargs: typing.Any) -> None:
443+
def update(self, *args: typing.Any, **kwargs: typing.Any) -> None: # pylint: disable=arguments-differ
444+
"""
445+
Updates D from mapping/iterable E and F.
446+
:param any args: Either a mapping object or an iterable of key-value pairs.
447+
"""
411448
self._data.update(*args, **kwargs)
412449

413450
@typing.overload
414451
def setdefault(self, key: str, default: None = None) -> None: ...
415452

416453
@typing.overload
417-
def setdefault(self, key: str, default: typing.Any) -> typing.Any: ...
454+
def setdefault(self, key: str, default: typing.Any) -> typing.Any: ... # pylint: disable=signature-differs
418455

419456
def setdefault(self, key: str, default: typing.Any = _UNSET) -> typing.Any:
457+
"""
458+
Same as calling D.get(k, d), and setting D[k]=d if k not found
459+
:param str key: The key to look up.
460+
:param any default: The value to set if key is not in the dictionary
461+
:returns: D[k] if k in D, else d.
462+
:rtype: any
463+
"""
420464
if default is _UNSET:
421465
return self._data.setdefault(key)
422466
return self._data.setdefault(key, default)
@@ -597,7 +641,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self:
597641
cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items())
598642
cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}")
599643

600-
return super().__new__(cls) # pylint: disable=no-value-for-parameter
644+
return super().__new__(cls)
601645

602646
def __init_subclass__(cls, discriminator: typing.Optional[str] = None) -> None:
603647
for base in cls.__bases__:
@@ -633,7 +677,7 @@ def _deserialize(cls, data, exist_discriminators):
633677
discriminator_value = data.find(xml_name).text # pyright: ignore
634678
else:
635679
discriminator_value = data.get(discriminator._rest_name)
636-
mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore
680+
mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member
637681
return mapped_cls._deserialize(data, exist_discriminators)
638682

639683
def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]:
@@ -754,7 +798,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur
754798
except AttributeError:
755799
model_name = annotation
756800
if module is not None:
757-
annotation = _get_model(module, model_name)
801+
annotation = _get_model(module, model_name) # type: ignore
758802

759803
try:
760804
if module and _is_model(annotation):
@@ -894,6 +938,35 @@ def _deserialize(
894938
return _deserialize_with_callable(deserializer, value)
895939

896940

941+
def _failsafe_deserialize(
942+
deserializer: typing.Any,
943+
value: typing.Any,
944+
module: typing.Optional[str] = None,
945+
rf: typing.Optional["_RestField"] = None,
946+
format: typing.Optional[str] = None,
947+
) -> typing.Any:
948+
try:
949+
return _deserialize(deserializer, value, module, rf, format)
950+
except DeserializationError:
951+
_LOGGER.warning(
952+
"Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True
953+
)
954+
return None
955+
956+
957+
def _failsafe_deserialize_xml(
958+
deserializer: typing.Any,
959+
value: typing.Any,
960+
) -> typing.Any:
961+
try:
962+
return _deserialize_xml(deserializer, value)
963+
except DeserializationError:
964+
_LOGGER.warning(
965+
"Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True
966+
)
967+
return None
968+
969+
897970
class _RestField:
898971
def __init__(
899972
self,

0 commit comments

Comments
 (0)