Skip to content

Commit cb39803

Browse files
author
SDKAuto
committed
CodeGen from PR 33826 in Azure/azure-rest-api-specs
Merge 0244a809d0e455ed5d00dea143355375e055c4b0 into 121c5e84647a9cdb1767d5146affdfe2af91d776
1 parent cca51a6 commit cb39803

File tree

11 files changed

+35
-27
lines changed

11 files changed

+35
-27
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"commit": "908f30f83295f8afe862310153344468510e3b88",
2+
"commit": "06be6f9b50e7f2b08822a0409c8402ec37c64544",
33
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
44
"typespec_src": "specification/carbon/Carbon.Management",
5-
"@azure-tools/typespec-python": "0.43.0"
5+
"@azure-tools/typespec-python": "0.44.1"
66
}

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,11 @@
3737
"azure.mgmt.carbonoptimization.models.EmissionScopeEnum": "Microsoft.Carbon.EmissionScopeEnum",
3838
"azure.mgmt.carbonoptimization.models.OrderByColumnEnum": "Microsoft.Carbon.OrderByColumnEnum",
3939
"azure.mgmt.carbonoptimization.models.SortDirectionEnum": "Microsoft.Carbon.SortDirectionEnum",
40-
"azure.mgmt.carbonoptimization.CarbonOptimizationMgmtClient.operations.list": "Azure.ResourceManager.Operations.list",
41-
"azure.mgmt.carbonoptimization.CarbonOptimizationMgmtClient.carbon_service.query_carbon_emission_reports": "Microsoft.Carbon.CarbonService.queryCarbonEmissionReports",
42-
"azure.mgmt.carbonoptimization.CarbonOptimizationMgmtClient.carbon_service.query_carbon_emission_data_available_date_range": "Microsoft.Carbon.CarbonService.queryCarbonEmissionDataAvailableDateRange"
40+
"azure.mgmt.carbonoptimization.operations.Operations.list": "Azure.ResourceManager.Operations.list",
41+
"azure.mgmt.carbonoptimization.aio.operations.Operations.list": "Azure.ResourceManager.Operations.list",
42+
"azure.mgmt.carbonoptimization.operations.CarbonServiceOperations.query_carbon_emission_reports": "Microsoft.Carbon.CarbonService.queryCarbonEmissionReports",
43+
"azure.mgmt.carbonoptimization.aio.operations.CarbonServiceOperations.query_carbon_emission_reports": "Microsoft.Carbon.CarbonService.queryCarbonEmissionReports",
44+
"azure.mgmt.carbonoptimization.operations.CarbonServiceOperations.query_carbon_emission_data_available_date_range": "Microsoft.Carbon.CarbonService.queryCarbonEmissionDataAvailableDateRange",
45+
"azure.mgmt.carbonoptimization.aio.operations.CarbonServiceOperations.query_carbon_emission_data_available_date_range": "Microsoft.Carbon.CarbonService.queryCarbonEmissionDataAvailableDateRange"
4346
}
4447
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from azure.mgmt.core.tools import get_arm_endpoints
1919

2020
from ._configuration import CarbonOptimizationMgmtClientConfiguration
21-
from ._serialization import Deserializer, Serializer
21+
from ._utils.serialization import Deserializer, Serializer
2222
from .operations import CarbonServiceOperations, Operations
2323

2424
if TYPE_CHECKING:
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/carbonoptimization/azure-mgmt-carbonoptimization/azure/mgmt/carbonoptimization/aio/_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from azure.mgmt.core.policies import AsyncARMAutoResourceProviderRegistrationPolicy
1818
from azure.mgmt.core.tools import get_arm_endpoints
1919

20-
from .._serialization import Deserializer, Serializer
20+
from .._utils.serialization import Deserializer, Serializer
2121
from ._configuration import CarbonOptimizationMgmtClientConfiguration
2222
from .operations import CarbonServiceOperations, Operations
2323

sdk/carbonoptimization/azure-mgmt-carbonoptimization/azure/mgmt/carbonoptimization/aio/operations/_operations.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
from azure.mgmt.core.exceptions import ARMErrorFormat
3232

