diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 70fe6060b80..31b6104d231 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -18,3 +18,5 @@ replace = {new_version} [bumpversion:file:text-to-speech/README.md] [bumpversion:file:docker/pom.xml] + +[bumpversion:file:.github/workflows/deploy.yml] diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index cafc11429da..de4f8856e56 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -86,8 +86,8 @@ jobs: - name: Publish to Maven Central env: GHA_TAG: "refs/tags/v14.0.2" # for setMavenVersion_gha - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} # for .travis.settings.xml - OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }} # for .travis.settings.xml + CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }} GPG_KEYNAME: ${{ secrets.SIGNING_KEY }} GPG_PASSPHRASE: ${{ secrets.SIGNING_PASSWORD }} SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }} # for setupSigning_gha diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/Assistant.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/Assistant.java index edeaeea3ea6..309911e6e47 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/Assistant.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/Assistant.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2019, 2024. + * (C) Copyright IBM Corp. 2019, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -12,7 +12,7 @@ */ /* - * IBM OpenAPI SDK Code Generator Version: 3.97.0-0e90eab1-20241120-170029 + * IBM OpenAPI SDK Code Generator Version: 3.105.0-3c13b041-20250605-193116 */ package com.ibm.watson.assistant.v2; @@ -110,7 +110,7 @@ public class Assistant extends BaseService { * the client instance. * * @param version Release date of the API version you want to use. Specify dates in YYYY-MM-DD - * format. The current version is `2023-06-15`. + * format. The current version is `2024-08-25`. */ public Assistant(String version) { this( @@ -124,7 +124,7 @@ public Assistant(String version) { * authenticator are used to configure the client instance. * * @param version Release date of the API version you want to use. Specify dates in YYYY-MM-DD - * format. The current version is `2023-06-15`. + * format. The current version is `2024-08-25`. * @param authenticator the {@link Authenticator} instance to be configured for this client */ public Assistant(String version, Authenticator authenticator) { @@ -136,7 +136,7 @@ public Assistant(String version, Authenticator authenticator) { * configure the client instance. * * @param version Release date of the API version you want to use. Specify dates in YYYY-MM-DD - * format. The current version is `2023-06-15`. + * format. The current version is `2024-08-25`. * @param serviceName the service name to be used when configuring the client instance */ public Assistant(String version, String serviceName) { @@ -148,7 +148,7 @@ public Assistant(String version, String serviceName) { * are used to configure the client instance. * * @param version Release date of the API version you want to use. Specify dates in YYYY-MM-DD - * format. The current version is `2023-06-15`. + * format. The current version is `2024-08-25`. * @param serviceName the service name to be used when configuring the client instance * @param authenticator the {@link Authenticator} instance to be configured for this client */ @@ -163,7 +163,7 @@ public Assistant(String version, String serviceName, Authenticator authenticator * Gets the version. * *

