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

Merge bc0d1def4f53f5f9241908d7fe63f997f4375bcc into 011ecc5633300a5eefe43dde748f269d39e96458

Author: SDKAuto

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

@@ -1,6 +1,6 @@
 {
-  "commit": "908f30f83295f8afe862310153344468510e3b88",
+  "commit": "78565d3abce7d2d36a40570fa9c95df7eb2f7c6e",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
   "typespec_src": "specification/carbon/Carbon.Management",
-  "@azure-tools/typespec-python": "0.43.0"
+  "@azure-tools/typespec-python": "0.44.2"
 }

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

@@ -37,8 +37,11 @@
         "azure.mgmt.carbonoptimization.models.EmissionScopeEnum": "Microsoft.Carbon.EmissionScopeEnum",
         "azure.mgmt.carbonoptimization.models.OrderByColumnEnum": "Microsoft.Carbon.OrderByColumnEnum",
         "azure.mgmt.carbonoptimization.models.SortDirectionEnum": "Microsoft.Carbon.SortDirectionEnum",
-        "azure.mgmt.carbonoptimization.CarbonOptimizationMgmtClient.operations.list": "Azure.ResourceManager.Operations.list",
-        "azure.mgmt.carbonoptimization.CarbonOptimizationMgmtClient.carbon_service.query_carbon_emission_reports": "Microsoft.Carbon.CarbonService.queryCarbonEmissionReports",
-        "azure.mgmt.carbonoptimization.CarbonOptimizationMgmtClient.carbon_service.query_carbon_emission_data_available_date_range": "Microsoft.Carbon.CarbonService.queryCarbonEmissionDataAvailableDateRange"
+        "azure.mgmt.carbonoptimization.operations.Operations.list": "Azure.ResourceManager.Operations.list",
+        "azure.mgmt.carbonoptimization.aio.operations.Operations.list": "Azure.ResourceManager.Operations.list",
+        "azure.mgmt.carbonoptimization.operations.CarbonServiceOperations.query_carbon_emission_reports": "Microsoft.Carbon.CarbonService.queryCarbonEmissionReports",
+        "azure.mgmt.carbonoptimization.aio.operations.CarbonServiceOperations.query_carbon_emission_reports": "Microsoft.Carbon.CarbonService.queryCarbonEmissionReports",
+        "azure.mgmt.carbonoptimization.operations.CarbonServiceOperations.query_carbon_emission_data_available_date_range": "Microsoft.Carbon.CarbonService.queryCarbonEmissionDataAvailableDateRange",
+        "azure.mgmt.carbonoptimization.aio.operations.CarbonServiceOperations.query_carbon_emission_data_available_date_range": "Microsoft.Carbon.CarbonService.queryCarbonEmissionDataAvailableDateRange"
     }
 }

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

@@ -18,7 +18,7 @@
 from azure.mgmt.core.tools import get_arm_endpoints
 
 from ._configuration import CarbonOptimizationMgmtClientConfiguration
-from ._serialization import Deserializer, Serializer
+from ._utils.serialization import Deserializer, Serializer
 from .operations import CarbonServiceOperations, Operations
 
 if TYPE_CHECKING:

sdk/carbonoptimization/azure-mgmt-carbonoptimization/azure/mgmt/carbonoptimization/_utils/__init__.py

@@ -0,0 +1,6 @@
+# --------------------------------------------------------------------------
+# 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.
+# --------------------------------------------------------------------------

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

@@ -17,7 +17,7 @@
 from azure.mgmt.core.policies import AsyncARMAutoResourceProviderRegistrationPolicy
 from azure.mgmt.core.tools import get_arm_endpoints
 
-from .._serialization import Deserializer, Serializer
+from .._utils.serialization import Deserializer, Serializer
 from ._configuration import CarbonOptimizationMgmtClientConfiguration
 from .operations import CarbonServiceOperations, Operations
 

sdk/carbonoptimization/azure-mgmt-carbonoptimization/azure/mgmt/carbonoptimization/_serialization.py renamed to sdk/carbonoptimization/azure-mgmt-carbonoptimization/azure/mgmt/carbonoptimization/_utils/serialization.py

