Regenerate client from commit 2920812 of spec repo

Author: ci.datadog-api-spec

.generator/schemas/v1/openapi.yaml

@@ -69185,6 +69185,42 @@ components:
         usage_type:
           $ref: '#/components/schemas/HourlyUsageType'
       type: object
+    UsageAttributionTypesAttributes:
+      description: List of usage attribution types.
+      properties:
+        values:
+          description: List of usage attribution types.
+          items:
+            description: A given usage type in a list.
+            example: infra_host
+            type: string
+          type: array
+      type: object
+    UsageAttributionTypesBody:
+      description: Usage attribution types data.
+      properties:
+        attributes:
+          $ref: '#/components/schemas/UsageAttributionTypesAttributes'
+        id:
+          description: Unique ID of the response.
+          type: string
+        type:
+          $ref: '#/components/schemas/UsageAttributionTypesType'
+      type: object
+    UsageAttributionTypesResponse:
+      description: Usage attribution types response.
+      properties:
+        data:
+          $ref: '#/components/schemas/UsageAttributionTypesBody'
+      type: object
+    UsageAttributionTypesType:
+      default: usage_attribution_types
+      description: Type of usage attribution types data.
+      enum:
+      - usage_attribution_types
+      type: string
+      x-enum-varnames:
+      - USAGE_ATTRIBUTION_TYPES
     UsageDataObject:
       description: Usage data.
       properties:
@@ -107057,6 +107093,41 @@ paths:
         permissions:
         - usage_read
         - billing_read
+  /api/v2/usage/usage-attribution-types:
+    get:
+      description: Get usage attribution types.
+      operationId: GetUsageAttributionTypes
+      responses:
+        '200':
+          content:
+            application/json;datetime-format=rfc3339:
+              schema:
+                $ref: '#/components/schemas/UsageAttributionTypesResponse'
+          description: OK
+        '403':
+          content:
+            application/json;datetime-format=rfc3339:
+              schema:
+                $ref: '#/components/schemas/APIErrorResponse'
+          description: Forbidden - User is not authorized
+        '429':
+          content:
+            application/json;datetime-format=rfc3339:
+              schema:
+                $ref: '#/components/schemas/APIErrorResponse'
+          description: Too many requests
+      security:
+      - apiKeyAuth: []
+        appKeyAuth: []
+      - AuthZ:
+        - usage_read
+      summary: Get usage attribution types
+      tags:
+      - Usage Metering
+      x-permission:
+        operator: OR
+        permissions:
+        - usage_read
   /api/v2/user_invitations:
     post:
       description: Sends emails to one or more users inviting them to join the organization.

.generator/schemas/v2/openapi.yaml

@@ -1369,13 +1369,6 @@ datadog\_api\_client.v1.model.hourly\_usage\_attribution\_response module
    :members:
    :show-inheritance:
 
-datadog\_api\_client.v1.model.hourly\_usage\_attribution\_usage\_type module
-----------------------------------------------------------------------------
-
-.. automodule:: datadog_api_client.v1.model.hourly_usage_attribution_usage_type
-   :members:
-   :show-inheritance:
-
 datadog\_api\_client.v1.model.http\_log module
 ----------------------------------------------
 
@@ -2685,13 +2678,6 @@ datadog\_api\_client.v1.model.monthly\_usage\_attribution\_response module
    :members:
    :show-inheritance:
 
-datadog\_api\_client.v1.model.monthly\_usage\_attribution\_supported\_metrics module
-------------------------------------------------------------------------------------
-
-.. automodule:: datadog_api_client.v1.model.monthly_usage_attribution_supported_metrics
-   :members:
-   :show-inheritance:
-
 datadog\_api\_client.v1.model.monthly\_usage\_attribution\_values module
 ------------------------------------------------------------------------
 

docs/datadog_api_client.v1.model.rst

@@ -30391,6 +30391,34 @@ datadog\_api\_client.v2.model.usage\_attributes\_object module
    :members:
    :show-inheritance:
 