Release date of the API version you want to use. Specify dates in YYYY-MM-DD format. The - * current version is `2023-06-15`. + * current version is `2024-08-25`. * * @return the version */ @@ -1516,8 +1516,9 @@ public ServiceCall updateSkill(UpdateSkillOptions updateSkillOptions) { * Export skills. * *

Asynchronously export the action skill and dialog skill (if enabled) for the assistant. Use - * this method to save all skill data so that you can import it to a different assistant using the - * **Import skills** method. + * this method to save all skill data from the draft environment so that you can import it to a + * different assistant using the **Import skills** method. Use `assistant_id` instead of + * `environment_id` to call this endpoint. * *

A successful call to this method only initiates an asynchronous export. The exported JSON * data is not available until processing completes. @@ -1562,6 +1563,8 @@ public ServiceCall exportSkills(ExportSkillsOptions exportSkillsOp * Import skills. * *

Asynchronously import skills into an existing assistant from a previously exported file. + * This method only imports assistants into a draft environment. Use `assistant_id` instead of + * `environment_id` to call this endpoint. * *

The request body for this method should contain the response data that was received from a * previous call to the **Export skills** method, without modification. diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/BulkClassifyOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/BulkClassifyOptions.java index 926510629f0..3e09becf3a1 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/BulkClassifyOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/BulkClassifyOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020, 2024. + * (C) Copyright IBM Corp. 2020, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -120,8 +120,10 @@ public Builder newBuilder() { /** * Gets the skillId. * - *

Unique identifier of the skill. To find the skill ID in the watsonx Assistant user - * interface, open the skill settings and click **API Details**. + *

Unique identifier of the skill. To find the action or dialog skill ID in the watsonx + * Assistant user interface, open the skill settings and click **API Details**. To find the search + * skill ID, use the Get environment API to retrieve the skill references for an environment and + * it will include the search skill info, if available. * * @return the skillId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ClientAction.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ClientAction.java index 7cc15720f46..545719b8b78 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ClientAction.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ClientAction.java @@ -15,6 +15,7 @@ import com.google.gson.annotations.SerializedName; import com.ibm.cloud.sdk.core.service.model.GenericModel; +import java.util.Map; /** ClientAction. */ public class ClientAction extends GenericModel { @@ -34,7 +35,7 @@ public interface Skill { protected String type; protected String skill; - protected ClientActionParameters parameters; + protected Map parameters; protected ClientAction() {} @@ -52,6 +53,8 @@ public String getName() { /** * Gets the resultVariable. * + *

The name of the variable that the results are stored in. + * * @return the resultVariable */ public String getResultVariable() { @@ -61,6 +64,8 @@ public String getResultVariable() { /** * Gets the type. * + *

The type of turn event. + * * @return the type */ public String getType() { @@ -81,9 +86,11 @@ public String getSkill() { /** * Gets the parameters. * + *

An object containing arbitrary variables that are included in the turn event. + * * @return the parameters */ - public ClientActionParameters getParameters() { + public Map getParameters() { return parameters; } } diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/CreateReleaseExportOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/CreateReleaseExportOptions.java index 5aa750c4a4b..68cdd6a842b 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/CreateReleaseExportOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/CreateReleaseExportOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2024. + * (C) Copyright IBM Corp. 2024, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -119,17 +119,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/CreateReleaseImportOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/CreateReleaseImportOptions.java index 5c25837a1fe..0380adce74a 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/CreateReleaseImportOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/CreateReleaseImportOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2024. + * (C) Copyright IBM Corp. 2024, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -135,17 +135,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/CreateReleaseOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/CreateReleaseOptions.java index e77ee9b4c48..162d1e58e85 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/CreateReleaseOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/CreateReleaseOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2023, 2024. + * (C) Copyright IBM Corp. 2023, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -112,17 +112,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/CreateSessionOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/CreateSessionOptions.java index c9731f2334c..f6e5ee6fdf0 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/CreateSessionOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/CreateSessionOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2018, 2024. + * (C) Copyright IBM Corp. 2018, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -101,17 +101,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/DeleteAssistantOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/DeleteAssistantOptions.java index 5b6a60c879e..9fb620082ea 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/DeleteAssistantOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/DeleteAssistantOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2023, 2024. + * (C) Copyright IBM Corp. 2023, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -86,17 +86,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/DeleteReleaseOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/DeleteReleaseOptions.java index a800d9be563..ba1c187ef5c 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/DeleteReleaseOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/DeleteReleaseOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2023, 2024. + * (C) Copyright IBM Corp. 2023, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -104,17 +104,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/DeleteSessionOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/DeleteSessionOptions.java index c7e3ac2e8cf..de7edfd5330 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/DeleteSessionOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/DeleteSessionOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2018, 2024. + * (C) Copyright IBM Corp. 2018, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -104,17 +104,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/DeployReleaseOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/DeployReleaseOptions.java index 9fd1b9afda7..53e4a646254 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/DeployReleaseOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/DeployReleaseOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2022, 2024. + * (C) Copyright IBM Corp. 2022, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -138,17 +138,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/DownloadReleaseExportOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/DownloadReleaseExportOptions.java index e902819c84c..77901e35acf 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/DownloadReleaseExportOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/DownloadReleaseExportOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2024. + * (C) Copyright IBM Corp. 2024, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -119,17 +119,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ExportSkillsOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ExportSkillsOptions.java index 5cedb8d8b1e..c4474a357f1 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ExportSkillsOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ExportSkillsOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2023, 2024. + * (C) Copyright IBM Corp. 2023, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -101,17 +101,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/FinalResponseOutput.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/FinalResponseOutput.java index c8c3161e7d7..9be7231d5bc 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/FinalResponseOutput.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/FinalResponseOutput.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2024. + * (C) Copyright IBM Corp. 2024, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -32,6 +32,9 @@ public class FinalResponseOutput extends GenericModel { protected MessageOutputSpelling spelling; + @SerializedName("llm_metadata") + protected List llmMetadata; + @SerializedName("streaming_metadata") protected MessageStreamMetadata streamingMetadata; @@ -116,6 +119,18 @@ public MessageOutputSpelling getSpelling() { return spelling; } + /** + * Gets the llmMetadata. + * + *

An array of objects that provide information about calls to large language models that + * occured as part of handling this message. + * + * @return the llmMetadata + */ + public List getLlmMetadata() { + return llmMetadata; + } + /** * Gets the streamingMetadata. * diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GenerativeAITask.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GenerativeAITask.java new file mode 100644 index 00000000000..6079e9da8de --- /dev/null +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GenerativeAITask.java @@ -0,0 +1,120 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +import com.google.gson.annotations.SerializedName; +import com.ibm.cloud.sdk.core.service.model.GenericModel; + +/** + * GenerativeAITask. + * + *

Classes which extend this class: - GenerativeAITaskContentGroundedAnswering - + * GenerativeAITaskGeneralPurposeAnswering + */ +public class GenerativeAITask extends GenericModel { + @SuppressWarnings("unused") + protected static String discriminatorPropertyName = "task"; + + protected static java.util.Map> discriminatorMapping; + + static { + discriminatorMapping = new java.util.HashMap<>(); + discriminatorMapping.put( + "content_grounded_answering", GenerativeAITaskContentGroundedAnswering.class); + discriminatorMapping.put( + "general_purpose_answering", GenerativeAITaskGeneralPurposeAnswering.class); + } + + protected String task; + + @SerializedName("is_idk_response") + protected Boolean isIdkResponse; + + @SerializedName("is_hap_detected") + protected Boolean isHapDetected; + + @SerializedName("confidence_scores") + protected GenerativeAITaskConfidenceScores confidenceScores; + + @SerializedName("original_response") + protected String originalResponse; + + @SerializedName("inferred_query") + protected String inferredQuery; + + protected GenerativeAITask() {} + + /** + * Gets the task. + * + *

The type of generative ai task. + * + * @return the task + */ + public String getTask() { + return task; + } + + /** + * Gets the isIdkResponse. + * + *

Whether response was an idk response. + * + * @return the isIdkResponse + */ + public Boolean isIsIdkResponse() { + return isIdkResponse; + } + + /** + * Gets the isHapDetected. + * + *

Whether response was a hap response. + * + * @return the isHapDetected + */ + public Boolean isIsHapDetected() { + return isHapDetected; + } + + /** + * Gets the confidenceScores. + * + *

The confidence scores for determining whether to show the generated response or an “I don't + * know” response. + * + * @return the confidenceScores + */ + public GenerativeAITaskConfidenceScores getConfidenceScores() { + return confidenceScores; + } + + /** + * Gets the originalResponse. + * + * @return the originalResponse + */ + public String getOriginalResponse() { + return originalResponse; + } + + /** + * Gets the inferredQuery. + * + * @return the inferredQuery + */ + public String getInferredQuery() { + return inferredQuery; + } +} diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GenerativeAITaskConfidenceScores.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GenerativeAITaskConfidenceScores.java new file mode 100644 index 00000000000..c0ddfabaaf2 --- /dev/null +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GenerativeAITaskConfidenceScores.java @@ -0,0 +1,74 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +import com.google.gson.annotations.SerializedName; +import com.ibm.cloud.sdk.core.service.model.GenericModel; + +/** + * The confidence scores for determining whether to show the generated response or an “I don't know” + * response. + */ +public class GenerativeAITaskConfidenceScores extends GenericModel { + + @SerializedName("pre_gen") + protected Double preGen; + + @SerializedName("pre_gen_threshold") + protected Double preGenThreshold; + + @SerializedName("post_gen") + protected Double postGen; + + @SerializedName("post_gen_threshold") + protected Double postGenThreshold; + + protected GenerativeAITaskConfidenceScores() {} + + /** + * Gets the preGen. + * + * @return the preGen + */ + public Double getPreGen() { + return preGen; + } + + /** + * Gets the preGenThreshold. + * + * @return the preGenThreshold + */ + public Double getPreGenThreshold() { + return preGenThreshold; + } + + /** + * Gets the postGen. + * + * @return the postGen + */ + public Double getPostGen() { + return postGen; + } + + /** + * Gets the postGenThreshold. + * + * @return the postGenThreshold + */ + public Double getPostGenThreshold() { + return postGenThreshold; + } +} diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GenerativeAITaskContentGroundedAnswering.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GenerativeAITaskContentGroundedAnswering.java new file mode 100644 index 00000000000..4c96b78743c --- /dev/null +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GenerativeAITaskContentGroundedAnswering.java @@ -0,0 +1,20 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +/** GenerativeAITaskContentGroundedAnswering. */ +public class GenerativeAITaskContentGroundedAnswering extends GenerativeAITask { + + protected GenerativeAITaskContentGroundedAnswering() {} +} diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GenerativeAITaskGeneralPurposeAnswering.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GenerativeAITaskGeneralPurposeAnswering.java new file mode 100644 index 00000000000..08be88ad80f --- /dev/null +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GenerativeAITaskGeneralPurposeAnswering.java @@ -0,0 +1,20 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +/** GenerativeAITaskGeneralPurposeAnswering. */ +public class GenerativeAITaskGeneralPurposeAnswering extends GenerativeAITask { + + protected GenerativeAITaskGeneralPurposeAnswering() {} +} diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GetEnvironmentOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GetEnvironmentOptions.java index d2a3885e1cf..1c96a4fb06f 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GetEnvironmentOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GetEnvironmentOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2022, 2024. + * (C) Copyright IBM Corp. 2022, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -120,17 +120,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GetReleaseImportStatusOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GetReleaseImportStatusOptions.java index de8feba7f8f..0a1d2c73a4e 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GetReleaseImportStatusOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GetReleaseImportStatusOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2024. + * (C) Copyright IBM Corp. 2024, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -101,17 +101,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GetReleaseOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GetReleaseOptions.java index 929f5d9d8a8..acd43ee329c 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GetReleaseOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GetReleaseOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2022, 2024. + * (C) Copyright IBM Corp. 2022, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -119,17 +119,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GetSkillOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GetSkillOptions.java index 8c8db0ec27f..e3c16aa4738 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GetSkillOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/GetSkillOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2023, 2024. + * (C) Copyright IBM Corp. 2023, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -104,17 +104,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ @@ -125,8 +131,10 @@ public String assistantId() { /** * Gets the skillId. * - *

Unique identifier of the skill. To find the skill ID in the watsonx Assistant user - * interface, open the skill settings and click **API Details**. + *

Unique identifier of the skill. To find the action or dialog skill ID in the watsonx + * Assistant user interface, open the skill settings and click **API Details**. To find the search + * skill ID, use the Get environment API to retrieve the skill references for an environment and + * it will include the search skill info, if available. * * @return the skillId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ImportSkillsOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ImportSkillsOptions.java index 1247413eb2c..6d037ebe6e0 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ImportSkillsOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ImportSkillsOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2023, 2024. + * (C) Copyright IBM Corp. 2023, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -158,17 +158,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ImportSkillsStatusOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ImportSkillsStatusOptions.java index 1622185d1bf..15683ce0339 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ImportSkillsStatusOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ImportSkillsStatusOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2023, 2024. + * (C) Copyright IBM Corp. 2023, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -86,17 +86,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/InputStreamConnectStrategy.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/InputStreamConnectStrategy.java index 17c5b2ec93e..2bfc27623f7 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/InputStreamConnectStrategy.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/InputStreamConnectStrategy.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2024. + * (C) Copyright IBM Corp. 2024, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -96,28 +96,29 @@ public InputStream inputStream() { @Override public Client createClient(LDLogger ldLogger) { - Client client = new Client() { - @Override - public Result connect(String s) throws StreamException { - Result result = new Result(inputStream, null, inputStream); - return result; - } - - @Override - public boolean awaitClosed(long l) throws InterruptedException { - return false; - } - - @Override - public URI getOrigin() { - return null; - } - - @Override - public void close() throws IOException { - inputStream.close(); - } - }; + Client client = + new Client() { + @Override + public Result connect(String s) throws StreamException { + Result result = new Result(inputStream, null, inputStream); + return result; + } + + @Override + public boolean awaitClosed(long l) throws InterruptedException { + return false; + } + + @Override + public URI getOrigin() { + return null; + } + + @Override + public void close() throws IOException { + inputStream.close(); + } + }; return client; } } diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ListEnvironmentsOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ListEnvironmentsOptions.java index 1037229a838..5a43b5d5eb1 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ListEnvironmentsOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ListEnvironmentsOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2022, 2024. + * (C) Copyright IBM Corp. 2022, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -172,17 +172,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ListLogsOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ListLogsOptions.java index ef7a3514dd7..40657673ba1 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ListLogsOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ListLogsOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020, 2024. + * (C) Copyright IBM Corp. 2020, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -146,17 +146,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ListReleasesOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ListReleasesOptions.java index 09a334cc414..b474326a14d 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ListReleasesOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ListReleasesOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2022, 2024. + * (C) Copyright IBM Corp. 2022, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -172,17 +172,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/LogResponseOutput.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/LogResponseOutput.java index 7e89e07c93a..52a26671bee 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/LogResponseOutput.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/LogResponseOutput.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2024. + * (C) Copyright IBM Corp. 2024, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -35,6 +35,9 @@ public class LogResponseOutput extends GenericModel { protected MessageOutputSpelling spelling; + @SerializedName("llm_metadata") + protected List llmMetadata; + protected LogResponseOutput() {} /** @@ -115,4 +118,16 @@ public Map getUserDefined() { public MessageOutputSpelling getSpelling() { return spelling; } + + /** + * Gets the llmMetadata. + * + *

An array of objects that provide information about calls to large language models that + * occured as part of handling this message. + * + * @return the llmMetadata + */ + public List getLlmMetadata() { + return llmMetadata; + } } diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageEventDeserializer.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageEventDeserializer.java index 48c0fd77778..61b906bc664 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageEventDeserializer.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageEventDeserializer.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2024. + * (C) Copyright IBM Corp. 2024, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -96,7 +96,6 @@ public Iterable statelessMessages() { return () -> new StatelessIteratorImpl<>(eventSource.messages()); } - private class IteratorImpl implements Iterator { private final Iterable messageEvents; @@ -116,7 +115,8 @@ public T next() { } } - private class StatelessIteratorImpl implements Iterator { + private class StatelessIteratorImpl + implements Iterator { private final Iterable messageEvents; StatelessIteratorImpl(Iterable messageEvents) { diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOptions.java index 69c6ea59bca..026669284fc 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2018, 2024. + * (C) Copyright IBM Corp. 2018, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -168,17 +168,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutput.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutput.java index a76c7ce378b..f59b20b826b 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutput.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutput.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2018, 2024. + * (C) Copyright IBM Corp. 2018, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -32,6 +32,9 @@ public class MessageOutput extends GenericModel { protected MessageOutputSpelling spelling; + @SerializedName("llm_metadata") + protected List llmMetadata; + protected MessageOutput() {} /** @@ -112,4 +115,16 @@ public Map getUserDefined() { public MessageOutputSpelling getSpelling() { return spelling; } + + /** + * Gets the llmMetadata. + * + *

An array of objects that provide information about calls to large language models that + * occured as part of handling this message. + * + * @return the llmMetadata + */ + public List getLlmMetadata() { + return llmMetadata; + } } diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutputDebugTurnEvent.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutputDebugTurnEvent.java index be13a89f0e1..0230d99c7b9 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutputDebugTurnEvent.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutputDebugTurnEvent.java @@ -32,6 +32,7 @@ * MessageOutputDebugTurnEventTurnEventTopicSwitchDenied - * MessageOutputDebugTurnEventTurnEventActionRoutingDenied - * MessageOutputDebugTurnEventTurnEventSuggestionIntentsDenied - + * MessageOutputDebugTurnEventTurnEventGenerativeAICalled - * MessageOutputDebugTurnEventTurnEventClientActions */ public class MessageOutputDebugTurnEvent extends GenericModel { @@ -65,6 +66,8 @@ public class MessageOutputDebugTurnEvent extends GenericModel { discriminatorMapping.put( "suggestion_intents_denied", MessageOutputDebugTurnEventTurnEventSuggestionIntentsDenied.class); + discriminatorMapping.put( + "generative_ai_called", MessageOutputDebugTurnEventTurnEventGenerativeAICalled.class); discriminatorMapping.put( "client_actions", MessageOutputDebugTurnEventTurnEventClientActions.class); } @@ -120,13 +123,20 @@ public interface Reason { protected Boolean hasQuestion; protected Boolean prompted; - protected TurnEventCalloutCallout callout; @SerializedName("route_name") protected String routeName; @SerializedName("intents_denied") protected List intentsDenied; + @SerializedName("generative_ai_start_time") + protected String generativeAiStartTime; + + @SerializedName("generative_ai") + protected GenerativeAITask generativeAi; + + protected TurnEventGenerativeAICalledMetrics metrics; + @SerializedName("client_actions") protected List clientActions; @@ -222,15 +232,6 @@ public Boolean isPrompted() { return prompted; } - /** - * Gets the callout. - * - * @return the callout - */ - public TurnEventCalloutCallout getCallout() { - return callout; - } - /** * Gets the routeName. * @@ -253,6 +254,35 @@ public List getIntentsDenied() { return intentsDenied; } + /** + * Gets the generativeAiStartTime. + * + *

The time when generative ai started processing the message. + * + * @return the generativeAiStartTime + */ + public String getGenerativeAiStartTime() { + return generativeAiStartTime; + } + + /** + * Gets the generativeAi. + * + * @return the generativeAi + */ + public GenerativeAITask getGenerativeAi() { + return generativeAi; + } + + /** + * Gets the metrics. + * + * @return the metrics + */ + public TurnEventGenerativeAICalledMetrics getMetrics() { + return metrics; + } + /** * Gets the clientActions. * diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutputDebugTurnEventTurnEventCallout.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutputDebugTurnEventTurnEventCallout.java index d4ec6acead8..b2ea8598734 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutputDebugTurnEventTurnEventCallout.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutputDebugTurnEventTurnEventCallout.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2022, 2024. + * (C) Copyright IBM Corp. 2022, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -17,6 +17,7 @@ public class MessageOutputDebugTurnEventTurnEventCallout extends MessageOutputDebugTurnEvent { protected TurnEventActionSource source; + protected TurnEventCalloutCallout callout; protected TurnEventCalloutError error; protected MessageOutputDebugTurnEventTurnEventCallout() {} @@ -30,6 +31,15 @@ public TurnEventActionSource getSource() { return source; } + /** + * Gets the callout. + * + * @return the callout + */ + public TurnEventCalloutCallout getCallout() { + return callout; + } + /** * Gets the error. * diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutputDebugTurnEventTurnEventGenerativeAICalled.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutputDebugTurnEventTurnEventGenerativeAICalled.java new file mode 100644 index 00000000000..5133312f36d --- /dev/null +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutputDebugTurnEventTurnEventGenerativeAICalled.java @@ -0,0 +1,44 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +import java.util.Map; + +/** MessageOutputDebugTurnEventTurnEventGenerativeAICalled. */ +public class MessageOutputDebugTurnEventTurnEventGenerativeAICalled + extends MessageOutputDebugTurnEvent { + + protected Map source; + protected TurnEventGenerativeAICalledCallout callout; + + protected MessageOutputDebugTurnEventTurnEventGenerativeAICalled() {} + + /** + * Gets the source. + * + * @return the source + */ + public Map getSource() { + return source; + } + + /** + * Gets the callout. + * + * @return the callout + */ + public TurnEventGenerativeAICalledCallout getCallout() { + return callout; + } +} diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutputLLMMetadata.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutputLLMMetadata.java new file mode 100644 index 00000000000..419160398fe --- /dev/null +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutputLLMMetadata.java @@ -0,0 +1,50 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +import com.google.gson.annotations.SerializedName; +import com.ibm.cloud.sdk.core.service.model.GenericModel; + +/** MessageOutputLLMMetadata. */ +public class MessageOutputLLMMetadata extends GenericModel { + + protected String task; + + @SerializedName("model_id") + protected String modelId; + + protected MessageOutputLLMMetadata() {} + + /** + * Gets the task. + * + *

The task that used a large language model. + * + * @return the task + */ + public String getTask() { + return task; + } + + /** + * Gets the modelId. + * + *

The id for the large language model used for the task. + * + * @return the modelId + */ + public String getModelId() { + return modelId; + } +} diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageStatelessOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageStatelessOptions.java index 736a6fe637e..55ef4da76fa 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageStatelessOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageStatelessOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020, 2024. + * (C) Copyright IBM Corp. 2020, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -150,17 +150,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageStreamOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageStreamOptions.java index af36dad5e47..bdd7da82b38 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageStreamOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageStreamOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2024. + * (C) Copyright IBM Corp. 2024, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -168,17 +168,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageStreamStatelessOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageStreamStatelessOptions.java index d4e0da7fcbe..39f48baccff 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageStreamStatelessOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageStreamStatelessOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2024. + * (C) Copyright IBM Corp. 2024, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -150,17 +150,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ResponseGenericConfidenceScores.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ResponseGenericConfidenceScores.java index 3a4adbfe48b..fbc36a19f22 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ResponseGenericConfidenceScores.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/ResponseGenericConfidenceScores.java @@ -38,9 +38,9 @@ protected ResponseGenericConfidenceScores() {} * Gets the threshold. * *

The confidence score threshold. If either the pre_gen or post_gen score is below this - * threshold, an “I don't know” response will be shown to replace the generated text. It can be - * configured either in the user interface or through the Update skill API. For more information, - * see the [watsonx Assistant documentation]( + * threshold, it shows an “I don't know” response to replace the generated text. You can configure + * the threshold in either the user interface or through the Update skill API. For more + * information, see the [watsonx Assistant documentation]( * https://cloud.ibm.com/docs/watson-assistant?topic=watson-assistant-conversational-search#behavioral-tuning-conversational-search). * * @return the threshold diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/SearchSettings.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/SearchSettings.java index 4d0da896dbc..d7ebc4e46ae 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/SearchSettings.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/SearchSettings.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2023, 2024. + * (C) Copyright IBM Corp. 2023, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -73,17 +73,17 @@ public Builder() {} /** * Instantiates a new builder with required properties. * - * @param discovery the discovery * @param messages the messages * @param schemaMapping the schemaMapping + * @param conversationalSearch the conversationalSearch */ public Builder( - SearchSettingsDiscovery discovery, SearchSettingsMessages messages, - SearchSettingsSchemaMapping schemaMapping) { - this.discovery = discovery; + SearchSettingsSchemaMapping schemaMapping, + SearchSettingsConversationalSearch conversationalSearch) { this.messages = messages; this.schemaMapping = schemaMapping; + this.conversationalSearch = conversationalSearch; } /** @@ -176,10 +176,11 @@ public Builder clientSideSearch(SearchSettingsClientSideSearch clientSideSearch) protected SearchSettings() {} protected SearchSettings(Builder builder) { - com.ibm.cloud.sdk.core.util.Validator.notNull(builder.discovery, "discovery cannot be null"); com.ibm.cloud.sdk.core.util.Validator.notNull(builder.messages, "messages cannot be null"); com.ibm.cloud.sdk.core.util.Validator.notNull( builder.schemaMapping, "schemaMapping cannot be null"); + com.ibm.cloud.sdk.core.util.Validator.notNull( + builder.conversationalSearch, "conversationalSearch cannot be null"); discovery = builder.discovery; messages = builder.messages; schemaMapping = builder.schemaMapping; diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/StatelessFinalResponseOutput.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/StatelessFinalResponseOutput.java index 075d8de9b8b..0d86df8d9fc 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/StatelessFinalResponseOutput.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/StatelessFinalResponseOutput.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2024. + * (C) Copyright IBM Corp. 2024, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -32,6 +32,9 @@ public class StatelessFinalResponseOutput extends GenericModel { protected MessageOutputSpelling spelling; + @SerializedName("llm_metadata") + protected List llmMetadata; + @SerializedName("streaming_metadata") protected StatelessMessageContext streamingMetadata; @@ -116,6 +119,18 @@ public MessageOutputSpelling getSpelling() { return spelling; } + /** + * Gets the llmMetadata. + * + *

An array of objects that provide information about calls to large language models that + * occured as part of handling this message. + * + * @return the llmMetadata + */ + public List getLlmMetadata() { + return llmMetadata; + } + /** * Gets the streamingMetadata. * diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCallout.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCallout.java new file mode 100644 index 00000000000..58e2976aa00 --- /dev/null +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCallout.java @@ -0,0 +1,80 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +import com.google.gson.annotations.SerializedName; +import com.ibm.cloud.sdk.core.service.model.GenericModel; + +/** TurnEventGenerativeAICalledCallout. */ +public class TurnEventGenerativeAICalledCallout extends GenericModel { + + @SerializedName("search_called") + protected Boolean searchCalled; + + @SerializedName("llm_called") + protected Boolean llmCalled; + + protected TurnEventGenerativeAICalledCalloutSearch search; + protected TurnEventGenerativeAICalledCalloutLlm llm; + + @SerializedName("idk_reason_code") + protected String idkReasonCode; + + protected TurnEventGenerativeAICalledCallout() {} + + /** + * Gets the searchCalled. + * + * @return the searchCalled + */ + public Boolean isSearchCalled() { + return searchCalled; + } + + /** + * Gets the llmCalled. + * + * @return the llmCalled + */ + public Boolean isLlmCalled() { + return llmCalled; + } + + /** + * Gets the search. + * + * @return the search + */ + public TurnEventGenerativeAICalledCalloutSearch getSearch() { + return search; + } + + /** + * Gets the llm. + * + * @return the llm + */ + public TurnEventGenerativeAICalledCalloutLlm getLlm() { + return llm; + } + + /** + * Gets the idkReasonCode. + * + * @return the idkReasonCode + */ + public String getIdkReasonCode() { + return idkReasonCode; + } +} diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutLlm.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutLlm.java new file mode 100644 index 00000000000..e449783b143 --- /dev/null +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutLlm.java @@ -0,0 +1,114 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +import com.google.gson.annotations.SerializedName; +import com.ibm.cloud.sdk.core.service.model.GenericModel; +import java.util.List; + +/** TurnEventGenerativeAICalledCalloutLlm. */ +public class TurnEventGenerativeAICalledCalloutLlm extends GenericModel { + + protected String type; + + @SerializedName("model_id") + protected String modelId; + + @SerializedName("model_class_id") + protected String modelClassId; + + @SerializedName("generated_token_count") + protected Long generatedTokenCount; + + @SerializedName("input_token_count") + protected Long inputTokenCount; + + protected Boolean success; + protected TurnEventGenerativeAICalledCalloutLlmResponse response; + protected List request; + + protected TurnEventGenerativeAICalledCalloutLlm() {} + + /** + * Gets the type. + * + * @return the type + */ + public String getType() { + return type; + } + + /** + * Gets the modelId. + * + * @return the modelId + */ + public String getModelId() { + return modelId; + } + + /** + * Gets the modelClassId. + * + * @return the modelClassId + */ + public String getModelClassId() { + return modelClassId; + } + + /** + * Gets the generatedTokenCount. + * + * @return the generatedTokenCount + */ + public Long getGeneratedTokenCount() { + return generatedTokenCount; + } + + /** + * Gets the inputTokenCount. + * + * @return the inputTokenCount + */ + public Long getInputTokenCount() { + return inputTokenCount; + } + + /** + * Gets the success. + * + * @return the success + */ + public Boolean isSuccess() { + return success; + } + + /** + * Gets the response. + * + * @return the response + */ + public TurnEventGenerativeAICalledCalloutLlmResponse getResponse() { + return response; + } + + /** + * Gets the request. + * + * @return the request + */ + public List getRequest() { + return request; + } +} diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutLlmResponse.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutLlmResponse.java new file mode 100644 index 00000000000..0b6b4b396e9 --- /dev/null +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutLlmResponse.java @@ -0,0 +1,58 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +import com.google.gson.annotations.SerializedName; +import com.ibm.cloud.sdk.core.service.model.GenericModel; + +/** */ +public class TurnEventGenerativeAICalledCalloutLlmResponse extends GenericModel { + + protected String text; + + @SerializedName("response_type") + protected String responseType; + + @SerializedName("is_idk_response") + protected Boolean isIdkResponse; + + protected TurnEventGenerativeAICalledCalloutLlmResponse() {} + + /** + * Gets the text. + * + * @return the text + */ + public String getText() { + return text; + } + + /** + * Gets the responseType. + * + * @return the responseType + */ + public String getResponseType() { + return responseType; + } + + /** + * Gets the isIdkResponse. + * + * @return the isIdkResponse + */ + public Boolean isIsIdkResponse() { + return isIdkResponse; + } +} diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutRequest.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutRequest.java new file mode 100644 index 00000000000..06d6a2fb81a --- /dev/null +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutRequest.java @@ -0,0 +1,127 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +import com.google.gson.annotations.SerializedName; +import com.ibm.cloud.sdk.core.service.model.GenericModel; +import java.util.Map; + +/** TurnEventGenerativeAICalledCalloutRequest. */ +public class TurnEventGenerativeAICalledCalloutRequest extends GenericModel { + + /** The REST method of the request. */ + public interface Method { + /** GET. */ + String GET = "GET"; + /** POST. */ + String POST = "POST"; + /** PUT. */ + String PUT = "PUT"; + /** DELETE. */ + String DELETE = "DELETE"; + /** PATCH. */ + String PATCH = "PATCH"; + } + + protected String method; + protected String url; + protected String port; + protected String path; + + @SerializedName("query_parameters") + protected String queryParameters; + + protected Map headers; + protected Map body; + + protected TurnEventGenerativeAICalledCalloutRequest() {} + + /** + * Gets the method. + * + *

The REST method of the request. + * + * @return the method + */ + public String getMethod() { + return method; + } + + /** + * Gets the url. + * + *

The host URL of the request call. + * + * @return the url + */ + public String getUrl() { + return url; + } + + /** + * Gets the port. + * + *

The host port of the request call. + * + * @return the port + */ + public String getPort() { + return port; + } + + /** + * Gets the path. + * + *

The URL path of the request call. + * + * @return the path + */ + public String getPath() { + return path; + } + + /** + * Gets the queryParameters. + * + *

Any query parameters appended to the URL of the request call. + * + * @return the queryParameters + */ + public String getQueryParameters() { + return queryParameters; + } + + /** + * Gets the headers. + * + *

Any headers included in the request call. + * + * @return the headers + */ + public Map getHeaders() { + return headers; + } + + /** + * Gets the body. + * + *

Contains the response of the external server or an object. In cases like timeouts or + * connections errors, it will contain details of why the callout to the external server failed. + * + * @return the body + */ + public Map getBody() { + return body; + } +} diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutResponse.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutResponse.java new file mode 100644 index 00000000000..8202916b42b --- /dev/null +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutResponse.java @@ -0,0 +1,51 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +import com.google.gson.annotations.SerializedName; +import com.ibm.cloud.sdk.core.service.model.GenericModel; + +/** TurnEventGenerativeAICalledCalloutResponse. */ +public class TurnEventGenerativeAICalledCalloutResponse extends GenericModel { + + protected String body; + + @SerializedName("status_code") + protected Long statusCode; + + protected TurnEventGenerativeAICalledCalloutResponse() {} + + /** + * Gets the body. + * + *

The final response string. This response is a composition of every partial chunk received + * from the stream. + * + * @return the body + */ + public String getBody() { + return body; + } + + /** + * Gets the statusCode. + * + *

The final status code of the response. + * + * @return the statusCode + */ + public Long getStatusCode() { + return statusCode; + } +} diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutSearch.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutSearch.java new file mode 100644 index 00000000000..ce03cc2beba --- /dev/null +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutSearch.java @@ -0,0 +1,73 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +import com.ibm.cloud.sdk.core.service.model.GenericModel; + +/** TurnEventGenerativeAICalledCalloutSearch. */ +public class TurnEventGenerativeAICalledCalloutSearch extends GenericModel { + + protected String engine; + protected String index; + protected String query; + protected TurnEventGenerativeAICalledCalloutRequest request; + protected TurnEventGenerativeAICalledCalloutResponse response; + + protected TurnEventGenerativeAICalledCalloutSearch() {} + + /** + * Gets the engine. + * + * @return the engine + */ + public String getEngine() { + return engine; + } + + /** + * Gets the index. + * + * @return the index + */ + public String getIndex() { + return index; + } + + /** + * Gets the query. + * + * @return the query + */ + public String getQuery() { + return query; + } + + /** + * Gets the request. + * + * @return the request + */ + public TurnEventGenerativeAICalledCalloutRequest getRequest() { + return request; + } + + /** + * Gets the response. + * + * @return the response + */ + public TurnEventGenerativeAICalledCalloutResponse getResponse() { + return response; + } +} diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledMetrics.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledMetrics.java new file mode 100644 index 00000000000..cb3bb31154a --- /dev/null +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledMetrics.java @@ -0,0 +1,59 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +import com.google.gson.annotations.SerializedName; +import com.ibm.cloud.sdk.core.service.model.GenericModel; + +/** TurnEventGenerativeAICalledMetrics. */ +public class TurnEventGenerativeAICalledMetrics extends GenericModel { + + @SerializedName("search_time_ms") + protected Double searchTimeMs; + + @SerializedName("answer_generation_time_ms") + protected Double answerGenerationTimeMs; + + @SerializedName("total_time_ms") + protected Double totalTimeMs; + + protected TurnEventGenerativeAICalledMetrics() {} + + /** + * Gets the searchTimeMs. + * + * @return the searchTimeMs + */ + public Double getSearchTimeMs() { + return searchTimeMs; + } + + /** + * Gets the answerGenerationTimeMs. + * + * @return the answerGenerationTimeMs + */ + public Double getAnswerGenerationTimeMs() { + return answerGenerationTimeMs; + } + + /** + * Gets the totalTimeMs. + * + * @return the totalTimeMs + */ + public Double getTotalTimeMs() { + return totalTimeMs; + } +} diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventStepSource.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventStepSource.java index a38957d75c5..204a2b22d94 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventStepSource.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/TurnEventStepSource.java @@ -88,6 +88,8 @@ public String getStep() { /** * Gets the isAiGuided. * + *

Whether the action that the turn event was generated from is an AI-guided action. + * * @return the isAiGuided */ public Boolean isIsAiGuided() { @@ -97,6 +99,8 @@ public Boolean isIsAiGuided() { /** * Gets the isSkillBased. * + *

Whether the action that the turn event was generated from is a skill-guided action. + * * @return the isSkillBased */ public Boolean isIsSkillBased() { diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/UpdateEnvironmentOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/UpdateEnvironmentOptions.java index d510469298e..e9829031bdf 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/UpdateEnvironmentOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/UpdateEnvironmentOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2023, 2024. + * (C) Copyright IBM Corp. 2023, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -198,17 +198,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/UpdateSkillOptions.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/UpdateSkillOptions.java index d4e011938b6..4381f894755 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v2/model/UpdateSkillOptions.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v2/model/UpdateSkillOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2023, 2024. + * (C) Copyright IBM Corp. 2023, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -180,17 +180,23 @@ public Builder newBuilder() { /** * Gets the assistantId. * - *

The assistant ID or the environment ID of the environment where the assistant is deployed, - * depending on the type of request: - For message, session, and log requests, specify the - * environment ID of the environment where the assistant is deployed. - For all other requests, - * specify the assistant ID of the assistant. + *

The assistant ID or the environment ID of the environment where the assistant is deployed. + * Set the value for this ID depending on the type of request: * - *

To find the environment ID or assistant ID in the watsonx Assistant user interface, open the - * assistant settings and scroll to the **Environments** section. + *

- For message, session, and log requests, specify the environment ID of the environment + * where the assistant is deployed. + * + *

- For all other requests, specify the assistant ID of the assistant. + * + *

To get the **assistant ID** and **environment ID** in the watsonx Assistant interface, open + * the **Assistant settings** page, and scroll to the **Assistant IDs and API details** section + * and click **View Details**. * *

**Note:** If you are using the classic Watson Assistant experience, always use the assistant - * ID. To find the assistant ID in the user interface, open the assistant settings and click API - * Details. + * ID. + * + *

To find the **assistant ID** in the user interface, open the **Assistant settings** and + * click **API Details**. * * @return the assistantId */ @@ -201,8 +207,10 @@ public String assistantId() { /** * Gets the skillId. * - *

Unique identifier of the skill. To find the skill ID in the watsonx Assistant user - * interface, open the skill settings and click **API Details**. + *

Unique identifier of the skill. To find the action or dialog skill ID in the watsonx + * Assistant user interface, open the skill settings and click **API Details**. To find the search + * skill ID, use the Get environment API to retrieve the skill references for an environment and + * it will include the search skill info, if available. * * @return the skillId */ diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/AssistantServiceIT.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/AssistantServiceIT.java index 6984d962f9b..7bdebf092ed 100644 --- a/assistant/src/test/java/com/ibm/watson/assistant/v2/AssistantServiceIT.java +++ b/assistant/src/test/java/com/ibm/watson/assistant/v2/AssistantServiceIT.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2019, 2024. + * (C) Copyright IBM Corp. 2019, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -18,16 +18,12 @@ import com.ibm.watson.assistant.v2.model.ListLogsOptions.Builder; import com.ibm.watson.common.RetryRunner; import com.launchdarkly.eventsource.StreamException; -import java.io.*; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import okhttp3.OkHttpClient; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -294,39 +290,44 @@ public void testGettingReleases() { } /** Test Provider API */ - @Test - public void testProviders() { - ListProvidersOptions listProviderOptions = new ListProvidersOptions.Builder().build(); - ProviderCollection listProvidersResponse = service.listProviders(listProviderOptions).execute().getResult(); - String providerId = listProvidersResponse.getConversationalSkillProviders().get(0).getProviderId(); - assertNotNull(listProvidersResponse); - assertNotNull(providerId); - - ArrayList serverList = new ArrayList<>(); - serverList.add( - new ProviderSpecificationServersItem.Builder() - .url("https://myProCodeProvider.com") - .build()); - - ProviderSpecification providerSpecification = - new ProviderSpecification.Builder().servers(serverList).build(); - - ProviderAuthenticationTypeAndValue password = new ProviderAuthenticationTypeAndValue.Builder().type("value").value("test").build(); - ProviderPrivateAuthenticationBasicFlow basicFlow = new ProviderPrivateAuthenticationBasicFlow.Builder().password(password).build(); - ProviderPrivate providerPrivate = new ProviderPrivate.Builder().authentication(basicFlow).build(); - - // service.setServiceUrl("http://localhost:9001"); - - UpdateProviderOptions updateProvidersOptions = - new UpdateProviderOptions.Builder() - .providerId(providerId) - .specification(providerSpecification) - .xPrivate(providerPrivate) - .build(); - ProviderResponse updateProvidersResponse = - service.updateProvider(updateProvidersOptions).execute().getResult(); - assertNotNull(updateProvidersResponse); - } + @Test + public void testProviders() { + ListProvidersOptions listProviderOptions = new ListProvidersOptions.Builder().build(); + ProviderCollection listProvidersResponse = + service.listProviders(listProviderOptions).execute().getResult(); + String providerId = + listProvidersResponse.getConversationalSkillProviders().get(0).getProviderId(); + assertNotNull(listProvidersResponse); + assertNotNull(providerId); + + ArrayList serverList = new ArrayList<>(); + serverList.add( + new ProviderSpecificationServersItem.Builder() + .url("https://myProCodeProvider.com") + .build()); + + ProviderSpecification providerSpecification = + new ProviderSpecification.Builder().servers(serverList).build(); + + ProviderAuthenticationTypeAndValue password = + new ProviderAuthenticationTypeAndValue.Builder().type("value").value("test").build(); + ProviderPrivateAuthenticationBasicFlow basicFlow = + new ProviderPrivateAuthenticationBasicFlow.Builder().password(password).build(); + ProviderPrivate providerPrivate = + new ProviderPrivate.Builder().authentication(basicFlow).build(); + + // service.setServiceUrl("http://localhost:9001"); + + UpdateProviderOptions updateProvidersOptions = + new UpdateProviderOptions.Builder() + .providerId(providerId) + .specification(providerSpecification) + .xPrivate(providerPrivate) + .build(); + ProviderResponse updateProvidersResponse = + service.updateProvider(updateProvidersOptions).execute().getResult(); + assertNotNull(updateProvidersResponse); + } /** Test Import/Export Release API */ @Test @@ -334,7 +335,8 @@ public void testImportRelease() throws IOException { InputStream testFile = new FileInputStream(RESOURCE + "demo_wa_V4.zip"); CreateReleaseImportOptions importOptions = new CreateReleaseImportOptions.Builder().assistantId(assistantId).body(testFile).build(); - CreateAssistantReleaseImportResponse importResponse = service.createReleaseImport(importOptions).execute().getResult(); + CreateAssistantReleaseImportResponse importResponse = + service.createReleaseImport(importOptions).execute().getResult(); assertNotNull(importResponse); } @@ -342,7 +344,8 @@ public void testImportRelease() throws IOException { public void testDownloadExportRelease() throws IOException { DownloadReleaseExportOptions exportOptions = new DownloadReleaseExportOptions.Builder().assistantId(assistantId).release("1").build(); - CreateReleaseExportWithStatusErrors exportResponse = service.downloadReleaseExport(exportOptions).execute().getResult(); + CreateReleaseExportWithStatusErrors exportResponse = + service.downloadReleaseExport(exportOptions).execute().getResult(); assertNotNull(exportResponse); } @@ -372,7 +375,8 @@ public void testMessageStreamStateless() throws IOException, StreamException { InputStream inputStream = service.messageStreamStateless(messageStreamStatelessOptions).execute().getResult(); - MessageEventDeserializer messageDeserializer = new MessageEventDeserializer.Builder(inputStream).build(); + MessageEventDeserializer messageDeserializer = + new MessageEventDeserializer.Builder(inputStream).build(); for (StatelessMessageStreamResponse message : messageDeserializer.statelessMessages()) { if (message.getPartialItem() != null) { assertNotNull(message.getPartialItem().getText()); diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/AssistantTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/AssistantTest.java index 967107c000a..4bcfd6315b1 100644 --- a/assistant/src/test/java/com/ibm/watson/assistant/v2/AssistantTest.java +++ b/assistant/src/test/java/com/ibm/watson/assistant/v2/AssistantTest.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2019, 2024. + * (C) Copyright IBM Corp. 2019, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -759,7 +759,7 @@ public void testDeleteSessionNoOptions() throws Throwable { public void testMessageWOptions() throws Throwable { // Register a mock response String mockResponseBody = - "{\"output\": {\"generic\": [{\"response_type\": \"text\", \"text\": \"text\", \"channels\": [{\"channel\": \"channel\"}]}], \"intents\": [{\"intent\": \"intent\", \"confidence\": 10, \"skill\": \"skill\"}], \"entities\": [{\"entity\": \"entity\", \"location\": [8], \"value\": \"value\", \"confidence\": 10, \"groups\": [{\"group\": \"group\", \"location\": [8]}], \"interpretation\": {\"calendar_type\": \"calendarType\", \"datetime_link\": \"datetimeLink\", \"festival\": \"festival\", \"granularity\": \"day\", \"range_link\": \"rangeLink\", \"range_modifier\": \"rangeModifier\", \"relative_day\": 11, \"relative_month\": 13, \"relative_week\": 12, \"relative_weekend\": 15, \"relative_year\": 12, \"specific_day\": 11, \"specific_day_of_week\": \"specificDayOfWeek\", \"specific_month\": 13, \"specific_quarter\": 15, \"specific_year\": 12, \"numeric_value\": 12, \"subtype\": \"subtype\", \"part_of_day\": \"partOfDay\", \"relative_hour\": 12, \"relative_minute\": 14, \"relative_second\": 14, \"specific_hour\": 12, \"specific_minute\": 14, \"specific_second\": 14, \"timezone\": \"timezone\"}, \"alternatives\": [{\"value\": \"value\", \"confidence\": 10}], \"role\": {\"type\": \"date_from\"}, \"skill\": \"skill\"}], \"actions\": [{\"name\": \"name\", \"type\": \"client\", \"parameters\": {\"anyKey\": \"anyValue\"}, \"result_variable\": \"resultVariable\", \"credentials\": \"credentials\"}], \"debug\": {\"nodes_visited\": [{\"dialog_node\": \"dialogNode\", \"title\": \"title\", \"conditions\": \"conditions\"}], \"log_messages\": [{\"level\": \"info\", \"message\": \"message\", \"code\": \"code\", \"source\": {\"type\": \"dialog_node\", \"dialog_node\": \"dialogNode\"}}], \"branch_exited\": true, \"branch_exited_reason\": \"completed\", \"turn_events\": [{\"event\": \"action_visited\", \"source\": {\"type\": \"action\", \"action\": \"action\", \"action_title\": \"actionTitle\", \"condition\": \"condition\"}, \"action_start_time\": \"actionStartTime\", \"condition_type\": \"user_defined\", \"reason\": \"intent\", \"result_variable\": \"resultVariable\"}]}, \"user_defined\": {\"anyKey\": \"anyValue\"}, \"spelling\": {\"text\": \"text\", \"original_text\": \"originalText\", \"suggested_text\": \"suggestedText\"}}, \"context\": {\"global\": {\"system\": {\"timezone\": \"timezone\", \"user_id\": \"userId\", \"turn_count\": 9, \"locale\": \"en-us\", \"reference_time\": \"referenceTime\", \"session_start_time\": \"sessionStartTime\", \"state\": \"state\", \"skip_user_input\": false}, \"session_id\": \"sessionId\"}, \"skills\": {\"main skill\": {\"user_defined\": {\"anyKey\": \"anyValue\"}, \"system\": {\"state\": \"state\"}}, \"actions skill\": {\"user_defined\": {\"anyKey\": \"anyValue\"}, \"system\": {\"state\": \"state\"}, \"action_variables\": {\"anyKey\": \"anyValue\"}, \"skill_variables\": {\"anyKey\": \"anyValue\"}}}, \"integrations\": {\"anyKey\": \"anyValue\"}}, \"user_id\": \"userId\", \"masked_output\": {\"generic\": [{\"response_type\": \"text\", \"text\": \"text\", \"channels\": [{\"channel\": \"channel\"}]}], \"intents\": [{\"intent\": \"intent\", \"confidence\": 10, \"skill\": \"skill\"}], \"entities\": [{\"entity\": \"entity\", \"location\": [8], \"value\": \"value\", \"confidence\": 10, \"groups\": [{\"group\": \"group\", \"location\": [8]}], \"interpretation\": {\"calendar_type\": \"calendarType\", \"datetime_link\": \"datetimeLink\", \"festival\": \"festival\", \"granularity\": \"day\", \"range_link\": \"rangeLink\", \"range_modifier\": \"rangeModifier\", \"relative_day\": 11, \"relative_month\": 13, \"relative_week\": 12, \"relative_weekend\": 15, \"relative_year\": 12, \"specific_day\": 11, \"specific_day_of_week\": \"specificDayOfWeek\", \"specific_month\": 13, \"specific_quarter\": 15, \"specific_year\": 12, \"numeric_value\": 12, \"subtype\": \"subtype\", \"part_of_day\": \"partOfDay\", \"relative_hour\": 12, \"relative_minute\": 14, \"relative_second\": 14, \"specific_hour\": 12, \"specific_minute\": 14, \"specific_second\": 14, \"timezone\": \"timezone\"}, \"alternatives\": [{\"value\": \"value\", \"confidence\": 10}], \"role\": {\"type\": \"date_from\"}, \"skill\": \"skill\"}], \"actions\": [{\"name\": \"name\", \"type\": \"client\", \"parameters\": {\"anyKey\": \"anyValue\"}, \"result_variable\": \"resultVariable\", \"credentials\": \"credentials\"}], \"debug\": {\"nodes_visited\": [{\"dialog_node\": \"dialogNode\", \"title\": \"title\", \"conditions\": \"conditions\"}], \"log_messages\": [{\"level\": \"info\", \"message\": \"message\", \"code\": \"code\", \"source\": {\"type\": \"dialog_node\", \"dialog_node\": \"dialogNode\"}}], \"branch_exited\": true, \"branch_exited_reason\": \"completed\", \"turn_events\": [{\"event\": \"action_visited\", \"source\": {\"type\": \"action\", \"action\": \"action\", \"action_title\": \"actionTitle\", \"condition\": \"condition\"}, \"action_start_time\": \"actionStartTime\", \"condition_type\": \"user_defined\", \"reason\": \"intent\", \"result_variable\": \"resultVariable\"}]}, \"user_defined\": {\"anyKey\": \"anyValue\"}, \"spelling\": {\"text\": \"text\", \"original_text\": \"originalText\", \"suggested_text\": \"suggestedText\"}}, \"masked_input\": {\"message_type\": \"text\", \"text\": \"text\", \"intents\": [{\"intent\": \"intent\", \"confidence\": 10, \"skill\": \"skill\"}], \"entities\": [{\"entity\": \"entity\", \"location\": [8], \"value\": \"value\", \"confidence\": 10, \"groups\": [{\"group\": \"group\", \"location\": [8]}], \"interpretation\": {\"calendar_type\": \"calendarType\", \"datetime_link\": \"datetimeLink\", \"festival\": \"festival\", \"granularity\": \"day\", \"range_link\": \"rangeLink\", \"range_modifier\": \"rangeModifier\", \"relative_day\": 11, \"relative_month\": 13, \"relative_week\": 12, \"relative_weekend\": 15, \"relative_year\": 12, \"specific_day\": 11, \"specific_day_of_week\": \"specificDayOfWeek\", \"specific_month\": 13, \"specific_quarter\": 15, \"specific_year\": 12, \"numeric_value\": 12, \"subtype\": \"subtype\", \"part_of_day\": \"partOfDay\", \"relative_hour\": 12, \"relative_minute\": 14, \"relative_second\": 14, \"specific_hour\": 12, \"specific_minute\": 14, \"specific_second\": 14, \"timezone\": \"timezone\"}, \"alternatives\": [{\"value\": \"value\", \"confidence\": 10}], \"role\": {\"type\": \"date_from\"}, \"skill\": \"skill\"}], \"suggestion_id\": \"suggestionId\", \"attachments\": [{\"url\": \"url\", \"media_type\": \"mediaType\"}], \"analytics\": {\"browser\": \"browser\", \"device\": \"device\", \"pageUrl\": \"pageUrl\"}, \"options\": {\"restart\": false, \"alternate_intents\": false, \"async_callout\": false, \"spelling\": {\"suggestions\": false, \"auto_correct\": false}, \"debug\": false, \"return_context\": false, \"export\": false}}}"; + "{\"output\": {\"generic\": [{\"response_type\": \"conversation_search\", \"text\": \"text\", \"citations_title\": \"citationsTitle\", \"citations\": [{\"title\": \"title\", \"text\": \"text\", \"body\": \"body\", \"search_result_index\": 17, \"ranges\": [{\"start\": 5, \"end\": 3}]}], \"confidence_scores\": {\"threshold\": 9, \"pre_gen\": 6, \"post_gen\": 7, \"extractiveness\": 14}, \"response_length_option\": \"responseLengthOption\", \"search_results\": [{\"result_metadata\": {\"document_retrieval_source\": \"documentRetrievalSource\", \"score\": 5}, \"id\": \"id\", \"title\": \"title\", \"body\": \"body\"}], \"disclaimer\": \"disclaimer\"}], \"intents\": [{\"intent\": \"intent\", \"confidence\": 10, \"skill\": \"skill\"}], \"entities\": [{\"entity\": \"entity\", \"location\": [8], \"value\": \"value\", \"confidence\": 10, \"groups\": [{\"group\": \"group\", \"location\": [8]}], \"interpretation\": {\"calendar_type\": \"calendarType\", \"datetime_link\": \"datetimeLink\", \"festival\": \"festival\", \"granularity\": \"day\", \"range_link\": \"rangeLink\", \"range_modifier\": \"rangeModifier\", \"relative_day\": 11, \"relative_month\": 13, \"relative_week\": 12, \"relative_weekend\": 15, \"relative_year\": 12, \"specific_day\": 11, \"specific_day_of_week\": \"specificDayOfWeek\", \"specific_month\": 13, \"specific_quarter\": 15, \"specific_year\": 12, \"numeric_value\": 12, \"subtype\": \"subtype\", \"part_of_day\": \"partOfDay\", \"relative_hour\": 12, \"relative_minute\": 14, \"relative_second\": 14, \"specific_hour\": 12, \"specific_minute\": 14, \"specific_second\": 14, \"timezone\": \"timezone\"}, \"alternatives\": [{\"value\": \"value\", \"confidence\": 10}], \"role\": {\"type\": \"date_from\"}, \"skill\": \"skill\"}], \"actions\": [{\"name\": \"name\", \"type\": \"client\", \"parameters\": {\"anyKey\": \"anyValue\"}, \"result_variable\": \"resultVariable\", \"credentials\": \"credentials\"}], \"debug\": {\"nodes_visited\": [{\"dialog_node\": \"dialogNode\", \"title\": \"title\", \"conditions\": \"conditions\"}], \"log_messages\": [{\"level\": \"info\", \"message\": \"message\", \"code\": \"code\", \"source\": {\"type\": \"dialog_node\", \"dialog_node\": \"dialogNode\"}}], \"branch_exited\": true, \"branch_exited_reason\": \"completed\", \"turn_events\": [{\"event\": \"action_visited\", \"source\": {\"type\": \"action\", \"action\": \"action\", \"action_title\": \"actionTitle\", \"condition\": \"condition\"}, \"action_start_time\": \"actionStartTime\", \"condition_type\": \"user_defined\", \"reason\": \"intent\", \"result_variable\": \"resultVariable\"}]}, \"user_defined\": {\"anyKey\": \"anyValue\"}, \"spelling\": {\"text\": \"text\", \"original_text\": \"originalText\", \"suggested_text\": \"suggestedText\"}, \"llm_metadata\": [{\"task\": \"task\", \"model_id\": \"modelId\"}]}, \"context\": {\"global\": {\"system\": {\"timezone\": \"timezone\", \"user_id\": \"userId\", \"turn_count\": 9, \"locale\": \"en-us\", \"reference_time\": \"referenceTime\", \"session_start_time\": \"sessionStartTime\", \"state\": \"state\", \"skip_user_input\": false}, \"session_id\": \"sessionId\"}, \"skills\": {\"main skill\": {\"user_defined\": {\"anyKey\": \"anyValue\"}, \"system\": {\"state\": \"state\"}}, \"actions skill\": {\"user_defined\": {\"anyKey\": \"anyValue\"}, \"system\": {\"state\": \"state\"}, \"action_variables\": {\"anyKey\": \"anyValue\"}, \"skill_variables\": {\"anyKey\": \"anyValue\"}}}, \"integrations\": {\"anyKey\": \"anyValue\"}}, \"user_id\": \"userId\", \"masked_output\": {\"generic\": [{\"response_type\": \"conversation_search\", \"text\": \"text\", \"citations_title\": \"citationsTitle\", \"citations\": [{\"title\": \"title\", \"text\": \"text\", \"body\": \"body\", \"search_result_index\": 17, \"ranges\": [{\"start\": 5, \"end\": 3}]}], \"confidence_scores\": {\"threshold\": 9, \"pre_gen\": 6, \"post_gen\": 7, \"extractiveness\": 14}, \"response_length_option\": \"responseLengthOption\", \"search_results\": [{\"result_metadata\": {\"document_retrieval_source\": \"documentRetrievalSource\", \"score\": 5}, \"id\": \"id\", \"title\": \"title\", \"body\": \"body\"}], \"disclaimer\": \"disclaimer\"}], \"intents\": [{\"intent\": \"intent\", \"confidence\": 10, \"skill\": \"skill\"}], \"entities\": [{\"entity\": \"entity\", \"location\": [8], \"value\": \"value\", \"confidence\": 10, \"groups\": [{\"group\": \"group\", \"location\": [8]}], \"interpretation\": {\"calendar_type\": \"calendarType\", \"datetime_link\": \"datetimeLink\", \"festival\": \"festival\", \"granularity\": \"day\", \"range_link\": \"rangeLink\", \"range_modifier\": \"rangeModifier\", \"relative_day\": 11, \"relative_month\": 13, \"relative_week\": 12, \"relative_weekend\": 15, \"relative_year\": 12, \"specific_day\": 11, \"specific_day_of_week\": \"specificDayOfWeek\", \"specific_month\": 13, \"specific_quarter\": 15, \"specific_year\": 12, \"numeric_value\": 12, \"subtype\": \"subtype\", \"part_of_day\": \"partOfDay\", \"relative_hour\": 12, \"relative_minute\": 14, \"relative_second\": 14, \"specific_hour\": 12, \"specific_minute\": 14, \"specific_second\": 14, \"timezone\": \"timezone\"}, \"alternatives\": [{\"value\": \"value\", \"confidence\": 10}], \"role\": {\"type\": \"date_from\"}, \"skill\": \"skill\"}], \"actions\": [{\"name\": \"name\", \"type\": \"client\", \"parameters\": {\"anyKey\": \"anyValue\"}, \"result_variable\": \"resultVariable\", \"credentials\": \"credentials\"}], \"debug\": {\"nodes_visited\": [{\"dialog_node\": \"dialogNode\", \"title\": \"title\", \"conditions\": \"conditions\"}], \"log_messages\": [{\"level\": \"info\", \"message\": \"message\", \"code\": \"code\", \"source\": {\"type\": \"dialog_node\", \"dialog_node\": \"dialogNode\"}}], \"branch_exited\": true, \"branch_exited_reason\": \"completed\", \"turn_events\": [{\"event\": \"action_visited\", \"source\": {\"type\": \"action\", \"action\": \"action\", \"action_title\": \"actionTitle\", \"condition\": \"condition\"}, \"action_start_time\": \"actionStartTime\", \"condition_type\": \"user_defined\", \"reason\": \"intent\", \"result_variable\": \"resultVariable\"}]}, \"user_defined\": {\"anyKey\": \"anyValue\"}, \"spelling\": {\"text\": \"text\", \"original_text\": \"originalText\", \"suggested_text\": \"suggestedText\"}, \"llm_metadata\": [{\"task\": \"task\", \"model_id\": \"modelId\"}]}, \"masked_input\": {\"message_type\": \"text\", \"text\": \"text\", \"intents\": [{\"intent\": \"intent\", \"confidence\": 10, \"skill\": \"skill\"}], \"entities\": [{\"entity\": \"entity\", \"location\": [8], \"value\": \"value\", \"confidence\": 10, \"groups\": [{\"group\": \"group\", \"location\": [8]}], \"interpretation\": {\"calendar_type\": \"calendarType\", \"datetime_link\": \"datetimeLink\", \"festival\": \"festival\", \"granularity\": \"day\", \"range_link\": \"rangeLink\", \"range_modifier\": \"rangeModifier\", \"relative_day\": 11, \"relative_month\": 13, \"relative_week\": 12, \"relative_weekend\": 15, \"relative_year\": 12, \"specific_day\": 11, \"specific_day_of_week\": \"specificDayOfWeek\", \"specific_month\": 13, \"specific_quarter\": 15, \"specific_year\": 12, \"numeric_value\": 12, \"subtype\": \"subtype\", \"part_of_day\": \"partOfDay\", \"relative_hour\": 12, \"relative_minute\": 14, \"relative_second\": 14, \"specific_hour\": 12, \"specific_minute\": 14, \"specific_second\": 14, \"timezone\": \"timezone\"}, \"alternatives\": [{\"value\": \"value\", \"confidence\": 10}], \"role\": {\"type\": \"date_from\"}, \"skill\": \"skill\"}], \"suggestion_id\": \"suggestionId\", \"attachments\": [{\"url\": \"url\", \"media_type\": \"mediaType\"}], \"analytics\": {\"browser\": \"browser\", \"device\": \"device\", \"pageUrl\": \"pageUrl\"}, \"options\": {\"restart\": false, \"alternate_intents\": false, \"async_callout\": false, \"spelling\": {\"suggestions\": false, \"auto_correct\": false}, \"debug\": false, \"return_context\": false, \"export\": false}}}"; String messagePath = "/v2/assistants/testString/sessions/testString/message"; server.enqueue( new MockResponse() @@ -987,7 +987,7 @@ public void testMessageNoOptions() throws Throwable { public void testMessageStatelessWOptions() throws Throwable { // Register a mock response String mockResponseBody = - "{\"output\": {\"generic\": [{\"response_type\": \"text\", \"text\": \"text\", \"channels\": [{\"channel\": \"channel\"}]}], \"intents\": [{\"intent\": \"intent\", \"confidence\": 10, \"skill\": \"skill\"}], \"entities\": [{\"entity\": \"entity\", \"location\": [8], \"value\": \"value\", \"confidence\": 10, \"groups\": [{\"group\": \"group\", \"location\": [8]}], \"interpretation\": {\"calendar_type\": \"calendarType\", \"datetime_link\": \"datetimeLink\", \"festival\": \"festival\", \"granularity\": \"day\", \"range_link\": \"rangeLink\", \"range_modifier\": \"rangeModifier\", \"relative_day\": 11, \"relative_month\": 13, \"relative_week\": 12, \"relative_weekend\": 15, \"relative_year\": 12, \"specific_day\": 11, \"specific_day_of_week\": \"specificDayOfWeek\", \"specific_month\": 13, \"specific_quarter\": 15, \"specific_year\": 12, \"numeric_value\": 12, \"subtype\": \"subtype\", \"part_of_day\": \"partOfDay\", \"relative_hour\": 12, \"relative_minute\": 14, \"relative_second\": 14, \"specific_hour\": 12, \"specific_minute\": 14, \"specific_second\": 14, \"timezone\": \"timezone\"}, \"alternatives\": [{\"value\": \"value\", \"confidence\": 10}], \"role\": {\"type\": \"date_from\"}, \"skill\": \"skill\"}], \"actions\": [{\"name\": \"name\", \"type\": \"client\", \"parameters\": {\"anyKey\": \"anyValue\"}, \"result_variable\": \"resultVariable\", \"credentials\": \"credentials\"}], \"debug\": {\"nodes_visited\": [{\"dialog_node\": \"dialogNode\", \"title\": \"title\", \"conditions\": \"conditions\"}], \"log_messages\": [{\"level\": \"info\", \"message\": \"message\", \"code\": \"code\", \"source\": {\"type\": \"dialog_node\", \"dialog_node\": \"dialogNode\"}}], \"branch_exited\": true, \"branch_exited_reason\": \"completed\", \"turn_events\": [{\"event\": \"action_visited\", \"source\": {\"type\": \"action\", \"action\": \"action\", \"action_title\": \"actionTitle\", \"condition\": \"condition\"}, \"action_start_time\": \"actionStartTime\", \"condition_type\": \"user_defined\", \"reason\": \"intent\", \"result_variable\": \"resultVariable\"}]}, \"user_defined\": {\"anyKey\": \"anyValue\"}, \"spelling\": {\"text\": \"text\", \"original_text\": \"originalText\", \"suggested_text\": \"suggestedText\"}}, \"context\": {\"global\": {\"system\": {\"timezone\": \"timezone\", \"user_id\": \"userId\", \"turn_count\": 9, \"locale\": \"en-us\", \"reference_time\": \"referenceTime\", \"session_start_time\": \"sessionStartTime\", \"state\": \"state\", \"skip_user_input\": false}, \"session_id\": \"sessionId\"}, \"skills\": {\"main skill\": {\"user_defined\": {\"anyKey\": \"anyValue\"}, \"system\": {\"state\": \"state\"}}, \"actions skill\": {\"user_defined\": {\"anyKey\": \"anyValue\"}, \"system\": {\"state\": \"state\"}, \"action_variables\": {\"anyKey\": \"anyValue\"}, \"skill_variables\": {\"anyKey\": \"anyValue\"}, \"private_action_variables\": {\"anyKey\": \"anyValue\"}, \"private_skill_variables\": {\"anyKey\": \"anyValue\"}}}, \"integrations\": {\"anyKey\": \"anyValue\"}}, \"masked_output\": {\"generic\": [{\"response_type\": \"text\", \"text\": \"text\", \"channels\": [{\"channel\": \"channel\"}]}], \"intents\": [{\"intent\": \"intent\", \"confidence\": 10, \"skill\": \"skill\"}], \"entities\": [{\"entity\": \"entity\", \"location\": [8], \"value\": \"value\", \"confidence\": 10, \"groups\": [{\"group\": \"group\", \"location\": [8]}], \"interpretation\": {\"calendar_type\": \"calendarType\", \"datetime_link\": \"datetimeLink\", \"festival\": \"festival\", \"granularity\": \"day\", \"range_link\": \"rangeLink\", \"range_modifier\": \"rangeModifier\", \"relative_day\": 11, \"relative_month\": 13, \"relative_week\": 12, \"relative_weekend\": 15, \"relative_year\": 12, \"specific_day\": 11, \"specific_day_of_week\": \"specificDayOfWeek\", \"specific_month\": 13, \"specific_quarter\": 15, \"specific_year\": 12, \"numeric_value\": 12, \"subtype\": \"subtype\", \"part_of_day\": \"partOfDay\", \"relative_hour\": 12, \"relative_minute\": 14, \"relative_second\": 14, \"specific_hour\": 12, \"specific_minute\": 14, \"specific_second\": 14, \"timezone\": \"timezone\"}, \"alternatives\": [{\"value\": \"value\", \"confidence\": 10}], \"role\": {\"type\": \"date_from\"}, \"skill\": \"skill\"}], \"actions\": [{\"name\": \"name\", \"type\": \"client\", \"parameters\": {\"anyKey\": \"anyValue\"}, \"result_variable\": \"resultVariable\", \"credentials\": \"credentials\"}], \"debug\": {\"nodes_visited\": [{\"dialog_node\": \"dialogNode\", \"title\": \"title\", \"conditions\": \"conditions\"}], \"log_messages\": [{\"level\": \"info\", \"message\": \"message\", \"code\": \"code\", \"source\": {\"type\": \"dialog_node\", \"dialog_node\": \"dialogNode\"}}], \"branch_exited\": true, \"branch_exited_reason\": \"completed\", \"turn_events\": [{\"event\": \"action_visited\", \"source\": {\"type\": \"action\", \"action\": \"action\", \"action_title\": \"actionTitle\", \"condition\": \"condition\"}, \"action_start_time\": \"actionStartTime\", \"condition_type\": \"user_defined\", \"reason\": \"intent\", \"result_variable\": \"resultVariable\"}]}, \"user_defined\": {\"anyKey\": \"anyValue\"}, \"spelling\": {\"text\": \"text\", \"original_text\": \"originalText\", \"suggested_text\": \"suggestedText\"}}, \"masked_input\": {\"message_type\": \"text\", \"text\": \"text\", \"intents\": [{\"intent\": \"intent\", \"confidence\": 10, \"skill\": \"skill\"}], \"entities\": [{\"entity\": \"entity\", \"location\": [8], \"value\": \"value\", \"confidence\": 10, \"groups\": [{\"group\": \"group\", \"location\": [8]}], \"interpretation\": {\"calendar_type\": \"calendarType\", \"datetime_link\": \"datetimeLink\", \"festival\": \"festival\", \"granularity\": \"day\", \"range_link\": \"rangeLink\", \"range_modifier\": \"rangeModifier\", \"relative_day\": 11, \"relative_month\": 13, \"relative_week\": 12, \"relative_weekend\": 15, \"relative_year\": 12, \"specific_day\": 11, \"specific_day_of_week\": \"specificDayOfWeek\", \"specific_month\": 13, \"specific_quarter\": 15, \"specific_year\": 12, \"numeric_value\": 12, \"subtype\": \"subtype\", \"part_of_day\": \"partOfDay\", \"relative_hour\": 12, \"relative_minute\": 14, \"relative_second\": 14, \"specific_hour\": 12, \"specific_minute\": 14, \"specific_second\": 14, \"timezone\": \"timezone\"}, \"alternatives\": [{\"value\": \"value\", \"confidence\": 10}], \"role\": {\"type\": \"date_from\"}, \"skill\": \"skill\"}], \"suggestion_id\": \"suggestionId\", \"attachments\": [{\"url\": \"url\", \"media_type\": \"mediaType\"}], \"analytics\": {\"browser\": \"browser\", \"device\": \"device\", \"pageUrl\": \"pageUrl\"}, \"options\": {\"restart\": false, \"alternate_intents\": false, \"async_callout\": false, \"spelling\": {\"suggestions\": false, \"auto_correct\": false}, \"debug\": false, \"return_context\": false, \"export\": false}}, \"user_id\": \"userId\"}"; + "{\"output\": {\"generic\": [{\"response_type\": \"conversation_search\", \"text\": \"text\", \"citations_title\": \"citationsTitle\", \"citations\": [{\"title\": \"title\", \"text\": \"text\", \"body\": \"body\", \"search_result_index\": 17, \"ranges\": [{\"start\": 5, \"end\": 3}]}], \"confidence_scores\": {\"threshold\": 9, \"pre_gen\": 6, \"post_gen\": 7, \"extractiveness\": 14}, \"response_length_option\": \"responseLengthOption\", \"search_results\": [{\"result_metadata\": {\"document_retrieval_source\": \"documentRetrievalSource\", \"score\": 5}, \"id\": \"id\", \"title\": \"title\", \"body\": \"body\"}], \"disclaimer\": \"disclaimer\"}], \"intents\": [{\"intent\": \"intent\", \"confidence\": 10, \"skill\": \"skill\"}], \"entities\": [{\"entity\": \"entity\", \"location\": [8], \"value\": \"value\", \"confidence\": 10, \"groups\": [{\"group\": \"group\", \"location\": [8]}], \"interpretation\": {\"calendar_type\": \"calendarType\", \"datetime_link\": \"datetimeLink\", \"festival\": \"festival\", \"granularity\": \"day\", \"range_link\": \"rangeLink\", \"range_modifier\": \"rangeModifier\", \"relative_day\": 11, \"relative_month\": 13, \"relative_week\": 12, \"relative_weekend\": 15, \"relative_year\": 12, \"specific_day\": 11, \"specific_day_of_week\": \"specificDayOfWeek\", \"specific_month\": 13, \"specific_quarter\": 15, \"specific_year\": 12, \"numeric_value\": 12, \"subtype\": \"subtype\", \"part_of_day\": \"partOfDay\", \"relative_hour\": 12, \"relative_minute\": 14, \"relative_second\": 14, \"specific_hour\": 12, \"specific_minute\": 14, \"specific_second\": 14, \"timezone\": \"timezone\"}, \"alternatives\": [{\"value\": \"value\", \"confidence\": 10}], \"role\": {\"type\": \"date_from\"}, \"skill\": \"skill\"}], \"actions\": [{\"name\": \"name\", \"type\": \"client\", \"parameters\": {\"anyKey\": \"anyValue\"}, \"result_variable\": \"resultVariable\", \"credentials\": \"credentials\"}], \"debug\": {\"nodes_visited\": [{\"dialog_node\": \"dialogNode\", \"title\": \"title\", \"conditions\": \"conditions\"}], \"log_messages\": [{\"level\": \"info\", \"message\": \"message\", \"code\": \"code\", \"source\": {\"type\": \"dialog_node\", \"dialog_node\": \"dialogNode\"}}], \"branch_exited\": true, \"branch_exited_reason\": \"completed\", \"turn_events\": [{\"event\": \"action_visited\", \"source\": {\"type\": \"action\", \"action\": \"action\", \"action_title\": \"actionTitle\", \"condition\": \"condition\"}, \"action_start_time\": \"actionStartTime\", \"condition_type\": \"user_defined\", \"reason\": \"intent\", \"result_variable\": \"resultVariable\"}]}, \"user_defined\": {\"anyKey\": \"anyValue\"}, \"spelling\": {\"text\": \"text\", \"original_text\": \"originalText\", \"suggested_text\": \"suggestedText\"}, \"llm_metadata\": [{\"task\": \"task\", \"model_id\": \"modelId\"}]}, \"context\": {\"global\": {\"system\": {\"timezone\": \"timezone\", \"user_id\": \"userId\", \"turn_count\": 9, \"locale\": \"en-us\", \"reference_time\": \"referenceTime\", \"session_start_time\": \"sessionStartTime\", \"state\": \"state\", \"skip_user_input\": false}, \"session_id\": \"sessionId\"}, \"skills\": {\"main skill\": {\"user_defined\": {\"anyKey\": \"anyValue\"}, \"system\": {\"state\": \"state\"}}, \"actions skill\": {\"user_defined\": {\"anyKey\": \"anyValue\"}, \"system\": {\"state\": \"state\"}, \"action_variables\": {\"anyKey\": \"anyValue\"}, \"skill_variables\": {\"anyKey\": \"anyValue\"}, \"private_action_variables\": {\"anyKey\": \"anyValue\"}, \"private_skill_variables\": {\"anyKey\": \"anyValue\"}}}, \"integrations\": {\"anyKey\": \"anyValue\"}}, \"masked_output\": {\"generic\": [{\"response_type\": \"conversation_search\", \"text\": \"text\", \"citations_title\": \"citationsTitle\", \"citations\": [{\"title\": \"title\", \"text\": \"text\", \"body\": \"body\", \"search_result_index\": 17, \"ranges\": [{\"start\": 5, \"end\": 3}]}], \"confidence_scores\": {\"threshold\": 9, \"pre_gen\": 6, \"post_gen\": 7, \"extractiveness\": 14}, \"response_length_option\": \"responseLengthOption\", \"search_results\": [{\"result_metadata\": {\"document_retrieval_source\": \"documentRetrievalSource\", \"score\": 5}, \"id\": \"id\", \"title\": \"title\", \"body\": \"body\"}], \"disclaimer\": \"disclaimer\"}], \"intents\": [{\"intent\": \"intent\", \"confidence\": 10, \"skill\": \"skill\"}], \"entities\": [{\"entity\": \"entity\", \"location\": [8], \"value\": \"value\", \"confidence\": 10, \"groups\": [{\"group\": \"group\", \"location\": [8]}], \"interpretation\": {\"calendar_type\": \"calendarType\", \"datetime_link\": \"datetimeLink\", \"festival\": \"festival\", \"granularity\": \"day\", \"range_link\": \"rangeLink\", \"range_modifier\": \"rangeModifier\", \"relative_day\": 11, \"relative_month\": 13, \"relative_week\": 12, \"relative_weekend\": 15, \"relative_year\": 12, \"specific_day\": 11, \"specific_day_of_week\": \"specificDayOfWeek\", \"specific_month\": 13, \"specific_quarter\": 15, \"specific_year\": 12, \"numeric_value\": 12, \"subtype\": \"subtype\", \"part_of_day\": \"partOfDay\", \"relative_hour\": 12, \"relative_minute\": 14, \"relative_second\": 14, \"specific_hour\": 12, \"specific_minute\": 14, \"specific_second\": 14, \"timezone\": \"timezone\"}, \"alternatives\": [{\"value\": \"value\", \"confidence\": 10}], \"role\": {\"type\": \"date_from\"}, \"skill\": \"skill\"}], \"actions\": [{\"name\": \"name\", \"type\": \"client\", \"parameters\": {\"anyKey\": \"anyValue\"}, \"result_variable\": \"resultVariable\", \"credentials\": \"credentials\"}], \"debug\": {\"nodes_visited\": [{\"dialog_node\": \"dialogNode\", \"title\": \"title\", \"conditions\": \"conditions\"}], \"log_messages\": [{\"level\": \"info\", \"message\": \"message\", \"code\": \"code\", \"source\": {\"type\": \"dialog_node\", \"dialog_node\": \"dialogNode\"}}], \"branch_exited\": true, \"branch_exited_reason\": \"completed\", \"turn_events\": [{\"event\": \"action_visited\", \"source\": {\"type\": \"action\", \"action\": \"action\", \"action_title\": \"actionTitle\", \"condition\": \"condition\"}, \"action_start_time\": \"actionStartTime\", \"condition_type\": \"user_defined\", \"reason\": \"intent\", \"result_variable\": \"resultVariable\"}]}, \"user_defined\": {\"anyKey\": \"anyValue\"}, \"spelling\": {\"text\": \"text\", \"original_text\": \"originalText\", \"suggested_text\": \"suggestedText\"}, \"llm_metadata\": [{\"task\": \"task\", \"model_id\": \"modelId\"}]}, \"masked_input\": {\"message_type\": \"text\", \"text\": \"text\", \"intents\": [{\"intent\": \"intent\", \"confidence\": 10, \"skill\": \"skill\"}], \"entities\": [{\"entity\": \"entity\", \"location\": [8], \"value\": \"value\", \"confidence\": 10, \"groups\": [{\"group\": \"group\", \"location\": [8]}], \"interpretation\": {\"calendar_type\": \"calendarType\", \"datetime_link\": \"datetimeLink\", \"festival\": \"festival\", \"granularity\": \"day\", \"range_link\": \"rangeLink\", \"range_modifier\": \"rangeModifier\", \"relative_day\": 11, \"relative_month\": 13, \"relative_week\": 12, \"relative_weekend\": 15, \"relative_year\": 12, \"specific_day\": 11, \"specific_day_of_week\": \"specificDayOfWeek\", \"specific_month\": 13, \"specific_quarter\": 15, \"specific_year\": 12, \"numeric_value\": 12, \"subtype\": \"subtype\", \"part_of_day\": \"partOfDay\", \"relative_hour\": 12, \"relative_minute\": 14, \"relative_second\": 14, \"specific_hour\": 12, \"specific_minute\": 14, \"specific_second\": 14, \"timezone\": \"timezone\"}, \"alternatives\": [{\"value\": \"value\", \"confidence\": 10}], \"role\": {\"type\": \"date_from\"}, \"skill\": \"skill\"}], \"suggestion_id\": \"suggestionId\", \"attachments\": [{\"url\": \"url\", \"media_type\": \"mediaType\"}], \"analytics\": {\"browser\": \"browser\", \"device\": \"device\", \"pageUrl\": \"pageUrl\"}, \"options\": {\"restart\": false, \"alternate_intents\": false, \"async_callout\": false, \"spelling\": {\"suggestions\": false, \"auto_correct\": false}, \"debug\": false, \"return_context\": false, \"export\": false}}, \"user_id\": \"userId\"}"; String messageStatelessPath = "/v2/assistants/testString/message"; server.enqueue( new MockResponse() @@ -1735,7 +1735,7 @@ public void testBulkClassifyNoOptions() throws Throwable { public void testListLogsWOptions() throws Throwable { // Register a mock response String mockResponseBody = - "{\"logs\": [{\"log_id\": \"logId\", \"request\": {\"input\": {\"message_type\": \"text\", \"text\": \"text\", \"intents\": [{\"intent\": \"intent\", \"confidence\": 10, \"skill\": \"skill\"}], \"entities\": [{\"entity\": \"entity\", \"location\": [8], \"value\": \"value\", \"confidence\": 10, \"groups\": [{\"group\": \"group\", \"location\": [8]}], \"interpretation\": {\"calendar_type\": \"calendarType\", \"datetime_link\": \"datetimeLink\", \"festival\": \"festival\", \"granularity\": \"day\", \"range_link\": \"rangeLink\", \"range_modifier\": \"rangeModifier\", \"relative_day\": 11, \"relative_month\": 13, \"relative_week\": 12, \"relative_weekend\": 15, \"relative_year\": 12, \"specific_day\": 11, \"specific_day_of_week\": \"specificDayOfWeek\", \"specific_month\": 13, \"specific_quarter\": 15, \"specific_year\": 12, \"numeric_value\": 12, \"subtype\": \"subtype\", \"part_of_day\": \"partOfDay\", \"relative_hour\": 12, \"relative_minute\": 14, \"relative_second\": 14, \"specific_hour\": 12, \"specific_minute\": 14, \"specific_second\": 14, \"timezone\": \"timezone\"}, \"alternatives\": [{\"value\": \"value\", \"confidence\": 10}], \"role\": {\"type\": \"date_from\"}, \"skill\": \"skill\"}], \"suggestion_id\": \"suggestionId\", \"attachments\": [{\"url\": \"url\", \"media_type\": \"mediaType\"}], \"analytics\": {\"browser\": \"browser\", \"device\": \"device\", \"pageUrl\": \"pageUrl\"}, \"options\": {\"restart\": false, \"alternate_intents\": false, \"async_callout\": false, \"spelling\": {\"suggestions\": false, \"auto_correct\": false}, \"debug\": false, \"return_context\": false, \"export\": false}}, \"context\": {\"global\": {\"system\": {\"timezone\": \"timezone\", \"user_id\": \"userId\", \"turn_count\": 9, \"locale\": \"en-us\", \"reference_time\": \"referenceTime\", \"session_start_time\": \"sessionStartTime\", \"state\": \"state\", \"skip_user_input\": false}, \"session_id\": \"sessionId\"}, \"skills\": {\"main skill\": {\"user_defined\": {\"anyKey\": \"anyValue\"}, \"system\": {\"state\": \"state\"}}, \"actions skill\": {\"user_defined\": {\"anyKey\": \"anyValue\"}, \"system\": {\"state\": \"state\"}, \"action_variables\": {\"anyKey\": \"anyValue\"}, \"skill_variables\": {\"anyKey\": \"anyValue\"}}}, \"integrations\": {\"anyKey\": \"anyValue\"}}, \"user_id\": \"userId\"}, \"response\": {\"output\": {\"generic\": [{\"response_type\": \"text\", \"text\": \"text\", \"channels\": [{\"channel\": \"channel\"}]}], \"intents\": [{\"intent\": \"intent\", \"confidence\": 10, \"skill\": \"skill\"}], \"entities\": [{\"entity\": \"entity\", \"location\": [8], \"value\": \"value\", \"confidence\": 10, \"groups\": [{\"group\": \"group\", \"location\": [8]}], \"interpretation\": {\"calendar_type\": \"calendarType\", \"datetime_link\": \"datetimeLink\", \"festival\": \"festival\", \"granularity\": \"day\", \"range_link\": \"rangeLink\", \"range_modifier\": \"rangeModifier\", \"relative_day\": 11, \"relative_month\": 13, \"relative_week\": 12, \"relative_weekend\": 15, \"relative_year\": 12, \"specific_day\": 11, \"specific_day_of_week\": \"specificDayOfWeek\", \"specific_month\": 13, \"specific_quarter\": 15, \"specific_year\": 12, \"numeric_value\": 12, \"subtype\": \"subtype\", \"part_of_day\": \"partOfDay\", \"relative_hour\": 12, \"relative_minute\": 14, \"relative_second\": 14, \"specific_hour\": 12, \"specific_minute\": 14, \"specific_second\": 14, \"timezone\": \"timezone\"}, \"alternatives\": [{\"value\": \"value\", \"confidence\": 10}], \"role\": {\"type\": \"date_from\"}, \"skill\": \"skill\"}], \"actions\": [{\"name\": \"name\", \"type\": \"client\", \"parameters\": {\"anyKey\": \"anyValue\"}, \"result_variable\": \"resultVariable\", \"credentials\": \"credentials\"}], \"debug\": {\"nodes_visited\": [{\"dialog_node\": \"dialogNode\", \"title\": \"title\", \"conditions\": \"conditions\"}], \"log_messages\": [{\"level\": \"info\", \"message\": \"message\", \"code\": \"code\", \"source\": {\"type\": \"dialog_node\", \"dialog_node\": \"dialogNode\"}}], \"branch_exited\": true, \"branch_exited_reason\": \"completed\", \"turn_events\": [{\"event\": \"action_visited\", \"source\": {\"type\": \"action\", \"action\": \"action\", \"action_title\": \"actionTitle\", \"condition\": \"condition\"}, \"action_start_time\": \"actionStartTime\", \"condition_type\": \"user_defined\", \"reason\": \"intent\", \"result_variable\": \"resultVariable\"}]}, \"user_defined\": {\"anyKey\": \"anyValue\"}, \"spelling\": {\"text\": \"text\", \"original_text\": \"originalText\", \"suggested_text\": \"suggestedText\"}}, \"context\": {\"global\": {\"system\": {\"timezone\": \"timezone\", \"user_id\": \"userId\", \"turn_count\": 9, \"locale\": \"en-us\", \"reference_time\": \"referenceTime\", \"session_start_time\": \"sessionStartTime\", \"state\": \"state\", \"skip_user_input\": false}, \"session_id\": \"sessionId\"}, \"skills\": {\"main skill\": {\"user_defined\": {\"anyKey\": \"anyValue\"}, \"system\": {\"state\": \"state\"}}, \"actions skill\": {\"user_defined\": {\"anyKey\": \"anyValue\"}, \"system\": {\"state\": \"state\"}, \"action_variables\": {\"anyKey\": \"anyValue\"}, \"skill_variables\": {\"anyKey\": \"anyValue\"}}}, \"integrations\": {\"anyKey\": \"anyValue\"}}, \"user_id\": \"userId\"}, \"assistant_id\": \"assistantId\", \"session_id\": \"sessionId\", \"skill_id\": \"skillId\", \"snapshot\": \"snapshot\", \"request_timestamp\": \"requestTimestamp\", \"response_timestamp\": \"responseTimestamp\", \"language\": \"language\", \"customer_id\": \"customerId\"}], \"pagination\": {\"next_url\": \"nextUrl\", \"matched\": 7, \"next_cursor\": \"nextCursor\"}}"; + "{\"logs\": [{\"log_id\": \"logId\", \"request\": {\"input\": {\"message_type\": \"text\", \"text\": \"text\", \"intents\": [{\"intent\": \"intent\", \"confidence\": 10, \"skill\": \"skill\"}], \"entities\": [{\"entity\": \"entity\", \"location\": [8], \"value\": \"value\", \"confidence\": 10, \"groups\": [{\"group\": \"group\", \"location\": [8]}], \"interpretation\": {\"calendar_type\": \"calendarType\", \"datetime_link\": \"datetimeLink\", \"festival\": \"festival\", \"granularity\": \"day\", \"range_link\": \"rangeLink\", \"range_modifier\": \"rangeModifier\", \"relative_day\": 11, \"relative_month\": 13, \"relative_week\": 12, \"relative_weekend\": 15, \"relative_year\": 12, \"specific_day\": 11, \"specific_day_of_week\": \"specificDayOfWeek\", \"specific_month\": 13, \"specific_quarter\": 15, \"specific_year\": 12, \"numeric_value\": 12, \"subtype\": \"subtype\", \"part_of_day\": \"partOfDay\", \"relative_hour\": 12, \"relative_minute\": 14, \"relative_second\": 14, \"specific_hour\": 12, \"specific_minute\": 14, \"specific_second\": 14, \"timezone\": \"timezone\"}, \"alternatives\": [{\"value\": \"value\", \"confidence\": 10}], \"role\": {\"type\": \"date_from\"}, \"skill\": \"skill\"}], \"suggestion_id\": \"suggestionId\", \"attachments\": [{\"url\": \"url\", \"media_type\": \"mediaType\"}], \"analytics\": {\"browser\": \"browser\", \"device\": \"device\", \"pageUrl\": \"pageUrl\"}, \"options\": {\"restart\": false, \"alternate_intents\": false, \"async_callout\": false, \"spelling\": {\"suggestions\": false, \"auto_correct\": false}, \"debug\": false, \"return_context\": false, \"export\": false}}, \"context\": {\"global\": {\"system\": {\"timezone\": \"timezone\", \"user_id\": \"userId\", \"turn_count\": 9, \"locale\": \"en-us\", \"reference_time\": \"referenceTime\", \"session_start_time\": \"sessionStartTime\", \"state\": \"state\", \"skip_user_input\": false}, \"session_id\": \"sessionId\"}, \"skills\": {\"main skill\": {\"user_defined\": {\"anyKey\": \"anyValue\"}, \"system\": {\"state\": \"state\"}}, \"actions skill\": {\"user_defined\": {\"anyKey\": \"anyValue\"}, \"system\": {\"state\": \"state\"}, \"action_variables\": {\"anyKey\": \"anyValue\"}, \"skill_variables\": {\"anyKey\": \"anyValue\"}}}, \"integrations\": {\"anyKey\": \"anyValue\"}}, \"user_id\": \"userId\"}, \"response\": {\"output\": {\"generic\": [{\"response_type\": \"conversation_search\", \"text\": \"text\", \"citations_title\": \"citationsTitle\", \"citations\": [{\"title\": \"title\", \"text\": \"text\", \"body\": \"body\", \"search_result_index\": 17, \"ranges\": [{\"start\": 5, \"end\": 3}]}], \"confidence_scores\": {\"threshold\": 9, \"pre_gen\": 6, \"post_gen\": 7, \"extractiveness\": 14}, \"response_length_option\": \"responseLengthOption\", \"search_results\": [{\"result_metadata\": {\"document_retrieval_source\": \"documentRetrievalSource\", \"score\": 5}, \"id\": \"id\", \"title\": \"title\", \"body\": \"body\"}], \"disclaimer\": \"disclaimer\"}], \"intents\": [{\"intent\": \"intent\", \"confidence\": 10, \"skill\": \"skill\"}], \"entities\": [{\"entity\": \"entity\", \"location\": [8], \"value\": \"value\", \"confidence\": 10, \"groups\": [{\"group\": \"group\", \"location\": [8]}], \"interpretation\": {\"calendar_type\": \"calendarType\", \"datetime_link\": \"datetimeLink\", \"festival\": \"festival\", \"granularity\": \"day\", \"range_link\": \"rangeLink\", \"range_modifier\": \"rangeModifier\", \"relative_day\": 11, \"relative_month\": 13, \"relative_week\": 12, \"relative_weekend\": 15, \"relative_year\": 12, \"specific_day\": 11, \"specific_day_of_week\": \"specificDayOfWeek\", \"specific_month\": 13, \"specific_quarter\": 15, \"specific_year\": 12, \"numeric_value\": 12, \"subtype\": \"subtype\", \"part_of_day\": \"partOfDay\", \"relative_hour\": 12, \"relative_minute\": 14, \"relative_second\": 14, \"specific_hour\": 12, \"specific_minute\": 14, \"specific_second\": 14, \"timezone\": \"timezone\"}, \"alternatives\": [{\"value\": \"value\", \"confidence\": 10}], \"role\": {\"type\": \"date_from\"}, \"skill\": \"skill\"}], \"actions\": [{\"name\": \"name\", \"type\": \"client\", \"parameters\": {\"anyKey\": \"anyValue\"}, \"result_variable\": \"resultVariable\", \"credentials\": \"credentials\"}], \"debug\": {\"nodes_visited\": [{\"dialog_node\": \"dialogNode\", \"title\": \"title\", \"conditions\": \"conditions\"}], \"log_messages\": [{\"level\": \"info\", \"message\": \"message\", \"code\": \"code\", \"source\": {\"type\": \"dialog_node\", \"dialog_node\": \"dialogNode\"}}], \"branch_exited\": true, \"branch_exited_reason\": \"completed\", \"turn_events\": [{\"event\": \"action_visited\", \"source\": {\"type\": \"action\", \"action\": \"action\", \"action_title\": \"actionTitle\", \"condition\": \"condition\"}, \"action_start_time\": \"actionStartTime\", \"condition_type\": \"user_defined\", \"reason\": \"intent\", \"result_variable\": \"resultVariable\"}]}, \"user_defined\": {\"anyKey\": \"anyValue\"}, \"spelling\": {\"text\": \"text\", \"original_text\": \"originalText\", \"suggested_text\": \"suggestedText\"}, \"llm_metadata\": [{\"task\": \"task\", \"model_id\": \"modelId\"}]}, \"context\": {\"global\": {\"system\": {\"timezone\": \"timezone\", \"user_id\": \"userId\", \"turn_count\": 9, \"locale\": \"en-us\", \"reference_time\": \"referenceTime\", \"session_start_time\": \"sessionStartTime\", \"state\": \"state\", \"skip_user_input\": false}, \"session_id\": \"sessionId\"}, \"skills\": {\"main skill\": {\"user_defined\": {\"anyKey\": \"anyValue\"}, \"system\": {\"state\": \"state\"}}, \"actions skill\": {\"user_defined\": {\"anyKey\": \"anyValue\"}, \"system\": {\"state\": \"state\"}, \"action_variables\": {\"anyKey\": \"anyValue\"}, \"skill_variables\": {\"anyKey\": \"anyValue\"}}}, \"integrations\": {\"anyKey\": \"anyValue\"}}, \"user_id\": \"userId\"}, \"assistant_id\": \"assistantId\", \"session_id\": \"sessionId\", \"skill_id\": \"skillId\", \"snapshot\": \"snapshot\", \"request_timestamp\": \"requestTimestamp\", \"response_timestamp\": \"responseTimestamp\", \"language\": \"language\", \"customer_id\": \"customerId\"}], \"pagination\": {\"next_url\": \"nextUrl\", \"matched\": 7, \"next_cursor\": \"nextCursor\"}}"; String listLogsPath = "/v2/assistants/testString/logs"; server.enqueue( new MockResponse() diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/CompleteItemTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/CompleteItemTest.java index 54c64f22e82..8e240b641af 100644 --- a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/CompleteItemTest.java +++ b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/CompleteItemTest.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2024. + * (C) Copyright IBM Corp. 2024, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -33,6 +33,12 @@ public void testCompleteItem() throws Throwable { CompleteItem completeItemModel = new CompleteItem(); assertNull(completeItemModel.responseType()); assertNull(completeItemModel.text()); + assertNull(completeItemModel.citationsTitle()); + assertNull(completeItemModel.citations()); + assertNull(completeItemModel.confidenceScores()); + assertNull(completeItemModel.responseLengthOption()); + assertNull(completeItemModel.searchResults()); + assertNull(completeItemModel.disclaimer()); assertNull(completeItemModel.channels()); assertNull(completeItemModel.time()); assertNull(completeItemModel.typing()); diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/FinalResponseOutputTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/FinalResponseOutputTest.java index 3ee5e6f0ff4..7887a248955 100644 --- a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/FinalResponseOutputTest.java +++ b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/FinalResponseOutputTest.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2024. + * (C) Copyright IBM Corp. 2024, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -38,6 +38,7 @@ public void testFinalResponseOutput() throws Throwable { assertNull(finalResponseOutputModel.getDebug()); assertNull(finalResponseOutputModel.getUserDefined()); assertNull(finalResponseOutputModel.getSpelling()); + assertNull(finalResponseOutputModel.getLlmMetadata()); assertNull(finalResponseOutputModel.getStreamingMetadata()); } } diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/GenerativeAITaskConfidenceScoresTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/GenerativeAITaskConfidenceScoresTest.java new file mode 100644 index 00000000000..316b7dceacb --- /dev/null +++ b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/GenerativeAITaskConfidenceScoresTest.java @@ -0,0 +1,40 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +import static org.testng.Assert.*; + +import com.ibm.cloud.sdk.core.service.model.FileWithMetadata; +import com.ibm.watson.assistant.v2.utils.TestUtilities; +import java.io.InputStream; +import java.util.HashMap; +import java.util.List; +import org.testng.annotations.Test; + +/** Unit test class for the GenerativeAITaskConfidenceScores model. */ +public class GenerativeAITaskConfidenceScoresTest { + final HashMap mockStreamMap = TestUtilities.createMockStreamMap(); + final List mockListFileWithMetadata = + TestUtilities.creatMockListFileWithMetadata(); + + @Test + public void testGenerativeAITaskConfidenceScores() throws Throwable { + GenerativeAITaskConfidenceScores generativeAiTaskConfidenceScoresModel = + new GenerativeAITaskConfidenceScores(); + assertNull(generativeAiTaskConfidenceScoresModel.getPreGen()); + assertNull(generativeAiTaskConfidenceScoresModel.getPreGenThreshold()); + assertNull(generativeAiTaskConfidenceScoresModel.getPostGen()); + assertNull(generativeAiTaskConfidenceScoresModel.getPostGenThreshold()); + } +} diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/GenerativeAITaskContentGroundedAnsweringTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/GenerativeAITaskContentGroundedAnsweringTest.java new file mode 100644 index 00000000000..aea5012576b --- /dev/null +++ b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/GenerativeAITaskContentGroundedAnsweringTest.java @@ -0,0 +1,42 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +import static org.testng.Assert.*; + +import com.ibm.cloud.sdk.core.service.model.FileWithMetadata; +import com.ibm.watson.assistant.v2.utils.TestUtilities; +import java.io.InputStream; +import java.util.HashMap; +import java.util.List; +import org.testng.annotations.Test; + +/** Unit test class for the GenerativeAITaskContentGroundedAnswering model. */ +public class GenerativeAITaskContentGroundedAnsweringTest { + final HashMap mockStreamMap = TestUtilities.createMockStreamMap(); + final List mockListFileWithMetadata = + TestUtilities.creatMockListFileWithMetadata(); + + @Test + public void testGenerativeAITaskContentGroundedAnswering() throws Throwable { + GenerativeAITaskContentGroundedAnswering generativeAiTaskContentGroundedAnsweringModel = + new GenerativeAITaskContentGroundedAnswering(); + assertNull(generativeAiTaskContentGroundedAnsweringModel.getTask()); + assertNull(generativeAiTaskContentGroundedAnsweringModel.isIsIdkResponse()); + assertNull(generativeAiTaskContentGroundedAnsweringModel.isIsHapDetected()); + assertNull(generativeAiTaskContentGroundedAnsweringModel.getConfidenceScores()); + assertNull(generativeAiTaskContentGroundedAnsweringModel.getOriginalResponse()); + assertNull(generativeAiTaskContentGroundedAnsweringModel.getInferredQuery()); + } +} diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/GenerativeAITaskGeneralPurposeAnsweringTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/GenerativeAITaskGeneralPurposeAnsweringTest.java new file mode 100644 index 00000000000..f1475bab523 --- /dev/null +++ b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/GenerativeAITaskGeneralPurposeAnsweringTest.java @@ -0,0 +1,39 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +import static org.testng.Assert.*; + +import com.ibm.cloud.sdk.core.service.model.FileWithMetadata; +import com.ibm.watson.assistant.v2.utils.TestUtilities; +import java.io.InputStream; +import java.util.HashMap; +import java.util.List; +import org.testng.annotations.Test; + +/** Unit test class for the GenerativeAITaskGeneralPurposeAnswering model. */ +public class GenerativeAITaskGeneralPurposeAnsweringTest { + final HashMap mockStreamMap = TestUtilities.createMockStreamMap(); + final List mockListFileWithMetadata = + TestUtilities.creatMockListFileWithMetadata(); + + @Test + public void testGenerativeAITaskGeneralPurposeAnswering() throws Throwable { + GenerativeAITaskGeneralPurposeAnswering generativeAiTaskGeneralPurposeAnsweringModel = + new GenerativeAITaskGeneralPurposeAnswering(); + assertNull(generativeAiTaskGeneralPurposeAnsweringModel.getTask()); + assertNull(generativeAiTaskGeneralPurposeAnsweringModel.isIsIdkResponse()); + assertNull(generativeAiTaskGeneralPurposeAnsweringModel.isIsHapDetected()); + } +} diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/GenerativeAITaskTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/GenerativeAITaskTest.java new file mode 100644 index 00000000000..534205cdf50 --- /dev/null +++ b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/GenerativeAITaskTest.java @@ -0,0 +1,37 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +import static org.testng.Assert.*; + +import com.ibm.cloud.sdk.core.service.model.FileWithMetadata; +import com.ibm.watson.assistant.v2.utils.TestUtilities; +import java.io.InputStream; +import java.util.HashMap; +import java.util.List; +import org.testng.annotations.Test; + +/** Unit test class for the GenerativeAITask model. */ +public class GenerativeAITaskTest { + final HashMap mockStreamMap = TestUtilities.createMockStreamMap(); + final List mockListFileWithMetadata = + TestUtilities.creatMockListFileWithMetadata(); + + // TODO: Add tests for models that are abstract + @Test + public void testGenerativeAITask() throws Throwable { + GenerativeAITask generativeAiTaskModel = new GenerativeAITask(); + assertNotNull(generativeAiTaskModel); + } +} diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/LogResponseOutputTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/LogResponseOutputTest.java index b77bd8269e1..fad933fa0ec 100644 --- a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/LogResponseOutputTest.java +++ b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/LogResponseOutputTest.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2024. + * (C) Copyright IBM Corp. 2024, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -38,5 +38,6 @@ public void testLogResponseOutput() throws Throwable { assertNull(logResponseOutputModel.getDebug()); assertNull(logResponseOutputModel.getUserDefined()); assertNull(logResponseOutputModel.getSpelling()); + assertNull(logResponseOutputModel.getLlmMetadata()); } } diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/MessageOutputDebugTurnEventTurnEventGenerativeAICalledTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/MessageOutputDebugTurnEventTurnEventGenerativeAICalledTest.java new file mode 100644 index 00000000000..9d9868529a1 --- /dev/null +++ b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/MessageOutputDebugTurnEventTurnEventGenerativeAICalledTest.java @@ -0,0 +1,44 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +import static org.testng.Assert.*; + +import com.ibm.cloud.sdk.core.service.model.FileWithMetadata; +import com.ibm.watson.assistant.v2.utils.TestUtilities; +import java.io.InputStream; +import java.util.HashMap; +import java.util.List; +import org.testng.annotations.Test; + +/** Unit test class for the MessageOutputDebugTurnEventTurnEventGenerativeAICalled model. */ +public class MessageOutputDebugTurnEventTurnEventGenerativeAICalledTest { + final HashMap mockStreamMap = TestUtilities.createMockStreamMap(); + final List mockListFileWithMetadata = + TestUtilities.creatMockListFileWithMetadata(); + + @Test + public void testMessageOutputDebugTurnEventTurnEventGenerativeAICalled() throws Throwable { + MessageOutputDebugTurnEventTurnEventGenerativeAICalled + messageOutputDebugTurnEventTurnEventGenerativeAiCalledModel = + new MessageOutputDebugTurnEventTurnEventGenerativeAICalled(); + assertNull(messageOutputDebugTurnEventTurnEventGenerativeAiCalledModel.getEvent()); + assertNull(messageOutputDebugTurnEventTurnEventGenerativeAiCalledModel.getSource()); + assertNull( + messageOutputDebugTurnEventTurnEventGenerativeAiCalledModel.getGenerativeAiStartTime()); + assertNull(messageOutputDebugTurnEventTurnEventGenerativeAiCalledModel.getGenerativeAi()); + assertNull(messageOutputDebugTurnEventTurnEventGenerativeAiCalledModel.getCallout()); + assertNull(messageOutputDebugTurnEventTurnEventGenerativeAiCalledModel.getMetrics()); + } +} diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/MessageOutputLLMMetadataTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/MessageOutputLLMMetadataTest.java new file mode 100644 index 00000000000..f7d5cff5307 --- /dev/null +++ b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/MessageOutputLLMMetadataTest.java @@ -0,0 +1,37 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +import static org.testng.Assert.*; + +import com.ibm.cloud.sdk.core.service.model.FileWithMetadata; +import com.ibm.watson.assistant.v2.utils.TestUtilities; +import java.io.InputStream; +import java.util.HashMap; +import java.util.List; +import org.testng.annotations.Test; + +/** Unit test class for the MessageOutputLLMMetadata model. */ +public class MessageOutputLLMMetadataTest { + final HashMap mockStreamMap = TestUtilities.createMockStreamMap(); + final List mockListFileWithMetadata = + TestUtilities.creatMockListFileWithMetadata(); + + @Test + public void testMessageOutputLLMMetadata() throws Throwable { + MessageOutputLLMMetadata messageOutputLlmMetadataModel = new MessageOutputLLMMetadata(); + assertNull(messageOutputLlmMetadataModel.getTask()); + assertNull(messageOutputLlmMetadataModel.getModelId()); + } +} diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/MessageOutputTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/MessageOutputTest.java index e04ac620884..5a904ded4f4 100644 --- a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/MessageOutputTest.java +++ b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/MessageOutputTest.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2020, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -38,5 +38,6 @@ public void testMessageOutput() throws Throwable { assertNull(messageOutputModel.getDebug()); assertNull(messageOutputModel.getUserDefined()); assertNull(messageOutputModel.getSpelling()); + assertNull(messageOutputModel.getLlmMetadata()); } } diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/StatelessFinalResponseOutputTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/StatelessFinalResponseOutputTest.java index 8223a8edd06..3ff8c30168f 100644 --- a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/StatelessFinalResponseOutputTest.java +++ b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/StatelessFinalResponseOutputTest.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2024. + * (C) Copyright IBM Corp. 2024, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -39,6 +39,7 @@ public void testStatelessFinalResponseOutput() throws Throwable { assertNull(statelessFinalResponseOutputModel.getDebug()); assertNull(statelessFinalResponseOutputModel.getUserDefined()); assertNull(statelessFinalResponseOutputModel.getSpelling()); + assertNull(statelessFinalResponseOutputModel.getLlmMetadata()); assertNull(statelessFinalResponseOutputModel.getStreamingMetadata()); } } diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutLlmResponseTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutLlmResponseTest.java new file mode 100644 index 00000000000..306a90a8e37 --- /dev/null +++ b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutLlmResponseTest.java @@ -0,0 +1,40 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +import static org.testng.Assert.*; + +import com.ibm.cloud.sdk.core.service.model.FileWithMetadata; +import com.ibm.watson.assistant.v2.utils.TestUtilities; +import java.io.InputStream; +import java.util.HashMap; +import java.util.List; +import org.testng.annotations.Test; + +/** Unit test class for the TurnEventGenerativeAICalledCalloutLlmResponse model. */ +public class TurnEventGenerativeAICalledCalloutLlmResponseTest { + final HashMap mockStreamMap = TestUtilities.createMockStreamMap(); + final List mockListFileWithMetadata = + TestUtilities.creatMockListFileWithMetadata(); + + @Test + public void testTurnEventGenerativeAICalledCalloutLlmResponse() throws Throwable { + TurnEventGenerativeAICalledCalloutLlmResponse + turnEventGenerativeAiCalledCalloutLlmResponseModel = + new TurnEventGenerativeAICalledCalloutLlmResponse(); + assertNull(turnEventGenerativeAiCalledCalloutLlmResponseModel.getText()); + assertNull(turnEventGenerativeAiCalledCalloutLlmResponseModel.getResponseType()); + assertNull(turnEventGenerativeAiCalledCalloutLlmResponseModel.isIsIdkResponse()); + } +} diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutLlmTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutLlmTest.java new file mode 100644 index 00000000000..c61732e31b9 --- /dev/null +++ b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutLlmTest.java @@ -0,0 +1,44 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +import static org.testng.Assert.*; + +import com.ibm.cloud.sdk.core.service.model.FileWithMetadata; +import com.ibm.watson.assistant.v2.utils.TestUtilities; +import java.io.InputStream; +import java.util.HashMap; +import java.util.List; +import org.testng.annotations.Test; + +/** Unit test class for the TurnEventGenerativeAICalledCalloutLlm model. */ +public class TurnEventGenerativeAICalledCalloutLlmTest { + final HashMap mockStreamMap = TestUtilities.createMockStreamMap(); + final List mockListFileWithMetadata = + TestUtilities.creatMockListFileWithMetadata(); + + @Test + public void testTurnEventGenerativeAICalledCalloutLlm() throws Throwable { + TurnEventGenerativeAICalledCalloutLlm turnEventGenerativeAiCalledCalloutLlmModel = + new TurnEventGenerativeAICalledCalloutLlm(); + assertNull(turnEventGenerativeAiCalledCalloutLlmModel.getType()); + assertNull(turnEventGenerativeAiCalledCalloutLlmModel.getModelId()); + assertNull(turnEventGenerativeAiCalledCalloutLlmModel.getModelClassId()); + assertNull(turnEventGenerativeAiCalledCalloutLlmModel.getGeneratedTokenCount()); + assertNull(turnEventGenerativeAiCalledCalloutLlmModel.getInputTokenCount()); + assertNull(turnEventGenerativeAiCalledCalloutLlmModel.isSuccess()); + assertNull(turnEventGenerativeAiCalledCalloutLlmModel.getResponse()); + assertNull(turnEventGenerativeAiCalledCalloutLlmModel.getRequest()); + } +} diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutRequestTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutRequestTest.java new file mode 100644 index 00000000000..9ee92bf2dd3 --- /dev/null +++ b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutRequestTest.java @@ -0,0 +1,43 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +import static org.testng.Assert.*; + +import com.ibm.cloud.sdk.core.service.model.FileWithMetadata; +import com.ibm.watson.assistant.v2.utils.TestUtilities; +import java.io.InputStream; +import java.util.HashMap; +import java.util.List; +import org.testng.annotations.Test; + +/** Unit test class for the TurnEventGenerativeAICalledCalloutRequest model. */ +public class TurnEventGenerativeAICalledCalloutRequestTest { + final HashMap mockStreamMap = TestUtilities.createMockStreamMap(); + final List mockListFileWithMetadata = + TestUtilities.creatMockListFileWithMetadata(); + + @Test + public void testTurnEventGenerativeAICalledCalloutRequest() throws Throwable { + TurnEventGenerativeAICalledCalloutRequest turnEventGenerativeAiCalledCalloutRequestModel = + new TurnEventGenerativeAICalledCalloutRequest(); + assertNull(turnEventGenerativeAiCalledCalloutRequestModel.getMethod()); + assertNull(turnEventGenerativeAiCalledCalloutRequestModel.getUrl()); + assertNull(turnEventGenerativeAiCalledCalloutRequestModel.getPort()); + assertNull(turnEventGenerativeAiCalledCalloutRequestModel.getPath()); + assertNull(turnEventGenerativeAiCalledCalloutRequestModel.getQueryParameters()); + assertNull(turnEventGenerativeAiCalledCalloutRequestModel.getHeaders()); + assertNull(turnEventGenerativeAiCalledCalloutRequestModel.getBody()); + } +} diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutResponseTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutResponseTest.java new file mode 100644 index 00000000000..9104deb2454 --- /dev/null +++ b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutResponseTest.java @@ -0,0 +1,38 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +import static org.testng.Assert.*; + +import com.ibm.cloud.sdk.core.service.model.FileWithMetadata; +import com.ibm.watson.assistant.v2.utils.TestUtilities; +import java.io.InputStream; +import java.util.HashMap; +import java.util.List; +import org.testng.annotations.Test; + +/** Unit test class for the TurnEventGenerativeAICalledCalloutResponse model. */ +public class TurnEventGenerativeAICalledCalloutResponseTest { + final HashMap mockStreamMap = TestUtilities.createMockStreamMap(); + final List mockListFileWithMetadata = + TestUtilities.creatMockListFileWithMetadata(); + + @Test + public void testTurnEventGenerativeAICalledCalloutResponse() throws Throwable { + TurnEventGenerativeAICalledCalloutResponse turnEventGenerativeAiCalledCalloutResponseModel = + new TurnEventGenerativeAICalledCalloutResponse(); + assertNull(turnEventGenerativeAiCalledCalloutResponseModel.getBody()); + assertNull(turnEventGenerativeAiCalledCalloutResponseModel.getStatusCode()); + } +} diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutSearchTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutSearchTest.java new file mode 100644 index 00000000000..cc2f49b478a --- /dev/null +++ b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutSearchTest.java @@ -0,0 +1,41 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +import static org.testng.Assert.*; + +import com.ibm.cloud.sdk.core.service.model.FileWithMetadata; +import com.ibm.watson.assistant.v2.utils.TestUtilities; +import java.io.InputStream; +import java.util.HashMap; +import java.util.List; +import org.testng.annotations.Test; + +/** Unit test class for the TurnEventGenerativeAICalledCalloutSearch model. */ +public class TurnEventGenerativeAICalledCalloutSearchTest { + final HashMap mockStreamMap = TestUtilities.createMockStreamMap(); + final List mockListFileWithMetadata = + TestUtilities.creatMockListFileWithMetadata(); + + @Test + public void testTurnEventGenerativeAICalledCalloutSearch() throws Throwable { + TurnEventGenerativeAICalledCalloutSearch turnEventGenerativeAiCalledCalloutSearchModel = + new TurnEventGenerativeAICalledCalloutSearch(); + assertNull(turnEventGenerativeAiCalledCalloutSearchModel.getEngine()); + assertNull(turnEventGenerativeAiCalledCalloutSearchModel.getIndex()); + assertNull(turnEventGenerativeAiCalledCalloutSearchModel.getQuery()); + assertNull(turnEventGenerativeAiCalledCalloutSearchModel.getRequest()); + assertNull(turnEventGenerativeAiCalledCalloutSearchModel.getResponse()); + } +} diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutTest.java new file mode 100644 index 00000000000..977db8b13a0 --- /dev/null +++ b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledCalloutTest.java @@ -0,0 +1,41 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +import static org.testng.Assert.*; + +import com.ibm.cloud.sdk.core.service.model.FileWithMetadata; +import com.ibm.watson.assistant.v2.utils.TestUtilities; +import java.io.InputStream; +import java.util.HashMap; +import java.util.List; +import org.testng.annotations.Test; + +/** Unit test class for the TurnEventGenerativeAICalledCallout model. */ +public class TurnEventGenerativeAICalledCalloutTest { + final HashMap mockStreamMap = TestUtilities.createMockStreamMap(); + final List mockListFileWithMetadata = + TestUtilities.creatMockListFileWithMetadata(); + + @Test + public void testTurnEventGenerativeAICalledCallout() throws Throwable { + TurnEventGenerativeAICalledCallout turnEventGenerativeAiCalledCalloutModel = + new TurnEventGenerativeAICalledCallout(); + assertNull(turnEventGenerativeAiCalledCalloutModel.isSearchCalled()); + assertNull(turnEventGenerativeAiCalledCalloutModel.isLlmCalled()); + assertNull(turnEventGenerativeAiCalledCalloutModel.getSearch()); + assertNull(turnEventGenerativeAiCalledCalloutModel.getLlm()); + assertNull(turnEventGenerativeAiCalledCalloutModel.getIdkReasonCode()); + } +} diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledMetricsTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledMetricsTest.java new file mode 100644 index 00000000000..338f770024c --- /dev/null +++ b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/TurnEventGenerativeAICalledMetricsTest.java @@ -0,0 +1,39 @@ +/* + * (C) Copyright IBM Corp. 2025. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.ibm.watson.assistant.v2.model; + +import static org.testng.Assert.*; + +import com.ibm.cloud.sdk.core.service.model.FileWithMetadata; +import com.ibm.watson.assistant.v2.utils.TestUtilities; +import java.io.InputStream; +import java.util.HashMap; +import java.util.List; +import org.testng.annotations.Test; + +/** Unit test class for the TurnEventGenerativeAICalledMetrics model. */ +public class TurnEventGenerativeAICalledMetricsTest { + final HashMap mockStreamMap = TestUtilities.createMockStreamMap(); + final List mockListFileWithMetadata = + TestUtilities.creatMockListFileWithMetadata(); + + @Test + public void testTurnEventGenerativeAICalledMetrics() throws Throwable { + TurnEventGenerativeAICalledMetrics turnEventGenerativeAiCalledMetricsModel = + new TurnEventGenerativeAICalledMetrics(); + assertNull(turnEventGenerativeAiCalledMetricsModel.getSearchTimeMs()); + assertNull(turnEventGenerativeAiCalledMetricsModel.getAnswerGenerationTimeMs()); + assertNull(turnEventGenerativeAiCalledMetricsModel.getTotalTimeMs()); + } +} diff --git a/build/.travis.settings.xml b/build/.travis.settings.xml index bb4f539a0d5..7142f2a05ce 100644 --- a/build/.travis.settings.xml +++ b/build/.travis.settings.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> - ossrh - ${env.OSSRH_USERNAME} - ${env.OSSRH_PASSWORD} + central + ${env.CENTRAL_USERNAME} + ${env.CENTRAL_PASSWORD} diff --git a/discovery/src/main/java/com/ibm/watson/discovery/v2/Discovery.java b/discovery/src/main/java/com/ibm/watson/discovery/v2/Discovery.java index d5b518523fb..9d270fc962d 100644 --- a/discovery/src/main/java/com/ibm/watson/discovery/v2/Discovery.java +++ b/discovery/src/main/java/com/ibm/watson/discovery/v2/Discovery.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2019, 2024. + * (C) Copyright IBM Corp. 2019, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -12,7 +12,7 @@ */ /* - * IBM OpenAPI SDK Code Generator Version: 3.97.0-0e90eab1-20241120-170029 + * IBM OpenAPI SDK Code Generator Version: 3.105.0-3c13b041-20250605-193116 */ package com.ibm.watson.discovery.v2; @@ -864,6 +864,25 @@ public ServiceCall updateDocument(UpdateDocumentOptions update * by an uploaded file, delete the original document instead. You can get the document ID of the * original document from the `parent_document_id` of the subdocument result. * + *

If the document with the given document ID exists, Watson Discovery first marks or tags the + * document as deleted when it sends the 200 response code. At a later time (within a couple of + * minutes unless the document has many child documents), it removes the document from the + * collection. + * + *

There is no bulk document delete API. Documents must be deleted one at a time using this + * API. However, you can delete a collection, and all the documents from the collection are + * removed along with the collection. + * + *

The document will be deleted from the given collection only, not from the corresponding data + * source. Wherever relevant, an incremental crawl will not bring back the document into Watson + * Discovery from the data source. Only a full crawl will retrieve the deleted document back from + * the data source provided it is still present in the same data source. + * + *

Finally, if multiple collections share the same dataset, deleting a document from a + * collection will remove it from that collection only (in other remaining collections the + * document will still exist). The document will be removed from the dataset, if this document is + * deleted from all the collections that share the same dataset. + * * @param deleteDocumentOptions the {@link DeleteDocumentOptions} containing the options for the * call * @return a {@link ServiceCall} with a result of type {@link DeleteDocumentResponse} diff --git a/pom.xml b/pom.xml index 409f2488d09..ec0c3bcbbee 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 3.0.0-M3 0.8.5 3.0.0-M1 - 1.6.8 + 0.7.0 1.6 3.1.0 3.2.2 @@ -191,9 +191,9 @@ ${maven-deploy-plugin-version} - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging-plugin-version} + org.sonatype.central + central-publishing-maven-plugin + ${central-publishing-plugin-version} org.apache.maven.plugins @@ -470,28 +470,14 @@ - - - - - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - org.sonatype.plugins - nexus-staging-maven-plugin + org.sonatype.central + central-publishing-maven-plugin true - ossrh - https://oss.sonatype.org/ - false - true + central diff --git a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/CreateAcousticModelOptions.java b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/CreateAcousticModelOptions.java index c2105ed97d8..6eac9eeef2c 100644 --- a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/CreateAcousticModelOptions.java +++ b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/CreateAcousticModelOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2018, 2024. + * (C) Copyright IBM Corp. 2018, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -29,6 +29,8 @@ public class CreateAcousticModelOptions extends GenericModel { public interface BaseModelName { /** ar-MS_BroadbandModel. */ String AR_MS_BROADBANDMODEL = "ar-MS_BroadbandModel"; + /** de-DE. */ + String DE_DE = "de-DE"; /** de-DE_BroadbandModel. */ String DE_DE_BROADBANDMODEL = "de-DE_BroadbandModel"; /** de-DE_NarrowbandModel. */ diff --git a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/CreateJobOptions.java b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/CreateJobOptions.java index bafdfe5340f..febc7d50a69 100644 --- a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/CreateJobOptions.java +++ b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/CreateJobOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2018, 2024. + * (C) Copyright IBM Corp. 2018, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -44,6 +44,8 @@ public interface Model { String AR_MS_TELEPHONY = "ar-MS_Telephony"; /** cs-CZ_Telephony. */ String CS_CZ_TELEPHONY = "cs-CZ_Telephony"; + /** de-DE. */ + String DE_DE = "de-DE"; /** de-DE_BroadbandModel. */ String DE_DE_BROADBANDMODEL = "de-DE_BroadbandModel"; /** de-DE_Multimedia. */ diff --git a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/CreateLanguageModelOptions.java b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/CreateLanguageModelOptions.java index 91228c8cc68..1df17a2d56f 100644 --- a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/CreateLanguageModelOptions.java +++ b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/CreateLanguageModelOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2018, 2024. + * (C) Copyright IBM Corp. 2018, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -32,6 +32,8 @@ public interface BaseModelName { String AR_MS_TELEPHONY = "ar-MS_Telephony"; /** cs-CZ_Telephony. */ String CS_CZ_TELEPHONY = "cs-CZ_Telephony"; + /** de-DE. */ + String DE_DE = "de-DE"; /** de-DE_BroadbandModel. */ String DE_DE_BROADBANDMODEL = "de-DE_BroadbandModel"; /** de-DE_Multimedia. */ diff --git a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/GetModelOptions.java b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/GetModelOptions.java index c5ea73ef0d4..6c0d50d0cb0 100644 --- a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/GetModelOptions.java +++ b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/GetModelOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2018, 2024. + * (C) Copyright IBM Corp. 2018, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -29,6 +29,8 @@ public interface ModelId { String AR_MS_TELEPHONY = "ar-MS_Telephony"; /** cs-CZ_Telephony. */ String CS_CZ_TELEPHONY = "cs-CZ_Telephony"; + /** de-DE. */ + String DE_DE = "de-DE"; /** de-DE_BroadbandModel. */ String DE_DE_BROADBANDMODEL = "de-DE_BroadbandModel"; /** de-DE_Multimedia. */ diff --git a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/RecognizeOptions.java b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/RecognizeOptions.java index ce7689934b7..5ea02904b90 100644 --- a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/RecognizeOptions.java +++ b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/RecognizeOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2016, 2024. + * (C) Copyright IBM Corp. 2016, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -44,6 +44,8 @@ public interface Model { String AR_MS_TELEPHONY = "ar-MS_Telephony"; /** cs-CZ_Telephony. */ String CS_CZ_TELEPHONY = "cs-CZ_Telephony"; + /** de-DE. */ + String DE_DE = "de-DE"; /** de-DE_BroadbandModel. */ String DE_DE_BROADBANDMODEL = "de-DE_BroadbandModel"; /** de-DE_Multimedia. */ diff --git a/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/TextToSpeech.java b/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/TextToSpeech.java index 7f77f707438..2c8a53d3438 100644 --- a/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/TextToSpeech.java +++ b/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/TextToSpeech.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2019, 2024. + * (C) Copyright IBM Corp. 2019, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -12,7 +12,7 @@ */ /* - * IBM OpenAPI SDK Code Generator Version: 3.97.0-0e90eab1-20241120-170029 + * IBM OpenAPI SDK Code Generator Version: 3.105.0-3c13b041-20250605-193116 */ package com.ibm.watson.text_to_speech.v1; @@ -310,18 +310,19 @@ public ServiceCall getVoice(GetVoiceOptions getVoiceOptions) { * `rate` of the audio. The default sampling rate is 22,050 Hz. * `audio/l16` - You must specify * the `rate` of the audio. You can optionally specify the `endianness` of the audio. The default * endianness is `little-endian`. * `audio/mp3` - You can optionally specify the `rate` of the - * audio. The default sampling rate is 22,050 Hz. * `audio/mpeg` - You can optionally specify the - * `rate` of the audio. The default sampling rate is 22,050 Hz. * `audio/mulaw` - You must specify - * the `rate` of the audio. * `audio/ogg` - The service returns the audio in the `vorbis` codec. - * You can optionally specify the `rate` of the audio. The default sampling rate is 22,050 Hz. * - * `audio/ogg;codecs=opus` - You can optionally specify the `rate` of the audio. Only the - * following values are valid sampling rates: `48000`, `24000`, `16000`, `12000`, or `8000`. If - * you specify a value other than one of these, the service returns an error. The default sampling - * rate is 48,000 Hz. * `audio/ogg;codecs=vorbis` - You can optionally specify the `rate` of the - * audio. The default sampling rate is 22,050 Hz. * `audio/wav` - You can optionally specify the - * `rate` of the audio. The default sampling rate is 22,050 Hz. * `audio/webm` - The service - * returns the audio in the `opus` codec. The service returns audio with a sampling rate of 48,000 - * Hz. * `audio/webm;codecs=opus` - The service returns audio with a sampling rate of 48,000 Hz. * + * audio. The default sampling rate is 24,000 Hz for Natural voices and 22,050 Hz for for all + * other voices. * `audio/mpeg` - You can optionally specify the `rate` of the audio. The default + * sampling rate is 22,050 Hz. * `audio/mulaw` - You must specify the `rate` of the audio. * + * `audio/ogg` - The service returns the audio in the `vorbis` codec. You can optionally specify + * the `rate` of the audio. The default sampling rate is 22,050 Hz. * `audio/ogg;codecs=opus` - + * You can optionally specify the `rate` of the audio. Only the following values are valid + * sampling rates: `48000`, `24000`, `16000`, `12000`, or `8000`. If you specify a value other + * than one of these, the service returns an error. The default sampling rate is 48,000 Hz. * + * `audio/ogg;codecs=vorbis` - You can optionally specify the `rate` of the audio. The default + * sampling rate is 22,050 Hz. * `audio/wav` - You can optionally specify the `rate` of the audio. + * The default sampling rate is 22,050 Hz. * `audio/webm` - The service returns the audio in the + * `opus` codec. The service returns audio with a sampling rate of 48,000 Hz. * + * `audio/webm;codecs=opus` - The service returns audio with a sampling rate of 48,000 Hz. * * `audio/webm;codecs=vorbis` - You can optionally specify the `rate` of the audio. The default * sampling rate is 22,050 Hz. * diff --git a/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/GetPronunciationOptions.java b/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/GetPronunciationOptions.java index 1ba747a45d3..a0280c67ff1 100644 --- a/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/GetPronunciationOptions.java +++ b/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/GetPronunciationOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2018, 2024. + * (C) Copyright IBM Corp. 2018, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -43,6 +43,8 @@ public interface Voice { String EN_AU_JACKEXPRESSIVE = "en-AU_JackExpressive"; /** en-GB_CharlotteV3Voice. */ String EN_GB_CHARLOTTEV3VOICE = "en-GB_CharlotteV3Voice"; + /** en-GB_GeorgeExpressive. */ + String EN_GB_GEORGEEXPRESSIVE = "en-GB_GeorgeExpressive"; /** en-GB_JamesV3Voice. */ String EN_GB_JAMESV3VOICE = "en-GB_JamesV3Voice"; /** en-GB_KateV3Voice. */ @@ -51,6 +53,8 @@ public interface Voice { String EN_US_ALLISONEXPRESSIVE = "en-US_AllisonExpressive"; /** en-US_AllisonV3Voice. */ String EN_US_ALLISONV3VOICE = "en-US_AllisonV3Voice"; + /** en-US_EllieNatural. */ + String EN_US_ELLIENATURAL = "en-US_EllieNatural"; /** en-US_EmilyV3Voice. */ String EN_US_EMILYV3VOICE = "en-US_EmilyV3Voice"; /** en-US_EmmaExpressive. */ @@ -73,6 +77,8 @@ public interface Voice { String ES_ES_ENRIQUEV3VOICE = "es-ES_EnriqueV3Voice"; /** es-ES_LauraV3Voice. */ String ES_ES_LAURAV3VOICE = "es-ES_LauraV3Voice"; + /** es-LA_DanielaExpressive. */ + String ES_LA_DANIELAEXPRESSIVE = "es-LA_DanielaExpressive"; /** es-LA_SofiaV3Voice. */ String ES_LA_SOFIAV3VOICE = "es-LA_SofiaV3Voice"; /** es-US_SofiaV3Voice. */ @@ -93,6 +99,8 @@ public interface Voice { String NL_NL_MERELV3VOICE = "nl-NL_MerelV3Voice"; /** pt-BR_IsabelaV3Voice. */ String PT_BR_ISABELAV3VOICE = "pt-BR_IsabelaV3Voice"; + /** pt-BR_LucasExpressive. */ + String PT_BR_LUCASEXPRESSIVE = "pt-BR_LucasExpressive"; } /** diff --git a/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/GetVoiceOptions.java b/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/GetVoiceOptions.java index 94386e13f8b..5f028d63941 100644 --- a/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/GetVoiceOptions.java +++ b/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/GetVoiceOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2018, 2024. + * (C) Copyright IBM Corp. 2018, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -32,6 +32,8 @@ public interface Voice { String EN_AU_JACKEXPRESSIVE = "en-AU_JackExpressive"; /** en-GB_CharlotteV3Voice. */ String EN_GB_CHARLOTTEV3VOICE = "en-GB_CharlotteV3Voice"; + /** en-GB_GeorgeExpressive. */ + String EN_GB_GEORGEEXPRESSIVE = "en-GB_GeorgeExpressive"; /** en-GB_JamesV3Voice. */ String EN_GB_JAMESV3VOICE = "en-GB_JamesV3Voice"; /** en-GB_KateV3Voice. */ @@ -40,6 +42,8 @@ public interface Voice { String EN_US_ALLISONEXPRESSIVE = "en-US_AllisonExpressive"; /** en-US_AllisonV3Voice. */ String EN_US_ALLISONV3VOICE = "en-US_AllisonV3Voice"; + /** en-US_EllieNatural. */ + String EN_US_ELLIENATURAL = "en-US_EllieNatural"; /** en-US_EmilyV3Voice. */ String EN_US_EMILYV3VOICE = "en-US_EmilyV3Voice"; /** en-US_EmmaExpressive. */ @@ -62,6 +66,8 @@ public interface Voice { String ES_ES_ENRIQUEV3VOICE = "es-ES_EnriqueV3Voice"; /** es-ES_LauraV3Voice. */ String ES_ES_LAURAV3VOICE = "es-ES_LauraV3Voice"; + /** es-LA_DanielaExpressive. */ + String ES_LA_DANIELAEXPRESSIVE = "es-LA_DanielaExpressive"; /** es-LA_SofiaV3Voice. */ String ES_LA_SOFIAV3VOICE = "es-LA_SofiaV3Voice"; /** es-US_SofiaV3Voice. */ @@ -82,6 +88,8 @@ public interface Voice { String NL_NL_MERELV3VOICE = "nl-NL_MerelV3Voice"; /** pt-BR_IsabelaV3Voice. */ String PT_BR_ISABELAV3VOICE = "pt-BR_IsabelaV3Voice"; + /** pt-BR_LucasExpressive. */ + String PT_BR_LUCASEXPRESSIVE = "pt-BR_LucasExpressive"; } protected String voice; diff --git a/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/SynthesizeOptions.java b/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/SynthesizeOptions.java index bd2b05e141d..714beaa5c7f 100644 --- a/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/SynthesizeOptions.java +++ b/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/SynthesizeOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2018, 2024. + * (C) Copyright IBM Corp. 2018, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -45,6 +45,8 @@ public interface Voice { String EN_AU_JACKEXPRESSIVE = "en-AU_JackExpressive"; /** en-GB_CharlotteV3Voice. */ String EN_GB_CHARLOTTEV3VOICE = "en-GB_CharlotteV3Voice"; + /** en-GB_GeorgeExpressive. */ + String EN_GB_GEORGEEXPRESSIVE = "en-GB_GeorgeExpressive"; /** en-GB_JamesV3Voice. */ String EN_GB_JAMESV3VOICE = "en-GB_JamesV3Voice"; /** en-GB_KateV3Voice. */ @@ -53,6 +55,8 @@ public interface Voice { String EN_US_ALLISONEXPRESSIVE = "en-US_AllisonExpressive"; /** en-US_AllisonV3Voice. */ String EN_US_ALLISONV3VOICE = "en-US_AllisonV3Voice"; + /** en-US_EllieNatural. */ + String EN_US_ELLIENATURAL = "en-US_EllieNatural"; /** en-US_EmilyV3Voice. */ String EN_US_EMILYV3VOICE = "en-US_EmilyV3Voice"; /** en-US_EmmaExpressive. */ @@ -75,6 +79,8 @@ public interface Voice { String ES_ES_ENRIQUEV3VOICE = "es-ES_EnriqueV3Voice"; /** es-ES_LauraV3Voice. */ String ES_ES_LAURAV3VOICE = "es-ES_LauraV3Voice"; + /** es-LA_DanielaExpressive. */ + String ES_LA_DANIELAEXPRESSIVE = "es-LA_DanielaExpressive"; /** es-LA_SofiaV3Voice. */ String ES_LA_SOFIAV3VOICE = "es-LA_SofiaV3Voice"; /** es-US_SofiaV3Voice. */ @@ -95,6 +101,8 @@ public interface Voice { String NL_NL_MERELV3VOICE = "nl-NL_MerelV3Voice"; /** pt-BR_IsabelaV3Voice. */ String PT_BR_ISABELAV3VOICE = "pt-BR_IsabelaV3Voice"; + /** pt-BR_LucasExpressive. */ + String PT_BR_LUCASEXPRESSIVE = "pt-BR_LucasExpressive"; } /**