@@ -31,8 +31,8 @@
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._model_base import SdkJSONEncoder, _deserialize, _failsafe_deserialize
-from ..._serialization import Deserializer, Serializer
+from ..._utils.model_base import SdkJSONEncoder, _deserialize, _failsafe_deserialize
+from ..._utils.serialization import Deserializer, Serializer
 from ...operations._operations import (
     build_carbon_service_query_carbon_emission_data_available_date_range_request,
     build_carbon_service_query_carbon_emission_reports_request,

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

@@ -11,15 +11,14 @@
 import datetime
 from typing import Any, Dict, List, Literal, Mapping, Optional, TYPE_CHECKING, Union, overload
 
-from .. import _model_base
-from .._model_base import rest_discriminator, rest_field
+from .._utils.model_base import Model as _Model, rest_discriminator, rest_field
 from ._enums import ReportTypeEnum, ResponseDataTypeEnum
 
 if TYPE_CHECKING:
     from .. import models as _models
 
 
-class CarbonEmissionData(_model_base.Model):
+class CarbonEmissionData(_Model):
     """The basic response for different query report, all query report result will have these
     information.
 
@@ -56,7 +55,7 @@ class CarbonEmissionData(_model_base.Model):
     :vartype monthly_emissions_change_value: float
     """
 
-    __mapping__: Dict[str, _model_base.Model] = {}
+    __mapping__: Dict[str, _Model] = {}
     data_type: str = rest_discriminator(name="dataType", visibility=["read", "create", "update", "delete", "query"])
     """The data type of the query result, indicating the format of the returned response. Required.
      Known values are: \"OverallSummaryData\", \"MonthlySummaryData\", \"TopItemsSummaryData\",
@@ -108,7 +107,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         super().__init__(*args, **kwargs)
 
 
-class CarbonEmissionDataAvailableDateRange(_model_base.Model):
+class CarbonEmissionDataAvailableDateRange(_Model):
     """Response for available date range of carbon emission data.
 
     :ivar start_date: Start date parameter, format is yyyy-MM-dd. Required.
@@ -141,7 +140,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         super().__init__(*args, **kwargs)
 
 
-class CarbonEmissionDataListResult(_model_base.Model):
+class CarbonEmissionDataListResult(_Model):
     """List of carbon emission results.
 
     :ivar value: The CarbonEmissionData items on this page. Required.
@@ -503,7 +502,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         super().__init__(*args, data_type=ResponseDataTypeEnum.TOP_ITEMS_SUMMARY_DATA, **kwargs)
 
 
-class DateRange(_model_base.Model):
+class DateRange(_Model):
     """Date range to be used with QueryParameter, it should be within 12 months between start and end
     date. In certain cases, start and end dates must be the same date.
 
@@ -541,7 +540,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         super().__init__(*args, **kwargs)
 
 
-class ErrorAdditionalInfo(_model_base.Model):
+class ErrorAdditionalInfo(_Model):
     """The resource management error additional info.
 
     :ivar type: The additional info type.
@@ -556,7 +555,7 @@ class ErrorAdditionalInfo(_model_base.Model):
     """The additional info."""
 
 
-class ErrorDetail(_model_base.Model):
+class ErrorDetail(_Model):
     """The error detail.
 
     :ivar code: The error code.
@@ -585,9 +584,8 @@ class ErrorDetail(_model_base.Model):
     """The error additional info."""
 
 
-class ErrorResponse(_model_base.Model):
-    """Common error response for all Azure Resource Manager APIs to return error details for failed
-    operations.
+class ErrorResponse(_Model):
+    """Error response.
 
     :ivar error: The error object.
     :vartype error: ~azure.mgmt.carbonoptimization.models.ErrorDetail
@@ -614,7 +612,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         super().__init__(*args, **kwargs)
 
 
-class QueryFilter(_model_base.Model):
+class QueryFilter(_Model):
     """Shared query filter parameter to configure carbon emissions data queries for all different
     report type defined in ReportTypeEnum.
 
@@ -656,7 +654,7 @@ class QueryFilter(_model_base.Model):
      ~azure.mgmt.carbonoptimization.models.EmissionScopeEnum]
     """
 
-    __mapping__: Dict[str, _model_base.Model] = {}
+    __mapping__: Dict[str, _Model] = {}
     report_type: str = rest_discriminator(name="reportType", visibility=["read", "create", "update", "delete", "query"])
     """The ReportType requested for carbon emissions data. Required. Specifies how data is aggregated
      and displayed in the output, as explained in the ReportTypeEnum. Required. Known values are:
@@ -902,8 +900,8 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         super().__init__(*args, report_type=ReportTypeEnum.MONTHLY_SUMMARY_REPORT, **kwargs)
 
 
-class Operation(_model_base.Model):
-    """Details of a REST API operation, returned from the Resource Provider Operations API.
+class Operation(_Model):
+    """REST API Operation.
 
     :ivar name: The name of the operation, as per Resource-Based Access Control (RBAC). Examples:
      "Microsoft.Compute/virtualMachines/write", "Microsoft.Compute/virtualMachines/capture/action".
@@ -959,7 +957,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         super().__init__(*args, **kwargs)
 
 
-class OperationDisplay(_model_base.Model):
+class OperationDisplay(_Model):
     """Localized display information for and operation.
 
     :ivar provider: The localized friendly form of the resource provider name, e.g. "Microsoft
@@ -1575,7 +1573,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         super().__init__(*args, data_type=ResponseDataTypeEnum.RESOURCE_GROUP_TOP_ITEMS_SUMMARY_DATA, **kwargs)
 
 
-class SubscriptionAccessDecision(_model_base.Model):
+class SubscriptionAccessDecision(_Model):
     """Access Decision for each Subscription.
 
     :ivar subscription_id: Id of Subscription. Required.

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

@@ -31,8 +31,8 @@
 
 from .. import models as _models
 from .._configuration import CarbonOptimizationMgmtClientConfiguration
-from .._model_base import SdkJSONEncoder, _deserialize, _failsafe_deserialize
-from .._serialization import Deserializer, Serializer
+from .._utils.model_base import SdkJSONEncoder, _deserialize, _failsafe_deserialize
+from .._utils.serialization import Deserializer, Serializer
 
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
@@ -116,7 +116,7 @@ class Operations:
         :attr:`operations` attribute.
     """
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: CarbonOptimizationMgmtClientConfiguration = (
@@ -219,7 +219,7 @@ class CarbonServiceOperations:
         :attr:`carbon_service` attribute.
     """
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: CarbonOptimizationMgmtClientConfiguration = (