Configurations: 'specification/consumption/resource-manager/Microsoft.Consumption/Consumption/tspconfig.yaml', API Version: 2024-08-01, SDK Release Type: beta, and CommitSHA: 'aa9df243e9a6ecf6110383e079d622a87bd405d3' in SpecRepo: 'https://github.com/Azure/azure-rest-api-specs' Pipeline run: https://dev.azure.com/azure-sdk/internal/_build/results?buildId=6339407 Refer to https://eng.ms/docs/products/azure-developer-experience/develop/sdk-release/sdk-release-prerequisites to prepare for SDK release.

Author: azure-sdk

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

@@ -1,8 +1,7 @@
-include _meta.json
-recursive-include tests *.py *.json
-recursive-include samples *.py *.md
 include *.md
-include azure/__init__.py
-include azure/mgmt/__init__.py
 include LICENSE
 include azure/mgmt/consumption/py.typed
+recursive-include tests *.py
+recursive-include samples *.py *.md
+include azure/__init__.py
+include azure/mgmt/__init__.py

sdk/consumption/azure-mgmt-consumption/MANIFEST.in

@@ -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.10+.
 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.10+ 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/README.md

@@ -0,0 +1,10 @@
+{
+  "apiVersion": "2024-08-01",
+  "apiVersions": {
+    "Microsoft.Consumption": "2024-08-01"
+  },
+  "commit": "aa9df243e9a6ecf6110383e079d622a87bd405d3",
+  "repository_url": "https://github.com/Azure/azure-rest-api-specs",
+  "typespec_src": "specification/consumption/resource-manager/Microsoft.Consumption/Consumption",
+  "emitterVersion": "0.62.1"
+}

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

@@ -1 +1 @@
-__path__ = __import__("pkgutil").extend_path(__path__, __name__)
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)  # type: ignore

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

@@ -1 +1 @@
-__path__ = __import__("pkgutil").extend_path(__path__, __name__)
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)  # type: ignore

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

@@ -2,25 +2,31 @@
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
+# Code generated by Microsoft (R) Python 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 ._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/__init__.py

@@ -2,19 +2,23 @@
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
+# Code generated by Microsoft (R) Python Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
 from copy import deepcopy
-from typing import Any, TYPE_CHECKING
+import sys
+from typing import Any, Optional, TYPE_CHECKING, cast
 
+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,
@@ -35,21 +39,32 @@
     UsageDetailsOperations,
 )
 
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self  # type: ignore
+
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
+    from azure.core import AzureClouds
     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 operations: Operations operations
+    :vartype operations: azure.mgmt.consumption.operations.Operations
+    :ivar price_sheet: PriceSheetOperations operations
+    :vartype price_sheet: azure.mgmt.consumption.operations.PriceSheetOperations
+    :ivar budgets: BudgetsOperations operations
+    :vartype budgets: azure.mgmt.consumption.operations.BudgetsOperations
+    :ivar credits: CreditsOperations operations
+    :vartype credits: azure.mgmt.consumption.operations.CreditsOperations
     :ivar usage_details: UsageDetailsOperations operations
     :vartype usage_details: azure.mgmt.consumption.operations.UsageDetailsOperations
     :ivar marketplaces: MarketplacesOperations operations
     :vartype marketplaces: azure.mgmt.consumption.operations.MarketplacesOperations
-    :ivar budgets: BudgetsOperations operations
-    :vartype budgets: azure.mgmt.consumption.operations.BudgetsOperations
     :ivar tags: TagsOperations operations
     :vartype tags: azure.mgmt.consumption.operations.TagsOperations
     :ivar charges: ChargesOperations operations
@@ -70,48 +85,82 @@ 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
     :vartype aggregated_cost: azure.mgmt.consumption.operations.AggregatedCostOperations
     :ivar events: EventsOperations operations
     :vartype events: azure.mgmt.consumption.operations.EventsOperations
     :ivar lots: LotsOperations operations
     :vartype lots: azure.mgmt.consumption.operations.LotsOperations
-    :ivar credits: CreditsOperations operations
-    :vartype credits: azure.mgmt.consumption.operations.CreditsOperations
-    :param credential: Credential needed for the client to connect to Azure. Required.
+    :param credential: Credential used to authenticate requests to the service. Required.
     :type credential: ~azure.core.credentials.TokenCredential
-    :param subscription_id: Azure Subscription ID. Required.
+    :param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
     :type subscription_id: str
-    :param base_url: Service URL. Default value is "https://management.azure.com".
+    :param base_url: Service host. Default value is None.
     :type base_url: str
-    :keyword api_version: Api Version. Default value is "2021-10-01". Note that overriding this
-     default value may result in unsupported behavior.
+    :keyword cloud_setting: The cloud setting for which to get the ARM endpoint. Default value is
+     None.
+    :paramtype cloud_setting: ~azure.core.AzureClouds
+    :keyword api_version: The API version to use for this operation. Known values are "2024-08-01"
+     and None. Default value is None. If not set, the operation's default API version will be used.
+     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",
+        base_url: Optional[str] = None,
+        *,
+        cloud_setting: Optional["AzureClouds"] = None,
         **kwargs: Any
     ) -> None:
+        _endpoint = "{endpoint}"
+        _cloud = cloud_setting 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,
+            base_url=cast(str, base_url),
+            cloud_setting=cloud_setting,
+            credential_scopes=credential_scopes,
+            **kwargs
         )
-        self._client = ARMPipelineClient(base_url=base_url, config=self._config, **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)
+        _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, _endpoint), policies=_policies, **kwargs)
+
+        self._serialize = Serializer()
+        self._deserialize = Deserializer()
         self._serialize.client_side_validation = False
+        self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
+        self.price_sheet = PriceSheetOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.budgets = BudgetsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.credits = CreditsOperations(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)
         self.tags = TagsOperations(self._client, self._config, self._serialize, self._deserialize)
         self.charges = ChargesOperations(self._client, self._config, self._serialize, self._deserialize)
         self.balances = BalancesOperations(self._client, self._config, self._serialize, self._deserialize)
@@ -130,20 +179,17 @@ 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
         >>> request = HttpRequest("GET", "https://www.example.org/")
         <HttpRequest [GET], url: 'https://www.example.org/'>
-        >>> response = client._send_request(request)
+        >>> response = client.send_request(request)
         <HttpResponse: 200 OK>
 
         For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request
@@ -156,15 +202,19 @@ 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)
+        path_format_arguments = {
+            "endpoint": self._serialize.url("self._config.base_url", self._config.base_url, "str", skip_quote=True),
+        }
+
+        request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments)
+        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)