From 767b836b3cd6d37c6c38694afef3be794b76924d Mon Sep 17 00:00:00 2001
From: "ci.datadog-api-spec" <packages@datadoghq.com>
Date: Wed, 27 May 2026 04:40:34 +0000
Subject: [PATCH] Regenerate client from commit d3120d2 of spec repo

---
 .generator/schemas/v2/openapi.yaml            |  724 ++++++++-
 .../BatchUpdateLLMObsDataset.java             |   59 +
 .../llm-observability/CloneLLMObsDataset.java |   42 +
 .../ExportLLMObsDataset.java                  |   26 +
 .../RestoreLLMObsDatasetVersion.java          |   37 +
 .../UploadLLMObsDatasetRecordsFile.java       |   27 +
 .../com/datadog/api/client/ApiClient.java     |    5 +
 .../client/v2/api/LlmObservabilityApi.java    | 1346 ++++++++++++++++-
 ...tasetBatchUpdateDataAttributesRequest.java |  302 ++++
 .../LLMObsDatasetBatchUpdateDataRequest.java  |  212 +++
 .../LLMObsDatasetBatchUpdateInsertRecord.java |  324 ++++
 .../LLMObsDatasetBatchUpdateRequest.java      |  148 ++
 .../LLMObsDatasetBatchUpdateUpdateRecord.java |  288 ++++
 ...MObsDatasetCloneDataAttributesRequest.java |  175 +++
 .../model/LLMObsDatasetCloneDataRequest.java  |  211 +++
 .../v2/model/LLMObsDatasetCloneRequest.java   |  147 ++
 .../v2/model/LLMObsDatasetExportFormat.java   |   55 +
 .../LLMObsDatasetRecordTagOperations.java     |  223 +++
 .../model/LLMObsDatasetRecordsUploadFile.java |  140 ++
 ...etRestoreVersionDataAttributesRequest.java |  151 ++
 ...LMObsDatasetRestoreVersionDataRequest.java |  212 +++
 .../LLMObsDatasetRestoreVersionRequest.java   |  148 ++
 ...er_returns_User_created_response_test.json |    2 +-
 ...reate_a_user_returns_null_access_role.json |    2 +-
 ...t_config_returns_Bad_Request_response.json |    2 +-
 ...nt_config_returns_No_Content_response.json |    2 +-
 ...unt_config_returns_Not_Found_response.json |    2 +-
 ...g_returns_AWS_Account_object_response.json |    2 +-
 ...unt_config_returns_Not_Found_response.json |    2 +-
 ...rns_AWS_Accounts_List_object_response.json |    2 +-
 ...s_AWS_Namespaces_List_object_response.json |    2 +-
 ...WS_Logs_Services_List_object_response.json |    2 +-
 ...t_config_returns_Bad_Request_response.json |    2 +-
 ...ive_case_returns_Bad_Request_response.json |    2 +-
 .../v2/Archive_case_returns_OK_response.json  |    2 +-
 .../v2/Assign_case_returns_OK_response.json   |    2 +-
 ...re_items_returns_Bad_Request_response.json |    2 +-
 ...e_datastore_items_returns_OK_response.json |    2 +-
 ...re_items_returns_Bad_Request_response.json |    2 +-
 ...e_datastore_items_returns_OK_response.json |    2 +-
 ..._a_historical_job_returns_OK_response.json |    2 +-
 ..._deletion_request_returns_OK_response.json |    2 +-
 ...ent_case_returns_Bad_Request_response.json |    2 +-
 ...eturns_AWS_CCM_Config_object_response.json |    2 +-
 ..._CCM_config_returns_Conflict_response.json |    4 +-
 ...and_task_returns_Bad_Request_response.json |    2 +-
 .../Create_App_returns_Created_response.json  |    2 +-
 ...options_enabled_successfully_response.json |    4 +-
 ..._options_returns_Bad_Request_response.json |    2 +-
 ..._Connection_returns_Conflict_response.json |    4 +-
 ...te_Scanning_Group_returns_OK_response.json |    2 +-
 ...ate_Scanning_Rule_returns_OK_response.json |    4 +-
 ...should_save_match_returns_OK_response.json |    4 +-
 ...m_framework_returns_Conflict_response.json |    6 +-
 ..._custom_framework_returns_OK_response.json |    4 +-
 ...e_a_dataset_returns_Conflict_response.json |    4 +-
 .../Create_a_dataset_returns_OK_response.json |    2 +-
 ...restriction_query_returns_OK_response.json |    2 +-
 ...integration_returns_Conflict_response.json |    2 +-
 ...ncident_type_returns_CREATED_response.json |    2 +-
 ...ase_type_returns_Bad_Request_response.json |    2 +-
 ..._a_case_type_returns_CREATED_response.json |    2 +-
 ...ication_rule_returns_Created_response.json |    2 +-
 ...ion_template_returns_Created_response.json |    2 +-
 ...with_a_permission_returns_OK_response.json |    2 +-
 ..._deletion_request_returns_OK_response.json |    2 +-
 .../v2/Delete_App_returns_OK_response.json    |    2 +-
 ...ete_Multiple_Apps_returns_OK_response.json |    2 +-
 ...te_Scanning_Group_returns_OK_response.json |    4 +-
 ...ete_Scanning_Rule_returns_OK_response.json |    2 +-
 ..._exclusion_filter_returns_OK_response.json |    2 +-
 ...case_type_returns_NotContent_response.json |    2 +-
 ...elete_a_case_type_returns_OK_response.json |    2 +-
 ..._custom_framework_returns_OK_response.json |    6 +-
 ...a_dataset_returns_No_Content_response.json |    2 +-
 ...restriction_query_returns_OK_response.json |    2 +-
 ..._retention_filter_returns_OK_response.json |    2 +-
 ...egration_returns_Bad_Request_response.json |    2 +-
 ...tegration_returns_No_Content_response.json |    2 +-
 ...ntegration_returns_Not_Found_response.json |    2 +-
 ...cessfully_deleted_a_workflow_response.json |    2 +-
 ..._an_incident_type_returns_OK_response.json |    2 +-
 ..._comment_returns_Bad_Request_response.json |    2 +-
 ...e_comment_returns_No_Content_response.json |    2 +-
 ...se_comment_returns_Not_Found_response.json |    2 +-
 ..._from_case_returns_Not_Found_response.json |    2 +-
 ...s_config_returns_Bad_Request_response.json |    2 +-
 ...te_datastore_item_returns_OK_response.json |    2 +-
 .../Delete_datastore_returns_OK_response.json |    2 +-
 ...tion_rule_returns_No_Content_response.json |    2 +-
 ..._template_returns_No_Content_response.json |    2 +-
 .../Edit_a_dataset_returns_OK_response.json   |    2 +-
 ...turns_AWS_External_ID_object_response.json |    2 +-
 ...turns_AWS_External_ID_object_response.json |    2 +-
 ...sk_by_id_returns_Bad_Request_response.json |    2 +-
 ...and_task_returns_Bad_Request_response.json |    2 +-
 .../v2/Get_App_returns_Gone_response.json     |    2 +-
 ..._a_critical_asset_returns_OK_response.json |    2 +-
 ..._custom_framework_returns_OK_response.json |    4 +-
 ..._retention_filter_returns_OK_response.json |    2 +-
 ...gle_dataset_by_ID_returns_OK_response.json |    2 +-
 ...nfig_of_case_type_returns_OK_response.json |    2 +-
 .../Get_all_datasets_returns_OK_response.json |    2 +-
 ...D_returns_AWS_Account_object_response.json |    2 +-
 ..._config_ID_returns_Not_Found_response.json |    2 +-
 ..._Successfully_got_a_workflow_response.json |    2 +-
 .../v2/Get_datastore_returns_OK_response.json |    2 +-
 ...notification_rule_returns_OK_response.json |    2 +-
 ...fication_template_returns_OK_response.json |    2 +-
 ...WS_Logs_Services_List_object_response.json |    2 +-
 ...details_of_a_case_returns_OK_response.json |    2 +-
 ...deletion_requests_returns_OK_response.json |    2 +-
 ...mission_to_a_role_returns_OK_response.json |    2 +-
 ...List_App_Versions_returns_OK_response.json |    2 +-
 ...t_Scanning_Groups_returns_OK_response.json |    6 +-
 ...retention_filters_returns_OK_response.json |    2 +-
 ...rns_AWS_Accounts_List_object_response.json |    2 +-
 ...s_AWS_Namespaces_List_object_response.json |    2 +-
 ...t_datastore_items_returns_OK_response.json |    2 +-
 ...otification_rules_returns_OK_response.json |    2 +-
 ...WS_Logs_Services_List_object_response.json |    2 +-
 ...ssions_for_a_role_returns_OK_response.json |    2 +-
 .../List_permissions_returns_OK_response.json |    2 +-
 .../List_pipelines_returns_OK_response.json   |    2 +-
 ...p_Version_returns_No_Content_response.json |    2 +-
 ...ptions_returns_Bad_Request_response_2.json |    2 +-
 ..._AWS_Scan_Options_returns_OK_response.json |    2 +-
 ..._Options_returns_Bad_Request_response.json |    2 +-
 ...l_Lab_run_returns_No_Content_response.json |    2 +-
 ...options_enabled_successfully_response.json |    2 +-
 ..._AWS_Scan_Options_returns_OK_response.json |    2 +-
 ...options_enabled_successfully_response.json |    4 +-
 ..._Options_returns_Bad_Request_response.json |    2 +-
 ...and_task_returns_Bad_Request_response.json |    2 +-
 .../Publish_App_returns_Created_response.json |    2 +-
 ...r_Groups_returns_Bad_Request_response.json |    4 +-
 .../Reorder_Groups_returns_OK_response.json   |    6 +-
 ...permission_returns_Not_found_response.json |    2 +-
 ...Revoke_permission_returns_OK_response.json |    2 +-
 ...l_job_returns_Status_created_response.json |    2 +-
 ...ive_case_returns_Bad_Request_response.json |    2 +-
 .../Unarchive_case_returns_OK_response.json   |    2 +-
 ...ign_case_returns_Bad_Request_response.json |    2 +-
 .../v2/Unassign_case_returns_OK_response.json |    2 +-
 ...l_Lab_run_returns_No_Content_response.json |    2 +-
 .../v2/Unpublish_App_returns_OK_response.json |    2 +-
 ...ptions_returns_Bad_Request_response_2.json |    2 +-
 ...n_options_returns_No_Content_response.json |    2 +-
 ...te_Status_returns_No_Content_response.json |    2 +-
 ..._Protection_Level_returns_OK_response.json |    2 +-
 ...ce_Status_returns_No_Content_response.json |    2 +-
 ..._App_Tags_returns_No_Content_response.json |    2 +-
 ...date_App_returns_Bad_Request_response.json |    2 +-
 .../v2/Update_App_returns_OK_response.json    |    2 +-
 ..._options_returns_Bad_Request_response.json |    2 +-
 ...nnection_returns_Bad_Request_response.json |    2 +-
 ...Connection_returns_Not_Found_response.json |    2 +-
 ...te_Org_Connection_returns_OK_response.json |    2 +-
 ...te_Scanning_Group_returns_OK_response.json |    4 +-
 ...ing_Rule_returns_Bad_Request_response.json |    4 +-
 ...ate_Scanning_Rule_returns_OK_response.json |    4 +-
 ..._exclusion_filter_returns_OK_response.json |    2 +-
 ..._a_critical_asset_returns_OK_response.json |    2 +-
 ..._custom_framework_returns_OK_response.json |    4 +-
 ...Update_a_pipeline_returns_OK_response.json |    2 +-
 ...n_filter_returns_Bad_Request_response.json |    2 +-
 ...ion_filter_returns_Not_Found_response.json |    2 +-
 ..._retention_filter_returns_OK_response.json |    2 +-
 ...r_with_trace_rate_returns_OK_response.json |    2 +-
 ..._filters_returns_Bad_Request_response.json |    2 +-
 ...on_filters_returns_Not_Found_response.json |    2 +-
 ...retention_filters_returns_OK_response.json |    2 +-
 ...e_a_role_returns_Bad_Request_response.json |    2 +-
 ...ate_a_role_returns_Not_found_response.json |    2 +-
 .../v2/Update_a_role_returns_OK_response.json |    2 +-
 ...n_returns_AWS_Account_object_response.json |    2 +-
 ...egration_returns_Bad_Request_response.json |    2 +-
 ...cessfully_updated_a_workflow_response.json |    2 +-
 ..._an_incident_type_returns_OK_response.json |    2 +-
 ...e_case_attributes_returns_OK_response.json |    2 +-
 ...ttribute_returns_Bad_Request_response.json |    2 +-
 ..._attribute_returns_Not_Found_response.json |    2 +-
 ..._custom_attribute_returns_OK_response.json |    2 +-
 ..._case_description_returns_OK_response.json |    2 +-
 ...priority_returns_Bad_Request_response.json |    2 +-
 ...ate_case_priority_returns_OK_response.json |    2 +-
 ...e_status_returns_Bad_Request_response.json |    2 +-
 ...pdate_case_status_returns_OK_response.json |    2 +-
 ...se_title_returns_Bad_Request_response.json |    2 +-
 ...Update_case_title_returns_OK_response.json |    2 +-
 ...te_datastore_item_returns_OK_response.json |    2 +-
 .../Update_datastore_returns_OK_response.json |    2 +-
 ...fication_template_returns_OK_response.json |    2 +-
 ...an_issue_returns_Bad_Request_response.json |    2 +-
 ...state_of_an_issue_returns_OK_response.json |    2 +-
 .../client/v2/api/llm_observability.feature   |  154 ++
 .../com/datadog/api/client/v2/api/undo.json   |   32 +
 197 files changed, 5305 insertions(+), 275 deletions(-)
 create mode 100644 examples/v2/llm-observability/BatchUpdateLLMObsDataset.java
 create mode 100644 examples/v2/llm-observability/CloneLLMObsDataset.java
 create mode 100644 examples/v2/llm-observability/ExportLLMObsDataset.java
 create mode 100644 examples/v2/llm-observability/RestoreLLMObsDatasetVersion.java
 create mode 100644 examples/v2/llm-observability/UploadLLMObsDatasetRecordsFile.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetBatchUpdateDataAttributesRequest.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetBatchUpdateDataRequest.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetBatchUpdateInsertRecord.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetBatchUpdateRequest.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetBatchUpdateUpdateRecord.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetCloneDataAttributesRequest.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetCloneDataRequest.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetCloneRequest.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetExportFormat.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetRecordTagOperations.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetRecordsUploadFile.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetRestoreVersionDataAttributesRequest.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetRestoreVersionDataRequest.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetRestoreVersionRequest.java

diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index c1ed2925666..5a9cc236477 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -44653,6 +44653,142 @@ components:
       type: string
       x-enum-varnames:
         - DELETION_REQUEST
+    LLMObsDatasetBatchUpdateDataAttributesRequest:
+      description: Attributes for batch-updating records in an LLM Observability dataset.
+      properties:
+        create_new_version:
+          description: Whether to create a new dataset version when applying the batch update. Defaults to `true`.
+          example: true
+          type: boolean
+        delete_records:
+          $ref: "#/components/schemas/LLMObsDatasetBatchUpdateDeleteRecords"
+        insert_records:
+          $ref: "#/components/schemas/LLMObsDatasetBatchUpdateInsertRecords"
+        tags:
+          $ref: "#/components/schemas/LLMObsDatasetRecordTagsList"
+        update_records:
+          $ref: "#/components/schemas/LLMObsDatasetBatchUpdateUpdateRecords"
+      type: object
+    LLMObsDatasetBatchUpdateDataRequest:
+      description: Data object for batch-updating records in an LLM Observability dataset.
+      properties:
+        attributes:
+          $ref: "#/components/schemas/LLMObsDatasetBatchUpdateDataAttributesRequest"
+        id:
+          description: Unique identifier of the dataset.
+          example: "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d"
+          type: string
+        type:
+          $ref: "#/components/schemas/LLMObsDatasetType"
+      required:
+        - id
+        - type
+        - attributes
+      type: object
+    LLMObsDatasetBatchUpdateDeleteRecords:
+      description: Record IDs to delete.
+      items:
+        description: A record ID to delete.
+        type: string
+      type: array
+    LLMObsDatasetBatchUpdateInsertRecord:
+      description: A record to insert as part of a batch update on an LLM Observability dataset.
+      properties:
+        expected_output:
+          $ref: "#/components/schemas/AnyValue"
+        id:
+          description: Optional user-provided identifier for the record. If omitted, the server generates an identifier.
+          example: "rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c"
+          type: string
+        input:
+          $ref: "#/components/schemas/AnyValue"
+        metadata:
+          additionalProperties: {}
+          description: Arbitrary metadata associated with the record.
+          type: object
+        tag_operations:
+          $ref: "#/components/schemas/LLMObsDatasetRecordTagOperations"
+        tags:
+          $ref: "#/components/schemas/LLMObsDatasetRecordTagsList"
+      required:
+        - input
+      type: object
+    LLMObsDatasetBatchUpdateInsertRecords:
+      description: Records to insert.
+      items:
+        $ref: "#/components/schemas/LLMObsDatasetBatchUpdateInsertRecord"
+      type: array
+    LLMObsDatasetBatchUpdateRequest:
+      description: Request to batch-insert, update, and delete records in an LLM Observability dataset.
+      properties:
+        data:
+          $ref: "#/components/schemas/LLMObsDatasetBatchUpdateDataRequest"
+      required:
+        - data
+      type: object
+    LLMObsDatasetBatchUpdateUpdateRecord:
+      description: A record update payload as part of a batch update on an LLM Observability dataset.
+      properties:
+        expected_output:
+          $ref: "#/components/schemas/AnyValue"
+        id:
+          description: Unique identifier of the record to update.
+          example: "rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c"
+          type: string
+        input:
+          $ref: "#/components/schemas/AnyValue"
+        metadata:
+          additionalProperties: {}
+          description: Updated metadata associated with the record.
+          type: object
+        tag_operations:
+          $ref: "#/components/schemas/LLMObsDatasetRecordTagOperations"
+      required:
+        - id
+      type: object
+    LLMObsDatasetBatchUpdateUpdateRecords:
+      description: Records to update by ID.
+      items:
+        $ref: "#/components/schemas/LLMObsDatasetBatchUpdateUpdateRecord"
+      type: array
+    LLMObsDatasetCloneDataAttributesRequest:
+      description: Attributes for cloning an LLM Observability dataset.
+      properties:
+        description:
+          description: Description of the cloned dataset.
+          example: "Clone of the original dataset for experimentation."
+          type: string
+        name:
+          description: Name of the cloned dataset.
+          example: "My cloned dataset"
+          type: string
+      required:
+        - name
+      type: object
+    LLMObsDatasetCloneDataRequest:
+      description: Data object for cloning an LLM Observability dataset.
+      properties:
+        attributes:
+          $ref: "#/components/schemas/LLMObsDatasetCloneDataAttributesRequest"
+        id:
+          description: Identifier of the source dataset to clone.
+          example: "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d"
+          type: string
+        type:
+          $ref: "#/components/schemas/LLMObsDatasetType"
+      required:
+        - id
+        - type
+        - attributes
+      type: object
+    LLMObsDatasetCloneRequest:
+      description: Request to clone an LLM Observability dataset.
+      properties:
+        data:
+          $ref: "#/components/schemas/LLMObsDatasetCloneDataRequest"
+      required:
+        - data
+      type: object
     LLMObsDatasetDataAttributesRequest:
       description: Attributes for creating an LLM Observability dataset.
       properties:
@@ -44809,6 +44945,15 @@ components:
       required:
         - id
       type: object
+    LLMObsDatasetExportFormat:
+      default: csv
+      description: Supported export format for an LLM Observability dataset.
+      enum:
+        - csv
+      example: csv
+      type: string
+      x-enum-varnames:
+        - CSV
     LLMObsDatasetRecordDataResponse:
       description: A single LLM Observability dataset record.
       properties:
@@ -44862,6 +45007,22 @@ components:
       required:
         - input
       type: object
+    LLMObsDatasetRecordTagOperations:
+      description: Explicit tag operations for updating records. Operations are applied in order, Remove then Add then Set. `set` is the final override; if specified, the result of `remove` and `add` is discarded.
+      properties:
+        add:
+          $ref: "#/components/schemas/LLMObsDatasetRecordTagsList"
+        remove:
+          $ref: "#/components/schemas/LLMObsDatasetRecordTagsList"
+        set:
+          $ref: "#/components/schemas/LLMObsDatasetRecordTagsList"
+      type: object
+    LLMObsDatasetRecordTagsList:
+      description: List of tag strings.
+      items:
+        description: A tag.
+        type: string
+      type: array
     LLMObsDatasetRecordUpdateItem:
       description: A record update payload for an LLM Observability dataset.
       properties:
@@ -44978,6 +45139,14 @@ components:
       required:
         - data
       type: object
+    LLMObsDatasetRecordsUploadFile:
+      description: Multipart payload for uploading dataset records from a file.
+      properties:
+        file:
+          description: The records file to upload. Currently only CSV is supported. The file must include an `input` column. Optional columns include `id`, `expected_output`, `metadata`, and `tags`.
+          format: binary
+          type: string
+      type: object
     LLMObsDatasetRequest:
       description: Request to create an LLM Observability dataset.
       properties:
@@ -44994,6 +45163,42 @@ components:
       required:
         - data
       type: object
+    LLMObsDatasetRestoreVersionDataAttributesRequest:
+      description: Attributes for restoring an LLM Observability dataset to a previous version.
+      properties:
+        dataset_version:
+          description: Version number of the dataset to restore. Must be between 0 and the current version of the dataset, inclusive.
+          example: 1
+          format: int32
+          maximum: 2147483647
+          type: integer
+      required:
+        - dataset_version
+      type: object
+    LLMObsDatasetRestoreVersionDataRequest:
+      description: Data object for restoring an LLM Observability dataset to a previous version.
+      properties:
+        attributes:
+          $ref: "#/components/schemas/LLMObsDatasetRestoreVersionDataAttributesRequest"
+        id:
+          description: Unique identifier of the dataset to restore.
+          example: "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d"
+          type: string
+        type:
+          $ref: "#/components/schemas/LLMObsDatasetType"
+      required:
+        - id
+        - type
+        - attributes
+      type: object
+    LLMObsDatasetRestoreVersionRequest:
+      description: Request to restore an LLM Observability dataset to a previous version.
+      properties:
+        data:
+          $ref: "#/components/schemas/LLMObsDatasetRestoreVersionDataRequest"
+      required:
+        - data
+      type: object
     LLMObsDatasetType:
       description: Resource type of an LLM Observability dataset.
       enum:
@@ -127650,10 +127855,10 @@ paths:
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
-  /api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/draft_state:
-    get:
-      description: Retrieve the draft state of a dataset, including whether it is currently locked for editing and which user holds the lock.
-      operationId: GetLLMObsDatasetDraftState
+  /api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/batch_update:
+    post:
+      description: Insert, update, and delete records in a single dataset operation. By default, a new dataset version is created when the batch is applied.
+      operationId: BatchUpdateLLMObsDataset
       parameters:
         - description: The ID of the LLM Observability project.
           example: "a33671aa-24fd-4dcd-9b33-a8ec7dde7751"
@@ -127669,6 +127874,137 @@ paths:
           required: true
           schema:
             type: string
+      requestBody:
+        content:
+          application/json:
+            examples:
+              default:
+                value:
+                  data:
+                    attributes:
+                      create_new_version: true
+                      delete_records:
+                        - rec-old-record-1
+                      insert_records:
+                        - expected_output:
+                            answer: "Paris"
+                          input:
+                            question: "What is the capital of France?"
+                          tags:
+                            - "topic:geography"
+                      update_records:
+                        - expected_output:
+                            answer: "Paris, France"
+                          id: rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c
+                    id: 9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d
+                    type: datasets
+            schema:
+              $ref: "#/components/schemas/LLMObsDatasetBatchUpdateRequest"
+        description: Batch update payload.
+        required: true
+      responses:
+        "200":
+          content:
+            application/json:
+              examples:
+                default:
+                  value:
+                    data:
+                      - records:
+                          - created_at: "2024-01-15T10:30:00Z"
+                            dataset_id: 9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d
+                            expected_output:
+                              answer: "Paris, France"
+                            id: rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c
+                            input:
+                              question: "What is the capital of France?"
+                            metadata:
+                            updated_at: "2024-01-15T10:30:00Z"
+              schema:
+                $ref: "#/components/schemas/LLMObsDatasetRecordsMutationResponse"
+          description: OK
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Bad Request
+        "401":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Unauthorized
+        "403":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Forbidden
+        "404":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Not Found
+        "413":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Payload Too Large
+        "429":
+          $ref: "#/components/responses/TooManyRequestsResponse"
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Internal Server Error
+      security:
+        - apiKeyAuth: []
+          appKeyAuth: []
+      summary: Batch update LLM Observability dataset records
+      tags:
+        - LLM Observability
+      x-unstable: |-
+        **Note**: This endpoint is in preview and is subject to change.
+        If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
+  /api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/clone:
+    post:
+      description: Clone a dataset, copying its current records into a new dataset within the same project.
+      operationId: CloneLLMObsDataset
+      parameters:
+        - description: The ID of the LLM Observability project.
+          example: "a33671aa-24fd-4dcd-9b33-a8ec7dde7751"
+          in: path
+          name: project_id
+          required: true
+          schema:
+            type: string
+        - description: The ID of the source LLM Observability dataset to clone.
+          example: "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d"
+          in: path
+          name: dataset_id
+          required: true
+          schema:
+            type: string
+      requestBody:
+        content:
+          application/json:
+            examples:
+              default:
+                value:
+                  data:
+                    attributes:
+                      description: "Clone of the original dataset for experimentation."
+                      name: "My cloned dataset"
+                    id: 9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d
+                    type: datasets
+            schema:
+              $ref: "#/components/schemas/LLMObsDatasetCloneRequest"
+        description: Clone dataset payload.
+        required: true
       responses:
         "200":
           content:
@@ -127678,16 +128014,16 @@ paths:
                   value:
                     data:
                       attributes:
-                        drafting_since: "2024-01-15T10:30:00Z"
-                        user:
-                          email: jane.doe@example.com
-                          handle: jane.doe@example.com
-                          id: 00000000-0000-0000-0000-000000000010
-                          name: Jane Doe
-                      id: 9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d
-                      type: draft_state_data
+                        created_at: "2024-01-15T10:30:00Z"
+                        current_version: 0
+                        description: "Clone of the original dataset for experimentation."
+                        metadata:
+                        name: "My cloned dataset"
+                        updated_at: "2024-01-15T10:30:00Z"
+                      id: 7c8d4e9a-1234-5678-9abc-def012345678
+                      type: datasets
               schema:
-                $ref: "#/components/schemas/LLMObsDatasetDraftStateResponse"
+                $ref: "#/components/schemas/LLMObsDatasetResponse"
           description: OK
         "400":
           content:
@@ -127724,16 +128060,96 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Get LLM Observability dataset draft state
+      summary: Clone an LLM Observability dataset
       tags:
         - LLM Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
-  /api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/draft_state/lock:
-    patch:
-      description: Acquire the draft lock on a dataset for the calling user. The lock prevents other users from concurrently editing the dataset draft.
-      operationId: LockLLMObsDatasetDraftState
+  /api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/draft_state:
+    get:
+      description: Retrieve the draft state of a dataset, including whether it is currently locked for editing and which user holds the lock.
+      operationId: GetLLMObsDatasetDraftState
+      parameters:
+        - description: The ID of the LLM Observability project.
+          example: "a33671aa-24fd-4dcd-9b33-a8ec7dde7751"
+          in: path
+          name: project_id
+          required: true
+          schema:
+            type: string
+        - description: The ID of the LLM Observability dataset.
+          example: "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d"
+          in: path
+          name: dataset_id
+          required: true
+          schema:
+            type: string
+      responses:
+        "200":
+          content:
+            application/json:
+              examples:
+                default:
+                  value:
+                    data:
+                      attributes:
+                        drafting_since: "2024-01-15T10:30:00Z"
+                        user:
+                          email: jane.doe@example.com
+                          handle: jane.doe@example.com
+                          id: 00000000-0000-0000-0000-000000000010
+                          name: Jane Doe
+                      id: 9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d
+                      type: draft_state_data
+              schema:
+                $ref: "#/components/schemas/LLMObsDatasetDraftStateResponse"
+          description: OK
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Bad Request
+        "401":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Unauthorized
+        "403":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Forbidden
+        "404":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Not Found
+        "429":
+          $ref: "#/components/responses/TooManyRequestsResponse"
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Internal Server Error
+      security:
+        - apiKeyAuth: []
+          appKeyAuth: []
+      summary: Get LLM Observability dataset draft state
+      tags:
+        - LLM Observability
+      x-unstable: |-
+        **Note**: This endpoint is in preview and is subject to change.
+        If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
+  /api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/draft_state/lock:
+    patch:
+      description: Acquire the draft lock on a dataset for the calling user. The lock prevents other users from concurrently editing the dataset draft.
+      operationId: LockLLMObsDatasetDraftState
       parameters:
         - description: The ID of the LLM Observability project.
           example: "a33671aa-24fd-4dcd-9b33-a8ec7dde7751"
@@ -127873,6 +128289,88 @@ paths:
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
+  /api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/export:
+    get:
+      description: Download the contents of a dataset as a CSV file. The download is streamed and includes one row per dataset record.
+      operationId: ExportLLMObsDataset
+      parameters:
+        - description: The ID of the LLM Observability project.
+          example: "a33671aa-24fd-4dcd-9b33-a8ec7dde7751"
+          in: path
+          name: project_id
+          required: true
+          schema:
+            type: string
+        - description: The ID of the LLM Observability dataset.
+          example: "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d"
+          in: path
+          name: dataset_id
+          required: true
+          schema:
+            type: string
+        - description: Export format for the dataset contents. Only `csv` is currently supported.
+          in: query
+          name: format
+          schema:
+            $ref: "#/components/schemas/LLMObsDatasetExportFormat"
+        - description: Version of the dataset to export. If omitted, the current version is used. Must be between 0 and the current version of the dataset, inclusive.
+          in: query
+          name: version
+          schema:
+            format: int64
+            maximum: 2147483647
+            type: integer
+      responses:
+        "200":
+          content:
+            text/csv:
+              examples:
+                default:
+                  value: "id,input,expected_output,metadata,tags\nrec-1,\"What is 2+2?\",\"4\",{},\"\""
+              schema:
+                type: string
+          description: OK
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Bad Request
+        "401":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Unauthorized
+        "403":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Forbidden
+        "404":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Not Found
+        "429":
+          $ref: "#/components/responses/TooManyRequestsResponse"
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Internal Server Error
+      security:
+        - apiKeyAuth: []
+          appKeyAuth: []
+      summary: Export an LLM Observability dataset
+      tags:
+        - LLM Observability
+      x-unstable: |-
+        **Note**: This endpoint is in preview and is subject to change.
+        If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/records:
     get:
       description: List all records in an LLM Observability dataset, sorted by creation date, newest first.
@@ -128183,6 +128681,84 @@ paths:
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
+  /api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/restore:
+    post:
+      description: Restore a dataset to a previous version. The dataset's current version is bumped, and its records are replaced with the records from the specified prior version.
+      operationId: RestoreLLMObsDatasetVersion
+      parameters:
+        - description: The ID of the LLM Observability project.
+          example: "a33671aa-24fd-4dcd-9b33-a8ec7dde7751"
+          in: path
+          name: project_id
+          required: true
+          schema:
+            type: string
+        - description: The ID of the LLM Observability dataset.
+          example: "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d"
+          in: path
+          name: dataset_id
+          required: true
+          schema:
+            type: string
+      requestBody:
+        content:
+          application/json:
+            examples:
+              default:
+                value:
+                  data:
+                    attributes:
+                      dataset_version: 1
+                    id: 9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d
+                    type: datasets
+            schema:
+              $ref: "#/components/schemas/LLMObsDatasetRestoreVersionRequest"
+        description: Restore dataset version payload.
+        required: true
+      responses:
+        "200":
+          description: OK
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Bad Request
+        "401":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Unauthorized
+        "403":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Forbidden
+        "404":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Not Found
+        "429":
+          $ref: "#/components/responses/TooManyRequestsResponse"
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Internal Server Error
+      security:
+        - apiKeyAuth: []
+          appKeyAuth: []
+      summary: Restore an LLM Observability dataset version
+      tags:
+        - LLM Observability
+      x-unstable: |-
+        **Note**: This endpoint is in preview and is subject to change.
+        If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/versions:
     get:
       description: List the active versions of a dataset. A version is created each time a dataset is referenced by an experiment run.
@@ -128266,6 +128842,118 @@ paths:
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
+  /api/v2/llm-obs/v2/{project_id}/datasets/{dataset_id}/records/upload:
+    post:
+      description: |-
+        Upload records to a dataset from a file. The request is a `multipart/form-data` upload containing a single `file` part.
+        Currently only CSV is supported. The CSV must include an `input` column. Optional columns are `id`, `expected_output`, `metadata`, and `tags`.
+
+        The response is a Server-Sent Events stream (`text/event-stream`) emitting progress updates while records are processed. The stream emits the following named events:
+          - `progress`: incremental record counts written so far.
+          - `completed`: terminal event with a JSON body containing `records_created`.
+          - `error`: terminal event with a JSON body containing an error `message`.
+      operationId: UploadLLMObsDatasetRecordsFile
+      parameters:
+        - description: The ID of the LLM Observability project.
+          example: "a33671aa-24fd-4dcd-9b33-a8ec7dde7751"
+          in: path
+          name: project_id
+          required: true
+          schema:
+            type: string
+        - description: The ID of the LLM Observability dataset.
+          example: "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d"
+          in: path
+          name: dataset_id
+          required: true
+          schema:
+            type: string
+        - description: Whether to skip records whose `input` already exists in the dataset. Defaults to `false`.
+          in: query
+          name: deduplicate
+          schema:
+            default: false
+            type: boolean
+        - description: Whether to overwrite existing records that share the same user-provided `id`. Defaults to `true`.
+          in: query
+          name: overwrite
+          schema:
+            default: true
+            type: boolean
+        - description: Tags to apply to every uploaded record, in addition to any tags defined on individual rows. Can be repeated, e.g. `tags=env:prod&tags=team:ai`.
+          in: query
+          name: tags
+          schema:
+            items:
+              type: string
+            type: array
+        - description: Whether to enrich the response with user metadata.
+          in: query
+          name: "include[user_data]"
+          schema:
+            type: boolean
+      requestBody:
+        content:
+          multipart/form-data:
+            examples:
+              default:
+                value:
+                  file: records.csv
+            schema:
+              $ref: "#/components/schemas/LLMObsDatasetRecordsUploadFile"
+        description: Multipart upload payload containing the records file.
+        required: true
+      responses:
+        "200":
+          content:
+            text/event-stream:
+              examples:
+                default:
+                  value: "event: progress\ndata: {\"records_processed\": 100}\n\nevent: completed\ndata: {\"records_created\": 250}"
+              schema:
+                type: string
+          description: OK
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Bad Request
+        "401":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Unauthorized
+        "403":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Forbidden
+        "404":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Not Found
+        "429":
+          $ref: "#/components/responses/TooManyRequestsResponse"
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Internal Server Error
+      security:
+        - apiKeyAuth: []
+          appKeyAuth: []
+      summary: Upload records to an LLM Observability dataset
+      tags:
+        - LLM Observability
+      x-unstable: |-
+        **Note**: This endpoint is in preview and is subject to change.
+        If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/v2/llm-obs/v3/experiments/{experiment_id}/events:
     get:
       description: Retrieve spans and experiment-level summary metrics for a given experiment with cursor-based pagination.