+datadog\_api\_client.v2.model.usage\_attribution\_types\_attributes module
+--------------------------------------------------------------------------
+
+.. automodule:: datadog_api_client.v2.model.usage_attribution_types_attributes
+   :members:
+   :show-inheritance:
+
+datadog\_api\_client.v2.model.usage\_attribution\_types\_body module
+--------------------------------------------------------------------
+
+.. automodule:: datadog_api_client.v2.model.usage_attribution_types_body
+   :members:
+   :show-inheritance:
+
+datadog\_api\_client.v2.model.usage\_attribution\_types\_response module
+------------------------------------------------------------------------
+
+.. automodule:: datadog_api_client.v2.model.usage_attribution_types_response
+   :members:
+   :show-inheritance:
+
+datadog\_api\_client.v2.model.usage\_attribution\_types\_type module
+--------------------------------------------------------------------
+
+.. automodule:: datadog_api_client.v2.model.usage_attribution_types_type
+   :members:
+   :show-inheritance:
+
 datadog\_api\_client.v2.model.usage\_data\_object module
 --------------------------------------------------------
 

docs/datadog_api_client.v2.model.rst

@@ -6,14 +6,13 @@
 from dateutil.relativedelta import relativedelta
 from datadog_api_client import ApiClient, Configuration
 from datadog_api_client.v1.api.usage_metering_api import UsageMeteringApi
-from datadog_api_client.v1.model.hourly_usage_attribution_usage_type import HourlyUsageAttributionUsageType
 
 configuration = Configuration()
 with ApiClient(configuration) as api_client:
     api_instance = UsageMeteringApi(api_client)
     response = api_instance.get_hourly_usage_attribution(
         start_hr=(datetime.now() + relativedelta(days=-3)),
-        usage_type=HourlyUsageAttributionUsageType.INFRA_HOST_USAGE,
+        usage_type="infra_host_usage",
     )
 
     print(response)

examples/v1/usage-metering/GetHourlyUsageAttribution.py

@@ -6,16 +6,13 @@
 from dateutil.relativedelta import relativedelta
 from datadog_api_client import ApiClient, Configuration
 from datadog_api_client.v1.api.usage_metering_api import UsageMeteringApi
-from datadog_api_client.v1.model.monthly_usage_attribution_supported_metrics import (
-    MonthlyUsageAttributionSupportedMetrics,
-)
 
 configuration = Configuration()
 with ApiClient(configuration) as api_client:
     api_instance = UsageMeteringApi(api_client)
     response = api_instance.get_monthly_usage_attribution(
         start_month=(datetime.now() + relativedelta(days=-3)),
-        fields=MonthlyUsageAttributionSupportedMetrics.INFRA_HOST_USAGE,
+        fields="infra_host_usage",
     )
 
     print(response)

examples/v1/usage-metering/GetMonthlyUsageAttribution.py

@@ -7,9 +7,6 @@
 from os import environ
 from datadog_api_client import ApiClient, Configuration
 from datadog_api_client.v1.api.usage_metering_api import UsageMeteringApi
-from datadog_api_client.v1.model.monthly_usage_attribution_supported_metrics import (
-    MonthlyUsageAttributionSupportedMetrics,
-)
 
 # there is a valid "monthly_usage_attribution" response
 MONTHLY_USAGE_ATTRIBUTION_METADATA_PAGINATION_NEXT_RECORD_ID = environ[
@@ -21,7 +18,7 @@
     api_instance = UsageMeteringApi(api_client)
     response = api_instance.get_monthly_usage_attribution(
         start_month=(datetime.now() + relativedelta(days=-3)),
-        fields=MonthlyUsageAttributionSupportedMetrics.INFRA_HOST_USAGE,
+        fields="infra_host_usage",
         next_record_id=MONTHLY_USAGE_ATTRIBUTION_METADATA_PAGINATION_NEXT_RECORD_ID,
     )
 

examples/v1/usage-metering/GetMonthlyUsageAttribution_3849653599.py

@@ -0,0 +1,13 @@
+"""
+Get usage attribution types returns "OK" response
+"""
+
+from datadog_api_client import ApiClient, Configuration
+from datadog_api_client.v2.api.usage_metering_api import UsageMeteringApi
+
+configuration = Configuration()
+with ApiClient(configuration) as api_client:
+    api_instance = UsageMeteringApi(api_client)
+    response = api_instance.get_usage_attribution_types()
+
+    print(response)

examples/v2/usage-metering/GetUsageAttributionTypes.py

@@ -30,7 +30,6 @@
 from datadog_api_client.v1.model.usage_fargate_response import UsageFargateResponse
 from datadog_api_client.v1.model.usage_hosts_response import UsageHostsResponse
 from datadog_api_client.v1.model.hourly_usage_attribution_response import HourlyUsageAttributionResponse
-from datadog_api_client.v1.model.hourly_usage_attribution_usage_type import HourlyUsageAttributionUsageType
 from datadog_api_client.v1.model.usage_incident_management_response import UsageIncidentManagementResponse
 from datadog_api_client.v1.model.usage_indexed_spans_response import UsageIndexedSpansResponse
 from datadog_api_client.v1.model.usage_ingested_spans_response import UsageIngestedSpansResponse
@@ -39,9 +38,6 @@
 from datadog_api_client.v1.model.usage_logs_by_retention_response import UsageLogsByRetentionResponse
 from datadog_api_client.v1.model.usage_logs_by_index_response import UsageLogsByIndexResponse
 from datadog_api_client.v1.model.monthly_usage_attribution_response import MonthlyUsageAttributionResponse
-from datadog_api_client.v1.model.monthly_usage_attribution_supported_metrics import (
-    MonthlyUsageAttributionSupportedMetrics,
-)
 from datadog_api_client.v1.model.usage_network_flows_response import UsageNetworkFlowsResponse
 from datadog_api_client.v1.model.usage_network_hosts_response import UsageNetworkHostsResponse
 from datadog_api_client.v1.model.usage_online_archive_response import UsageOnlineArchiveResponse
@@ -137,7 +133,7 @@ def __init__(self, api_client=None):
                 },
                 "usage_type": {
                     "required": True,
-                    "openapi_types": (HourlyUsageAttributionUsageType,),
+                    "openapi_types": (str,),
                     "attribute": "usage_type",
                     "location": "query",
                 },