3333
from ... import models as _models
34-
from ..._model_base import SdkJSONEncoder, _deserialize, _failsafe_deserialize
35-
from ..._serialization import Deserializer, Serializer
34+
from ..._utils.model_base import SdkJSONEncoder, _deserialize, _failsafe_deserialize
35+
from ..._utils.serialization import Deserializer, Serializer
3636
from ...operations._operations import (
3737
build_carbon_service_query_carbon_emission_data_available_date_range_request,
3838
build_carbon_service_query_carbon_emission_reports_request,

sdk/carbonoptimization/azure-mgmt-carbonoptimization/azure/mgmt/carbonoptimization/models/_models.py

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@
1111
import datetime
1212
from typing import Any, Dict, List, Literal, Mapping, Optional, TYPE_CHECKING, Union, overload
1313

14-
from .. import _model_base
15-
from .._model_base import rest_discriminator, rest_field
14+
from .._utils.model_base import Model as _Model, rest_discriminator, rest_field
1615
from ._enums import ReportTypeEnum, ResponseDataTypeEnum
1716

1817
if TYPE_CHECKING:
1918
from .. import models as _models
2019

2120

22-
class CarbonEmissionData(_model_base.Model):
21+
class CarbonEmissionData(_Model):
2322
"""The basic response for different query report, all query report result will have these
2423
information.
2524
@@ -56,7 +55,7 @@ class CarbonEmissionData(_model_base.Model):
5655
:vartype monthly_emissions_change_value: float
5756
"""
5857

59-
__mapping__: Dict[str, _model_base.Model] = {}
58+
__mapping__: Dict[str, _Model] = {}
6059
data_type: str = rest_discriminator(name="dataType", visibility=["read", "create", "update", "delete", "query"])
6160
"""The data type of the query result, indicating the format of the returned response. Required.
6261
Known values are: \"OverallSummaryData\", \"MonthlySummaryData\", \"TopItemsSummaryData\",
@@ -108,7 +107,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
108107
super().__init__(*args, **kwargs)
109108

110109

111-
class CarbonEmissionDataAvailableDateRange(_model_base.Model):
110+
class CarbonEmissionDataAvailableDateRange(_Model):
112111
"""Response for available date range of carbon emission data.
113112
114113
:ivar start_date: Start date parameter, format is yyyy-MM-dd. Required.
@@ -141,7 +140,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
141140
super().__init__(*args, **kwargs)
142141

143142

144-
class CarbonEmissionDataListResult(_model_base.Model):
143+
class CarbonEmissionDataListResult(_Model):
145144
"""List of carbon emission results.
146145
147146
:ivar value: The CarbonEmissionData items on this page. Required.
@@ -503,7 +502,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
503502
super().__init__(*args, data_type=ResponseDataTypeEnum.TOP_ITEMS_SUMMARY_DATA, **kwargs)
504503

505504

506-
class DateRange(_model_base.Model):
505+
class DateRange(_Model):
507506
"""Date range to be used with QueryParameter, it should be within 12 months between start and end
508507
date. In certain cases, start and end dates must be the same date.
509508
@@ -541,7 +540,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
541540
super().__init__(*args, **kwargs)
542541

543542

544-
class ErrorAdditionalInfo(_model_base.Model):
543+
class ErrorAdditionalInfo(_Model):
545544
"""The resource management error additional info.
546545
547546
:ivar type: The additional info type.
@@ -556,7 +555,7 @@ class ErrorAdditionalInfo(_model_base.Model):
556555
"""The additional info."""
557556

558557

559-
class ErrorDetail(_model_base.Model):
558+
class ErrorDetail(_Model):
560559
"""The error detail.
561560
562561
:ivar code: The error code.
@@ -585,7 +584,7 @@ class ErrorDetail(_model_base.Model):
585584
"""The error additional info."""
586585

587586

588-
class ErrorResponse(_model_base.Model):
587+
class ErrorResponse(_Model):
589588
"""Common error response for all Azure Resource Manager APIs to return error details for failed
590589
operations.
591590
@@ -614,7 +613,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
614613
super().__init__(*args, **kwargs)
615614

616615

617-
class QueryFilter(_model_base.Model):
616+
class QueryFilter(_Model):
618617
"""Shared query filter parameter to configure carbon emissions data queries for all different
619618
report type defined in ReportTypeEnum.
620619
@@ -656,7 +655,7 @@ class QueryFilter(_model_base.Model):
656655
~azure.mgmt.carbonoptimization.models.EmissionScopeEnum]
657656
"""
658657

659-
__mapping__: Dict[str, _model_base.Model] = {}
658+
__mapping__: Dict[str, _Model] = {}
660659
report_type: str = rest_discriminator(name="reportType", visibility=["read", "create", "update", "delete", "query"])
661660
"""The ReportType requested for carbon emissions data. Required. Specifies how data is aggregated
662661
and displayed in the output, as explained in the ReportTypeEnum. Required. Known values are:
@@ -902,7 +901,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
902901
super().__init__(*args, report_type=ReportTypeEnum.MONTHLY_SUMMARY_REPORT, **kwargs)
903902

904903

905-
class Operation(_model_base.Model):
904+
class Operation(_Model):
906905
"""Details of a REST API operation, returned from the Resource Provider Operations API.
907906
908907
:ivar name: The name of the operation, as per Resource-Based Access Control (RBAC). Examples:
@@ -959,7 +958,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
959958
super().__init__(*args, **kwargs)
960959

961960

962-
class OperationDisplay(_model_base.Model):
961+
class OperationDisplay(_Model):
963962
"""Localized display information for and operation.
964963
965964
:ivar provider: The localized friendly form of the resource provider name, e.g. "Microsoft
@@ -1575,7 +1574,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
15751574
super().__init__(*args, data_type=ResponseDataTypeEnum.RESOURCE_GROUP_TOP_ITEMS_SUMMARY_DATA, **kwargs)
15761575

15771576

1578-
class SubscriptionAccessDecision(_model_base.Model):
1577+
class SubscriptionAccessDecision(_Model):
15791578
"""Access Decision for each Subscription.
15801579
15811580
:ivar subscription_id: Id of Subscription. Required.

sdk/carbonoptimization/azure-mgmt-carbonoptimization/azure/mgmt/carbonoptimization/operations/_operations.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
from .. import models as _models
3333
from .._configuration import CarbonOptimizationMgmtClientConfiguration
34-
from .._model_base import SdkJSONEncoder, _deserialize, _failsafe_deserialize
35-
from .._serialization import Deserializer, Serializer
34+
from .._utils.model_base import SdkJSONEncoder, _deserialize, _failsafe_deserialize
35+
from .._utils.serialization import Deserializer, Serializer
3636

3737
T = TypeVar("T")
3838
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]

0 commit comments

Comments
 (0)