diff --git a/examples/v2/llm-observability/BatchUpdateLLMObsDataset.java b/examples/v2/llm-observability/BatchUpdateLLMObsDataset.java
new file mode 100644
index 00000000000..6cbe1877526
--- /dev/null
+++ b/examples/v2/llm-observability/BatchUpdateLLMObsDataset.java
@@ -0,0 +1,59 @@
+// Batch update LLM Observability dataset records returns "OK" response
+
+import com.datadog.api.client.ApiClient;
+import com.datadog.api.client.ApiException;
+import com.datadog.api.client.v2.api.LlmObservabilityApi;
+import com.datadog.api.client.v2.model.LLMObsDatasetBatchUpdateDataAttributesRequest;
+import com.datadog.api.client.v2.model.LLMObsDatasetBatchUpdateDataRequest;
+import com.datadog.api.client.v2.model.LLMObsDatasetBatchUpdateInsertRecord;
+import com.datadog.api.client.v2.model.LLMObsDatasetBatchUpdateRequest;
+import com.datadog.api.client.v2.model.LLMObsDatasetBatchUpdateUpdateRecord;
+import com.datadog.api.client.v2.model.LLMObsDatasetRecordTagOperations;
+import com.datadog.api.client.v2.model.LLMObsDatasetRecordsMutationResponse;
+import com.datadog.api.client.v2.model.LLMObsDatasetType;
+import java.util.Collections;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = ApiClient.getDefaultApiClient();
+    defaultClient.setUnstableOperationEnabled("v2.batchUpdateLLMObsDataset", true);
+    LlmObservabilityApi apiInstance = new LlmObservabilityApi(defaultClient);
+
+    LLMObsDatasetBatchUpdateRequest body =
+        new LLMObsDatasetBatchUpdateRequest()
+            .data(
+                new LLMObsDatasetBatchUpdateDataRequest()
+                    .attributes(
+                        new LLMObsDatasetBatchUpdateDataAttributesRequest()
+                            .createNewVersion(true)
+                            .insertRecords(
+                                Collections.singletonList(
+                                    new LLMObsDatasetBatchUpdateInsertRecord()
+                                        .expectedOutput(null)
+                                        .id("rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c")
+                                        .input(null)
+                                        .tagOperations(new LLMObsDatasetRecordTagOperations())))
+                            .updateRecords(
+                                Collections.singletonList(
+                                    new LLMObsDatasetBatchUpdateUpdateRecord()
+                                        .expectedOutput(null)
+                                        .id("rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c")
+                                        .input(null)
+                                        .tagOperations(new LLMObsDatasetRecordTagOperations()))))
+                    .id("9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d")
+                    .type(LLMObsDatasetType.DATASETS));
+
+    try {
+      LLMObsDatasetRecordsMutationResponse result =
+          apiInstance.batchUpdateLLMObsDataset(
+              "a33671aa-24fd-4dcd-9b33-a8ec7dde7751", "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d", body);
+      System.out.println(result);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling LlmObservabilityApi#batchUpdateLLMObsDataset");
+      System.err.println("Status code: " + e.getCode());
+      System.err.println("Reason: " + e.getResponseBody());
+      System.err.println("Response headers: " + e.getResponseHeaders());
+      e.printStackTrace();
+    }
+  }
+}
diff --git a/examples/v2/llm-observability/CloneLLMObsDataset.java b/examples/v2/llm-observability/CloneLLMObsDataset.java
new file mode 100644
index 00000000000..980d7bea56f
--- /dev/null
+++ b/examples/v2/llm-observability/CloneLLMObsDataset.java
@@ -0,0 +1,42 @@
+// Clone an LLM Observability dataset returns "OK" response
+
+import com.datadog.api.client.ApiClient;
+import com.datadog.api.client.ApiException;
+import com.datadog.api.client.v2.api.LlmObservabilityApi;
+import com.datadog.api.client.v2.model.LLMObsDatasetCloneDataAttributesRequest;
+import com.datadog.api.client.v2.model.LLMObsDatasetCloneDataRequest;
+import com.datadog.api.client.v2.model.LLMObsDatasetCloneRequest;
+import com.datadog.api.client.v2.model.LLMObsDatasetResponse;
+import com.datadog.api.client.v2.model.LLMObsDatasetType;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = ApiClient.getDefaultApiClient();
+    defaultClient.setUnstableOperationEnabled("v2.cloneLLMObsDataset", true);
+    LlmObservabilityApi apiInstance = new LlmObservabilityApi(defaultClient);
+
+    LLMObsDatasetCloneRequest body =
+        new LLMObsDatasetCloneRequest()
+            .data(
+                new LLMObsDatasetCloneDataRequest()
+                    .attributes(
+                        new LLMObsDatasetCloneDataAttributesRequest()
+                            .description("Clone of the original dataset for experimentation.")
+                            .name("My cloned dataset"))
+                    .id("9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d")
+                    .type(LLMObsDatasetType.DATASETS));
+
+    try {
+      LLMObsDatasetResponse result =
+          apiInstance.cloneLLMObsDataset(
+              "a33671aa-24fd-4dcd-9b33-a8ec7dde7751", "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d", body);
+      System.out.println(result);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling LlmObservabilityApi#cloneLLMObsDataset");
+      System.err.println("Status code: " + e.getCode());
+      System.err.println("Reason: " + e.getResponseBody());
+      System.err.println("Response headers: " + e.getResponseHeaders());
+      e.printStackTrace();
+    }
+  }
+}
diff --git a/examples/v2/llm-observability/ExportLLMObsDataset.java b/examples/v2/llm-observability/ExportLLMObsDataset.java
new file mode 100644
index 00000000000..e56c0b145b0
--- /dev/null
+++ b/examples/v2/llm-observability/ExportLLMObsDataset.java
@@ -0,0 +1,26 @@
+// Export an LLM Observability dataset returns "OK" response
+
+import com.datadog.api.client.ApiClient;
+import com.datadog.api.client.ApiException;
+import com.datadog.api.client.v2.api.LlmObservabilityApi;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = ApiClient.getDefaultApiClient();
+    defaultClient.setUnstableOperationEnabled("v2.exportLLMObsDataset", true);
+    LlmObservabilityApi apiInstance = new LlmObservabilityApi(defaultClient);
+
+    try {
+      String result =
+          apiInstance.exportLLMObsDataset(
+              "a33671aa-24fd-4dcd-9b33-a8ec7dde7751", "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d");
+      System.out.println(result);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling LlmObservabilityApi#exportLLMObsDataset");
+      System.err.println("Status code: " + e.getCode());
+      System.err.println("Reason: " + e.getResponseBody());
+      System.err.println("Response headers: " + e.getResponseHeaders());
+      e.printStackTrace();
+    }
+  }
+}
diff --git a/examples/v2/llm-observability/RestoreLLMObsDatasetVersion.java b/examples/v2/llm-observability/RestoreLLMObsDatasetVersion.java
new file mode 100644
index 00000000000..c91c95fadcd
--- /dev/null
+++ b/examples/v2/llm-observability/RestoreLLMObsDatasetVersion.java
@@ -0,0 +1,37 @@
+// Restore an LLM Observability dataset version returns "OK" response
+
+import com.datadog.api.client.ApiClient;
+import com.datadog.api.client.ApiException;
+import com.datadog.api.client.v2.api.LlmObservabilityApi;
+import com.datadog.api.client.v2.model.LLMObsDatasetRestoreVersionDataAttributesRequest;
+import com.datadog.api.client.v2.model.LLMObsDatasetRestoreVersionDataRequest;
+import com.datadog.api.client.v2.model.LLMObsDatasetRestoreVersionRequest;
+import com.datadog.api.client.v2.model.LLMObsDatasetType;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = ApiClient.getDefaultApiClient();
+    defaultClient.setUnstableOperationEnabled("v2.restoreLLMObsDatasetVersion", true);
+    LlmObservabilityApi apiInstance = new LlmObservabilityApi(defaultClient);
+
+    LLMObsDatasetRestoreVersionRequest body =
+        new LLMObsDatasetRestoreVersionRequest()
+            .data(
+                new LLMObsDatasetRestoreVersionDataRequest()
+                    .attributes(
+                        new LLMObsDatasetRestoreVersionDataAttributesRequest().datasetVersion(1))
+                    .id("9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d")
+                    .type(LLMObsDatasetType.DATASETS));
+
+    try {
+      apiInstance.restoreLLMObsDatasetVersion(
+          "a33671aa-24fd-4dcd-9b33-a8ec7dde7751", "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d", body);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling LlmObservabilityApi#restoreLLMObsDatasetVersion");
+      System.err.println("Status code: " + e.getCode());
+      System.err.println("Reason: " + e.getResponseBody());
+      System.err.println("Response headers: " + e.getResponseHeaders());
+      e.printStackTrace();
+    }
+  }
+}
diff --git a/examples/v2/llm-observability/UploadLLMObsDatasetRecordsFile.java b/examples/v2/llm-observability/UploadLLMObsDatasetRecordsFile.java
new file mode 100644
index 00000000000..697654497fc
--- /dev/null
+++ b/examples/v2/llm-observability/UploadLLMObsDatasetRecordsFile.java
@@ -0,0 +1,27 @@
+// Upload records to an LLM Observability dataset returns "OK" response
+
+import com.datadog.api.client.ApiClient;
+import com.datadog.api.client.ApiException;
+import com.datadog.api.client.v2.api.LlmObservabilityApi;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = ApiClient.getDefaultApiClient();
+    defaultClient.setUnstableOperationEnabled("v2.uploadLLMObsDatasetRecordsFile", true);
+    LlmObservabilityApi apiInstance = new LlmObservabilityApi(defaultClient);
+
+    try {
+      String result =
+          apiInstance.uploadLLMObsDatasetRecordsFile(
+              "a33671aa-24fd-4dcd-9b33-a8ec7dde7751", "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d");
+      System.out.println(result);
+    } catch (ApiException e) {
+      System.err.println(
+          "Exception when calling LlmObservabilityApi#uploadLLMObsDatasetRecordsFile");
+      System.err.println("Status code: " + e.getCode());
+      System.err.println("Reason: " + e.getResponseBody());
+      System.err.println("Response headers: " + e.getResponseHeaders());
+      e.printStackTrace();
+    }
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/ApiClient.java b/src/main/java/com/datadog/api/client/ApiClient.java
index 68d8583171e..7124c99925a 100644
--- a/src/main/java/com/datadog/api/client/ApiClient.java
+++ b/src/main/java/com/datadog/api/client/ApiClient.java
@@ -774,6 +774,8 @@ public class ApiClient {
           put("v2.triggerFleetSchedule", false);
           put("v2.updateFleetSchedule", false);
           put("v2.aggregateLLMObsExperimentation", false);
+          put("v2.batchUpdateLLMObsDataset", false);
+          put("v2.cloneLLMObsDataset", false);
           put("v2.createLLMObsAnnotationQueue", false);
           put("v2.createLLMObsAnnotationQueueInteractions", false);
           put("v2.createLLMObsDataset", false);
@@ -790,6 +792,7 @@ public class ApiClient {
           put("v2.deleteLLMObsDatasets", false);
           put("v2.deleteLLMObsExperiments", false);
           put("v2.deleteLLMObsProjects", false);
+          put("v2.exportLLMObsDataset", false);
           put("v2.getLLMObsAnnotatedInteractions", false);
           put("v2.getLLMObsAnnotatedInteractionsByTraceIDs", false);
           put("v2.getLLMObsAnnotationQueueLabelSchema", false);
@@ -806,6 +809,7 @@ public class ApiClient {
           put("v2.listLLMObsProjects", false);
           put("v2.listLLMObsSpans", false);
           put("v2.lockLLMObsDatasetDraftState", false);
+          put("v2.restoreLLMObsDatasetVersion", false);
           put("v2.searchLLMObsExperimentation", false);
           put("v2.searchLLMObsSpans", false);
           put("v2.simpleSearchLLMObsExperimentation", false);
@@ -817,6 +821,7 @@ public class ApiClient {
           put("v2.updateLLMObsDatasetRecords", false);
           put("v2.updateLLMObsExperiment", false);
           put("v2.updateLLMObsProject", false);
+          put("v2.uploadLLMObsDatasetRecordsFile", false);
           put("v2.anonymizeUsers", false);
           put("v2.validate", false);
           put("v2.createOpenAPI", false);
diff --git a/src/main/java/com/datadog/api/client/v2/api/LlmObservabilityApi.java b/src/main/java/com/datadog/api/client/v2/api/LlmObservabilityApi.java
index bdfee06a173..13acacc51b5 100644
--- a/src/main/java/com/datadog/api/client/v2/api/LlmObservabilityApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/LlmObservabilityApi.java
@@ -18,13 +18,17 @@
 import com.datadog.api.client.v2.model.LLMObsCustomEvalConfigUpdateRequest;
 import com.datadog.api.client.v2.model.LLMObsDataDeletionRequest;
 import com.datadog.api.client.v2.model.LLMObsDataDeletionResponse;
+import com.datadog.api.client.v2.model.LLMObsDatasetBatchUpdateRequest;
+import com.datadog.api.client.v2.model.LLMObsDatasetCloneRequest;
 import com.datadog.api.client.v2.model.LLMObsDatasetDraftStateResponse;
+import com.datadog.api.client.v2.model.LLMObsDatasetExportFormat;
 import com.datadog.api.client.v2.model.LLMObsDatasetRecordsListResponse;
 import com.datadog.api.client.v2.model.LLMObsDatasetRecordsMutationResponse;
 import com.datadog.api.client.v2.model.LLMObsDatasetRecordsRequest;
 import com.datadog.api.client.v2.model.LLMObsDatasetRecordsUpdateRequest;
 import com.datadog.api.client.v2.model.LLMObsDatasetRequest;
 import com.datadog.api.client.v2.model.LLMObsDatasetResponse;
+import com.datadog.api.client.v2.model.LLMObsDatasetRestoreVersionRequest;
 import com.datadog.api.client.v2.model.LLMObsDatasetUpdateRequest;
 import com.datadog.api.client.v2.model.LLMObsDatasetVersionsResponse;
 import com.datadog.api.client.v2.model.LLMObsDatasetsResponse;
@@ -58,6 +62,7 @@
 import com.datadog.api.client.v2.model.LLMObsSpansResponse;
 import jakarta.ws.rs.client.Invocation;
 import jakarta.ws.rs.core.GenericType;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -256,6 +261,412 @@ public LLMObsExperimentationAnalyticsResponse aggregateLLMObsExperimentation(
         new GenericType<LLMObsExperimentationAnalyticsResponse>() {});
   }
 
+  /**
+   * Batch update LLM Observability dataset records.
+   *
+   * <p>See {@link #batchUpdateLLMObsDatasetWithHttpInfo}.
+   *
+   * @param projectId The ID of the LLM Observability project. (required)
+   * @param datasetId The ID of the LLM Observability dataset. (required)
+   * @param body Batch update payload. (required)
+   * @return LLMObsDatasetRecordsMutationResponse
+   * @throws ApiException if fails to make API call
+   */
+  public LLMObsDatasetRecordsMutationResponse batchUpdateLLMObsDataset(
+      String projectId, String datasetId, LLMObsDatasetBatchUpdateRequest body)
+      throws ApiException {
+    return batchUpdateLLMObsDatasetWithHttpInfo(projectId, datasetId, body).getData();
+  }
+
+  /**
+   * Batch update LLM Observability dataset records.
+   *
+   * <p>See {@link #batchUpdateLLMObsDatasetWithHttpInfoAsync}.
+   *
+   * @param projectId The ID of the LLM Observability project. (required)
+   * @param datasetId The ID of the LLM Observability dataset. (required)
+   * @param body Batch update payload. (required)
+   * @return CompletableFuture&lt;LLMObsDatasetRecordsMutationResponse&gt;
+   */
+  public CompletableFuture<LLMObsDatasetRecordsMutationResponse> batchUpdateLLMObsDatasetAsync(
+      String projectId, String datasetId, LLMObsDatasetBatchUpdateRequest body) {
+    return batchUpdateLLMObsDatasetWithHttpInfoAsync(projectId, datasetId, body)
+        .thenApply(
+            response -> {
+              return response.getData();
+            });
+  }
+
+  /**
+   * Insert, update, and delete records in a single dataset operation. By default, a new dataset
+   * version is created when the batch is applied.
+   *
+   * @param projectId The ID of the LLM Observability project. (required)
+   * @param datasetId The ID of the LLM Observability dataset. (required)
+   * @param body Batch update payload. (required)
+   * @return ApiResponse&lt;LLMObsDatasetRecordsMutationResponse&gt;
+   * @throws ApiException if fails to make API call
+   * @http.response.details
+   *     <table border="1">
+   *    <caption>Response details</caption>
+   *       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+   *       <tr><td> 200 </td><td> OK </td><td>  -  </td></tr>
+   *       <tr><td> 400 </td><td> Bad Request </td><td>  -  </td></tr>
+   *       <tr><td> 401 </td><td> Unauthorized </td><td>  -  </td></tr>
+   *       <tr><td> 403 </td><td> Forbidden </td><td>  -  </td></tr>
+   *       <tr><td> 404 </td><td> Not Found </td><td>  -  </td></tr>
+   *       <tr><td> 413 </td><td> Payload Too Large </td><td>  -  </td></tr>
+   *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
+   *       <tr><td> 500 </td><td> Internal Server Error </td><td>  -  </td></tr>
+   *     </table>
+   */
+  public ApiResponse<LLMObsDatasetRecordsMutationResponse> batchUpdateLLMObsDatasetWithHttpInfo(
+      String projectId, String datasetId, LLMObsDatasetBatchUpdateRequest body)
+      throws ApiException {
+    // Check if unstable operation is enabled
+    String operationId = "batchUpdateLLMObsDataset";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
+    }
+    Object localVarPostBody = body;
+
+    // verify the required parameter 'projectId' is set
+    if (projectId == null) {
+      throw new ApiException(
+          400, "Missing the required parameter 'projectId' when calling batchUpdateLLMObsDataset");
+    }
+
+    // verify the required parameter 'datasetId' is set
+    if (datasetId == null) {
+      throw new ApiException(
+          400, "Missing the required parameter 'datasetId' when calling batchUpdateLLMObsDataset");
+    }
+
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      throw new ApiException(
+          400, "Missing the required parameter 'body' when calling batchUpdateLLMObsDataset");
+    }
+    // create path and map variables
+    String localVarPath =
+        "/api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/batch_update"
+            .replaceAll("\\{" + "project_id" + "\\}", apiClient.escapeString(projectId.toString()))
+            .replaceAll("\\{" + "dataset_id" + "\\}", apiClient.escapeString(datasetId.toString()));
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Invocation.Builder builder =
+        apiClient.createBuilder(
+            "v2.LlmObservabilityApi.batchUpdateLLMObsDataset",
+            localVarPath,
+            new ArrayList<Pair>(),
+            localVarHeaderParams,
+            new HashMap<String, String>(),
+            new String[] {"application/json"},
+            new String[] {"apiKeyAuth", "appKeyAuth"});
+    return apiClient.invokeAPI(
+        "POST",
+        builder,
+        localVarHeaderParams,
+        new String[] {"application/json"},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        new GenericType<LLMObsDatasetRecordsMutationResponse>() {});
+  }
+
+  /**
+   * Batch update LLM Observability dataset records.
+   *
+   * <p>See {@link #batchUpdateLLMObsDatasetWithHttpInfo}.
+   *
+   * @param projectId The ID of the LLM Observability project. (required)
+   * @param datasetId The ID of the LLM Observability dataset. (required)
+   * @param body Batch update payload. (required)
+   * @return CompletableFuture&lt;ApiResponse&lt;LLMObsDatasetRecordsMutationResponse&gt;&gt;
+   */
+  public CompletableFuture<ApiResponse<LLMObsDatasetRecordsMutationResponse>>
+      batchUpdateLLMObsDatasetWithHttpInfoAsync(
+          String projectId, String datasetId, LLMObsDatasetBatchUpdateRequest body) {
+    // Check if unstable operation is enabled
+    String operationId = "batchUpdateLLMObsDataset";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      CompletableFuture<ApiResponse<LLMObsDatasetRecordsMutationResponse>> result =
+          new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
+      return result;
+    }
+    Object localVarPostBody = body;
+
+    // verify the required parameter 'projectId' is set
+    if (projectId == null) {
+      CompletableFuture<ApiResponse<LLMObsDatasetRecordsMutationResponse>> result =
+          new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400,
+              "Missing the required parameter 'projectId' when calling batchUpdateLLMObsDataset"));
+      return result;
+    }
+
+    // verify the required parameter 'datasetId' is set
+    if (datasetId == null) {
+      CompletableFuture<ApiResponse<LLMObsDatasetRecordsMutationResponse>> result =
+          new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400,
+              "Missing the required parameter 'datasetId' when calling batchUpdateLLMObsDataset"));
+      return result;
+    }
+
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      CompletableFuture<ApiResponse<LLMObsDatasetRecordsMutationResponse>> result =
+          new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400, "Missing the required parameter 'body' when calling batchUpdateLLMObsDataset"));
+      return result;
+    }
+    // create path and map variables
+    String localVarPath =
+        "/api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/batch_update"
+            .replaceAll("\\{" + "project_id" + "\\}", apiClient.escapeString(projectId.toString()))
+            .replaceAll("\\{" + "dataset_id" + "\\}", apiClient.escapeString(datasetId.toString()));
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Invocation.Builder builder;
+    try {
+      builder =
+          apiClient.createBuilder(
+              "v2.LlmObservabilityApi.batchUpdateLLMObsDataset",
+              localVarPath,
+              new ArrayList<Pair>(),
+              localVarHeaderParams,
+              new HashMap<String, String>(),
+              new String[] {"application/json"},
+              new String[] {"apiKeyAuth", "appKeyAuth"});
+    } catch (ApiException ex) {
+      CompletableFuture<ApiResponse<LLMObsDatasetRecordsMutationResponse>> result =
+          new CompletableFuture<>();
+      result.completeExceptionally(ex);
+      return result;
+    }
+    return apiClient.invokeAPIAsync(
+        "POST",
+        builder,
+        localVarHeaderParams,
+        new String[] {"application/json"},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        new GenericType<LLMObsDatasetRecordsMutationResponse>() {});
+  }
+
+  /**
+   * Clone an LLM Observability dataset.
+   *
+   * <p>See {@link #cloneLLMObsDatasetWithHttpInfo}.
+   *
+   * @param projectId The ID of the LLM Observability project. (required)
+   * @param datasetId The ID of the source LLM Observability dataset to clone. (required)
+   * @param body Clone dataset payload. (required)
+   * @return LLMObsDatasetResponse
+   * @throws ApiException if fails to make API call
+   */
+  public LLMObsDatasetResponse cloneLLMObsDataset(
+      String projectId, String datasetId, LLMObsDatasetCloneRequest body) throws ApiException {
+    return cloneLLMObsDatasetWithHttpInfo(projectId, datasetId, body).getData();
+  }
+
+  /**
+   * Clone an LLM Observability dataset.
+   *
+   * <p>See {@link #cloneLLMObsDatasetWithHttpInfoAsync}.
+   *
+   * @param projectId The ID of the LLM Observability project. (required)
+   * @param datasetId The ID of the source LLM Observability dataset to clone. (required)
+   * @param body Clone dataset payload. (required)
+   * @return CompletableFuture&lt;LLMObsDatasetResponse&gt;
+   */
+  public CompletableFuture<LLMObsDatasetResponse> cloneLLMObsDatasetAsync(
+      String projectId, String datasetId, LLMObsDatasetCloneRequest body) {
+    return cloneLLMObsDatasetWithHttpInfoAsync(projectId, datasetId, body)
+        .thenApply(
+            response -> {
+              return response.getData();
+            });
+  }
+
+  /**
+   * Clone a dataset, copying its current records into a new dataset within the same project.
+   *
+   * @param projectId The ID of the LLM Observability project. (required)
+   * @param datasetId The ID of the source LLM Observability dataset to clone. (required)
+   * @param body Clone dataset payload. (required)
+   * @return ApiResponse&lt;LLMObsDatasetResponse&gt;
+   * @throws ApiException if fails to make API call
+   * @http.response.details
+   *     <table border="1">
+   *    <caption>Response details</caption>
+   *       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+   *       <tr><td> 200 </td><td> OK </td><td>  -  </td></tr>
+   *       <tr><td> 400 </td><td> Bad Request </td><td>  -  </td></tr>
+   *       <tr><td> 401 </td><td> Unauthorized </td><td>  -  </td></tr>
+   *       <tr><td> 403 </td><td> Forbidden </td><td>  -  </td></tr>
+   *       <tr><td> 404 </td><td> Not Found </td><td>  -  </td></tr>
+   *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
+   *       <tr><td> 500 </td><td> Internal Server Error </td><td>  -  </td></tr>
+   *     </table>
+   */
+  public ApiResponse<LLMObsDatasetResponse> cloneLLMObsDatasetWithHttpInfo(
+      String projectId, String datasetId, LLMObsDatasetCloneRequest body) throws ApiException {
+    // Check if unstable operation is enabled
+    String operationId = "cloneLLMObsDataset";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
+    }
+    Object localVarPostBody = body;
+
+    // verify the required parameter 'projectId' is set
+    if (projectId == null) {
+      throw new ApiException(
+          400, "Missing the required parameter 'projectId' when calling cloneLLMObsDataset");
+    }
+
+    // verify the required parameter 'datasetId' is set
+    if (datasetId == null) {
+      throw new ApiException(
+          400, "Missing the required parameter 'datasetId' when calling cloneLLMObsDataset");
+    }
+
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      throw new ApiException(
+          400, "Missing the required parameter 'body' when calling cloneLLMObsDataset");
+    }
+    // create path and map variables
+    String localVarPath =
+        "/api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/clone"
+            .replaceAll("\\{" + "project_id" + "\\}", apiClient.escapeString(projectId.toString()))
+            .replaceAll("\\{" + "dataset_id" + "\\}", apiClient.escapeString(datasetId.toString()));
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Invocation.Builder builder =
+        apiClient.createBuilder(
+            "v2.LlmObservabilityApi.cloneLLMObsDataset",
+            localVarPath,
+            new ArrayList<Pair>(),
+            localVarHeaderParams,
+            new HashMap<String, String>(),
+            new String[] {"application/json"},
+            new String[] {"apiKeyAuth", "appKeyAuth"});
+    return apiClient.invokeAPI(
+        "POST",
+        builder,
+        localVarHeaderParams,
+        new String[] {"application/json"},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        new GenericType<LLMObsDatasetResponse>() {});
+  }
+
+  /**
+   * Clone an LLM Observability dataset.
+   *
+   * <p>See {@link #cloneLLMObsDatasetWithHttpInfo}.
+   *
+   * @param projectId The ID of the LLM Observability project. (required)
+   * @param datasetId The ID of the source LLM Observability dataset to clone. (required)
+   * @param body Clone dataset payload. (required)
+   * @return CompletableFuture&lt;ApiResponse&lt;LLMObsDatasetResponse&gt;&gt;
+   */
+  public CompletableFuture<ApiResponse<LLMObsDatasetResponse>> cloneLLMObsDatasetWithHttpInfoAsync(
+      String projectId, String datasetId, LLMObsDatasetCloneRequest body) {
+    // Check if unstable operation is enabled
+    String operationId = "cloneLLMObsDataset";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      CompletableFuture<ApiResponse<LLMObsDatasetResponse>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
+      return result;
+    }
+    Object localVarPostBody = body;
+
+    // verify the required parameter 'projectId' is set
+    if (projectId == null) {
+      CompletableFuture<ApiResponse<LLMObsDatasetResponse>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400, "Missing the required parameter 'projectId' when calling cloneLLMObsDataset"));
+      return result;
+    }
+
+    // verify the required parameter 'datasetId' is set
+    if (datasetId == null) {
+      CompletableFuture<ApiResponse<LLMObsDatasetResponse>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400, "Missing the required parameter 'datasetId' when calling cloneLLMObsDataset"));
+      return result;
+    }
+
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      CompletableFuture<ApiResponse<LLMObsDatasetResponse>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400, "Missing the required parameter 'body' when calling cloneLLMObsDataset"));
+      return result;
+    }
+    // create path and map variables
+    String localVarPath =
+        "/api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/clone"
+            .replaceAll("\\{" + "project_id" + "\\}", apiClient.escapeString(projectId.toString()))
+            .replaceAll("\\{" + "dataset_id" + "\\}", apiClient.escapeString(datasetId.toString()));
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Invocation.Builder builder;
+    try {
+      builder =
+          apiClient.createBuilder(
+              "v2.LlmObservabilityApi.cloneLLMObsDataset",
+              localVarPath,
+              new ArrayList<Pair>(),
+              localVarHeaderParams,
+              new HashMap<String, String>(),
+              new String[] {"application/json"},
+              new String[] {"apiKeyAuth", "appKeyAuth"});
+    } catch (ApiException ex) {
+      CompletableFuture<ApiResponse<LLMObsDatasetResponse>> result = new CompletableFuture<>();
+      result.completeExceptionally(ex);
+      return result;
+    }
+    return apiClient.invokeAPIAsync(
+        "POST",
+        builder,
+        localVarHeaderParams,
+        new String[] {"application/json"},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        new GenericType<LLMObsDatasetResponse>() {});
+  }
+
   /**
    * Create an LLM Observability annotation queue.
    *
@@ -2910,123 +3321,384 @@ public CompletableFuture<Void> deleteLLMObsProjectsAsync(LLMObsDeleteProjectsReq
   }
 
   /**
-   * Delete one or more LLM Observability projects.
+   * Delete one or more LLM Observability projects.
+   *
+   * @param body Delete projects payload. (required)
+   * @return ApiResponse&lt;Void&gt;
+   * @throws ApiException if fails to make API call
+   * @http.response.details
+   *     <table border="1">
+   *    <caption>Response details</caption>
+   *       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+   *       <tr><td> 204 </td><td> No Content </td><td>  -  </td></tr>
+   *       <tr><td> 400 </td><td> Bad Request </td><td>  -  </td></tr>
+   *       <tr><td> 401 </td><td> Unauthorized </td><td>  -  </td></tr>
+   *       <tr><td> 403 </td><td> Forbidden </td><td>  -  </td></tr>
+   *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
+   *     </table>
+   */
+  public ApiResponse<Void> deleteLLMObsProjectsWithHttpInfo(LLMObsDeleteProjectsRequest body)
+      throws ApiException {
+    // Check if unstable operation is enabled
+    String operationId = "deleteLLMObsProjects";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
+    }
+    Object localVarPostBody = body;
+
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      throw new ApiException(
+          400, "Missing the required parameter 'body' when calling deleteLLMObsProjects");
+    }
+    // create path and map variables
+    String localVarPath = "/api/v2/llm-obs/v1/projects/delete";
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Invocation.Builder builder =
+        apiClient.createBuilder(
+            "v2.LlmObservabilityApi.deleteLLMObsProjects",
+            localVarPath,
+            new ArrayList<Pair>(),
+            localVarHeaderParams,
+            new HashMap<String, String>(),
+            new String[] {"*/*"},
+            new String[] {"apiKeyAuth", "appKeyAuth"});
+    return apiClient.invokeAPI(
+        "POST",
+        builder,
+        localVarHeaderParams,
+        new String[] {"application/json"},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        null);
+  }
+
+  /**
+   * Delete LLM Observability projects.
+   *
+   * <p>See {@link #deleteLLMObsProjectsWithHttpInfo}.
+   *
+   * @param body Delete projects payload. (required)
+   * @return CompletableFuture&lt;ApiResponse&lt;Void&gt;&gt;
+   */
+  public CompletableFuture<ApiResponse<Void>> deleteLLMObsProjectsWithHttpInfoAsync(
+      LLMObsDeleteProjectsRequest body) {
+    // Check if unstable operation is enabled
+    String operationId = "deleteLLMObsProjects";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
+      return result;
+    }
+    Object localVarPostBody = body;
+
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400, "Missing the required parameter 'body' when calling deleteLLMObsProjects"));
+      return result;
+    }
+    // create path and map variables
+    String localVarPath = "/api/v2/llm-obs/v1/projects/delete";
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Invocation.Builder builder;
+    try {
+      builder =
+          apiClient.createBuilder(
+              "v2.LlmObservabilityApi.deleteLLMObsProjects",
+              localVarPath,
+              new ArrayList<Pair>(),
+              localVarHeaderParams,
+              new HashMap<String, String>(),
+              new String[] {"*/*"},
+              new String[] {"apiKeyAuth", "appKeyAuth"});
+    } catch (ApiException ex) {
+      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
+      result.completeExceptionally(ex);
+      return result;
+    }
+    return apiClient.invokeAPIAsync(
+        "POST",
+        builder,
+        localVarHeaderParams,
+        new String[] {"application/json"},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        null);
+  }
+
+  /** Manage optional parameters to exportLLMObsDataset. */
+  public static class ExportLLMObsDatasetOptionalParameters {
+    private LLMObsDatasetExportFormat format;
+    private Long version;
+
+    /**
+     * Set format.
+     *
+     * @param format Export format for the dataset contents. Only <code>csv</code> is currently
+     *     supported. (optional, default to "csv")
+     * @return ExportLLMObsDatasetOptionalParameters
+     */
+    public ExportLLMObsDatasetOptionalParameters format(LLMObsDatasetExportFormat format) {
+      this.format = format;
+      return this;
+    }
+
+    /**
+     * Set version.
+     *
+     * @param version Version of the dataset to export. If omitted, the current version is used.
+     *     Must be between 0 and the current version of the dataset, inclusive. (optional)
+     * @return ExportLLMObsDatasetOptionalParameters
+     */
+    public ExportLLMObsDatasetOptionalParameters version(Long version) {
+      this.version = version;
+      return this;
+    }
+  }
+
+  /**
+   * Export an LLM Observability dataset.
+   *
+   * <p>See {@link #exportLLMObsDatasetWithHttpInfo}.
+   *
+   * @param projectId The ID of the LLM Observability project. (required)
+   * @param datasetId The ID of the LLM Observability dataset. (required)
+   * @return String
+   * @throws ApiException if fails to make API call
+   */
+  public String exportLLMObsDataset(String projectId, String datasetId) throws ApiException {
+    return exportLLMObsDatasetWithHttpInfo(
+            projectId, datasetId, new ExportLLMObsDatasetOptionalParameters())
+        .getData();
+  }
+
+  /**
+   * Export an LLM Observability dataset.
+   *
+   * <p>See {@link #exportLLMObsDatasetWithHttpInfoAsync}.
+   *
+   * @param projectId The ID of the LLM Observability project. (required)
+   * @param datasetId The ID of the LLM Observability dataset. (required)
+   * @return CompletableFuture&lt;String&gt;
+   */
+  public CompletableFuture<String> exportLLMObsDatasetAsync(String projectId, String datasetId) {
+    return exportLLMObsDatasetWithHttpInfoAsync(
+            projectId, datasetId, new ExportLLMObsDatasetOptionalParameters())
+        .thenApply(
+            response -> {
+              return response.getData();
+            });
+  }
+
+  /**
+   * Export an LLM Observability dataset.
+   *
+   * <p>See {@link #exportLLMObsDatasetWithHttpInfo}.
+   *
+   * @param projectId The ID of the LLM Observability project. (required)
+   * @param datasetId The ID of the LLM Observability dataset. (required)
+   * @param parameters Optional parameters for the request.
+   * @return String
+   * @throws ApiException if fails to make API call
+   */
+  public String exportLLMObsDataset(
+      String projectId, String datasetId, ExportLLMObsDatasetOptionalParameters parameters)
+      throws ApiException {
+    return exportLLMObsDatasetWithHttpInfo(projectId, datasetId, parameters).getData();
+  }
+
+  /**
+   * Export an LLM Observability dataset.
+   *
+   * <p>See {@link #exportLLMObsDatasetWithHttpInfoAsync}.
+   *
+   * @param projectId The ID of the LLM Observability project. (required)
+   * @param datasetId The ID of the LLM Observability dataset. (required)
+   * @param parameters Optional parameters for the request.
+   * @return CompletableFuture&lt;String&gt;
+   */
+  public CompletableFuture<String> exportLLMObsDatasetAsync(
+      String projectId, String datasetId, ExportLLMObsDatasetOptionalParameters parameters) {
+    return exportLLMObsDatasetWithHttpInfoAsync(projectId, datasetId, parameters)
+        .thenApply(
+            response -> {
+              return response.getData();
+            });
+  }
+
+  /**
+   * Download the contents of a dataset as a CSV file. The download is streamed and includes one row
+   * per dataset record.
    *
-   * @param body Delete projects payload. (required)
-   * @return ApiResponse&lt;Void&gt;
+   * @param projectId The ID of the LLM Observability project. (required)
+   * @param datasetId The ID of the LLM Observability dataset. (required)
+   * @param parameters Optional parameters for the request.
+   * @return ApiResponse&lt;String&gt;
    * @throws ApiException if fails to make API call
    * @http.response.details
    *     <table border="1">
    *    <caption>Response details</caption>
    *       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-   *       <tr><td> 204 </td><td> No Content </td><td>  -  </td></tr>
+   *       <tr><td> 200 </td><td> OK </td><td>  -  </td></tr>
    *       <tr><td> 400 </td><td> Bad Request </td><td>  -  </td></tr>
    *       <tr><td> 401 </td><td> Unauthorized </td><td>  -  </td></tr>
    *       <tr><td> 403 </td><td> Forbidden </td><td>  -  </td></tr>
+   *       <tr><td> 404 </td><td> Not Found </td><td>  -  </td></tr>
    *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
+   *       <tr><td> 500 </td><td> Internal Server Error </td><td>  -  </td></tr>
    *     </table>
    */
-  public ApiResponse<Void> deleteLLMObsProjectsWithHttpInfo(LLMObsDeleteProjectsRequest body)
+  public ApiResponse<String> exportLLMObsDatasetWithHttpInfo(
+      String projectId, String datasetId, ExportLLMObsDatasetOptionalParameters parameters)
       throws ApiException {
     // Check if unstable operation is enabled
-    String operationId = "deleteLLMObsProjects";
+    String operationId = "exportLLMObsDataset";
     if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
       apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
     } else {
       throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
     }
-    Object localVarPostBody = body;
+    Object localVarPostBody = null;
 
-    // verify the required parameter 'body' is set
-    if (body == null) {
+    // verify the required parameter 'projectId' is set
+    if (projectId == null) {
       throw new ApiException(
-          400, "Missing the required parameter 'body' when calling deleteLLMObsProjects");
+          400, "Missing the required parameter 'projectId' when calling exportLLMObsDataset");
+    }
+
+    // verify the required parameter 'datasetId' is set
+    if (datasetId == null) {
+      throw new ApiException(
+          400, "Missing the required parameter 'datasetId' when calling exportLLMObsDataset");
     }
+    LLMObsDatasetExportFormat format = parameters.format;
+    Long version = parameters.version;
     // create path and map variables
-    String localVarPath = "/api/v2/llm-obs/v1/projects/delete";
+    String localVarPath =
+        "/api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/export"
+            .replaceAll("\\{" + "project_id" + "\\}", apiClient.escapeString(projectId.toString()))
+            .replaceAll("\\{" + "dataset_id" + "\\}", apiClient.escapeString(datasetId.toString()));
 
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "format", format));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "version", version));
+
     Invocation.Builder builder =
         apiClient.createBuilder(
-            "v2.LlmObservabilityApi.deleteLLMObsProjects",
+            "v2.LlmObservabilityApi.exportLLMObsDataset",
             localVarPath,
-            new ArrayList<Pair>(),
+            localVarQueryParams,
             localVarHeaderParams,
             new HashMap<String, String>(),
-            new String[] {"*/*"},
+            new String[] {"text/csv", "application/json"},
             new String[] {"apiKeyAuth", "appKeyAuth"});
     return apiClient.invokeAPI(
-        "POST",
+        "GET",
         builder,
         localVarHeaderParams,
-        new String[] {"application/json"},
+        new String[] {},
         localVarPostBody,
         new HashMap<String, Object>(),
         false,
-        null);
+        new GenericType<String>() {});
   }
 
   /**
-   * Delete LLM Observability projects.
+   * Export an LLM Observability dataset.
    *
-   * <p>See {@link #deleteLLMObsProjectsWithHttpInfo}.
+   * <p>See {@link #exportLLMObsDatasetWithHttpInfo}.
    *
-   * @param body Delete projects payload. (required)
-   * @return CompletableFuture&lt;ApiResponse&lt;Void&gt;&gt;
+   * @param projectId The ID of the LLM Observability project. (required)
+   * @param datasetId The ID of the LLM Observability dataset. (required)
+   * @param parameters Optional parameters for the request.
+   * @return CompletableFuture&lt;ApiResponse&lt;String&gt;&gt;
    */