@@ -279,7 +275,7 @@ def __init__(self, api_client=None):
                 },
                 "fields": {
                     "required": True,
-                    "openapi_types": (MonthlyUsageAttributionSupportedMetrics,),
+                    "openapi_types": (str,),
                     "attribute": "fields",
                     "location": "query",
                 },
@@ -289,7 +285,7 @@ def __init__(self, api_client=None):
                     "location": "query",
                 },
                 "sort_name": {
-                    "openapi_types": (MonthlyUsageAttributionSupportedMetrics,),
+                    "openapi_types": (str,),
                     "attribute": "sort_name",
                     "location": "query",
                 },
@@ -1255,7 +1251,7 @@ def get_daily_custom_reports(
     def get_hourly_usage_attribution(
         self,
         start_hr: datetime,
-        usage_type: HourlyUsageAttributionUsageType,
+        usage_type: str,
         *,
         end_hr: Union[datetime, UnsetType] = unset,
         next_record_id: Union[str, UnsetType] = unset,
@@ -1280,14 +1276,13 @@ def get_hourly_usage_attribution(
              cursor := response.metadata.pagination.next_record_id
            END
 
-        The following values have been **deprecated** :
-            ``estimated_indexed_spans_usage`` , ``estimated_indexed_spans_percentage`` , ``estimated_ingested_spans_usage`` , ``estimated_ingested_spans_percentage`` , ``llm_observability_usage`` , ``llm_observability_percentage``.
-
         :param start_hr: Datetime in ISO-8601 format, UTC, precise to hour: ``[YYYY-MM-DDThh]`` for usage beginning at this hour.
         :type start_hr: datetime
-        :param usage_type: Usage type to retrieve. The following values have been **deprecated** :
-            ``estimated_indexed_spans_usage`` , ``estimated_ingested_spans_usage``.
-        :type usage_type: HourlyUsageAttributionUsageType
+        :param usage_type: Usage type to retrieve. Usage types are in the format ``<usage_type>_usage``.
+            Example: ``infra_host_usage``
+            To obtain the complete list of active usage types that can be used to replace
+            ``<usage_type>`` in the field names, make a request to the `Get usage attribution types API <https://docs.datadoghq.com/api/latest/usage-metering/#get-usage-attribution-types>`_.
+        :type usage_type: str
         :param end_hr: Datetime in ISO-8601 format, UTC, precise to hour: ``[YYYY-MM-DDThh]`` for usage ending
             **before** this hour.
         :type end_hr: datetime, optional
@@ -1417,11 +1412,11 @@ def get_monthly_custom_reports(
     def get_monthly_usage_attribution(
         self,
         start_month: datetime,
-        fields: MonthlyUsageAttributionSupportedMetrics,
+        fields: str,
         *,
         end_month: Union[datetime, UnsetType] = unset,
         sort_direction: Union[UsageSortDirection, UnsetType] = unset,
-        sort_name: Union[MonthlyUsageAttributionSupportedMetrics, UnsetType] = unset,
+        sort_name: Union[str, UnsetType] = unset,
         tag_breakdown_keys: Union[str, UnsetType] = unset,
         next_record_id: Union[str, UnsetType] = unset,
         include_descendants: Union[bool, UnsetType] = unset,
@@ -1448,17 +1443,20 @@ def get_monthly_usage_attribution(
             Maximum of 15 months ago.
         :type start_month: datetime
         :param fields: Comma-separated list of usage types to return, or ``*`` for all usage types.
-            The following values have been **deprecated** :
-            ``estimated_indexed_spans_usage`` , ``estimated_indexed_spans_percentage`` , ``estimated_ingested_spans_usage`` , ``estimated_ingested_spans_percentage`` , ``llm_observability_usage`` , ``llm_observability_percentage``.
-        :type fields: MonthlyUsageAttributionSupportedMetrics
+            Usage types are in the format ``<usage_type>_usage`` and ``<usage_type>_percentage``.
+            Example: ``infra_host_usage,infra_host_percentage``
+            To obtain the complete list of usage attribution types that can be used to replace
+            ``<usage_type>`` in the field names, make a request to the `Get usage attribution types API <https://docs.datadoghq.com/api/latest/usage-metering/#get-usage-attribution-types>`_.
+        :type fields: str
         :param end_month: Datetime in ISO-8601 format, UTC, precise to month: ``[YYYY-MM]`` for usage ending this month.
         :type end_month: datetime, optional
         :param sort_direction: The direction to sort by: ``[desc, asc]``.
         :type sort_direction: UsageSortDirection, optional
-        :param sort_name: The field to sort by.
-            The following values have been **deprecated** :
-            ``estimated_indexed_spans_usage`` , ``estimated_indexed_spans_percentage`` , ``estimated_ingested_spans_usage`` , ``estimated_ingested_spans_percentage``.
-        :type sort_name: MonthlyUsageAttributionSupportedMetrics, optional
+        :param sort_name: The field to sort by. Sort fields are in the format ``<usage_type>_usage``.
+            Example: ``infra_host_usage``
+            To obtain the complete list of usage attribution types that can be used to replace
+            ``<usage_type>`` in the field names, make a request to the `Get usage attribution types API <https://docs.datadoghq.com/api/latest/usage-metering/#get-usage-attribution-types>`_.
+        :type sort_name: str, optional
         :param tag_breakdown_keys: Comma separated list of tag keys used to group usage. If no value is provided the usage will not be broken down by tags.
 
             To see which tags are available, look for the value of ``tag_config_source`` in the API response.

src/datadog_api_client/v1/api/usage_metering_api.py

@@ -17,14 +17,12 @@
 
 if TYPE_CHECKING:
     from datadog_api_client.v1.model.usage_attribution_tag_names import UsageAttributionTagNames
-    from datadog_api_client.v1.model.hourly_usage_attribution_usage_type import HourlyUsageAttributionUsageType
 
 
 class HourlyUsageAttributionBody(ModelNormal):
     @cached_property
     def openapi_types(_):
         from datadog_api_client.v1.model.usage_attribution_tag_names import UsageAttributionTagNames
-        from datadog_api_client.v1.model.hourly_usage_attribution_usage_type import HourlyUsageAttributionUsageType
 
         return {
             "hour": (datetime,),
@@ -35,7 +33,7 @@ def openapi_types(_):
             "tags": (UsageAttributionTagNames,),
             "total_usage_sum": (float,),
             "updated_at": (str,),
-            "usage_type": (HourlyUsageAttributionUsageType,),
+            "usage_type": (str,),
         }
 
     attribute_map = {
@@ -60,7 +58,7 @@ def __init__(
         tags: Union[UsageAttributionTagNames, none_type, UnsetType] = unset,
         total_usage_sum: Union[float, UnsetType] = unset,
         updated_at: Union[str, UnsetType] = unset,
-        usage_type: Union[HourlyUsageAttributionUsageType, UnsetType] = unset,
+        usage_type: Union[str, UnsetType] = unset,
         **kwargs,
     ):
         """
@@ -95,8 +93,8 @@ def __init__(
         :type updated_at: str, optional
 
         :param usage_type: Supported products for hourly usage attribution requests.
-            The following values have been **deprecated** : ``estimated_indexed_spans_usage`` , ``estimated_ingested_spans_usage``.
-        :type usage_type: HourlyUsageAttributionUsageType, optional
+            To obtain the complete list of valid usage types, make a request to the `Get usage attribution types API <https://docs.datadoghq.com/api/latest/usage-metering/#get-usage-attribution-types>`_.
+        :type usage_type: str, optional
         """
         if hour is not unset:
             kwargs["hour"] = hour