CodeGen from PR 33626 in Azure/azure-rest-api-specs

Merge 5aecafed12c38ab12e3439d86807805f7ee59dee into ebabd96a91be0af107cc66f3149b0b41d7d44a8f

Author: SDKAuto

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

@@ -1,5 +1,56 @@
 # Release History
 
+## 11.0.0 (2025-05-05)
+
+### Features Added
+
+  - Model `Balance` added property `overage_refund`
+  - Model `CreditSummary` added property `is_estimated_balance`
+  - Model `CreditSummary` added property `e_tag_properties_e_tag`
+  - Model `EventSummary` added property `charges_in_lot_currency`
+  - Model `EventSummary` added property `closed_balance_in_lot_currency`
+  - Model `EventSummary` added property `billing_account_id`
+  - Model `EventSummary` added property `billing_account_display_name`
+  - Model `EventSummary` added property `is_estimated_balance`
+  - Model `LegacyChargeSummary` added property `azure_marketplace_charges`
+  - Model `LegacyReservationRecommendation` added property `last_usage_date`
+  - Model `LegacyReservationRecommendation` added property `total_hours`
+  - Model `LegacyReservationRecommendationProperties` added property `last_usage_date`
+  - Model `LegacyReservationRecommendationProperties` added property `total_hours`
+  - Model `LegacySharedScopeReservationRecommendationProperties` added property `last_usage_date`
+  - Model `LegacySharedScopeReservationRecommendationProperties` added property `total_hours`
+  - Model `LegacySingleScopeReservationRecommendationProperties` added property `last_usage_date`
+  - Model `LegacySingleScopeReservationRecommendationProperties` added property `total_hours`
+  - Model `LotSummary` added property `is_estimated_balance`
+  - Model `LotSummary` added property `organization_type`
+  - Model `LotSummary` added property `used_amount`
+  - Model `ModernChargeSummary` added property `subscription_id`
+  - Model `ModernReservationRecommendation` added property `resource_type`
+  - Model `ModernReservationRecommendation` added property `last_usage_date`
+  - Model `ModernReservationRecommendation` added property `total_hours`
+  - Model `PriceSheetProperties` added property `savings_plan`
+  - Enum `Term` added member `P1_M`
+  - Added model `ErrorAdditionalInfo`
+  - Added model `ErrorDetail`
+  - Added model `ErrorResponseAutoGenerated`
+  - Added model `ModernReservationRecommendationProperties`
+  - Added model `ModernSharedScopeReservationRecommendationProperties`
+  - Added model `ModernSingleScopeReservationRecommendationProperties`
+  - Added model `OperationStatus`
+  - Added enum `OperationStatusType`
+  - Added enum `OrganizationType`
+  - Added model `SavingsPlan`
+  - Model `PriceSheetOperations` added method `begin_download_by_billing_account_period`
+  - Method `BudgetsOperations.create_or_update` has a new overload `def create_or_update(self: None, scope: str, budget_name: str, parameters: Budget, content_type: str)`
+  - Method `BudgetsOperations.create_or_update` has a new overload `def create_or_update(self: None, scope: str, budget_name: str, parameters: IO[bytes], content_type: str)`
+
+### Breaking Changes
+
+  - Deleted or renamed enum value `BudgetOperatorType.IN_ENUM`
+  - Model `CreditSummary` deleted or renamed its instance variable `etag`
+  - Model `CreditSummary` deleted or renamed its instance variable `tags`
+  - Model `LegacyChargeSummary` deleted or renamed its instance variable `marketplace_charges`
+
 ## 11.0.0b1 (2022-12-07)
 
 ### Features Added

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

@@ -1,28 +1,61 @@
 # Microsoft Azure SDK for Python
 
 This is the Microsoft Azure Consumption Client Library.
-This package has been tested with Python 3.7+.
+This package has been tested with Python 3.9+.
 For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all).
 
 ## _Disclaimer_
 
 _Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For more information and questions, please refer to https://github.com/Azure/azure-sdk-for-python/issues/20691_
 
-# Usage
+## Getting started
 
+### Prerequisites
 
