Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions sdk/commerce/azure-mgmt-commerce/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,28 @@
# Release History

## 6.1.0b2 (2026-03-10)

### Features Added

- Model `UsageManagementClient` added parameter `cloud_setting` in method `__init__`
- Client `UsageManagementClient` added method `send_request`
- Model `UsageAggregation` added property `properties`
- Added model `ErrorObjectResponse`
- Added model `UsageSample`

### Breaking Changes

- This version introduces new hybrid models which have dual dictionary and model nature. Please follow https://aka.ms/azsdk/python/migrate/hybrid-models for migration.
- For the method breakings, please refer to https://aka.ms/azsdk/python/migrate/operations for migration.
- Deleted or renamed model `InfoField`
- Renamed enum `OfferTermInfoEnum` to `OfferTermInfoName`
- Model `UsageAggregation` moved instance variable `subscription_id`, `meter_id`, `usage_start_time`, `usage_end_time`, `quantity`, `unit`, `meter_name`, `meter_category`, `meter_sub_category`, `meter_region`, `info_fields` and `instance_data` under property `properties`
- Method `UsageAggregatesOperations.list` changed its parameter `reported_start_time`/`reported_end_time`/`show_details`/`aggregation_granularity`/`continuation_token_parameter` from `positional_or_keyword` to `keyword_only`

### Other Changes

- Deleted model `RateCardQueryParameters` which actually were not used by SDK users

## 6.1.0b1 (2023-02-10)

### Other Changes
Expand Down
9 changes: 4 additions & 5 deletions sdk/commerce/azure-mgmt-commerce/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -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/commerce/py.typed
recursive-include tests *.py
recursive-include samples *.py *.md
include azure/__init__.py
include azure/mgmt/__init__.py
14 changes: 6 additions & 8 deletions sdk/commerce/azure-mgmt-commerce/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Microsoft Azure SDK for Python

This is the Microsoft Azure Commerce 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_
Expand All @@ -12,7 +12,7 @@ _Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For

### Prerequisites

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

### Install the package
Expand All @@ -24,7 +24,7 @@ pip install azure-identity

### Authentication