-  public CompletableFuture<ApiResponse<Void>> deleteLLMObsProjectsWithHttpInfoAsync(
-      LLMObsDeleteProjectsRequest body) {
+  public CompletableFuture<ApiResponse<String>> exportLLMObsDatasetWithHttpInfoAsync(
+      String projectId, String datasetId, ExportLLMObsDatasetOptionalParameters parameters) {
     // Check if unstable operation is enabled
-    String operationId = "deleteLLMObsProjects";
+    String operationId = "exportLLMObsDataset";
     if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
       apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
     } else {
-      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
+      CompletableFuture<ApiResponse<String>> result = new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
       return result;
     }
-    Object localVarPostBody = body;
+    Object localVarPostBody = null;
 
-    // verify the required parameter 'body' is set
-    if (body == null) {
-      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
+    // verify the required parameter 'projectId' is set
+    if (projectId == null) {
+      CompletableFuture<ApiResponse<String>> result = new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(
-              400, "Missing the required parameter 'body' when calling deleteLLMObsProjects"));
+              400, "Missing the required parameter 'projectId' when calling exportLLMObsDataset"));
+      return result;
+    }
+
+    // verify the required parameter 'datasetId' is set
+    if (datasetId == null) {
+      CompletableFuture<ApiResponse<String>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400, "Missing the required parameter 'datasetId' when calling exportLLMObsDataset"));
       return result;
     }
+    LLMObsDatasetExportFormat format = parameters.format;
+    Long version = parameters.version;
     // create path and map variables
-    String localVarPath = "/api/v2/llm-obs/v1/projects/delete";
+    String localVarPath =
+        "/api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/export"
+            .replaceAll("\\{" + "project_id" + "\\}", apiClient.escapeString(projectId.toString()))
+            .replaceAll("\\{" + "dataset_id" + "\\}", apiClient.escapeString(datasetId.toString()));
 
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "format", format));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "version", version));
+
     Invocation.Builder builder;
     try {
       builder =
           apiClient.createBuilder(
-              "v2.LlmObservabilityApi.deleteLLMObsProjects",
+              "v2.LlmObservabilityApi.exportLLMObsDataset",
               localVarPath,
-              new ArrayList<Pair>(),
+              localVarQueryParams,
               localVarHeaderParams,
               new HashMap<String, String>(),
-              new String[] {"*/*"},
+              new String[] {"text/csv", "application/json"},
               new String[] {"apiKeyAuth", "appKeyAuth"});
     } catch (ApiException ex) {
-      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
+      CompletableFuture<ApiResponse<String>> result = new CompletableFuture<>();
       result.completeExceptionally(ex);
       return result;
     }
     return apiClient.invokeAPIAsync(
-        "POST",
+        "GET",
         builder,
         localVarHeaderParams,
-        new String[] {"application/json"},
+        new String[] {},
         localVarPostBody,
         new HashMap<String, Object>(),
         false,
-        null);
+        new GenericType<String>() {});
   }
 
   /**
@@ -6479,55 +7151,262 @@ public ApiResponse<LLMObsDatasetDraftStateResponse> lockLLMObsDatasetDraftStateW
   }
 
   /**
-   * Lock LLM Observability dataset draft state.
+   * Lock LLM Observability dataset draft state.
+   *
+   * <p>See {@link #lockLLMObsDatasetDraftStateWithHttpInfo}.
+   *
+   * @param projectId The ID of the LLM Observability project. (required)
+   * @param datasetId The ID of the LLM Observability dataset. (required)
+   * @return CompletableFuture&lt;ApiResponse&lt;LLMObsDatasetDraftStateResponse&gt;&gt;
+   */
+  public CompletableFuture<ApiResponse<LLMObsDatasetDraftStateResponse>>
+      lockLLMObsDatasetDraftStateWithHttpInfoAsync(String projectId, String datasetId) {
+    // Check if unstable operation is enabled
+    String operationId = "lockLLMObsDatasetDraftState";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      CompletableFuture<ApiResponse<LLMObsDatasetDraftStateResponse>> result =
+          new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
+      return result;
+    }
+    Object localVarPostBody = null;
+
+    // verify the required parameter 'projectId' is set
+    if (projectId == null) {
+      CompletableFuture<ApiResponse<LLMObsDatasetDraftStateResponse>> result =
+          new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400,
+              "Missing the required parameter 'projectId' when calling"
+                  + " lockLLMObsDatasetDraftState"));
+      return result;
+    }
+
+    // verify the required parameter 'datasetId' is set
+    if (datasetId == null) {
+      CompletableFuture<ApiResponse<LLMObsDatasetDraftStateResponse>> result =
+          new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400,
+              "Missing the required parameter 'datasetId' when calling"
+                  + " lockLLMObsDatasetDraftState"));
+      return result;
+    }
+    // create path and map variables
+    String localVarPath =
+        "/api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/draft_state/lock"
+            .replaceAll("\\{" + "project_id" + "\\}", apiClient.escapeString(projectId.toString()))
+            .replaceAll("\\{" + "dataset_id" + "\\}", apiClient.escapeString(datasetId.toString()));
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Invocation.Builder builder;
+    try {
+      builder =
+          apiClient.createBuilder(
+              "v2.LlmObservabilityApi.lockLLMObsDatasetDraftState",
+              localVarPath,
+              new ArrayList<Pair>(),
+              localVarHeaderParams,
+              new HashMap<String, String>(),
+              new String[] {"application/json"},
+              new String[] {"apiKeyAuth", "appKeyAuth"});
+    } catch (ApiException ex) {
+      CompletableFuture<ApiResponse<LLMObsDatasetDraftStateResponse>> result =
+          new CompletableFuture<>();
+      result.completeExceptionally(ex);
+      return result;
+    }
+    return apiClient.invokeAPIAsync(
+        "PATCH",
+        builder,
+        localVarHeaderParams,
+        new String[] {},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        new GenericType<LLMObsDatasetDraftStateResponse>() {});
+  }
+
+  /**
+   * Restore an LLM Observability dataset version.
+   *
+   * <p>See {@link #restoreLLMObsDatasetVersionWithHttpInfo}.
+   *
+   * @param projectId The ID of the LLM Observability project. (required)
+   * @param datasetId The ID of the LLM Observability dataset. (required)
+   * @param body Restore dataset version payload. (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void restoreLLMObsDatasetVersion(
+      String projectId, String datasetId, LLMObsDatasetRestoreVersionRequest body)
+      throws ApiException {
+    restoreLLMObsDatasetVersionWithHttpInfo(projectId, datasetId, body);
+  }
+
+  /**
+   * Restore an LLM Observability dataset version.
+   *
+   * <p>See {@link #restoreLLMObsDatasetVersionWithHttpInfoAsync}.
+   *
+   * @param projectId The ID of the LLM Observability project. (required)
+   * @param datasetId The ID of the LLM Observability dataset. (required)
+   * @param body Restore dataset version payload. (required)
+   * @return CompletableFuture
+   */
+  public CompletableFuture<Void> restoreLLMObsDatasetVersionAsync(
+      String projectId, String datasetId, LLMObsDatasetRestoreVersionRequest body) {
+    return restoreLLMObsDatasetVersionWithHttpInfoAsync(projectId, datasetId, body)
+        .thenApply(
+            response -> {
+              return response.getData();
+            });
+  }
+
+  /**
+   * Restore a dataset to a previous version. The dataset's current version is bumped, and its
+   * records are replaced with the records from the specified prior version.
+   *
+   * @param projectId The ID of the LLM Observability project. (required)
+   * @param datasetId The ID of the LLM Observability dataset. (required)
+   * @param body Restore dataset version payload. (required)
+   * @return ApiResponse&lt;Void&gt;
+   * @throws ApiException if fails to make API call
+   * @http.response.details
+   *     <table border="1">
+   *    <caption>Response details</caption>
+   *       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+   *       <tr><td> 200 </td><td> OK </td><td>  -  </td></tr>
+   *       <tr><td> 400 </td><td> Bad Request </td><td>  -  </td></tr>
+   *       <tr><td> 401 </td><td> Unauthorized </td><td>  -  </td></tr>
+   *       <tr><td> 403 </td><td> Forbidden </td><td>  -  </td></tr>
+   *       <tr><td> 404 </td><td> Not Found </td><td>  -  </td></tr>
+   *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
+   *       <tr><td> 500 </td><td> Internal Server Error </td><td>  -  </td></tr>
+   *     </table>
+   */
+  public ApiResponse<Void> restoreLLMObsDatasetVersionWithHttpInfo(
+      String projectId, String datasetId, LLMObsDatasetRestoreVersionRequest body)
+      throws ApiException {
+    // Check if unstable operation is enabled
+    String operationId = "restoreLLMObsDatasetVersion";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
+    }
+    Object localVarPostBody = body;
+
+    // verify the required parameter 'projectId' is set
+    if (projectId == null) {
+      throw new ApiException(
+          400,
+          "Missing the required parameter 'projectId' when calling restoreLLMObsDatasetVersion");
+    }
+
+    // verify the required parameter 'datasetId' is set
+    if (datasetId == null) {
+      throw new ApiException(
+          400,
+          "Missing the required parameter 'datasetId' when calling restoreLLMObsDatasetVersion");
+    }
+
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      throw new ApiException(
+          400, "Missing the required parameter 'body' when calling restoreLLMObsDatasetVersion");
+    }
+    // create path and map variables
+    String localVarPath =
+        "/api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/restore"
+            .replaceAll("\\{" + "project_id" + "\\}", apiClient.escapeString(projectId.toString()))
+            .replaceAll("\\{" + "dataset_id" + "\\}", apiClient.escapeString(datasetId.toString()));
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Invocation.Builder builder =
+        apiClient.createBuilder(
+            "v2.LlmObservabilityApi.restoreLLMObsDatasetVersion",
+            localVarPath,
+            new ArrayList<Pair>(),
+            localVarHeaderParams,
+            new HashMap<String, String>(),
+            new String[] {"*/*"},
+            new String[] {"apiKeyAuth", "appKeyAuth"});
+    return apiClient.invokeAPI(
+        "POST",
+        builder,
+        localVarHeaderParams,
+        new String[] {"application/json"},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        null);
+  }
+
+  /**
+   * Restore an LLM Observability dataset version.
    *
-   * <p>See {@link #lockLLMObsDatasetDraftStateWithHttpInfo}.
+   * <p>See {@link #restoreLLMObsDatasetVersionWithHttpInfo}.
    *
    * @param projectId The ID of the LLM Observability project. (required)
    * @param datasetId The ID of the LLM Observability dataset. (required)
-   * @return CompletableFuture&lt;ApiResponse&lt;LLMObsDatasetDraftStateResponse&gt;&gt;
+   * @param body Restore dataset version payload. (required)
+   * @return CompletableFuture&lt;ApiResponse&lt;Void&gt;&gt;
    */
-  public CompletableFuture<ApiResponse<LLMObsDatasetDraftStateResponse>>
-      lockLLMObsDatasetDraftStateWithHttpInfoAsync(String projectId, String datasetId) {
+  public CompletableFuture<ApiResponse<Void>> restoreLLMObsDatasetVersionWithHttpInfoAsync(
+      String projectId, String datasetId, LLMObsDatasetRestoreVersionRequest body) {
     // Check if unstable operation is enabled
-    String operationId = "lockLLMObsDatasetDraftState";
+    String operationId = "restoreLLMObsDatasetVersion";
     if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
       apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
     } else {
-      CompletableFuture<ApiResponse<LLMObsDatasetDraftStateResponse>> result =
-          new CompletableFuture<>();
+      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
       return result;
     }
-    Object localVarPostBody = null;
+    Object localVarPostBody = body;
 
     // verify the required parameter 'projectId' is set
     if (projectId == null) {
-      CompletableFuture<ApiResponse<LLMObsDatasetDraftStateResponse>> result =
-          new CompletableFuture<>();
+      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(
               400,
               "Missing the required parameter 'projectId' when calling"
-                  + " lockLLMObsDatasetDraftState"));
+                  + " restoreLLMObsDatasetVersion"));
       return result;
     }
 
     // verify the required parameter 'datasetId' is set
     if (datasetId == null) {
-      CompletableFuture<ApiResponse<LLMObsDatasetDraftStateResponse>> result =
-          new CompletableFuture<>();
+      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(
               400,
               "Missing the required parameter 'datasetId' when calling"
-                  + " lockLLMObsDatasetDraftState"));
+                  + " restoreLLMObsDatasetVersion"));
+      return result;
+    }
+
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400,
+              "Missing the required parameter 'body' when calling restoreLLMObsDatasetVersion"));
       return result;
     }
     // create path and map variables
     String localVarPath =
-        "/api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/draft_state/lock"
+        "/api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/restore"
             .replaceAll("\\{" + "project_id" + "\\}", apiClient.escapeString(projectId.toString()))
             .replaceAll("\\{" + "dataset_id" + "\\}", apiClient.escapeString(datasetId.toString()));
 
@@ -6537,28 +7416,27 @@ public ApiResponse<LLMObsDatasetDraftStateResponse> lockLLMObsDatasetDraftStateW
     try {
       builder =
           apiClient.createBuilder(
-              "v2.LlmObservabilityApi.lockLLMObsDatasetDraftState",
+              "v2.LlmObservabilityApi.restoreLLMObsDatasetVersion",
               localVarPath,
               new ArrayList<Pair>(),
               localVarHeaderParams,
               new HashMap<String, String>(),
-              new String[] {"application/json"},
+              new String[] {"*/*"},
               new String[] {"apiKeyAuth", "appKeyAuth"});
     } catch (ApiException ex) {
-      CompletableFuture<ApiResponse<LLMObsDatasetDraftStateResponse>> result =
-          new CompletableFuture<>();
+      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
       result.completeExceptionally(ex);
       return result;
     }
     return apiClient.invokeAPIAsync(
-        "PATCH",
+        "POST",
         builder,
         localVarHeaderParams,
-        new String[] {},
+        new String[] {"application/json"},
         localVarPostBody,
         new HashMap<String, Object>(),
         false,
-        new GenericType<LLMObsDatasetDraftStateResponse>() {});
+        null);
   }
 
   /**
@@ -8541,4 +9419,350 @@ public CompletableFuture<ApiResponse<LLMObsProjectResponse>> updateLLMObsProject
         false,
         new GenericType<LLMObsProjectResponse>() {});
   }
+
+  /** Manage optional parameters to uploadLLMObsDatasetRecordsFile. */
+  public static class UploadLLMObsDatasetRecordsFileOptionalParameters {
+    private File file;
+    private Boolean deduplicate;
+    private Boolean overwrite;
+    private List<String> tags;
+    private Boolean includeUserData;
+
+    /**
+     * Set file.
+     *
+     * @param file The records file to upload. Currently only CSV is supported. The file must
+     *     include an <code>input</code> column. Optional columns include <code>id</code>, <code>
+     *     expected_output</code>, <code>metadata</code>, and <code>tags</code>. (optional)
+     * @return UploadLLMObsDatasetRecordsFileOptionalParameters
+     */
+    public UploadLLMObsDatasetRecordsFileOptionalParameters file(File file) {
+      this.file = file;
+      return this;
+    }
+
+    /**
+     * Set deduplicate.
+     *
+     * @param deduplicate Whether to skip records whose <code>input</code> already exists in the
+     *     dataset. Defaults to <code>false</code>. (optional, default to false)
+     * @return UploadLLMObsDatasetRecordsFileOptionalParameters
+     */
+    public UploadLLMObsDatasetRecordsFileOptionalParameters deduplicate(Boolean deduplicate) {
+      this.deduplicate = deduplicate;
+      return this;
+    }
+
+    /**
+     * Set overwrite.
+     *
+     * @param overwrite Whether to overwrite existing records that share the same user-provided
+     *     <code>id</code>. Defaults to <code>true</code>. (optional, default to true)
+     * @return UploadLLMObsDatasetRecordsFileOptionalParameters
+     */
+    public UploadLLMObsDatasetRecordsFileOptionalParameters overwrite(Boolean overwrite) {
+      this.overwrite = overwrite;
+      return this;
+    }
+
+    /**
+     * Set tags.
+     *
+     * @param tags Tags to apply to every uploaded record, in addition to any tags defined on
+     *     individual rows. Can be repeated, e.g. <code>tags=env:prod&amp;tags=team:ai</code>.
+     *     (optional)
+     * @return UploadLLMObsDatasetRecordsFileOptionalParameters
+     */
+    public UploadLLMObsDatasetRecordsFileOptionalParameters tags(List<String> tags) {
+      this.tags = tags;
+      return this;
+    }
+
+    /**
+     * Set includeUserData.
+     *
+     * @param includeUserData Whether to enrich the response with user metadata. (optional)
+     * @return UploadLLMObsDatasetRecordsFileOptionalParameters
+     */
+    public UploadLLMObsDatasetRecordsFileOptionalParameters includeUserData(
+        Boolean includeUserData) {
+      this.includeUserData = includeUserData;
+      return this;
+    }
+  }
+
+  /**
+   * Upload records to an LLM Observability dataset.
+   *
+   * <p>See {@link #uploadLLMObsDatasetRecordsFileWithHttpInfo}.
+   *
+   * @param projectId The ID of the LLM Observability project. (required)
+   * @param datasetId The ID of the LLM Observability dataset. (required)
+   * @return String
+   * @throws ApiException if fails to make API call
+   */
+  public String uploadLLMObsDatasetRecordsFile(String projectId, String datasetId)
+      throws ApiException {
+    return uploadLLMObsDatasetRecordsFileWithHttpInfo(
+            projectId, datasetId, new UploadLLMObsDatasetRecordsFileOptionalParameters())
+        .getData();
+  }
+
+  /**
+   * Upload records to an LLM Observability dataset.
+   *
+   * <p>See {@link #uploadLLMObsDatasetRecordsFileWithHttpInfoAsync}.
+   *
+   * @param projectId The ID of the LLM Observability project. (required)
+   * @param datasetId The ID of the LLM Observability dataset. (required)
+   * @return CompletableFuture&lt;String&gt;
+   */
+  public CompletableFuture<String> uploadLLMObsDatasetRecordsFileAsync(
+      String projectId, String datasetId) {
+    return uploadLLMObsDatasetRecordsFileWithHttpInfoAsync(
+            projectId, datasetId, new UploadLLMObsDatasetRecordsFileOptionalParameters())
+        .thenApply(
+            response -> {
+              return response.getData();
+            });
+  }
+
+  /**
+   * Upload records to an LLM Observability dataset.
+   *
+   * <p>See {@link #uploadLLMObsDatasetRecordsFileWithHttpInfo}.
+   *
+   * @param projectId The ID of the LLM Observability project. (required)
+   * @param datasetId The ID of the LLM Observability dataset. (required)
+   * @param parameters Optional parameters for the request.
+   * @return String
+   * @throws ApiException if fails to make API call
+   */
+  public String uploadLLMObsDatasetRecordsFile(
+      String projectId,
+      String datasetId,
+      UploadLLMObsDatasetRecordsFileOptionalParameters parameters)
+      throws ApiException {
+    return uploadLLMObsDatasetRecordsFileWithHttpInfo(projectId, datasetId, parameters).getData();
+  }
+
+  /**
+   * Upload records to an LLM Observability dataset.
+   *
+   * <p>See {@link #uploadLLMObsDatasetRecordsFileWithHttpInfoAsync}.
+   *
+   * @param projectId The ID of the LLM Observability project. (required)
+   * @param datasetId The ID of the LLM Observability dataset. (required)
+   * @param parameters Optional parameters for the request.
+   * @return CompletableFuture&lt;String&gt;
+   */
+  public CompletableFuture<String> uploadLLMObsDatasetRecordsFileAsync(
+      String projectId,
+      String datasetId,
+      UploadLLMObsDatasetRecordsFileOptionalParameters parameters) {
+    return uploadLLMObsDatasetRecordsFileWithHttpInfoAsync(projectId, datasetId, parameters)
+        .thenApply(
+            response -> {
+              return response.getData();
+            });
+  }
+
+  /**
+   * Upload records to a dataset from a file. The request is a <code>multipart/form-data</code>
+   * upload containing a single <code>file</code> part. Currently only CSV is supported. The CSV
+   * must include an <code>input</code> column. Optional columns are <code>id</code>, <code>
+   * expected_output</code>, <code>metadata</code>, and <code>tags</code>.
+   *
+   * <p>The response is a Server-Sent Events stream (<code>text/event-stream</code>) emitting
+   * progress updates while records are processed. The stream emits the following named events: -
+   * <code>progress</code>: incremental record counts written so far. - <code>completed</code>:
+   * terminal event with a JSON body containing <code>records_created</code>. - <code>error</code>:
+   * terminal event with a JSON body containing an error <code>message</code>.
+   *
+   * @param projectId The ID of the LLM Observability project. (required)
+   * @param datasetId The ID of the LLM Observability dataset. (required)
+   * @param parameters Optional parameters for the request.
+   * @return ApiResponse&lt;String&gt;
+   * @throws ApiException if fails to make API call
+   * @http.response.details
+   *     <table border="1">
+   *    <caption>Response details</caption>
+   *       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+   *       <tr><td> 200 </td><td> OK </td><td>  -  </td></tr>
+   *       <tr><td> 400 </td><td> Bad Request </td><td>  -  </td></tr>
+   *       <tr><td> 401 </td><td> Unauthorized </td><td>  -  </td></tr>
+   *       <tr><td> 403 </td><td> Forbidden </td><td>  -  </td></tr>
+   *       <tr><td> 404 </td><td> Not Found </td><td>  -  </td></tr>
+   *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
+   *       <tr><td> 500 </td><td> Internal Server Error </td><td>  -  </td></tr>
+   *     </table>
+   */
+  public ApiResponse<String> uploadLLMObsDatasetRecordsFileWithHttpInfo(
+      String projectId,
+      String datasetId,
+      UploadLLMObsDatasetRecordsFileOptionalParameters parameters)
+      throws ApiException {
+    // Check if unstable operation is enabled
+    String operationId = "uploadLLMObsDatasetRecordsFile";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
+    }
+    Object localVarPostBody = null;
+
+    // verify the required parameter 'projectId' is set
+    if (projectId == null) {
+      throw new ApiException(
+          400,
+          "Missing the required parameter 'projectId' when calling uploadLLMObsDatasetRecordsFile");
+    }
+
+    // verify the required parameter 'datasetId' is set
+    if (datasetId == null) {
+      throw new ApiException(
+          400,
+          "Missing the required parameter 'datasetId' when calling uploadLLMObsDatasetRecordsFile");
+    }
+    File file = parameters.file;
+    Boolean deduplicate = parameters.deduplicate;
+    Boolean overwrite = parameters.overwrite;
+    List<String> tags = parameters.tags;
+    Boolean includeUserData = parameters.includeUserData;
+    // create path and map variables
+    String localVarPath =
+        "/api/v2/llm-obs/v2/{project_id}/datasets/{dataset_id}/records/upload"
+            .replaceAll("\\{" + "project_id" + "\\}", apiClient.escapeString(projectId.toString()))
+            .replaceAll("\\{" + "dataset_id" + "\\}", apiClient.escapeString(datasetId.toString()));
+
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "deduplicate", deduplicate));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "overwrite", overwrite));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "tags", tags));
+    localVarQueryParams.addAll(
+        apiClient.parameterToPairs("", "include[user_data]", includeUserData));
+    if (file != null) {
+      localVarFormParams.put("file", file);
+    }
+
+    Invocation.Builder builder =
+        apiClient.createBuilder(
+            "v2.LlmObservabilityApi.uploadLLMObsDatasetRecordsFile",
+            localVarPath,
+            localVarQueryParams,
+            localVarHeaderParams,
+            new HashMap<String, String>(),
+            new String[] {"text/event-stream", "application/json"},
+            new String[] {"apiKeyAuth", "appKeyAuth"});
+    return apiClient.invokeAPI(
+        "POST",
+        builder,
+        localVarHeaderParams,
+        new String[] {"multipart/form-data"},
+        localVarPostBody,
+        localVarFormParams,
+        false,
+        new GenericType<String>() {});
+  }
+
+  /**
+   * Upload records to an LLM Observability dataset.
+   *
+   * <p>See {@link #uploadLLMObsDatasetRecordsFileWithHttpInfo}.
+   *
+   * @param projectId The ID of the LLM Observability project. (required)
+   * @param datasetId The ID of the LLM Observability dataset. (required)
+   * @param parameters Optional parameters for the request.
+   * @return CompletableFuture&lt;ApiResponse&lt;String&gt;&gt;
+   */
+  public CompletableFuture<ApiResponse<String>> uploadLLMObsDatasetRecordsFileWithHttpInfoAsync(
+      String projectId,
+      String datasetId,
+      UploadLLMObsDatasetRecordsFileOptionalParameters parameters) {
+    // Check if unstable operation is enabled
+    String operationId = "uploadLLMObsDatasetRecordsFile";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      CompletableFuture<ApiResponse<String>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
+      return result;
+    }
+    Object localVarPostBody = null;
+
+    // verify the required parameter 'projectId' is set
+    if (projectId == null) {
+      CompletableFuture<ApiResponse<String>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400,
+              "Missing the required parameter 'projectId' when calling"
+                  + " uploadLLMObsDatasetRecordsFile"));
+      return result;
+    }
+
+    // verify the required parameter 'datasetId' is set
+    if (datasetId == null) {
+      CompletableFuture<ApiResponse<String>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400,
+              "Missing the required parameter 'datasetId' when calling"
+                  + " uploadLLMObsDatasetRecordsFile"));
+      return result;
+    }
+    File file = parameters.file;
+    Boolean deduplicate = parameters.deduplicate;
+    Boolean overwrite = parameters.overwrite;
+    List<String> tags = parameters.tags;
+    Boolean includeUserData = parameters.includeUserData;
+    // create path and map variables
+    String localVarPath =
+        "/api/v2/llm-obs/v2/{project_id}/datasets/{dataset_id}/records/upload"
+            .replaceAll("\\{" + "project_id" + "\\}", apiClient.escapeString(projectId.toString()))
+            .replaceAll("\\{" + "dataset_id" + "\\}", apiClient.escapeString(datasetId.toString()));
+
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "deduplicate", deduplicate));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "overwrite", overwrite));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "tags", tags));
+    localVarQueryParams.addAll(
+        apiClient.parameterToPairs("", "include[user_data]", includeUserData));
+    if (file != null) {
+      localVarFormParams.put("file", file);
+    }
+
+    Invocation.Builder builder;
+    try {
+      builder =
+          apiClient.createBuilder(
+              "v2.LlmObservabilityApi.uploadLLMObsDatasetRecordsFile",
+              localVarPath,
+              localVarQueryParams,
+              localVarHeaderParams,
+              new HashMap<String, String>(),
+              new String[] {"text/event-stream", "application/json"},
+              new String[] {"apiKeyAuth", "appKeyAuth"});
+    } catch (ApiException ex) {
+      CompletableFuture<ApiResponse<String>> result = new CompletableFuture<>();
+      result.completeExceptionally(ex);
+      return result;
+    }
+    return apiClient.invokeAPIAsync(
+        "POST",
+        builder,
+        localVarHeaderParams,
+        new String[] {"multipart/form-data"},
+        localVarPostBody,
+        localVarFormParams,
+        false,
+        new GenericType<String>() {});
+  }
 }