-To learn how to use this package, see the [quickstart guide](https://aka.ms/azsdk/python/mgmt)
- 
-For docs and references, see [Python SDK References](https://docs.microsoft.com/python/api/overview/azure/consumption)
-Code samples for this package can be found at [Consumption](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com.
-Additional code samples for different Azure services are available at [Samples Repo](https://github.com/Azure-Samples/azure-samples-python-management/tree/main/samples/consumption)
+- Python 3.9+ is required to use this package.
+- [Azure subscription](https://azure.microsoft.com/free/)
 
+### Install the package
 
-# Provide Feedback
+```bash
+pip install azure-mgmt-consumption
+pip install azure-identity
+```
 
-If you encounter any bugs or have suggestions, please file an issue in the
-[Issues](https://github.com/Azure/azure-sdk-for-python/issues)
-section of the project. 
+### Authentication
+
+By default, [Azure Active Directory](https://aka.ms/awps/aad) token authentication depends on correct configuration of the following environment variables.
+
+- `AZURE_CLIENT_ID` for Azure client ID.
+- `AZURE_TENANT_ID` for Azure tenant ID.
+- `AZURE_CLIENT_SECRET` for Azure client secret.
+
+In addition, Azure subscription ID can be configured via environment variable `AZURE_SUBSCRIPTION_ID`.
+
+With above configuration, client can be authenticated by following code:
+
+```python
+from azure.identity import DefaultAzureCredential
+from azure.mgmt.consumption import ConsumptionManagementClient
+import os
 
+sub_id = os.getenv("AZURE_SUBSCRIPTION_ID")
+client = ConsumptionManagementClient(credential=DefaultAzureCredential(), subscription_id=sub_id)
+```
 
+## Examples
 
+Code samples for this package can be found at:
+- [Search Consumption](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com
+- [Azure Python Mgmt SDK Samples Repo](https://aka.ms/azsdk/python/mgmt/samples)
+
+
+## Troubleshooting
+
+## Next steps
+
+## Provide Feedback
+
+If you encounter any bugs or have suggestions, please file an issue in the
+[Issues](https://github.com/Azure/azure-sdk-for-python/issues)
+section of the project. 

sdk/consumption/azure-mgmt-consumption/_meta.json

@@ -1,11 +1,11 @@
 {
-  "commit": "1be09531e4c6edeafde41d6562371566d39669e8",
+  "commit": "55d10e88f37024edfb692533c1770b6b9a97aaeb",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest": "3.9.2",
+  "autorest": "3.10.2",
   "use": [
-    "@autorest/python@6.2.7",
-    "@autorest/modelerfour@4.24.3"
+    "@autorest/python@6.34.1",
+    "@autorest/modelerfour@4.27.0"
   ],
-  "autorest_command": "autorest specification/consumption/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.2.7 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
+  "autorest_command": "autorest specification/consumption/resource-manager/readme.md --generate-sample=True --generate-test=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.34.1 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False",
   "readme": "specification/consumption/resource-manager/readme.md"
 }

sdk/consumption/azure-mgmt-consumption/azure/mgmt/consumption/__init__.py

@@ -5,22 +5,28 @@
 # Code generated by Microsoft (R) AutoRest Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
 
-from ._consumption_management_client import ConsumptionManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._consumption_management_client import ConsumptionManagementClient  # type: ignore
 from ._version import VERSION
 
 __version__ = VERSION
 
 try:
     from ._patch import __all__ as _patch_all
-    from ._patch import *  # pylint: disable=unused-wildcard-import
+    from ._patch import *
 except ImportError:
     _patch_all = []
 from ._patch import patch_sdk as _patch_sdk
 
 __all__ = [
     "ConsumptionManagementClient",
 ]
-__all__.extend([p for p in _patch_all if p not in __all__])
+__all__.extend([p for p in _patch_all if p not in __all__])  # pyright: ignore
 
 _patch_sdk()

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

@@ -6,26 +6,18 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-import sys
 from typing import Any, TYPE_CHECKING
 
-from azure.core.configuration import Configuration
 from azure.core.pipeline import policies
 from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy
 
 from ._version import VERSION
 
-if sys.version_info >= (3, 8):
-    from typing import Literal  # pylint: disable=no-name-in-module, ungrouped-imports
-else:
-    from typing_extensions import Literal  # type: ignore  # pylint: disable=ungrouped-imports
-
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class ConsumptionManagementClientConfiguration(Configuration):  # pylint: disable=too-many-instance-attributes
+class ConsumptionManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for ConsumptionManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
@@ -35,14 +27,13 @@ class ConsumptionManagementClientConfiguration(Configuration):  # pylint: disabl
     :type credential: ~azure.core.credentials.TokenCredential
     :param subscription_id: Azure Subscription ID. Required.
     :type subscription_id: str
-    :keyword api_version: Api Version. Default value is "2021-10-01". Note that overriding this
+    :keyword api_version: Api Version. Default value is "2025-04-01". Note that overriding this
      default value may result in unsupported behavior.
     :paramtype api_version: str
     """
 
     def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
-        super(ConsumptionManagementClientConfiguration, self).__init__(**kwargs)
-        api_version: Literal["2021-10-01"] = kwargs.pop("api_version", "2021-10-01")
+        api_version: str = kwargs.pop("api_version", "2025-04-01")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")
@@ -54,6 +45,7 @@ def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs
         self.api_version = api_version
         self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
         kwargs.setdefault("sdk_moniker", "mgmt-consumption/{}".format(VERSION))
+        self.polling_interval = kwargs.get("polling_interval", 30)
         self._configure(**kwargs)
 
     def _configure(self, **kwargs: Any) -> None:
@@ -62,9 +54,9 @@ def _configure(self, **kwargs: Any) -> None:
         self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
         self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
         self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs)
-        self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
         self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
         self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs)
+        self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
         self.authentication_policy = kwargs.get("authentication_policy")
         if self.credential and not self.authentication_policy:
             self.authentication_policy = ARMChallengeAuthenticationPolicy(

sdk/consumption/azure-mgmt-consumption/azure/mgmt/consumption/_consumption_management_client.py

@@ -7,14 +7,19 @@
 # --------------------------------------------------------------------------
 
 from copy import deepcopy
-from typing import Any, TYPE_CHECKING
+from typing import Any, Optional, TYPE_CHECKING, cast
+from typing_extensions import Self
 
+from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.settings import settings
 from azure.mgmt.core import ARMPipelineClient
+from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy
+from azure.mgmt.core.tools import get_arm_endpoints
 
 from . import models as _models
 from ._configuration import ConsumptionManagementClientConfiguration
-from ._serialization import Deserializer, Serializer
+from ._utils.serialization import Deserializer, Serializer
 from .operations import (
     AggregatedCostOperations,
     BalancesOperations,
@@ -36,14 +41,15 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class ConsumptionManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class ConsumptionManagementClient:  # pylint: disable=too-many-instance-attributes
     """Consumption management client provides access to consumption resources for Azure Enterprise
     Subscriptions.
 
+    :ivar price_sheet: PriceSheetOperations operations
+    :vartype price_sheet: azure.mgmt.consumption.operations.PriceSheetOperations
     :ivar usage_details: UsageDetailsOperations operations
     :vartype usage_details: azure.mgmt.consumption.operations.UsageDetailsOperations
     :ivar marketplaces: MarketplacesOperations operations
@@ -70,8 +76,6 @@ class ConsumptionManagementClient:  # pylint: disable=client-accepts-api-version
     :ivar reservation_transactions: ReservationTransactionsOperations operations
     :vartype reservation_transactions:
      azure.mgmt.consumption.operations.ReservationTransactionsOperations
-    :ivar price_sheet: PriceSheetOperations operations
-    :vartype price_sheet: azure.mgmt.consumption.operations.PriceSheetOperations
     :ivar operations: Operations operations
     :vartype operations: azure.mgmt.consumption.operations.Operations
     :ivar aggregated_cost: AggregatedCostOperations operations
@@ -86,29 +90,52 @@ class ConsumptionManagementClient:  # pylint: disable=client-accepts-api-version
     :type credential: ~azure.core.credentials.TokenCredential
     :param subscription_id: Azure Subscription ID. Required.
     :type subscription_id: str
-    :param base_url: Service URL. Default value is "https://management.azure.com".
+    :param base_url: Service URL. Default value is None.
     :type base_url: str
-    :keyword api_version: Api Version. Default value is "2021-10-01". Note that overriding this
+    :keyword api_version: Api Version. Default value is "2025-04-01". Note that overriding this
      default value may result in unsupported behavior.
     :paramtype api_version: str
+    :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
+     Retry-After header is present.
     """
 
     def __init__(
-        self,
-        credential: "TokenCredential",
-        subscription_id: str,
-        base_url: str = "https://management.azure.com",
-        **kwargs: Any
+        self, credential: "TokenCredential", subscription_id: str, base_url: Optional[str] = None, **kwargs: Any
     ) -> None:
+        _cloud = kwargs.pop("cloud_setting", None) or settings.current.azure_cloud  # type: ignore
+        _endpoints = get_arm_endpoints(_cloud)
+        if not base_url:
+            base_url = _endpoints["resource_manager"]
+        credential_scopes = kwargs.pop("credential_scopes", _endpoints["credential_scopes"])
         self._config = ConsumptionManagementClientConfiguration(
-            credential=credential, subscription_id=subscription_id, **kwargs
+            credential=credential, subscription_id=subscription_id, credential_scopes=credential_scopes, **kwargs
         )
-        self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
+
+        _policies = kwargs.pop("policies", None)
+        if _policies is None:
+            _policies = [
+                policies.RequestIdPolicy(**kwargs),
+                self._config.headers_policy,
+                self._config.user_agent_policy,
+                self._config.proxy_policy,
+                policies.ContentDecodePolicy(**kwargs),
+                ARMAutoResourceProviderRegistrationPolicy(),
+                self._config.redirect_policy,
+                self._config.retry_policy,
+                self._config.authentication_policy,
+                self._config.custom_hook_policy,
+                self._config.logging_policy,
+                policies.DistributedTracingPolicy(**kwargs),
+                policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
+                self._config.http_logging_policy,
+            ]
+        self._client: ARMPipelineClient = ARMPipelineClient(base_url=cast(str, base_url), policies=_policies, **kwargs)
 
         client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
         self._serialize.client_side_validation = False
+        self.price_sheet = PriceSheetOperations(self._client, self._config, self._serialize, self._deserialize)
         self.usage_details = UsageDetailsOperations(self._client, self._config, self._serialize, self._deserialize)
         self.marketplaces = MarketplacesOperations(self._client, self._config, self._serialize, self._deserialize)
         self.budgets = BudgetsOperations(self._client, self._config, self._serialize, self._deserialize)
@@ -130,14 +157,13 @@ def __init__(
         self.reservation_transactions = ReservationTransactionsOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
-        self.price_sheet = PriceSheetOperations(self._client, self._config, self._serialize, self._deserialize)
         self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
         self.aggregated_cost = AggregatedCostOperations(self._client, self._config, self._serialize, self._deserialize)
         self.events = EventsOperations(self._client, self._config, self._serialize, self._deserialize)
         self.lots = LotsOperations(self._client, self._config, self._serialize, self._deserialize)
         self.credits = CreditsOperations(self._client, self._config, self._serialize, self._deserialize)
 
-    def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
+    def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
         """Runs the network request through the client's chained policies.
 
         >>> from azure.core.rest import HttpRequest
@@ -157,14 +183,14 @@ def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
 
         request_copy = deepcopy(request)
         request_copy.url = self._client.format_url(request_copy.url)
-        return self._client.send_request(request_copy, **kwargs)
+        return self._client.send_request(request_copy, stream=stream, **kwargs)  # type: ignore
 
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "ConsumptionManagementClient":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
-    def __exit__(self, *exc_details) -> None:
+    def __exit__(self, *exc_details: Any) -> None:
         self._client.__exit__(*exc_details)

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

@@ -25,6 +25,7 @@
 #
 # --------------------------------------------------------------------------
 
+
 # This file is used for handwritten extensions to the generated code. Example:
 # https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
 def patch_sdk():