By default, [Azure Active Directory](https://aka.ms/awps/aad) token authentication depends on correct configure of following environment variables.
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.
Expand All @@ -45,8 +45,9 @@ client = UsageManagementClient(credential=DefaultAzureCredential(), subscription

## Examples


Code samples for this package can be found at [Commerce](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com and [Samples Repo](https://aka.ms/azsdk/python/mgmt/samples)
Code samples for this package can be found at:
- [Search Commerce](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
Expand All @@ -58,6 +59,3 @@ Code samples for this package can be found at [Commerce](https://docs.microsoft.
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.



11 changes: 0 additions & 11 deletions sdk/commerce/azure-mgmt-commerce/_meta.json

This file was deleted.

10 changes: 10 additions & 0 deletions sdk/commerce/azure-mgmt-commerce/_metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"apiVersion": "2015-06-01-preview",
"apiVersions": {
"Microsoft.Commerce": "2015-06-01-preview"
},
"commit": "48e2c462287288d03adad21e682404d90375462e",
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
"typespec_src": "specification/commerce/resource-manager/Microsoft.Commerce/Commerce",
"emitterVersion": "0.60.2"
}
21 changes: 21 additions & 0 deletions sdk/commerce/azure-mgmt-commerce/apiview-properties.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"CrossLanguagePackageId": "Microsoft.Commerce",
"CrossLanguageDefinitionId": {
"azure.mgmt.commerce.models.ErrorObjectResponse": "Microsoft.Commerce.ErrorObjectResponse",
"azure.mgmt.commerce.models.ErrorResponse": "Microsoft.Commerce.ErrorResponse",
"azure.mgmt.commerce.models.MeterInfo": "Microsoft.Commerce.MeterInfo",
"azure.mgmt.commerce.models.OfferTermInfo": "Microsoft.Commerce.OfferTermInfo",
"azure.mgmt.commerce.models.MonetaryCommitment": "Microsoft.Commerce.MonetaryCommitment",
"azure.mgmt.commerce.models.MonetaryCredit": "Microsoft.Commerce.MonetaryCredit",
"azure.mgmt.commerce.models.RecurringCharge": "Microsoft.Commerce.RecurringCharge",
"azure.mgmt.commerce.models.ResourceRateCardInfo": "Microsoft.Commerce.ResourceRateCardInfo",
"azure.mgmt.commerce.models.UsageAggregation": "Microsoft.Commerce.UsageAggregation",
"azure.mgmt.commerce.models.UsageSample": "Microsoft.Commerce.UsageSample",
"azure.mgmt.commerce.models.AggregationGranularity": "Microsoft.Commerce.AggregationGranularity",
"azure.mgmt.commerce.models.OfferTermInfoName": "Microsoft.Commerce.OfferTermInfoName",
"azure.mgmt.commerce.operations.UsageAggregatesOperations.list": "Microsoft.Commerce.UsageAggregatesOperationGroup.list",
"azure.mgmt.commerce.aio.operations.UsageAggregatesOperations.list": "Microsoft.Commerce.UsageAggregatesOperationGroup.list",
"azure.mgmt.commerce.operations.RateCardOperations.get": "Microsoft.Commerce.RateCardOperationGroup.get",
"azure.mgmt.commerce.aio.operations.RateCardOperations.get": "Microsoft.Commerce.RateCardOperationGroup.get"
}
}
2 changes: 1 addition & 1 deletion sdk/commerce/azure-mgmt-commerce/azure/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__path__ = __import__("pkgutil").extend_path(__path__, __name__)
__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore
2 changes: 1 addition & 1 deletion sdk/commerce/azure-mgmt-commerce/azure/mgmt/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__path__ = __import__("pkgutil").extend_path(__path__, __name__)
__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore
Original file line number Diff line number Diff line change
Expand Up @@ -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 ._usage_management_client import UsageManagementClient
from typing import TYPE_CHECKING

if TYPE_CHECKING:
from ._patch import * # pylint: disable=unused-wildcard-import

from ._client import UsageManagementClient # 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__ = [
"UsageManagementClient",
]
__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()
137 changes: 137 additions & 0 deletions sdk/commerce/azure-mgmt-commerce/azure/mgmt/commerce/_client.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
# coding=utf-8
# --------------------------------------------------------------------------
# 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) 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, 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 ._configuration import UsageManagementClientConfiguration
from ._utils.serialization import Deserializer, Serializer
from .operations import RateCardOperations, UsageAggregatesOperations

if TYPE_CHECKING:
from azure.core import AzureClouds
from azure.core.credentials import TokenCredential


class UsageManagementClient:
"""UsageManagementClient.

:ivar usage_aggregates: UsageAggregatesOperations operations
:vartype usage_aggregates: azure.mgmt.commerce.operations.UsageAggregatesOperations
:ivar rate_card: RateCardOperations operations
:vartype rate_card: azure.mgmt.commerce.operations.RateCardOperations
:param credential: Credential used to authenticate requests to the service. Required.
:type credential: ~azure.core.credentials.TokenCredential
:param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
:type subscription_id: str
:param base_url: Service host. Default value is None.
:type base_url: str
: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
"2015-06-01-preview" and None. Default value is "2015-06-01-preview". Note that overriding this
default value may result in unsupported behavior.
:paramtype api_version: str
"""

def __init__(
self,
credential: "TokenCredential",
subscription_id: str,
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 = UsageManagementClientConfiguration(
credential=credential,
subscription_id=subscription_id,
base_url=cast(str, base_url),
cloud_setting=cloud_setting,
credential_scopes=credential_scopes,
**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, _endpoint), policies=_policies, **kwargs)

self._serialize = Serializer()
self._deserialize = Deserializer()
self._serialize.client_side_validation = False
self.usage_aggregates = UsageAggregatesOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.rate_card = RateCardOperations(self._client, self._config, self._serialize, self._deserialize)

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)
<HttpResponse: 200 OK>

For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request

:param request: The network request you want to make. Required.
:type request: ~azure.core.rest.HttpRequest
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
:return: The response of your network call. Does not do error handling on your response.
:rtype: ~azure.core.rest.HttpResponse
"""

request_copy = deepcopy(request)
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) -> Self:
self._client.__enter__()
return self

def __exit__(self, *exc_details: Any) -> None:
self._client.__exit__(*exc_details)
Loading