diff --git a/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetBatchUpdateDataAttributesRequest.java b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetBatchUpdateDataAttributesRequest.java
new file mode 100644
index 00000000000..6bbf5bef30d
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetBatchUpdateDataAttributesRequest.java
@@ -0,0 +1,302 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/** Attributes for batch-updating records in an LLM Observability dataset. */
+@JsonPropertyOrder({
+  LLMObsDatasetBatchUpdateDataAttributesRequest.JSON_PROPERTY_CREATE_NEW_VERSION,
+  LLMObsDatasetBatchUpdateDataAttributesRequest.JSON_PROPERTY_DELETE_RECORDS,
+  LLMObsDatasetBatchUpdateDataAttributesRequest.JSON_PROPERTY_INSERT_RECORDS,
+  LLMObsDatasetBatchUpdateDataAttributesRequest.JSON_PROPERTY_TAGS,
+  LLMObsDatasetBatchUpdateDataAttributesRequest.JSON_PROPERTY_UPDATE_RECORDS
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class LLMObsDatasetBatchUpdateDataAttributesRequest {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_CREATE_NEW_VERSION = "create_new_version";
+  private Boolean createNewVersion;
+
+  public static final String JSON_PROPERTY_DELETE_RECORDS = "delete_records";
+  private List<String> deleteRecords = null;
+
+  public static final String JSON_PROPERTY_INSERT_RECORDS = "insert_records";
+  private List<LLMObsDatasetBatchUpdateInsertRecord> insertRecords = null;
+
+  public static final String JSON_PROPERTY_TAGS = "tags";
+  private List<String> tags = null;
+
+  public static final String JSON_PROPERTY_UPDATE_RECORDS = "update_records";
+  private List<LLMObsDatasetBatchUpdateUpdateRecord> updateRecords = null;
+
+  public LLMObsDatasetBatchUpdateDataAttributesRequest createNewVersion(Boolean createNewVersion) {
+    this.createNewVersion = createNewVersion;
+    return this;
+  }
+
+  /**
+   * Whether to create a new dataset version when applying the batch update. Defaults to <code>true
+   * </code>.
+   *
+   * @return createNewVersion
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_CREATE_NEW_VERSION)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Boolean getCreateNewVersion() {
+    return createNewVersion;
+  }
+
+  public void setCreateNewVersion(Boolean createNewVersion) {
+    this.createNewVersion = createNewVersion;
+  }
+
+  public LLMObsDatasetBatchUpdateDataAttributesRequest deleteRecords(List<String> deleteRecords) {
+    this.deleteRecords = deleteRecords;
+    return this;
+  }
+
+  public LLMObsDatasetBatchUpdateDataAttributesRequest addDeleteRecordsItem(
+      String deleteRecordsItem) {
+    if (this.deleteRecords == null) {
+      this.deleteRecords = new ArrayList<>();
+    }
+    this.deleteRecords.add(deleteRecordsItem);
+    return this;
+  }
+
+  /**
+   * Record IDs to delete.
+   *
+   * @return deleteRecords
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_DELETE_RECORDS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<String> getDeleteRecords() {
+    return deleteRecords;
+  }
+
+  public void setDeleteRecords(List<String> deleteRecords) {
+    this.deleteRecords = deleteRecords;
+  }
+
+  public LLMObsDatasetBatchUpdateDataAttributesRequest insertRecords(
+      List<LLMObsDatasetBatchUpdateInsertRecord> insertRecords) {
+    this.insertRecords = insertRecords;
+    for (LLMObsDatasetBatchUpdateInsertRecord item : insertRecords) {
+      this.unparsed |= item.unparsed;
+    }
+    return this;
+  }
+
+  public LLMObsDatasetBatchUpdateDataAttributesRequest addInsertRecordsItem(
+      LLMObsDatasetBatchUpdateInsertRecord insertRecordsItem) {
+    if (this.insertRecords == null) {
+      this.insertRecords = new ArrayList<>();
+    }
+    this.insertRecords.add(insertRecordsItem);
+    this.unparsed |= insertRecordsItem.unparsed;
+    return this;
+  }
+
+  /**
+   * Records to insert.
+   *
+   * @return insertRecords
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_INSERT_RECORDS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<LLMObsDatasetBatchUpdateInsertRecord> getInsertRecords() {
+    return insertRecords;
+  }
+
+  public void setInsertRecords(List<LLMObsDatasetBatchUpdateInsertRecord> insertRecords) {
+    this.insertRecords = insertRecords;
+  }
+
+  public LLMObsDatasetBatchUpdateDataAttributesRequest tags(List<String> tags) {
+    this.tags = tags;
+    return this;
+  }
+
+  public LLMObsDatasetBatchUpdateDataAttributesRequest addTagsItem(String tagsItem) {
+    if (this.tags == null) {
+      this.tags = new ArrayList<>();
+    }
+    this.tags.add(tagsItem);
+    return this;
+  }
+
+  /**
+   * List of tag strings.
+   *
+   * @return tags
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_TAGS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<String> getTags() {
+    return tags;
+  }
+
+  public void setTags(List<String> tags) {
+    this.tags = tags;
+  }
+
+  public LLMObsDatasetBatchUpdateDataAttributesRequest updateRecords(
+      List<LLMObsDatasetBatchUpdateUpdateRecord> updateRecords) {
+    this.updateRecords = updateRecords;
+    for (LLMObsDatasetBatchUpdateUpdateRecord item : updateRecords) {
+      this.unparsed |= item.unparsed;
+    }
+    return this;
+  }
+
+  public LLMObsDatasetBatchUpdateDataAttributesRequest addUpdateRecordsItem(
+      LLMObsDatasetBatchUpdateUpdateRecord updateRecordsItem) {
+    if (this.updateRecords == null) {
+      this.updateRecords = new ArrayList<>();
+    }
+    this.updateRecords.add(updateRecordsItem);
+    this.unparsed |= updateRecordsItem.unparsed;
+    return this;
+  }
+
+  /**
+   * Records to update by ID.
+   *
+   * @return updateRecords
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_UPDATE_RECORDS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<LLMObsDatasetBatchUpdateUpdateRecord> getUpdateRecords() {
+    return updateRecords;
+  }
+
+  public void setUpdateRecords(List<LLMObsDatasetBatchUpdateUpdateRecord> updateRecords) {
+    this.updateRecords = updateRecords;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return LLMObsDatasetBatchUpdateDataAttributesRequest
+   */
+  @JsonAnySetter
+  public LLMObsDatasetBatchUpdateDataAttributesRequest putAdditionalProperty(
+      String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this LLMObsDatasetBatchUpdateDataAttributesRequest object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    LLMObsDatasetBatchUpdateDataAttributesRequest llmObsDatasetBatchUpdateDataAttributesRequest =
+        (LLMObsDatasetBatchUpdateDataAttributesRequest) o;
+    return Objects.equals(
+            this.createNewVersion, llmObsDatasetBatchUpdateDataAttributesRequest.createNewVersion)
+        && Objects.equals(
+            this.deleteRecords, llmObsDatasetBatchUpdateDataAttributesRequest.deleteRecords)
+        && Objects.equals(
+            this.insertRecords, llmObsDatasetBatchUpdateDataAttributesRequest.insertRecords)
+        && Objects.equals(this.tags, llmObsDatasetBatchUpdateDataAttributesRequest.tags)
+        && Objects.equals(
+            this.updateRecords, llmObsDatasetBatchUpdateDataAttributesRequest.updateRecords)
+        && Objects.equals(
+            this.additionalProperties,
+            llmObsDatasetBatchUpdateDataAttributesRequest.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(
+        createNewVersion, deleteRecords, insertRecords, tags, updateRecords, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class LLMObsDatasetBatchUpdateDataAttributesRequest {\n");
+    sb.append("    createNewVersion: ").append(toIndentedString(createNewVersion)).append("\n");
+    sb.append("    deleteRecords: ").append(toIndentedString(deleteRecords)).append("\n");
+    sb.append("    insertRecords: ").append(toIndentedString(insertRecords)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
+    sb.append("    updateRecords: ").append(toIndentedString(updateRecords)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetBatchUpdateDataRequest.java b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetBatchUpdateDataRequest.java
new file mode 100644
index 00000000000..80b86a49328
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetBatchUpdateDataRequest.java
@@ -0,0 +1,212 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** Data object for batch-updating records in an LLM Observability dataset. */
+@JsonPropertyOrder({
+  LLMObsDatasetBatchUpdateDataRequest.JSON_PROPERTY_ATTRIBUTES,
+  LLMObsDatasetBatchUpdateDataRequest.JSON_PROPERTY_ID,
+  LLMObsDatasetBatchUpdateDataRequest.JSON_PROPERTY_TYPE
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class LLMObsDatasetBatchUpdateDataRequest {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_ATTRIBUTES = "attributes";
+  private LLMObsDatasetBatchUpdateDataAttributesRequest attributes;
+
+  public static final String JSON_PROPERTY_ID = "id";
+  private String id;
+
+  public static final String JSON_PROPERTY_TYPE = "type";
+  private LLMObsDatasetType type;
+
+  public LLMObsDatasetBatchUpdateDataRequest() {}
+
+  @JsonCreator
+  public LLMObsDatasetBatchUpdateDataRequest(
+      @JsonProperty(required = true, value = JSON_PROPERTY_ATTRIBUTES)
+          LLMObsDatasetBatchUpdateDataAttributesRequest attributes,
+      @JsonProperty(required = true, value = JSON_PROPERTY_ID) String id,
+      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE) LLMObsDatasetType type) {
+    this.attributes = attributes;
+    this.unparsed |= attributes.unparsed;
+    this.id = id;
+    this.type = type;
+    this.unparsed |= !type.isValid();
+  }
+
+  public LLMObsDatasetBatchUpdateDataRequest attributes(
+      LLMObsDatasetBatchUpdateDataAttributesRequest attributes) {
+    this.attributes = attributes;
+    this.unparsed |= attributes.unparsed;
+    return this;
+  }
+
+  /**
+   * Attributes for batch-updating records in an LLM Observability dataset.
+   *
+   * @return attributes
+   */
+  @JsonProperty(JSON_PROPERTY_ATTRIBUTES)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public LLMObsDatasetBatchUpdateDataAttributesRequest getAttributes() {
+    return attributes;
+  }
+
+  public void setAttributes(LLMObsDatasetBatchUpdateDataAttributesRequest attributes) {
+    this.attributes = attributes;
+  }
+
+  public LLMObsDatasetBatchUpdateDataRequest id(String id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * Unique identifier of the dataset.
+   *
+   * @return id
+   */
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public LLMObsDatasetBatchUpdateDataRequest type(LLMObsDatasetType type) {
+    this.type = type;
+    this.unparsed |= !type.isValid();
+    return this;
+  }
+
+  /**
+   * Resource type of an LLM Observability dataset.
+   *
+   * @return type
+   */
+  @JsonProperty(JSON_PROPERTY_TYPE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public LLMObsDatasetType getType() {
+    return type;
+  }
+
+  public void setType(LLMObsDatasetType type) {
+    if (!type.isValid()) {
+      this.unparsed = true;
+    }
+    this.type = type;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return LLMObsDatasetBatchUpdateDataRequest
+   */
+  @JsonAnySetter
+  public LLMObsDatasetBatchUpdateDataRequest putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this LLMObsDatasetBatchUpdateDataRequest object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    LLMObsDatasetBatchUpdateDataRequest llmObsDatasetBatchUpdateDataRequest =
+        (LLMObsDatasetBatchUpdateDataRequest) o;
+    return Objects.equals(this.attributes, llmObsDatasetBatchUpdateDataRequest.attributes)
+        && Objects.equals(this.id, llmObsDatasetBatchUpdateDataRequest.id)
+        && Objects.equals(this.type, llmObsDatasetBatchUpdateDataRequest.type)
+        && Objects.equals(
+            this.additionalProperties, llmObsDatasetBatchUpdateDataRequest.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(attributes, id, type, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class LLMObsDatasetBatchUpdateDataRequest {\n");
+    sb.append("    attributes: ").append(toIndentedString(attributes)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    type: ").append(toIndentedString(type)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetBatchUpdateInsertRecord.java b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetBatchUpdateInsertRecord.java
new file mode 100644
index 00000000000..35bfcba1115
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetBatchUpdateInsertRecord.java
@@ -0,0 +1,324 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import org.openapitools.jackson.nullable.JsonNullable;
+
+/** A record to insert as part of a batch update on an LLM Observability dataset. */
+@JsonPropertyOrder({
+  LLMObsDatasetBatchUpdateInsertRecord.JSON_PROPERTY_EXPECTED_OUTPUT,
+  LLMObsDatasetBatchUpdateInsertRecord.JSON_PROPERTY_ID,
+  LLMObsDatasetBatchUpdateInsertRecord.JSON_PROPERTY_INPUT,
+  LLMObsDatasetBatchUpdateInsertRecord.JSON_PROPERTY_METADATA,
+  LLMObsDatasetBatchUpdateInsertRecord.JSON_PROPERTY_TAG_OPERATIONS,
+  LLMObsDatasetBatchUpdateInsertRecord.JSON_PROPERTY_TAGS
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class LLMObsDatasetBatchUpdateInsertRecord {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_EXPECTED_OUTPUT = "expected_output";
+  private JsonNullable<AnyValue> expectedOutput = JsonNullable.<AnyValue>undefined();
+
+  public static final String JSON_PROPERTY_ID = "id";
+  private String id;
+
+  public static final String JSON_PROPERTY_INPUT = "input";
+  private AnyValue input;
+
+  public static final String JSON_PROPERTY_METADATA = "metadata";
+  private Map<String, Object> metadata = null;
+
+  public static final String JSON_PROPERTY_TAG_OPERATIONS = "tag_operations";
+  private LLMObsDatasetRecordTagOperations tagOperations;
+
+  public static final String JSON_PROPERTY_TAGS = "tags";
+  private List<String> tags = null;
+
+  public LLMObsDatasetBatchUpdateInsertRecord() {}
+
+  @JsonCreator
+  public LLMObsDatasetBatchUpdateInsertRecord(
+      @JsonProperty(required = true, value = JSON_PROPERTY_INPUT) AnyValue input) {
+    this.input = input;
+    if (input != null) {
+      this.unparsed |= input.unparsed;
+    }
+  }
+
+  public LLMObsDatasetBatchUpdateInsertRecord expectedOutput(AnyValue expectedOutput) {
+    this.expectedOutput = JsonNullable.<AnyValue>of(expectedOutput);
+    return this;
+  }
+
+  /**
+   * Represents any valid JSON value.
+   *
+   * @return expectedOutput
+   */
+  @jakarta.annotation.Nullable
+  @JsonIgnore
+  public AnyValue getExpectedOutput() {
+    return expectedOutput.orElse(null);
+  }
+
+  @JsonProperty(JSON_PROPERTY_EXPECTED_OUTPUT)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public JsonNullable<AnyValue> getExpectedOutput_JsonNullable() {
+    return expectedOutput;
+  }
+
+  @JsonProperty(JSON_PROPERTY_EXPECTED_OUTPUT)
+  public void setExpectedOutput_JsonNullable(JsonNullable<AnyValue> expectedOutput) {
+    this.expectedOutput = expectedOutput;
+  }
+
+  public void setExpectedOutput(AnyValue expectedOutput) {
+    this.expectedOutput = JsonNullable.<AnyValue>of(expectedOutput);
+  }
+
+  public LLMObsDatasetBatchUpdateInsertRecord id(String id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * Optional user-provided identifier for the record. If omitted, the server generates an
+   * identifier.
+   *
+   * @return id
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public LLMObsDatasetBatchUpdateInsertRecord input(AnyValue input) {
+    this.input = input;
+    if (input != null) {
+      this.unparsed |= input.unparsed;
+    }
+    return this;
+  }
+
+  /**
+   * Represents any valid JSON value.
+   *
+   * @return input
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_INPUT)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public AnyValue getInput() {
+    return input;
+  }
+
+  public void setInput(AnyValue input) {
+    this.input = input;
+  }
+
+  public LLMObsDatasetBatchUpdateInsertRecord metadata(Map<String, Object> metadata) {
+    this.metadata = metadata;
+    return this;
+  }
+
+  public LLMObsDatasetBatchUpdateInsertRecord putMetadataItem(String key, Object metadataItem) {
+    if (this.metadata == null) {
+      this.metadata = new HashMap<>();
+    }
+    this.metadata.put(key, metadataItem);
+    return this;
+  }
+
+  /**
+   * Arbitrary metadata associated with the record.
+   *
+   * @return metadata
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_METADATA)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Map<String, Object> getMetadata() {
+    return metadata;
+  }
+
+  public void setMetadata(Map<String, Object> metadata) {
+    this.metadata = metadata;
+  }
+
+  public LLMObsDatasetBatchUpdateInsertRecord tagOperations(
+      LLMObsDatasetRecordTagOperations tagOperations) {
+    this.tagOperations = tagOperations;
+    this.unparsed |= tagOperations.unparsed;
+    return this;
+  }
+
+  /**
+   * Explicit tag operations for updating records. Operations are applied in order, Remove then Add
+   * then Set. <code>set</code> is the final override; if specified, the result of <code>remove
+   * </code> and <code>add</code> is discarded.
+   *
+   * @return tagOperations
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_TAG_OPERATIONS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public LLMObsDatasetRecordTagOperations getTagOperations() {
+    return tagOperations;
+  }
+
+  public void setTagOperations(LLMObsDatasetRecordTagOperations tagOperations) {
+    this.tagOperations = tagOperations;
+  }
+
+  public LLMObsDatasetBatchUpdateInsertRecord tags(List<String> tags) {
+    this.tags = tags;
+    return this;
+  }
+
+  public LLMObsDatasetBatchUpdateInsertRecord addTagsItem(String tagsItem) {
+    if (this.tags == null) {
+      this.tags = new ArrayList<>();
+    }
+    this.tags.add(tagsItem);
+    return this;
+  }
+
+  /**
+   * List of tag strings.
+   *
+   * @return tags
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_TAGS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<String> getTags() {
+    return tags;
+  }
+
+  public void setTags(List<String> tags) {
+    this.tags = tags;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return LLMObsDatasetBatchUpdateInsertRecord
+   */
+  @JsonAnySetter
+  public LLMObsDatasetBatchUpdateInsertRecord putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this LLMObsDatasetBatchUpdateInsertRecord object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    LLMObsDatasetBatchUpdateInsertRecord llmObsDatasetBatchUpdateInsertRecord =
+        (LLMObsDatasetBatchUpdateInsertRecord) o;
+    return Objects.equals(this.expectedOutput, llmObsDatasetBatchUpdateInsertRecord.expectedOutput)
+        && Objects.equals(this.id, llmObsDatasetBatchUpdateInsertRecord.id)
+        && Objects.equals(this.input, llmObsDatasetBatchUpdateInsertRecord.input)
+        && Objects.equals(this.metadata, llmObsDatasetBatchUpdateInsertRecord.metadata)
+        && Objects.equals(this.tagOperations, llmObsDatasetBatchUpdateInsertRecord.tagOperations)
+        && Objects.equals(this.tags, llmObsDatasetBatchUpdateInsertRecord.tags)
+        && Objects.equals(
+            this.additionalProperties, llmObsDatasetBatchUpdateInsertRecord.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(
+        expectedOutput, id, input, metadata, tagOperations, tags, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class LLMObsDatasetBatchUpdateInsertRecord {\n");
+    sb.append("    expectedOutput: ").append(toIndentedString(expectedOutput)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    input: ").append(toIndentedString(input)).append("\n");
+    sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
+    sb.append("    tagOperations: ").append(toIndentedString(tagOperations)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetBatchUpdateRequest.java b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetBatchUpdateRequest.java
new file mode 100644
index 00000000000..fbf255ca515
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetBatchUpdateRequest.java
@@ -0,0 +1,148 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** Request to batch-insert, update, and delete records in an LLM Observability dataset. */
+@JsonPropertyOrder({LLMObsDatasetBatchUpdateRequest.JSON_PROPERTY_DATA})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class LLMObsDatasetBatchUpdateRequest {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_DATA = "data";
+  private LLMObsDatasetBatchUpdateDataRequest data;
+
+  public LLMObsDatasetBatchUpdateRequest() {}
+
+  @JsonCreator
+  public LLMObsDatasetBatchUpdateRequest(
+      @JsonProperty(required = true, value = JSON_PROPERTY_DATA)
+          LLMObsDatasetBatchUpdateDataRequest data) {
+    this.data = data;
+    this.unparsed |= data.unparsed;
+  }
+
+  public LLMObsDatasetBatchUpdateRequest data(LLMObsDatasetBatchUpdateDataRequest data) {
+    this.data = data;
+    this.unparsed |= data.unparsed;
+    return this;
+  }
+
+  /**
+   * Data object for batch-updating records in an LLM Observability dataset.
+   *
+   * @return data
+   */
+  @JsonProperty(JSON_PROPERTY_DATA)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public LLMObsDatasetBatchUpdateDataRequest getData() {
+    return data;
+  }
+
+  public void setData(LLMObsDatasetBatchUpdateDataRequest data) {
+    this.data = data;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return LLMObsDatasetBatchUpdateRequest
+   */
+  @JsonAnySetter
+  public LLMObsDatasetBatchUpdateRequest putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this LLMObsDatasetBatchUpdateRequest object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    LLMObsDatasetBatchUpdateRequest llmObsDatasetBatchUpdateRequest =
+        (LLMObsDatasetBatchUpdateRequest) o;
+    return Objects.equals(this.data, llmObsDatasetBatchUpdateRequest.data)
+        && Objects.equals(
+            this.additionalProperties, llmObsDatasetBatchUpdateRequest.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(data, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class LLMObsDatasetBatchUpdateRequest {\n");
+    sb.append("    data: ").append(toIndentedString(data)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetBatchUpdateUpdateRecord.java b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetBatchUpdateUpdateRecord.java
new file mode 100644
index 00000000000..0a162c76d11
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetBatchUpdateUpdateRecord.java
@@ -0,0 +1,288 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import org.openapitools.jackson.nullable.JsonNullable;
+
+/** A record update payload as part of a batch update on an LLM Observability dataset. */
+@JsonPropertyOrder({
+  LLMObsDatasetBatchUpdateUpdateRecord.JSON_PROPERTY_EXPECTED_OUTPUT,
+  LLMObsDatasetBatchUpdateUpdateRecord.JSON_PROPERTY_ID,
+  LLMObsDatasetBatchUpdateUpdateRecord.JSON_PROPERTY_INPUT,
+  LLMObsDatasetBatchUpdateUpdateRecord.JSON_PROPERTY_METADATA,
+  LLMObsDatasetBatchUpdateUpdateRecord.JSON_PROPERTY_TAG_OPERATIONS
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class LLMObsDatasetBatchUpdateUpdateRecord {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_EXPECTED_OUTPUT = "expected_output";
+  private JsonNullable<AnyValue> expectedOutput = JsonNullable.<AnyValue>undefined();
+
+  public static final String JSON_PROPERTY_ID = "id";
+  private String id;
+
+  public static final String JSON_PROPERTY_INPUT = "input";
+  private JsonNullable<AnyValue> input = JsonNullable.<AnyValue>undefined();
+
+  public static final String JSON_PROPERTY_METADATA = "metadata";
+  private Map<String, Object> metadata = null;
+
+  public static final String JSON_PROPERTY_TAG_OPERATIONS = "tag_operations";
+  private LLMObsDatasetRecordTagOperations tagOperations;
+
+  public LLMObsDatasetBatchUpdateUpdateRecord() {}
+
+  @JsonCreator
+  public LLMObsDatasetBatchUpdateUpdateRecord(
+      @JsonProperty(required = true, value = JSON_PROPERTY_ID) String id) {
+    this.id = id;
+  }
+
+  public LLMObsDatasetBatchUpdateUpdateRecord expectedOutput(AnyValue expectedOutput) {
+    this.expectedOutput = JsonNullable.<AnyValue>of(expectedOutput);
+    return this;
+  }
+
+  /**
+   * Represents any valid JSON value.
+   *
+   * @return expectedOutput
+   */
+  @jakarta.annotation.Nullable
+  @JsonIgnore
+  public AnyValue getExpectedOutput() {
+    return expectedOutput.orElse(null);
+  }
+
+  @JsonProperty(JSON_PROPERTY_EXPECTED_OUTPUT)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public JsonNullable<AnyValue> getExpectedOutput_JsonNullable() {
+    return expectedOutput;
+  }
+
+  @JsonProperty(JSON_PROPERTY_EXPECTED_OUTPUT)
+  public void setExpectedOutput_JsonNullable(JsonNullable<AnyValue> expectedOutput) {
+    this.expectedOutput = expectedOutput;
+  }
+
+  public void setExpectedOutput(AnyValue expectedOutput) {
+    this.expectedOutput = JsonNullable.<AnyValue>of(expectedOutput);
+  }
+
+  public LLMObsDatasetBatchUpdateUpdateRecord id(String id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * Unique identifier of the record to update.
+   *
+   * @return id
+   */
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public LLMObsDatasetBatchUpdateUpdateRecord input(AnyValue input) {
+    this.input = JsonNullable.<AnyValue>of(input);
+    return this;
+  }
+
+  /**
+   * Represents any valid JSON value.
+   *
+   * @return input
+   */
+  @jakarta.annotation.Nullable
+  @JsonIgnore
+  public AnyValue getInput() {
+    return input.orElse(null);
+  }
+
+  @JsonProperty(JSON_PROPERTY_INPUT)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public JsonNullable<AnyValue> getInput_JsonNullable() {
+    return input;
+  }
+
+  @JsonProperty(JSON_PROPERTY_INPUT)
+  public void setInput_JsonNullable(JsonNullable<AnyValue> input) {
+    this.input = input;
+  }
+
+  public void setInput(AnyValue input) {
+    this.input = JsonNullable.<AnyValue>of(input);
+  }
+
+  public LLMObsDatasetBatchUpdateUpdateRecord metadata(Map<String, Object> metadata) {
+    this.metadata = metadata;
+    return this;
+  }
+
+  public LLMObsDatasetBatchUpdateUpdateRecord putMetadataItem(String key, Object metadataItem) {
+    if (this.metadata == null) {
+      this.metadata = new HashMap<>();
+    }
+    this.metadata.put(key, metadataItem);
+    return this;
+  }
+
+  /**
+   * Updated metadata associated with the record.
+   *
+   * @return metadata
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_METADATA)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Map<String, Object> getMetadata() {
+    return metadata;
+  }
+
+  public void setMetadata(Map<String, Object> metadata) {
+    this.metadata = metadata;
+  }
+
+  public LLMObsDatasetBatchUpdateUpdateRecord tagOperations(
+      LLMObsDatasetRecordTagOperations tagOperations) {
+    this.tagOperations = tagOperations;
+    this.unparsed |= tagOperations.unparsed;
+    return this;
+  }
+
+  /**
+   * Explicit tag operations for updating records. Operations are applied in order, Remove then Add
+   * then Set. <code>set</code> is the final override; if specified, the result of <code>remove
+   * </code> and <code>add</code> is discarded.
+   *
+   * @return tagOperations
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_TAG_OPERATIONS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public LLMObsDatasetRecordTagOperations getTagOperations() {
+    return tagOperations;
+  }
+
+  public void setTagOperations(LLMObsDatasetRecordTagOperations tagOperations) {
+    this.tagOperations = tagOperations;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return LLMObsDatasetBatchUpdateUpdateRecord
+   */
+  @JsonAnySetter
+  public LLMObsDatasetBatchUpdateUpdateRecord putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this LLMObsDatasetBatchUpdateUpdateRecord object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    LLMObsDatasetBatchUpdateUpdateRecord llmObsDatasetBatchUpdateUpdateRecord =
+        (LLMObsDatasetBatchUpdateUpdateRecord) o;
+    return Objects.equals(this.expectedOutput, llmObsDatasetBatchUpdateUpdateRecord.expectedOutput)
+        && Objects.equals(this.id, llmObsDatasetBatchUpdateUpdateRecord.id)
+        && Objects.equals(this.input, llmObsDatasetBatchUpdateUpdateRecord.input)
+        && Objects.equals(this.metadata, llmObsDatasetBatchUpdateUpdateRecord.metadata)
+        && Objects.equals(this.tagOperations, llmObsDatasetBatchUpdateUpdateRecord.tagOperations)
+        && Objects.equals(
+            this.additionalProperties, llmObsDatasetBatchUpdateUpdateRecord.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(expectedOutput, id, input, metadata, tagOperations, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class LLMObsDatasetBatchUpdateUpdateRecord {\n");
+    sb.append("    expectedOutput: ").append(toIndentedString(expectedOutput)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    input: ").append(toIndentedString(input)).append("\n");
+    sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
+    sb.append("    tagOperations: ").append(toIndentedString(tagOperations)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetCloneDataAttributesRequest.java b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetCloneDataAttributesRequest.java
new file mode 100644
index 00000000000..182fb9c4b49
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetCloneDataAttributesRequest.java
@@ -0,0 +1,175 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** Attributes for cloning an LLM Observability dataset. */
+@JsonPropertyOrder({
+  LLMObsDatasetCloneDataAttributesRequest.JSON_PROPERTY_DESCRIPTION,
+  LLMObsDatasetCloneDataAttributesRequest.JSON_PROPERTY_NAME
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class LLMObsDatasetCloneDataAttributesRequest {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_DESCRIPTION = "description";
+  private String description;
+
+  public static final String JSON_PROPERTY_NAME = "name";
+  private String name;
+
+  public LLMObsDatasetCloneDataAttributesRequest() {}
+
+  @JsonCreator
+  public LLMObsDatasetCloneDataAttributesRequest(
+      @JsonProperty(required = true, value = JSON_PROPERTY_NAME) String name) {
+    this.name = name;
+  }
+
+  public LLMObsDatasetCloneDataAttributesRequest description(String description) {
+    this.description = description;
+    return this;
+  }
+
+  /**
+   * Description of the cloned dataset.
+   *
+   * @return description
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_DESCRIPTION)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  public LLMObsDatasetCloneDataAttributesRequest name(String name) {
+    this.name = name;
+    return this;
+  }
+
+  /**
+   * Name of the cloned dataset.
+   *
+   * @return name
+   */
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return LLMObsDatasetCloneDataAttributesRequest
+   */
+  @JsonAnySetter
+  public LLMObsDatasetCloneDataAttributesRequest putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this LLMObsDatasetCloneDataAttributesRequest object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    LLMObsDatasetCloneDataAttributesRequest llmObsDatasetCloneDataAttributesRequest =
+        (LLMObsDatasetCloneDataAttributesRequest) o;
+    return Objects.equals(this.description, llmObsDatasetCloneDataAttributesRequest.description)
+        && Objects.equals(this.name, llmObsDatasetCloneDataAttributesRequest.name)
+        && Objects.equals(
+            this.additionalProperties,
+            llmObsDatasetCloneDataAttributesRequest.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(description, name, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class LLMObsDatasetCloneDataAttributesRequest {\n");
+    sb.append("    description: ").append(toIndentedString(description)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetCloneDataRequest.java b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetCloneDataRequest.java
new file mode 100644
index 00000000000..9646f74a531
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetCloneDataRequest.java
@@ -0,0 +1,211 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** Data object for cloning an LLM Observability dataset. */
+@JsonPropertyOrder({
+  LLMObsDatasetCloneDataRequest.JSON_PROPERTY_ATTRIBUTES,
+  LLMObsDatasetCloneDataRequest.JSON_PROPERTY_ID,
+  LLMObsDatasetCloneDataRequest.JSON_PROPERTY_TYPE
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class LLMObsDatasetCloneDataRequest {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_ATTRIBUTES = "attributes";
+  private LLMObsDatasetCloneDataAttributesRequest attributes;
+
+  public static final String JSON_PROPERTY_ID = "id";
+  private String id;
+
+  public static final String JSON_PROPERTY_TYPE = "type";
+  private LLMObsDatasetType type;
+
+  public LLMObsDatasetCloneDataRequest() {}
+
+  @JsonCreator
+  public LLMObsDatasetCloneDataRequest(
+      @JsonProperty(required = true, value = JSON_PROPERTY_ATTRIBUTES)
+          LLMObsDatasetCloneDataAttributesRequest attributes,
+      @JsonProperty(required = true, value = JSON_PROPERTY_ID) String id,
+      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE) LLMObsDatasetType type) {
+    this.attributes = attributes;
+    this.unparsed |= attributes.unparsed;
+    this.id = id;
+    this.type = type;
+    this.unparsed |= !type.isValid();
+  }
+
+  public LLMObsDatasetCloneDataRequest attributes(
+      LLMObsDatasetCloneDataAttributesRequest attributes) {
+    this.attributes = attributes;
+    this.unparsed |= attributes.unparsed;
+    return this;
+  }
+
+  /**
+   * Attributes for cloning an LLM Observability dataset.
+   *
+   * @return attributes
+   */
+  @JsonProperty(JSON_PROPERTY_ATTRIBUTES)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public LLMObsDatasetCloneDataAttributesRequest getAttributes() {
+    return attributes;
+  }
+
+  public void setAttributes(LLMObsDatasetCloneDataAttributesRequest attributes) {
+    this.attributes = attributes;
+  }
+
+  public LLMObsDatasetCloneDataRequest id(String id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * Identifier of the source dataset to clone.
+   *
+   * @return id
+   */
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public LLMObsDatasetCloneDataRequest type(LLMObsDatasetType type) {
+    this.type = type;
+    this.unparsed |= !type.isValid();
+    return this;
+  }
+
+  /**
+   * Resource type of an LLM Observability dataset.
+   *
+   * @return type
+   */
+  @JsonProperty(JSON_PROPERTY_TYPE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public LLMObsDatasetType getType() {
+    return type;
+  }
+
+  public void setType(LLMObsDatasetType type) {
+    if (!type.isValid()) {
+      this.unparsed = true;
+    }
+    this.type = type;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return LLMObsDatasetCloneDataRequest
+   */
+  @JsonAnySetter
+  public LLMObsDatasetCloneDataRequest putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this LLMObsDatasetCloneDataRequest object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    LLMObsDatasetCloneDataRequest llmObsDatasetCloneDataRequest = (LLMObsDatasetCloneDataRequest) o;
+    return Objects.equals(this.attributes, llmObsDatasetCloneDataRequest.attributes)
+        && Objects.equals(this.id, llmObsDatasetCloneDataRequest.id)
+        && Objects.equals(this.type, llmObsDatasetCloneDataRequest.type)
+        && Objects.equals(
+            this.additionalProperties, llmObsDatasetCloneDataRequest.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(attributes, id, type, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class LLMObsDatasetCloneDataRequest {\n");
+    sb.append("    attributes: ").append(toIndentedString(attributes)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    type: ").append(toIndentedString(type)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetCloneRequest.java b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetCloneRequest.java
new file mode 100644
index 00000000000..bc4fd4e4574
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetCloneRequest.java
@@ -0,0 +1,147 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** Request to clone an LLM Observability dataset. */
+@JsonPropertyOrder({LLMObsDatasetCloneRequest.JSON_PROPERTY_DATA})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class LLMObsDatasetCloneRequest {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_DATA = "data";
+  private LLMObsDatasetCloneDataRequest data;
+
+  public LLMObsDatasetCloneRequest() {}
+
+  @JsonCreator
+  public LLMObsDatasetCloneRequest(
+      @JsonProperty(required = true, value = JSON_PROPERTY_DATA)
+          LLMObsDatasetCloneDataRequest data) {
+    this.data = data;
+    this.unparsed |= data.unparsed;
+  }
+
+  public LLMObsDatasetCloneRequest data(LLMObsDatasetCloneDataRequest data) {
+    this.data = data;
+    this.unparsed |= data.unparsed;
+    return this;
+  }
+
+  /**
+   * Data object for cloning an LLM Observability dataset.
+   *
+   * @return data
+   */
+  @JsonProperty(JSON_PROPERTY_DATA)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public LLMObsDatasetCloneDataRequest getData() {
+    return data;
+  }
+
+  public void setData(LLMObsDatasetCloneDataRequest data) {
+    this.data = data;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return LLMObsDatasetCloneRequest
+   */
+  @JsonAnySetter
+  public LLMObsDatasetCloneRequest putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this LLMObsDatasetCloneRequest object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    LLMObsDatasetCloneRequest llmObsDatasetCloneRequest = (LLMObsDatasetCloneRequest) o;
+    return Objects.equals(this.data, llmObsDatasetCloneRequest.data)
+        && Objects.equals(
+            this.additionalProperties, llmObsDatasetCloneRequest.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(data, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class LLMObsDatasetCloneRequest {\n");
+    sb.append("    data: ").append(toIndentedString(data)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetExportFormat.java b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetExportFormat.java
new file mode 100644
index 00000000000..7853241f7f4
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetExportFormat.java
@@ -0,0 +1,55 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.datadog.api.client.ModelEnum;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+/** Supported export format for an LLM Observability dataset. */
+@JsonSerialize(using = LLMObsDatasetExportFormat.LLMObsDatasetExportFormatSerializer.class)
+public class LLMObsDatasetExportFormat extends ModelEnum<String> {
+
+  private static final Set<String> allowedValues = new HashSet<String>(Arrays.asList("csv"));
+
+  public static final LLMObsDatasetExportFormat CSV = new LLMObsDatasetExportFormat("csv");
+
+  LLMObsDatasetExportFormat(String value) {
+    super(value, allowedValues);
+  }
+
+  public static class LLMObsDatasetExportFormatSerializer
+      extends StdSerializer<LLMObsDatasetExportFormat> {
+    public LLMObsDatasetExportFormatSerializer(Class<LLMObsDatasetExportFormat> t) {
+      super(t);
+    }
+
+    public LLMObsDatasetExportFormatSerializer() {
+      this(null);
+    }
+
+    @Override
+    public void serialize(
+        LLMObsDatasetExportFormat value, JsonGenerator jgen, SerializerProvider provider)
+        throws IOException, JsonProcessingException {
+      jgen.writeObject(value.value);
+    }
+  }
+
+  @JsonCreator
+  public static LLMObsDatasetExportFormat fromValue(String value) {
+    return new LLMObsDatasetExportFormat(value);
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetRecordTagOperations.java b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetRecordTagOperations.java
new file mode 100644
index 00000000000..90924949681
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetRecordTagOperations.java
@@ -0,0 +1,223 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * Explicit tag operations for updating records. Operations are applied in order, Remove then Add
+ * then Set. <code>set</code> is the final override; if specified, the result of <code>remove</code>
+ * and <code>add</code> is discarded.
+ */
+@JsonPropertyOrder({
+  LLMObsDatasetRecordTagOperations.JSON_PROPERTY_ADD,
+  LLMObsDatasetRecordTagOperations.JSON_PROPERTY_REMOVE,
+  LLMObsDatasetRecordTagOperations.JSON_PROPERTY_SET
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class LLMObsDatasetRecordTagOperations {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_ADD = "add";
+  private List<String> add = null;
+
+  public static final String JSON_PROPERTY_REMOVE = "remove";
+  private List<String> remove = null;
+
+  public static final String JSON_PROPERTY_SET = "set";
+  private List<String> set = null;
+
+  public LLMObsDatasetRecordTagOperations add(List<String> add) {
+    this.add = add;
+    return this;
+  }
+
+  public LLMObsDatasetRecordTagOperations addAddItem(String addItem) {
+    if (this.add == null) {
+      this.add = new ArrayList<>();
+    }
+    this.add.add(addItem);
+    return this;
+  }
+
+  /**
+   * List of tag strings.
+   *
+   * @return add
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ADD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<String> getAdd() {
+    return add;
+  }
+
+  public void setAdd(List<String> add) {
+    this.add = add;
+  }
+
+  public LLMObsDatasetRecordTagOperations remove(List<String> remove) {
+    this.remove = remove;
+    return this;
+  }
+
+  public LLMObsDatasetRecordTagOperations addRemoveItem(String removeItem) {
+    if (this.remove == null) {
+      this.remove = new ArrayList<>();
+    }
+    this.remove.add(removeItem);
+    return this;
+  }
+
+  /**
+   * List of tag strings.
+   *
+   * @return remove
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_REMOVE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<String> getRemove() {
+    return remove;
+  }
+
+  public void setRemove(List<String> remove) {
+    this.remove = remove;
+  }
+
+  public LLMObsDatasetRecordTagOperations set(List<String> set) {
+    this.set = set;
+    return this;
+  }
+
+  public LLMObsDatasetRecordTagOperations addSetItem(String setItem) {
+    if (this.set == null) {
+      this.set = new ArrayList<>();
+    }
+    this.set.add(setItem);
+    return this;
+  }
+
+  /**
+   * List of tag strings.
+   *
+   * @return set
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_SET)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<String> getSet() {
+    return set;
+  }
+
+  public void setSet(List<String> set) {
+    this.set = set;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return LLMObsDatasetRecordTagOperations
+   */
+  @JsonAnySetter
+  public LLMObsDatasetRecordTagOperations putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this LLMObsDatasetRecordTagOperations object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    LLMObsDatasetRecordTagOperations llmObsDatasetRecordTagOperations =
+        (LLMObsDatasetRecordTagOperations) o;
+    return Objects.equals(this.add, llmObsDatasetRecordTagOperations.add)
+        && Objects.equals(this.remove, llmObsDatasetRecordTagOperations.remove)
+        && Objects.equals(this.set, llmObsDatasetRecordTagOperations.set)
+        && Objects.equals(
+            this.additionalProperties, llmObsDatasetRecordTagOperations.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(add, remove, set, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class LLMObsDatasetRecordTagOperations {\n");
+    sb.append("    add: ").append(toIndentedString(add)).append("\n");
+    sb.append("    remove: ").append(toIndentedString(remove)).append("\n");
+    sb.append("    set: ").append(toIndentedString(set)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetRecordsUploadFile.java b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetRecordsUploadFile.java
new file mode 100644
index 00000000000..cca6ee2d4b0
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetRecordsUploadFile.java
@@ -0,0 +1,140 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** Multipart payload for uploading dataset records from a file. */
+@JsonPropertyOrder({LLMObsDatasetRecordsUploadFile.JSON_PROPERTY_FILE})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class LLMObsDatasetRecordsUploadFile {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_FILE = "file";
+  private File file;
+
+  public LLMObsDatasetRecordsUploadFile file(File file) {
+    this.file = file;
+    return this;
+  }
+
+  /**
+   * The records file to upload. Currently only CSV is supported. The file must include an <code>
+   * input</code> column. Optional columns include <code>id</code>, <code>expected_output</code>,
+   * <code>metadata</code>, and <code>tags</code>.
+   *
+   * @return file
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_FILE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public File getFile() {
+    return file;
+  }
+
+  public void setFile(File file) {
+    this.file = file;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return LLMObsDatasetRecordsUploadFile
+   */
+  @JsonAnySetter
+  public LLMObsDatasetRecordsUploadFile putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this LLMObsDatasetRecordsUploadFile object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    LLMObsDatasetRecordsUploadFile llmObsDatasetRecordsUploadFile =
+        (LLMObsDatasetRecordsUploadFile) o;
+    return Objects.equals(this.file, llmObsDatasetRecordsUploadFile.file)
+        && Objects.equals(
+            this.additionalProperties, llmObsDatasetRecordsUploadFile.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(file, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class LLMObsDatasetRecordsUploadFile {\n");
+    sb.append("    file: ").append(toIndentedString(file)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetRestoreVersionDataAttributesRequest.java b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetRestoreVersionDataAttributesRequest.java
new file mode 100644
index 00000000000..00e34b48694
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetRestoreVersionDataAttributesRequest.java
@@ -0,0 +1,151 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** Attributes for restoring an LLM Observability dataset to a previous version. */
+@JsonPropertyOrder({LLMObsDatasetRestoreVersionDataAttributesRequest.JSON_PROPERTY_DATASET_VERSION})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class LLMObsDatasetRestoreVersionDataAttributesRequest {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_DATASET_VERSION = "dataset_version";
+  private Integer datasetVersion;
+
+  public LLMObsDatasetRestoreVersionDataAttributesRequest() {}
+
+  @JsonCreator
+  public LLMObsDatasetRestoreVersionDataAttributesRequest(
+      @JsonProperty(required = true, value = JSON_PROPERTY_DATASET_VERSION)
+          Integer datasetVersion) {
+    this.datasetVersion = datasetVersion;
+  }
+
+  public LLMObsDatasetRestoreVersionDataAttributesRequest datasetVersion(Integer datasetVersion) {
+    this.datasetVersion = datasetVersion;
+    return this;
+  }
+
+  /**
+   * Version number of the dataset to restore. Must be between 0 and the current version of the
+   * dataset, inclusive. maximum: 2147483647
+   *
+   * @return datasetVersion
+   */
+  @JsonProperty(JSON_PROPERTY_DATASET_VERSION)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public Integer getDatasetVersion() {
+    return datasetVersion;
+  }
+
+  public void setDatasetVersion(Integer datasetVersion) {
+    this.datasetVersion = datasetVersion;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return LLMObsDatasetRestoreVersionDataAttributesRequest
+   */
+  @JsonAnySetter
+  public LLMObsDatasetRestoreVersionDataAttributesRequest putAdditionalProperty(
+      String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this LLMObsDatasetRestoreVersionDataAttributesRequest object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    LLMObsDatasetRestoreVersionDataAttributesRequest
+        llmObsDatasetRestoreVersionDataAttributesRequest =
+            (LLMObsDatasetRestoreVersionDataAttributesRequest) o;
+    return Objects.equals(
+            this.datasetVersion, llmObsDatasetRestoreVersionDataAttributesRequest.datasetVersion)
+        && Objects.equals(
+            this.additionalProperties,
+            llmObsDatasetRestoreVersionDataAttributesRequest.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(datasetVersion, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class LLMObsDatasetRestoreVersionDataAttributesRequest {\n");
+    sb.append("    datasetVersion: ").append(toIndentedString(datasetVersion)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetRestoreVersionDataRequest.java b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetRestoreVersionDataRequest.java
new file mode 100644
index 00000000000..e80ec531aa6
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetRestoreVersionDataRequest.java
@@ -0,0 +1,212 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** Data object for restoring an LLM Observability dataset to a previous version. */
+@JsonPropertyOrder({
+  LLMObsDatasetRestoreVersionDataRequest.JSON_PROPERTY_ATTRIBUTES,
+  LLMObsDatasetRestoreVersionDataRequest.JSON_PROPERTY_ID,
+  LLMObsDatasetRestoreVersionDataRequest.JSON_PROPERTY_TYPE
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class LLMObsDatasetRestoreVersionDataRequest {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_ATTRIBUTES = "attributes";
+  private LLMObsDatasetRestoreVersionDataAttributesRequest attributes;
+
+  public static final String JSON_PROPERTY_ID = "id";
+  private String id;
+
+  public static final String JSON_PROPERTY_TYPE = "type";
+  private LLMObsDatasetType type;
+
+  public LLMObsDatasetRestoreVersionDataRequest() {}
+
+  @JsonCreator
+  public LLMObsDatasetRestoreVersionDataRequest(
+      @JsonProperty(required = true, value = JSON_PROPERTY_ATTRIBUTES)
+          LLMObsDatasetRestoreVersionDataAttributesRequest attributes,
+      @JsonProperty(required = true, value = JSON_PROPERTY_ID) String id,
+      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE) LLMObsDatasetType type) {
+    this.attributes = attributes;
+    this.unparsed |= attributes.unparsed;
+    this.id = id;
+    this.type = type;
+    this.unparsed |= !type.isValid();
+  }
+
+  public LLMObsDatasetRestoreVersionDataRequest attributes(
+      LLMObsDatasetRestoreVersionDataAttributesRequest attributes) {
+    this.attributes = attributes;
+    this.unparsed |= attributes.unparsed;
+    return this;
+  }
+
+  /**
+   * Attributes for restoring an LLM Observability dataset to a previous version.
+   *
+   * @return attributes
+   */
+  @JsonProperty(JSON_PROPERTY_ATTRIBUTES)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public LLMObsDatasetRestoreVersionDataAttributesRequest getAttributes() {
+    return attributes;
+  }
+
+  public void setAttributes(LLMObsDatasetRestoreVersionDataAttributesRequest attributes) {
+    this.attributes = attributes;
+  }
+
+  public LLMObsDatasetRestoreVersionDataRequest id(String id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * Unique identifier of the dataset to restore.
+   *
+   * @return id
+   */
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public LLMObsDatasetRestoreVersionDataRequest type(LLMObsDatasetType type) {
+    this.type = type;
+    this.unparsed |= !type.isValid();
+    return this;
+  }
+
+  /**
+   * Resource type of an LLM Observability dataset.
+   *
+   * @return type
+   */
+  @JsonProperty(JSON_PROPERTY_TYPE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public LLMObsDatasetType getType() {
+    return type;
+  }
+
+  public void setType(LLMObsDatasetType type) {
+    if (!type.isValid()) {
+      this.unparsed = true;
+    }
+    this.type = type;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return LLMObsDatasetRestoreVersionDataRequest
+   */
+  @JsonAnySetter
+  public LLMObsDatasetRestoreVersionDataRequest putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this LLMObsDatasetRestoreVersionDataRequest object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    LLMObsDatasetRestoreVersionDataRequest llmObsDatasetRestoreVersionDataRequest =
+        (LLMObsDatasetRestoreVersionDataRequest) o;
+    return Objects.equals(this.attributes, llmObsDatasetRestoreVersionDataRequest.attributes)
+        && Objects.equals(this.id, llmObsDatasetRestoreVersionDataRequest.id)
+        && Objects.equals(this.type, llmObsDatasetRestoreVersionDataRequest.type)
+        && Objects.equals(
+            this.additionalProperties, llmObsDatasetRestoreVersionDataRequest.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(attributes, id, type, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class LLMObsDatasetRestoreVersionDataRequest {\n");
+    sb.append("    attributes: ").append(toIndentedString(attributes)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    type: ").append(toIndentedString(type)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetRestoreVersionRequest.java b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetRestoreVersionRequest.java
new file mode 100644
index 00000000000..8c1f0d666a3
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/LLMObsDatasetRestoreVersionRequest.java
@@ -0,0 +1,148 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** Request to restore an LLM Observability dataset to a previous version. */
+@JsonPropertyOrder({LLMObsDatasetRestoreVersionRequest.JSON_PROPERTY_DATA})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class LLMObsDatasetRestoreVersionRequest {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_DATA = "data";
+  private LLMObsDatasetRestoreVersionDataRequest data;
+
+  public LLMObsDatasetRestoreVersionRequest() {}
+
+  @JsonCreator
+  public LLMObsDatasetRestoreVersionRequest(
+      @JsonProperty(required = true, value = JSON_PROPERTY_DATA)
+          LLMObsDatasetRestoreVersionDataRequest data) {
+    this.data = data;
+    this.unparsed |= data.unparsed;
+  }
+
+  public LLMObsDatasetRestoreVersionRequest data(LLMObsDatasetRestoreVersionDataRequest data) {
+    this.data = data;
+    this.unparsed |= data.unparsed;
+    return this;
+  }
+
+  /**
+   * Data object for restoring an LLM Observability dataset to a previous version.
+   *
+   * @return data
+   */
+  @JsonProperty(JSON_PROPERTY_DATA)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public LLMObsDatasetRestoreVersionDataRequest getData() {
+    return data;
+  }
+
+  public void setData(LLMObsDatasetRestoreVersionDataRequest data) {
+    this.data = data;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return LLMObsDatasetRestoreVersionRequest
+   */
+  @JsonAnySetter
+  public LLMObsDatasetRestoreVersionRequest putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this LLMObsDatasetRestoreVersionRequest object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    LLMObsDatasetRestoreVersionRequest llmObsDatasetRestoreVersionRequest =
+        (LLMObsDatasetRestoreVersionRequest) o;
+    return Objects.equals(this.data, llmObsDatasetRestoreVersionRequest.data)
+        && Objects.equals(
+            this.additionalProperties, llmObsDatasetRestoreVersionRequest.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(data, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class LLMObsDatasetRestoreVersionRequest {\n");
+    sb.append("    data: ").append(toIndentedString(data)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/test/resources/cassettes/features/v1/Create_a_user_returns_User_created_response_test.json b/src/test/resources/cassettes/features/v1/Create_a_user_returns_User_created_response_test.json
index b676df880e6..42def371a51 100644
--- a/src/test/resources/cassettes/features/v1/Create_a_user_returns_User_created_response_test.json
+++ b/src/test/resources/cassettes/features/v1/Create_a_user_returns_User_created_response_test.json
@@ -53,6 +53,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "af617072-2860-ba27-e045-b00c8baf0188"
+    "id": "af617072-2860-ba27-e045-b00c8baf0187"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v1/Create_a_user_returns_null_access_role.json b/src/test/resources/cassettes/features/v1/Create_a_user_returns_null_access_role.json
index e5b3fe6bcf6..5a17eb5f03a 100644
--- a/src/test/resources/cassettes/features/v1/Create_a_user_returns_null_access_role.json
+++ b/src/test/resources/cassettes/features/v1/Create_a_user_returns_null_access_role.json
@@ -53,6 +53,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "af617072-2860-ba27-e045-b00c8baf0187"
+    "id": "af617072-2860-ba27-e045-b00c8baf0188"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json
index a42ef29bfae..c82b6c27f29 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a8"
+    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a9"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json
index cf63593c8d1..0d38d7d0a6a 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9ee9"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eeb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Not_Found_response.json
index aa5b0a6e9b8..89c80bd879e 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eed"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9ee9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json
index f02f71207af..f2248371931 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eeb"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eee"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Not_Found_response.json
index 7e5c7b1234d..55368f4ae1c 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Not_Found_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "9b33b83c-c8bb-714f-cf71-33ab2f3af9d3"
+    "id": "9b33b83c-c8bb-714f-cf71-33ab2f3af9d4"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_all_account_configs_returns_AWS_Accounts_List_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_all_account_configs_returns_AWS_Accounts_List_object_response.json
index e1e0b004585..cb1a6e0b10f 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_all_account_configs_returns_AWS_Accounts_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_all_account_configs_returns_AWS_Accounts_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "101a55f5-5a26-d616-5fb4-8d0451d83d10"
+    "id": "101a55f5-5a26-d616-5fb4-8d0451d83d11"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
index 7711ea26b7b..994e56ed9eb 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0e"
+    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d11"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_List_log_services_returns_AWS_Logs_Services_List_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_List_log_services_returns_AWS_Logs_Services_List_object_response.json
index 266b281e690..f469a5cda1f 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_List_log_services_returns_AWS_Logs_Services_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_List_log_services_returns_AWS_Logs_Services_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d7a"
+    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d79"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json
index f2b714e3f34..8fcc5731aee 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eee"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eed"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json
index a8c4aa7a929..e271cf945b0 100644
--- a/src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e7014600"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json
index b65d84821ea..3c9bf8d6267 100644
--- a/src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ff"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fa"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json
index 8e9d7338d0d..2831c66a09c 100644
--- a/src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ec"
+    "id": "79babc38-7a70-5347-c8a6-73b0e7014600"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_Bad_Request_response.json
index 633105f0f85..25ab575ed0d 100644
--- a/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d30"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d33"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_OK_response.json
index c794e78463c..d39fee8a337 100644
--- a/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2f"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_Bad_Request_response.json
index eb6915eead6..b22410fa4ef 100644
--- a/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d32"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d30"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_OK_response.json
index b7e39e620cf..21ee8cc402d 100644
--- a/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2e"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d32"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Cancel_a_historical_job_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Cancel_a_historical_job_returns_OK_response.json
index 2dd306813ac..9645e2b41cc 100644
--- a/src/test/resources/cassettes/features/v2/Cancel_a_historical_job_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Cancel_a_historical_job_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6bb82102-e994-f0d1-ee96-e1e3f1d80ffe"
+    "id": "6bb82102-e994-f0d1-ee96-e1e3f1d80fff"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Cancels_a_data_deletion_request_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Cancels_a_data_deletion_request_returns_OK_response.json
index cfae7af1511..0b99dd1bd72 100644
--- a/src/test/resources/cassettes/features/v2/Cancels_a_data_deletion_request_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Cancels_a_data_deletion_request_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "516e2b97-25f6-b08c-4d4a-1da22948b32f"
+    "id": "516e2b97-25f6-b08c-4d4a-1da22948b32e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Comment_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Comment_case_returns_Bad_Request_response.json
index 8c97b2392b3..415e80ea1fb 100644
--- a/src/test/resources/cassettes/features/v2/Comment_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Comment_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f6"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f2"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_AWS_CCM_Config_object_response.json b/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_AWS_CCM_Config_object_response.json
index 7c726903cc8..5ba8e36023e 100644
--- a/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_AWS_CCM_Config_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_AWS_CCM_Config_object_response.json
@@ -48,7 +48,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "58d1c8d5-bb10-59b9-aa85-8871f847921f"
+    "id": "58d1c8d5-bb10-59b9-aa85-8871f8479221"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_Conflict_response.json
index 563401356dc..a885ab105be 100644
--- a/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "58d1c8d5-bb10-59b9-aa85-8871f8479220"
+    "id": "58d1c8d5-bb10-59b9-aa85-8871f847921f"
   },
   {
     "httpRequest": {
@@ -57,6 +57,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "58d1c8d5-bb10-59b9-aa85-8871f8479221"
+    "id": "58d1c8d5-bb10-59b9-aa85-8871f8479220"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_AWS_on_demand_task_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Create_AWS_on_demand_task_returns_Bad_Request_response.json
index ea94cd9866e..91451dfea49 100644
--- a/src/test/resources/cassettes/features/v2/Create_AWS_on_demand_task_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_AWS_on_demand_task_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ddc95453-e78c-c1f7-f3a9-441d29765f2e"
+    "id": "ddc95453-e78c-c1f7-f3a9-441d29765f2f"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_App_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Create_App_returns_Created_response.json
index 149f4ec2ee3..12d11a05f48 100644
--- a/src/test/resources/cassettes/features/v2/Create_App_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_App_returns_Created_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c514"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Agentless_scan_options_enabled_successfully_response.json b/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Agentless_scan_options_enabled_successfully_response.json
index 848565e096f..25b85370788 100644
--- a/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Agentless_scan_options_enabled_successfully_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Agentless_scan_options_enabled_successfully_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "95d55fc8-65c9-599d-fc62-5922c3357590"
+    "id": "95d55fc8-65c9-599d-fc62-5922c335758f"
   },
   {
     "httpRequest": {
@@ -48,6 +48,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7e1fd6df-f1a0-70b4-90c2-13c11f689f83"
+    "id": "7e1fd6df-f1a0-70b4-90c2-13c11f689f82"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Bad_Request_response.json
index f2582dd2e15..1b79699f31c 100644
--- a/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "88bc6eec-07d7-cb8c-599b-ab5a96b05cc7"
+    "id": "88bc6eec-07d7-cb8c-599b-ab5a96b05cc6"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_Conflict_response.json
index 95cb4a17509..223e245f710 100644
--- a/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae45"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae47"
   },
   {
     "httpRequest": {
@@ -57,7 +57,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae46"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae48"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Scanning_Group_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_Scanning_Group_returns_OK_response.json
index c7581f314f6..c4618fa2695 100644
--- a/src/test/resources/cassettes/features/v2/Create_Scanning_Group_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Scanning_Group_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7c"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e82"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json
index 27a0366d605..7cd225c46c7 100644
--- a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7d"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e83"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa1"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json
index 724c6d79189..1fec75541c7 100644
--- a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7a"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7f"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9f"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa3"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json
index 0f7572f4ef5..3af6b797aec 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c74"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c75"
   },
   {
     "httpRequest": {
@@ -57,7 +57,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c75"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c76"
   },
   {
     "httpRequest": {
@@ -83,6 +83,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3e"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3f"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json
index 09067379e94..28abb6f8e76 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c71"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c74"
   },
   {
     "httpRequest": {
@@ -53,6 +53,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3a"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3e"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_Conflict_response.json
index df7ec302f17..98400c9266c 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addca"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcd"
   },
   {
     "httpRequest": {
@@ -57,7 +57,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcb"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addce"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_OK_response.json
index fba8b2ccd41..e735e8a6ac5 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcd"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addca"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json
index fef955ebbee..2cb19c254b0 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f5185e"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51861"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_an_AWS_integration_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_an_AWS_integration_returns_Conflict_response.json
index d5488cdba66..19dc53b7c6a 100644
--- a/src/test/resources/cassettes/features/v2/Create_an_AWS_integration_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_an_AWS_integration_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce2"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce4"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_an_incident_type_returns_CREATED_response.json b/src/test/resources/cassettes/features/v2/Create_an_incident_type_returns_CREATED_response.json
index 4e0d708d5b5..ae1a3ad8373 100644
--- a/src/test/resources/cassettes/features/v2/Create_an_incident_type_returns_CREATED_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_an_incident_type_returns_CREATED_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd6"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bda"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_Bad_Request_response.json
index c312b3face8..127207e03a2 100644
--- a/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6466"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6462"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_CREATED_response.json b/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_CREATED_response.json
index 1a120b75ae8..9fe6ad431e0 100644
--- a/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_CREATED_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_CREATED_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6463"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6464"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_incident_notification_rule_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Create_incident_notification_rule_returns_Created_response.json
index 4032fbdc8fc..b794f34e580 100644
--- a/src/test/resources/cassettes/features/v2/Create_incident_notification_rule_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_incident_notification_rule_returns_Created_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bdc"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd1"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_incident_notification_template_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Create_incident_notification_template_returns_Created_response.json
index 6b69cce1630..91af4088c4a 100644
--- a/src/test/resources/cassettes/features/v2/Create_incident_notification_template_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_incident_notification_template_returns_Created_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bdb"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd2"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_role_with_a_permission_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_role_with_a_permission_returns_OK_response.json
index 226202c4126..036e7ac60ea 100644
--- a/src/test/resources/cassettes/features/v2/Create_role_with_a_permission_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_role_with_a_permission_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892173"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892172"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Creates_a_data_deletion_request_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Creates_a_data_deletion_request_returns_OK_response.json
index 8155c3aeded..c12abc0c362 100644
--- a/src/test/resources/cassettes/features/v2/Creates_a_data_deletion_request_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Creates_a_data_deletion_request_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "516e2b97-25f6-b08c-4d4a-1da22948b32e"
+    "id": "516e2b97-25f6-b08c-4d4a-1da22948b330"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_App_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_App_returns_OK_response.json
index a03b13eebf8..813ef8386df 100644
--- a/src/test/resources/cassettes/features/v2/Delete_App_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_App_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c510"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c511"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_Multiple_Apps_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_Multiple_Apps_returns_OK_response.json
index 7ed67796512..a3cb24b8701 100644
--- a/src/test/resources/cassettes/features/v2/Delete_Multiple_Apps_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_Multiple_Apps_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50d"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json
index f6f0ad2102c..1077273c329 100644
--- a/src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7f"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7e"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa3"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa2"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json
index 703a137e1f9..b25f9a30e79 100644
--- a/src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa0"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_WAF_exclusion_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_WAF_exclusion_filter_returns_OK_response.json
index e17e659929e..d14b87aa29b 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_WAF_exclusion_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_WAF_exclusion_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3e9"
+    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3ea"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_NotContent_response.json b/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_NotContent_response.json
index 1511b4f762f..d49ca03fd7c 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_NotContent_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_NotContent_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6462"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6466"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_OK_response.json
index 7919b99b4ff..7a28290d6ae 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6461"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6467"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_custom_framework_returns_OK_response.json
index ab18e4a92c4..ebf1f92f4a9 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_custom_framework_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_custom_framework_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c73"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c72"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3c"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3b"
   },
   {
     "httpRequest": {
@@ -79,6 +79,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3d"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3c"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_dataset_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_a_dataset_returns_No_Content_response.json
index 21f390e6ce1..92c10c6b507 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_dataset_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_dataset_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addce"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addc9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_restriction_query_returns_OK_response.json
index 85885d0581b..b4f342c7c6b 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51861"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f5185e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_retention_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_retention_filter_returns_OK_response.json
index 381d1b90a1b..48b483cd7a4 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_retention_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_retention_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0699"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069b"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Bad_Request_response.json
index c82b6c27f29..a42ef29bfae 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a9"
+    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a8"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_No_Content_response.json
index 10fbac85dbb..0847900878e 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce5"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce1"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Not_Found_response.json
index a5021c6aada..797500d67cb 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce6"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_existing_Workflow_returns_Successfully_deleted_a_workflow_response.json b/src/test/resources/cassettes/features/v2/Delete_an_existing_Workflow_returns_Successfully_deleted_a_workflow_response.json
index a86b5756b5e..0d2738de1a3 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_existing_Workflow_returns_Successfully_deleted_a_workflow_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_existing_Workflow_returns_Successfully_deleted_a_workflow_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21c"
+    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_incident_type_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_an_incident_type_returns_OK_response.json
index 8b898cb6a9d..74fcc0a0c5e 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_incident_type_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_incident_type_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bda"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd8"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Bad_Request_response.json
index 18d5998a22a..355262a1b02 100644
--- a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ea"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fc"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_No_Content_response.json
index 021bac611d3..3c7a22d087a 100644
--- a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f2"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ea"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Not_Found_response.json
index f1c8d39365e..f352512410e 100644
--- a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f4"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f3"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_Not_Found_response.json
index 7747f8db345..d85b4091fcb 100644
--- a/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f7"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145e9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_Bad_Request_response.json
index 2dc635d3a78..32e889b68d6 100644
--- a/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6467"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6461"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_datastore_item_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_datastore_item_returns_OK_response.json
index 14ecd66b8a4..02c557b492b 100644
--- a/src/test/resources/cassettes/features/v2/Delete_datastore_item_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_datastore_item_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2c"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d34"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_datastore_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_datastore_returns_OK_response.json
index 89a12a585b3..0f4bd1ebaf2 100644
--- a/src/test/resources/cassettes/features/v2/Delete_datastore_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_datastore_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d31"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_incident_notification_rule_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_incident_notification_rule_returns_No_Content_response.json
index 6e8b7d7b0b1..edd6a6da9bf 100644
--- a/src/test/resources/cassettes/features/v2/Delete_incident_notification_rule_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_incident_notification_rule_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd9"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd3"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_incident_notification_template_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_incident_notification_template_returns_No_Content_response.json
index 3770b9b0a09..53b4917f2bb 100644
--- a/src/test/resources/cassettes/features/v2/Delete_incident_notification_template_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_incident_notification_template_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd5"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd7"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Edit_a_dataset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Edit_a_dataset_returns_OK_response.json
index 75a40d06c1c..f868434d6ac 100644
--- a/src/test/resources/cassettes/features/v2/Edit_a_dataset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Edit_a_dataset_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addc9"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcf"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Generate_a_new_external_ID_returns_AWS_External_ID_object_response.json b/src/test/resources/cassettes/features/v2/Generate_a_new_external_ID_returns_AWS_External_ID_object_response.json
index 6ef442b0c31..c2491988476 100644
--- a/src/test/resources/cassettes/features/v2/Generate_a_new_external_ID_returns_AWS_External_ID_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Generate_a_new_external_ID_returns_AWS_External_ID_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2ce"
+    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2cc"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Generate_new_external_ID_returns_AWS_External_ID_object_response.json b/src/test/resources/cassettes/features/v2/Generate_new_external_ID_returns_AWS_External_ID_object_response.json
index dbcf089d3c7..1e23eb77688 100644
--- a/src/test/resources/cassettes/features/v2/Generate_new_external_ID_returns_AWS_External_ID_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Generate_new_external_ID_returns_AWS_External_ID_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2cc"
+    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2ce"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json
index fe4cf251d57..6b2882ea815 100644
--- a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "4fd99083-06ab-185c-0a48-d579a5f192c1"
+    "id": "4fd99083-06ab-185c-0a48-d579a5f192c2"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Bad_Request_response.json
index 6b2882ea815..fe4cf251d57 100644
--- a/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "4fd99083-06ab-185c-0a48-d579a5f192c2"
+    "id": "4fd99083-06ab-185c-0a48-d579a5f192c1"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_App_returns_Gone_response.json b/src/test/resources/cassettes/features/v2/Get_App_returns_Gone_response.json
index e633be95098..bd34150cae6 100644
--- a/src/test/resources/cassettes/features/v2/Get_App_returns_Gone_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_App_returns_Gone_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c511"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c515"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_critical_asset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_critical_asset_returns_OK_response.json
index 0baec6032c5..eccc4031f16 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_critical_asset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_critical_asset_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e5"
+    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_custom_framework_returns_OK_response.json
index 009fff14323..5661edabb7b 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_custom_framework_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_custom_framework_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c72"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c73"
   },
   {
     "httpRequest": {
@@ -79,6 +79,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3b"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3d"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_a_given_APM_retention_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_given_APM_retention_filter_returns_OK_response.json
index 1519dba55ca..108cf352bd9 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_given_APM_retention_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_given_APM_retention_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069c"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_single_dataset_by_ID_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_single_dataset_by_ID_returns_OK_response.json
index 59a863c261f..4d88f30cac5 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_single_dataset_by_ID_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_single_dataset_by_ID_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcf"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcc"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_all_custom_attributes_config_of_case_type_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_all_custom_attributes_config_of_case_type_returns_OK_response.json
index 3286dbce5dc..07da3e25a95 100644
--- a/src/test/resources/cassettes/features/v2/Get_all_custom_attributes_config_of_case_type_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_all_custom_attributes_config_of_case_type_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6464"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6463"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_all_datasets_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_all_datasets_returns_OK_response.json
index bd35bd59ea6..7b4fa0f864b 100644
--- a/src/test/resources/cassettes/features/v2/Get_all_datasets_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_all_datasets_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcc"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_AWS_Account_object_response.json
index 88ec4190fd7..9933d6258ad 100644
--- a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce3"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Not_Found_response.json
index 55368f4ae1c..7e5c7b1234d 100644
--- a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Not_Found_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "9b33b83c-c8bb-714f-cf71-33ab2f3af9d4"
+    "id": "9b33b83c-c8bb-714f-cf71-33ab2f3af9d3"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_an_existing_Workflow_returns_Successfully_got_a_workflow_response.json b/src/test/resources/cassettes/features/v2/Get_an_existing_Workflow_returns_Successfully_got_a_workflow_response.json
index c859297de35..0ad821e051f 100644
--- a/src/test/resources/cassettes/features/v2/Get_an_existing_Workflow_returns_Successfully_got_a_workflow_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_an_existing_Workflow_returns_Successfully_got_a_workflow_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21d"
+    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_datastore_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_datastore_returns_OK_response.json
index b79df729351..4aba2dd2af0 100644
--- a/src/test/resources/cassettes/features/v2/Get_datastore_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_datastore_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d34"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d35"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_incident_notification_rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_incident_notification_rule_returns_OK_response.json
index 7b054104c3f..00f0e4bc8fd 100644
--- a/src/test/resources/cassettes/features/v2/Get_incident_notification_rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_incident_notification_rule_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd7"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bdc"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_incident_notification_template_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_incident_notification_template_returns_OK_response.json
index 06a6f28a5dd..8af5e0e1230 100644
--- a/src/test/resources/cassettes/features/v2/Get_incident_notification_template_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_incident_notification_template_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd3"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bdb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_list_of_AWS_log_ready_services_returns_AWS_Logs_Services_List_object_response.json b/src/test/resources/cassettes/features/v2/Get_list_of_AWS_log_ready_services_returns_AWS_Logs_Services_List_object_response.json
index f469a5cda1f..e05cab1201f 100644
--- a/src/test/resources/cassettes/features/v2/Get_list_of_AWS_log_ready_services_returns_AWS_Logs_Services_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_list_of_AWS_log_ready_services_returns_AWS_Logs_Services_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d79"
+    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d7b"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json
index 832db589a6a..aa8f9bb249e 100644
--- a/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fa"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f0"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Gets_a_list_of_data_deletion_requests_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Gets_a_list_of_data_deletion_requests_returns_OK_response.json
index 6ab71e5cb0b..1eccad92176 100644
--- a/src/test/resources/cassettes/features/v2/Gets_a_list_of_data_deletion_requests_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Gets_a_list_of_data_deletion_requests_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "516e2b97-25f6-b08c-4d4a-1da22948b330"
+    "id": "516e2b97-25f6-b08c-4d4a-1da22948b32f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Grant_permission_to_a_role_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Grant_permission_to_a_role_returns_OK_response.json
index c185341f0ba..7c863a23483 100644
--- a/src/test/resources/cassettes/features/v2/Grant_permission_to_a_role_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Grant_permission_to_a_role_returns_OK_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892175"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_App_Versions_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_App_Versions_returns_OK_response.json
index 47c8d6237a9..45cfbd41d64 100644
--- a/src/test/resources/cassettes/features/v2/List_App_Versions_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_App_Versions_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50e"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c518"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json
index 601160992e8..debb94ef652 100644
--- a/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e84"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e79"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa7"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9e"
   },
   {
     "httpRequest": {
@@ -79,7 +79,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e85"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7a"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_all_APM_retention_filters_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_all_APM_retention_filters_returns_OK_response.json
index 3ea25dce874..0a42d776a20 100644
--- a/src/test/resources/cassettes/features/v2/List_all_APM_retention_filters_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_all_APM_retention_filters_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069b"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_all_AWS_integrations_returns_AWS_Accounts_List_object_response.json b/src/test/resources/cassettes/features/v2/List_all_AWS_integrations_returns_AWS_Accounts_List_object_response.json
index bd48720dd5f..4ddbbbf6380 100644
--- a/src/test/resources/cassettes/features/v2/List_all_AWS_integrations_returns_AWS_Accounts_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/List_all_AWS_integrations_returns_AWS_Accounts_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "101a55f5-5a26-d616-5fb4-8d0451d83d11"
+    "id": "101a55f5-5a26-d616-5fb4-8d0451d83d10"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_available_namespaces_returns_AWS_Namespaces_List_object_response.json b/src/test/resources/cassettes/features/v2/List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
index 4e2a1b8a39b..b4ab43f6993 100644
--- a/src/test/resources/cassettes/features/v2/List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d11"
+    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0e"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_datastore_items_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_datastore_items_returns_OK_response.json
index 3ec5cb41a21..1796631327a 100644
--- a/src/test/resources/cassettes/features/v2/List_datastore_items_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_datastore_items_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d35"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_incident_notification_rules_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_incident_notification_rules_returns_OK_response.json
index 658cc27abad..3b4c609f8c5 100644
--- a/src/test/resources/cassettes/features/v2/List_incident_notification_rules_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_incident_notification_rules_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd1"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_log_services_returns_AWS_Logs_Services_List_object_response.json b/src/test/resources/cassettes/features/v2/List_log_services_returns_AWS_Logs_Services_List_object_response.json
index e05cab1201f..266b281e690 100644
--- a/src/test/resources/cassettes/features/v2/List_log_services_returns_AWS_Logs_Services_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/List_log_services_returns_AWS_Logs_Services_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d7b"
+    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d7a"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json
index cfd81d2cd53..068dfdc41d2 100644
--- a/src/test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb89216d"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892170"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json
index 15f40344bd7..af216062061 100644
--- a/src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb89216c"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892175"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_pipelines_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_pipelines_returns_OK_response.json
index 7f8215348d1..d25ab6492a4 100644
--- a/src/test/resources/cassettes/features/v2/List_pipelines_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_pipelines_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c80"
+    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Name_App_Version_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Name_App_Version_returns_No_Content_response.json
index 794b5deb5db..15fabc90492 100644
--- a/src/test/resources/cassettes/features/v2/Name_App_Version_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Name_App_Version_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50f"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c512"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Bad_Request_response_2.json b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Bad_Request_response_2.json
index c48e77cce48..2ebfbdcfa75 100644
--- a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Bad_Request_response_2.json
+++ b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Bad_Request_response_2.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c6af96d1-87d1-3cd6-0d2d-71631b85bb78"
+    "id": "c6af96d1-87d1-3cd6-0d2d-71631b85bb77"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_OK_response.json
index 0a176ee003e..974c53ce63d 100644
--- a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_OK_response.json
@@ -22,6 +22,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "0f485c8a-a29e-ebed-3836-545f90bc9457"
+    "id": "0f485c8a-a29e-ebed-3836-545f90bc9456"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_Bad_Request_response.json
index fee9f74e00a..d4bcf1ca8ac 100644
--- a/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c2c329a8-5875-126a-1858-e7c00b5af114"
+    "id": "c2c329a8-5875-126a-1858-e7c00b5af113"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Pin_a_Model_Lab_run_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Pin_a_Model_Lab_run_returns_No_Content_response.json
index 3292c6ddbd0..9c853b6672d 100644
--- a/src/test/resources/cassettes/features/v2/Pin_a_Model_Lab_run_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Pin_a_Model_Lab_run_returns_No_Content_response.json
@@ -39,6 +39,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e9b5da5a-ee96-27b2-f8a0-482fba517ccd"
+    "id": "e9b5da5a-ee96-27b2-f8a0-482fba517cce"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
index ead796b159c..858d36f9769 100644
--- a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
@@ -52,6 +52,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "49ae287a-8cc5-118a-4b1c-2dbceae02054"
+    "id": "49ae287a-8cc5-118a-4b1c-2dbceae02055"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_OK_response.json
index 199c7919faf..08f556111f9 100644
--- a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_OK_response.json
@@ -52,6 +52,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "49ae287a-8cc5-118a-4b1c-2dbceae02055"
+    "id": "49ae287a-8cc5-118a-4b1c-2dbceae02054"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json b/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
index 25b85370788..848565e096f 100644
--- a/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "95d55fc8-65c9-599d-fc62-5922c335758f"
+    "id": "95d55fc8-65c9-599d-fc62-5922c3357590"
   },
   {
     "httpRequest": {
@@ -48,6 +48,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7e1fd6df-f1a0-70b4-90c2-13c11f689f82"
+    "id": "7e1fd6df-f1a0-70b4-90c2-13c11f689f83"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Bad_Request_response.json
index 15a68603f06..edd75392e93 100644
--- a/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "88bc6eec-07d7-cb8c-599b-ab5a96b05cc6"
+    "id": "88bc6eec-07d7-cb8c-599b-ab5a96b05cc7"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_an_AWS_on_demand_task_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Post_an_AWS_on_demand_task_returns_Bad_Request_response.json
index 91451dfea49..ea94cd9866e 100644
--- a/src/test/resources/cassettes/features/v2/Post_an_AWS_on_demand_task_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_an_AWS_on_demand_task_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ddc95453-e78c-c1f7-f3a9-441d29765f2f"
+    "id": "ddc95453-e78c-c1f7-f3a9-441d29765f2e"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json
index 99b5cd75580..007a5928092 100644
--- a/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c519"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json
index db4e9405d0d..e6fd8ed3e42 100644
--- a/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e79"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7d"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9e"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa1"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json
index f301ca6f3ce..a825db5ee55 100644
--- a/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e80"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e84"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa4"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa7"
   },
   {
     "httpRequest": {
@@ -79,7 +79,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e81"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e85"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json b/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json
index 3ad8271712a..a6d6057cc63 100644
--- a/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json
+++ b/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb89216f"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Revoke_permission_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Revoke_permission_returns_OK_response.json
index 29de68e4b42..524aba86421 100644
--- a/src/test/resources/cassettes/features/v2/Revoke_permission_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Revoke_permission_returns_OK_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892174"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892171"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Run_a_historical_job_returns_Status_created_response.json b/src/test/resources/cassettes/features/v2/Run_a_historical_job_returns_Status_created_response.json
index e5433d704cc..916bccfa080 100644
--- a/src/test/resources/cassettes/features/v2/Run_a_historical_job_returns_Status_created_response.json
+++ b/src/test/resources/cassettes/features/v2/Run_a_historical_job_returns_Status_created_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6bb82102-e994-f0d1-ee96-e1e3f1d80fff"
+    "id": "6bb82102-e994-f0d1-ee96-e1e3f1d80ffe"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Unarchive_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Unarchive_case_returns_Bad_Request_response.json
index b0100b1774b..332b85099dd 100644
--- a/src/test/resources/cassettes/features/v2/Unarchive_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Unarchive_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ee"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unarchive_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Unarchive_case_returns_OK_response.json
index 60a873eea23..e2e2a133bc8 100644
--- a/src/test/resources/cassettes/features/v2/Unarchive_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Unarchive_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145e9"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ef"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unassign_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Unassign_case_returns_Bad_Request_response.json
index 9696ac40e32..d51ad920076 100644
--- a/src/test/resources/cassettes/features/v2/Unassign_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Unassign_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ef"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json
index 25c50b5140f..88b95ace082 100644
--- a/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fb"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f1"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unpin_a_Model_Lab_run_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Unpin_a_Model_Lab_run_returns_No_Content_response.json
index f9fb078423e..3af8cd28dc9 100644
--- a/src/test/resources/cassettes/features/v2/Unpin_a_Model_Lab_run_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Unpin_a_Model_Lab_run_returns_No_Content_response.json
@@ -18,6 +18,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e9b5da5a-ee96-27b2-f8a0-482fba517cce"
+    "id": "e9b5da5a-ee96-27b2-f8a0-482fba517ccd"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json
index cf3de41da76..785bd78f8b8 100644
--- a/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c518"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c513"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Bad_Request_response_2.json b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Bad_Request_response_2.json
index 2ebfbdcfa75..c48e77cce48 100644
--- a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Bad_Request_response_2.json
+++ b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Bad_Request_response_2.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c6af96d1-87d1-3cd6-0d2d-71631b85bb77"
+    "id": "c6af96d1-87d1-3cd6-0d2d-71631b85bb78"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json
index 974c53ce63d..0a176ee003e 100644
--- a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json
@@ -22,6 +22,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "0f485c8a-a29e-ebed-3836-545f90bc9456"
+    "id": "0f485c8a-a29e-ebed-3836-545f90bc9457"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_App_Favorite_Status_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Update_App_Favorite_Status_returns_No_Content_response.json
index fb2106e33db..31b69ffd5db 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_Favorite_Status_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_Favorite_Status_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c512"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c516"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_App_Protection_Level_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_App_Protection_Level_returns_OK_response.json
index b097c819bce..2e968ee5068 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_Protection_Level_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_Protection_Level_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c516"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c510"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_App_Self_Service_Status_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Update_App_Self_Service_Status_returns_No_Content_response.json
index 65d3667dc0a..e34cd831da4 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_Self_Service_Status_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_Self_Service_Status_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c515"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c51a"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_App_Tags_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Update_App_Tags_returns_No_Content_response.json
index 5f6656d94c1..0d48cfd6420 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_Tags_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_Tags_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c51a"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c519"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json
index 5e1d57e1aff..557872184a5 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50c"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_App_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_App_returns_OK_response.json
index 561057ced5c..8754c8dd9f3 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c513"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c514"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_Bad_Request_response.json
index bd889c4d7e5..e0d488678ae 100644
--- a/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c2c329a8-5875-126a-1858-e7c00b5af113"
+    "id": "c2c329a8-5875-126a-1858-e7c00b5af114"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Bad_Request_response.json
index 970a0b596df..30f5bc71d9c 100644
--- a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae47"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae43"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Not_Found_response.json
index 441a98208d4..1c923bb6635 100644
--- a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae48"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae46"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_OK_response.json
index 085c2a10ee9..bc6d33ad1cb 100644
--- a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae43"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae45"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json
index 4fc4e2937a7..b67f3a1d41c 100644
--- a/src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e83"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e81"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa6"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_Bad_Request_response.json
index 71ae1c8ab0f..7929a88b4e0 100644
--- a/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_Bad_Request_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e82"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e80"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa5"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa4"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_OK_response.json
index 19819989192..c3bd407a946 100644
--- a/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7e"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7c"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa2"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa0"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_WAF_exclusion_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_WAF_exclusion_filter_returns_OK_response.json
index 2d88a0bc75b..fdf05e33c3a 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_WAF_exclusion_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_WAF_exclusion_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3ea"
+    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3e9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_critical_asset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_critical_asset_returns_OK_response.json
index 3f634cdfdc4..6b10b1f99cb 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_critical_asset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_critical_asset_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e6"
+    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_custom_framework_returns_OK_response.json
index c6d6252edc4..4144e776050 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_custom_framework_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_custom_framework_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c76"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c71"
   },
   {
     "httpRequest": {
@@ -83,6 +83,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3f"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3a"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_OK_response.json
index 5486c5522b1..9a05ea21a67 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7c"
+    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c80"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Bad_Request_response.json
index c669844b54b..e93ced0b7aa 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0697"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069a"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Not_Found_response.json
index 170166752c7..f8e2615c3f8 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Not_Found_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ce266f9d-5f90-251e-805b-1fa5bbd62feb"
+    "id": "ce266f9d-5f90-251e-805b-1fa5bbd62fea"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_OK_response.json
index 3e2885f919c..83f232b7769 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069a"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0698"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_with_trace_rate_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_with_trace_rate_returns_OK_response.json
index a39d900e784..6b4562c95f9 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_with_trace_rate_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_with_trace_rate_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069d"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Bad_Request_response.json
index f7ba5a0c135..a8ee0769782 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069e"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0699"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Not_Found_response.json
index f8e2615c3f8..170166752c7 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Not_Found_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ce266f9d-5f90-251e-805b-1fa5bbd62fea"
+    "id": "ce266f9d-5f90-251e-805b-1fa5bbd62feb"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_OK_response.json
index 4f3f459c693..4f6a89b85f3 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0698"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0697"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Request_response.json
index 73305cd59ef..2733aa2afce 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Request_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892171"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Not_found_response.json b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Not_found_response.json
index 3523eabfb46..f994b57c57d 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Not_found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Not_found_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892170"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892173"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_role_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_role_returns_OK_response.json
index ada6cbf8cd4..19ad9312674 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_role_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_role_returns_OK_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892172"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892174"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json
index 2efa53de1ac..e47e6cdfe12 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce4"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce3"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_Bad_Request_response.json
index 5e43645a6a4..833d5ca5043 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce1"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce2"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Successfully_updated_a_workflow_response.json b/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Successfully_updated_a_workflow_response.json
index be6cf1cbadf..ab514e51ba2 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Successfully_updated_a_workflow_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Successfully_updated_a_workflow_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21e"
+    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_incident_type_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_an_incident_type_returns_OK_response.json
index 6309739cc9f..7bd770826d4 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_incident_type_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_incident_type_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd2"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_OK_response.json
index 88be588dd3c..44f28b45360 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f5"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fe"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Bad_Request_response.json
index 876ad2e41fe..c69aaf87654 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6469"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af646a"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Not_Found_response.json
index edb0c4fa3c7..fe19098a6f3 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ed"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ff"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_OK_response.json
index 3e0850132da..c2b2cab762b 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af646a"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6469"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_description_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_description_returns_OK_response.json
index b4cf2323a2d..fef8d736355 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_description_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_description_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f1"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f8"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_priority_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_priority_returns_Bad_Request_response.json
index 266a2b33b31..fc0f56bc1de 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_priority_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_priority_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fe"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f4"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_priority_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_priority_returns_OK_response.json
index f462fd4c8dd..2231d87f113 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_priority_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_priority_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f0"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f7"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_status_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_status_returns_Bad_Request_response.json
index 6a5f8600d39..73fbdd658a2 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_status_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_status_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f3"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ec"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_status_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_status_returns_OK_response.json
index 4d0529dbc46..e39974723b5 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_status_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_status_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f8"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ee"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_title_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_title_returns_Bad_Request_response.json
index 40f7af7c478..b7f4230cf66 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_title_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_title_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f9"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ed"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_title_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_title_returns_OK_response.json
index 1463cb0e2aa..6c834d6b77d 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_title_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_title_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fc"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_datastore_item_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_datastore_item_returns_OK_response.json
index a293ad3ef40..7e38c35c46e 100644
--- a/src/test/resources/cassettes/features/v2/Update_datastore_item_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_datastore_item_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2d"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_datastore_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_datastore_returns_OK_response.json
index a5223c853a8..2163486ba0e 100644
--- a/src/test/resources/cassettes/features/v2/Update_datastore_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_datastore_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d33"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d31"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_incident_notification_template_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_incident_notification_template_returns_OK_response.json
index 92e2e3d0445..32bf36c65c1 100644
--- a/src/test/resources/cassettes/features/v2/Update_incident_notification_template_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_incident_notification_template_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd8"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_Bad_Request_response.json
index e642f719a20..4a27cd1e9d6 100644
--- a/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a2c05b3b-bab5-013b-200d-7dc622c1b35e"
+    "id": "a2c05b3b-bab5-013b-200d-7dc622c1b35f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_OK_response.json
index 0c4d5613d6a..6078cbf29e3 100644
--- a/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a2c05b3b-bab5-013b-200d-7dc622c1b35f"
+    "id": "a2c05b3b-bab5-013b-200d-7dc622c1b35e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/com/datadog/api/client/v2/api/llm_observability.feature b/src/test/resources/com/datadog/api/client/v2/api/llm_observability.feature
index 63b64631db2..ea384fa8ed4 100644
--- a/src/test/resources/com/datadog/api/client/v2/api/llm_observability.feature
+++ b/src/test/resources/com/datadog/api/client/v2/api/llm_observability.feature
@@ -109,6 +109,76 @@ Feature: LLM Observability
     When the request is sent
     Then the response status is 200 OK
 
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Batch update LLM Observability dataset records returns "Bad Request" response
+    Given operation "BatchUpdateLLMObsDataset" enabled
+    And new "BatchUpdateLLMObsDataset" request
+    And request contains "project_id" parameter from "REPLACE.ME"
+    And request contains "dataset_id" parameter from "REPLACE.ME"
+    And body with value {"data": {"attributes": {"create_new_version": true, "delete_records": [], "insert_records": [{"expected_output": null, "id": "rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c", "input": null, "tag_operations": {"add": [], "remove": [], "set": []}, "tags": []}], "tags": [], "update_records": [{"expected_output": null, "id": "rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c", "input": null, "tag_operations": {"add": [], "remove": [], "set": []}}]}, "id": "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d", "type": "datasets"}}
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Batch update LLM Observability dataset records returns "Not Found" response
+    Given operation "BatchUpdateLLMObsDataset" enabled
+    And new "BatchUpdateLLMObsDataset" request
+    And request contains "project_id" parameter from "REPLACE.ME"
+    And request contains "dataset_id" parameter from "REPLACE.ME"
+    And body with value {"data": {"attributes": {"create_new_version": true, "delete_records": [], "insert_records": [{"expected_output": null, "id": "rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c", "input": null, "tag_operations": {"add": [], "remove": [], "set": []}, "tags": []}], "tags": [], "update_records": [{"expected_output": null, "id": "rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c", "input": null, "tag_operations": {"add": [], "remove": [], "set": []}}]}, "id": "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d", "type": "datasets"}}
+    When the request is sent
+    Then the response status is 404 Not Found
+
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Batch update LLM Observability dataset records returns "OK" response
+    Given operation "BatchUpdateLLMObsDataset" enabled
+    And new "BatchUpdateLLMObsDataset" request
+    And request contains "project_id" parameter from "REPLACE.ME"
+    And request contains "dataset_id" parameter from "REPLACE.ME"
+    And body with value {"data": {"attributes": {"create_new_version": true, "delete_records": [], "insert_records": [{"expected_output": null, "id": "rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c", "input": null, "tag_operations": {"add": [], "remove": [], "set": []}, "tags": []}], "tags": [], "update_records": [{"expected_output": null, "id": "rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c", "input": null, "tag_operations": {"add": [], "remove": [], "set": []}}]}, "id": "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d", "type": "datasets"}}
+    When the request is sent
+    Then the response status is 200 OK
+
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Batch update LLM Observability dataset records returns "Payload Too Large" response
+    Given operation "BatchUpdateLLMObsDataset" enabled
+    And new "BatchUpdateLLMObsDataset" request
+    And request contains "project_id" parameter from "REPLACE.ME"
+    And request contains "dataset_id" parameter from "REPLACE.ME"
+    And body with value {"data": {"attributes": {"create_new_version": true, "delete_records": [], "insert_records": [{"expected_output": null, "id": "rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c", "input": null, "tag_operations": {"add": [], "remove": [], "set": []}, "tags": []}], "tags": [], "update_records": [{"expected_output": null, "id": "rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c", "input": null, "tag_operations": {"add": [], "remove": [], "set": []}}]}, "id": "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d", "type": "datasets"}}
+    When the request is sent
+    Then the response status is 413 Payload Too Large
+
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Clone an LLM Observability dataset returns "Bad Request" response
+    Given operation "CloneLLMObsDataset" enabled
+    And new "CloneLLMObsDataset" request
+    And request contains "project_id" parameter from "REPLACE.ME"
+    And request contains "dataset_id" parameter from "REPLACE.ME"
+    And body with value {"data": {"attributes": {"description": "Clone of the original dataset for experimentation.", "name": "My cloned dataset"}, "id": "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d", "type": "datasets"}}
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Clone an LLM Observability dataset returns "Not Found" response
+    Given operation "CloneLLMObsDataset" enabled
+    And new "CloneLLMObsDataset" request
+    And request contains "project_id" parameter from "REPLACE.ME"
+    And request contains "dataset_id" parameter from "REPLACE.ME"
+    And body with value {"data": {"attributes": {"description": "Clone of the original dataset for experimentation.", "name": "My cloned dataset"}, "id": "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d", "type": "datasets"}}
+    When the request is sent
+    Then the response status is 404 Not Found
+
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Clone an LLM Observability dataset returns "OK" response
+    Given operation "CloneLLMObsDataset" enabled
+    And new "CloneLLMObsDataset" request
+    And request contains "project_id" parameter from "REPLACE.ME"
+    And request contains "dataset_id" parameter from "REPLACE.ME"
+    And body with value {"data": {"attributes": {"description": "Clone of the original dataset for experimentation.", "name": "My cloned dataset"}, "id": "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d", "type": "datasets"}}
+    When the request is sent
+    Then the response status is 200 OK
+
   @generated @skip @team:DataDog/ml-observability
   Scenario: Create an LLM Observability annotation queue returns "Bad Request" response
     Given operation "CreateLLMObsAnnotationQueue" enabled
@@ -417,6 +487,33 @@ Feature: LLM Observability
     When the request is sent
     Then the response status is 404 Not Found
 
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Export an LLM Observability dataset returns "Bad Request" response
+    Given operation "ExportLLMObsDataset" enabled
+    And new "ExportLLMObsDataset" request
+    And request contains "project_id" parameter from "REPLACE.ME"
+    And request contains "dataset_id" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Export an LLM Observability dataset returns "Not Found" response
+    Given operation "ExportLLMObsDataset" enabled
+    And new "ExportLLMObsDataset" request
+    And request contains "project_id" parameter from "REPLACE.ME"
+    And request contains "dataset_id" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 404 Not Found
+
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Export an LLM Observability dataset returns "OK" response
+    Given operation "ExportLLMObsDataset" enabled
+    And new "ExportLLMObsDataset" request
+    And request contains "project_id" parameter from "REPLACE.ME"
+    And request contains "dataset_id" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 200 OK
+
   @generated @skip @team:DataDog/ml-observability
   Scenario: Get LLM Observability dataset draft state returns "Bad Request" response
     Given operation "GetLLMObsDatasetDraftState" enabled
@@ -770,6 +867,36 @@ Feature: LLM Observability
     When the request is sent
     Then the response status is 404 Not Found
 
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Restore an LLM Observability dataset version returns "Bad Request" response
+    Given operation "RestoreLLMObsDatasetVersion" enabled
+    And new "RestoreLLMObsDatasetVersion" request
+    And request contains "project_id" parameter from "REPLACE.ME"
+    And request contains "dataset_id" parameter from "REPLACE.ME"
+    And body with value {"data": {"attributes": {"dataset_version": 1}, "id": "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d", "type": "datasets"}}
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Restore an LLM Observability dataset version returns "Not Found" response
+    Given operation "RestoreLLMObsDatasetVersion" enabled
+    And new "RestoreLLMObsDatasetVersion" request
+    And request contains "project_id" parameter from "REPLACE.ME"
+    And request contains "dataset_id" parameter from "REPLACE.ME"
+    And body with value {"data": {"attributes": {"dataset_version": 1}, "id": "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d", "type": "datasets"}}
+    When the request is sent
+    Then the response status is 404 Not Found
+
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Restore an LLM Observability dataset version returns "OK" response
+    Given operation "RestoreLLMObsDatasetVersion" enabled
+    And new "RestoreLLMObsDatasetVersion" request
+    And request contains "project_id" parameter from "REPLACE.ME"
+    And request contains "dataset_id" parameter from "REPLACE.ME"
+    And body with value {"data": {"attributes": {"dataset_version": 1}, "id": "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d", "type": "datasets"}}
+    When the request is sent
+    Then the response status is 200 OK
+
   @generated @skip @team:DataDog/ml-observability
   Scenario: Run an LLM inference returns "Bad Request" response
     Given operation "CreateLLMObsIntegrationInference" enabled
@@ -1040,3 +1167,30 @@ Feature: LLM Observability
     And body with value {"data": {"attributes": {"annotation_schema": {"label_schemas": [{"description": "Rating of the response quality.", "has_assessment": false, "has_reasoning": false, "id": "abc-123", "is_assessment": false, "is_integer": false, "is_required": true, "max": 5.0, "min": 0.0, "name": "quality", "type": "score", "values": ["good", "bad", "neutral"]}]}}, "type": "queues"}}
     When the request is sent
     Then the response status is 200 OK
+
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Upload records to an LLM Observability dataset returns "Bad Request" response
+    Given operation "UploadLLMObsDatasetRecordsFile" enabled
+    And new "UploadLLMObsDatasetRecordsFile" request
+    And request contains "project_id" parameter from "REPLACE.ME"
+    And request contains "dataset_id" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Upload records to an LLM Observability dataset returns "Not Found" response
+    Given operation "UploadLLMObsDatasetRecordsFile" enabled
+    And new "UploadLLMObsDatasetRecordsFile" request
+    And request contains "project_id" parameter from "REPLACE.ME"
+    And request contains "dataset_id" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 404 Not Found
+
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Upload records to an LLM Observability dataset returns "OK" response
+    Given operation "UploadLLMObsDatasetRecordsFile" enabled
+    And new "UploadLLMObsDatasetRecordsFile" request
+    And request contains "project_id" parameter from "REPLACE.ME"
+    And request contains "dataset_id" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 200 OK
diff --git a/src/test/resources/com/datadog/api/client/v2/api/undo.json b/src/test/resources/com/datadog/api/client/v2/api/undo.json
index d86d61c2288..9127662da88 100644
--- a/src/test/resources/com/datadog/api/client/v2/api/undo.json
+++ b/src/test/resources/com/datadog/api/client/v2/api/undo.json
@@ -3943,6 +3943,20 @@
       "type": "idempotent"
     }
   },
+  "BatchUpdateLLMObsDataset": {
+    "tag": "LLM Observability",
+    "undo": {
+      "type": "idempotent"
+    }
+  },
+  "CloneLLMObsDataset": {
+    "tag": "LLM Observability",
+    "undo": {
+      "operationId": "TODO",
+      "parameters": [],
+      "type": "unsafe"
+    }
+  },
   "GetLLMObsDatasetDraftState": {
     "tag": "LLM Observability",
     "undo": {
@@ -3961,6 +3975,12 @@
       "type": "idempotent"
     }
   },
+  "ExportLLMObsDataset": {
+    "tag": "LLM Observability",
+    "undo": {
+      "type": "safe"
+    }
+  },
   "ListLLMObsDatasetRecords": {
     "tag": "LLM Observability",
     "undo": {
@@ -3998,12 +4018,24 @@
       "type": "unsafe"
     }
   },
+  "RestoreLLMObsDatasetVersion": {
+    "tag": "LLM Observability",
+    "undo": {
+      "type": "idempotent"
+    }
+  },
   "ListLLMObsDatasetVersions": {
     "tag": "LLM Observability",
     "undo": {
       "type": "safe"
     }
   },
+  "UploadLLMObsDatasetRecordsFile": {
+    "tag": "LLM Observability",
+    "undo": {
+      "type": "idempotent"
+    }
+  },
   "ListLLMObsExperimentEvents": {
     "tag": "LLM Observability",
     "undo": {