Merge pull request watson-developer-cloud#833 from watson-developer-cloud/regenerate-sdk-release-2-2019

Regenerate sdk release 2 2019

Author: dpopp07

assistant/v1.ts

@@ -4228,6 +4228,8 @@ namespace AssistantV1 {
   export interface InputData {
     /** The text of the user input. This string cannot contain carriage return, newline, or tab characters, and it must be no longer than 2048 characters. */
     text: string;
+    /** InputData accepts additional properties. */
+    [propName: string]: any;
   }
 
   /** Intent. */
@@ -4364,8 +4366,6 @@ namespace AssistantV1 {
     output: OutputData;
     /** An array of objects describing any actions requested by the dialog node. */
     actions?: DialogNodeAction[];
-    /** MessageResponse accepts additional properties. */
-    [propName: string]: any;
   }
 
   /** An output object that includes the response to the user, the dialog nodes that were triggered, and messages from the log. */

compare-comply/v1.ts

@@ -1350,6 +1350,52 @@ class DiscoveryV1 extends BaseService {
     return this.createRequest(parameters, _callback);
   };
 
+  /**
+   * Get stopword list status.
+   *
+   * Returns the current status of the stopword list for the specified collection.
+   *
+   * @param {Object} params - The parameters to send to the service.
+   * @param {string} params.environment_id - The ID of the environment.
+   * @param {string} params.collection_id - The ID of the collection.
+   * @param {Object} [params.headers] - Custom request headers
+   * @param {Function} [callback] - The callback that handles the response.
+   * @returns {NodeJS.ReadableStream|void}
+   */
+  public getStopwordListStatus(params: DiscoveryV1.GetStopwordListStatusParams, callback?: DiscoveryV1.Callback<DiscoveryV1.TokenDictStatusResponse>): NodeJS.ReadableStream | void {
+    const _params = extend({}, params);
+    const _callback = (callback) ? callback : () => { /* noop */ };
+    const requiredParams = ['environment_id', 'collection_id'];
+
+    const missingParams = getMissingParams(_params, requiredParams);
+    if (missingParams) {
+      return _callback(missingParams);
+    }
+
+    const path = {
+      'environment_id': _params.environment_id,
+      'collection_id': _params.collection_id
+    };
+
+    const defaultHeaders = getDefaultHeaders('discovery', 'v1', 'getStopwordListStatus');
+ 
+    const parameters = {
+      options: {
+        url: '/v1/environments/{environment_id}/collections/{collection_id}/word_lists/stopwords',
+        method: 'GET',
+        path,
+      },
+      defaultOptions: extend(true, {}, this._options, {
+        headers: extend(true, defaultHeaders, {
+          'Accept': 'application/json',
+          'Content-Type': 'application/json',
+        }, _params.headers),
+      }),
+    };
+
+    return this.createRequest(parameters, _callback);
+  };
+
   /**
    * Get tokenization dictionary status.
    *
@@ -4047,6 +4093,15 @@ namespace DiscoveryV1 {
     headers?: Object;
   }
 
+  /** Parameters for the `getStopwordListStatus` operation. */
+  export interface GetStopwordListStatusParams {
+    /** The ID of the environment. */
+    environment_id: string;
+    /** The ID of the collection. */
+    collection_id: string;
+    headers?: Object;
+  }
+
   /** Parameters for the `getTokenizationDictionaryStatus` operation. */
   export interface GetTokenizationDictionaryStatusParams {
     /** The ID of the environment. */
@@ -4935,7 +4990,7 @@ namespace DiscoveryV1 {
   export interface DocumentAccepted {
     /** The unique identifier of the ingested document. */
     document_id?: string;
-    /** Status of the document in the ingestion process. */
+    /** Status of the document in the ingestion process. A status of `processing` is returned for documents that are ingested with a *version* date before `2019-01-01`. The `pending` status is returned for all others. */
     status?: string;
     /** Array of notices produced by the document-ingestion process. */
     notices?: Notice[];
@@ -4949,6 +5004,8 @@ namespace DiscoveryV1 {
     processing?: number;
     /** The number of documents in the collection that failed to be ingested. */
     failed?: number;
+    /** The number of documents that have been uploaded to the collection, but have not yet started processing. */
+    pending?: number;
   }
 
   /** DocumentSnapshot. */

discovery/v1-generated.ts

@@ -14,7 +14,7 @@ export function getDefaultHeaders(serviceName: string, serviceVersion: string, o
 
   const headers = {
     'User-Agent': `${sdkName}-${sdkVersion} ${osName} ${osVersion} ${nodeVersion}`,
-    'X-IBMCloud-SDK-Analytics': `service_name=${serviceName};service_version=${serviceVersion};operation_id=${operationId},async=true`,
+    'X-IBMCloud-SDK-Analytics': `service_name=${serviceName};service_version=${serviceVersion};operation_id=${operationId};async=true`,
   }
 
   return headers;

lib/common.ts

@@ -22,7 +22,7 @@ import { getMissingParams } from '../lib/helper';
 import { FileObject } from '../lib/helper';
 
 /**
- * The IBM® Speech to Text service provides APIs that use IBM's speech-recognition capabilities to produce transcripts of spoken audio. The service can transcribe speech from various languages and audio formats. It addition to basic transcription, the service can produce detailed information about many different aspects of the audio. For most languages, the service supports two sampling rates, broadband and narrowband. It returns all JSON response content in the UTF-8 character set.   For speech recognition, the service supports synchronous and asynchronous HTTP Representational State Transfer (REST) interfaces. It also supports a WebSocket interface that provides a full-duplex, low-latency communication channel: Clients send requests and audio to the service and receive results over a single connection asynchronously.   The service also offers two customization interfaces. Use language model customization to expand the vocabulary of a base model with domain-specific terminology. Use acoustic model customization to adapt a base model for the acoustic characteristics of your audio. For language model customization, the service also supports grammars. A grammar is a formal language specification that lets you restrict the phrases that the service can recognize.   Language model customization is generally available for production use with most supported languages. Acoustic model customization is beta functionality that is available for all supported languages.
+ * The IBM® Speech to Text service provides APIs that use IBM's speech-recognition capabilities to produce transcripts of spoken audio. The service can transcribe speech from various languages and audio formats. In addition to basic transcription, the service can produce detailed information about many different aspects of the audio. For most languages, the service supports two sampling rates, broadband and narrowband. It returns all JSON response content in the UTF-8 character set.   For speech recognition, the service supports synchronous and asynchronous HTTP Representational State Transfer (REST) interfaces. It also supports a WebSocket interface that provides a full-duplex, low-latency communication channel: Clients send requests and audio to the service and receive results over a single connection asynchronously.   The service also offers two customization interfaces. Use language model customization to expand the vocabulary of a base model with domain-specific terminology. Use acoustic model customization to adapt a base model for the acoustic characteristics of your audio. For language model customization, the service also supports grammars. A grammar is a formal language specification that lets you restrict the phrases that the service can recognize.   Language model customization is generally available for production use with most supported languages. Acoustic model customization is beta functionality that is available for all supported languages.
  */
 
 class SpeechToTextV1 extends BaseService {
@@ -2565,16 +2565,18 @@ class SpeechToTextV1 extends BaseService {
    * existing request completes.
    *
    * You can use the optional `custom_language_model_id` parameter to specify the GUID of a separately created custom
-   * language model that is to be used during training. Specify a custom language model if you have verbatim
+   * language model that is to be used during training. Train with a custom language model if you have verbatim
    * transcriptions of the audio files that you have added to the custom model or you have either corpora (text files)
-   * or a list of words that are relevant to the contents of the audio files. For more information, see the **Create a
-   * custom language model** method.
+   * or a list of words that are relevant to the contents of the audio files. Both of the custom models must be based on
+   * the same version of the same base model for training to succeed.
    *
    * Training can fail to start for the following reasons:
    * * The service is currently handling another request for the custom model, such as another training request or a
    * request to add audio resources to the model.
    * * The custom model contains less than 10 minutes or more than 100 hours of audio data.
    * * One or more of the custom model's audio resources is invalid.
+   * * You passed an incompatible custom language model with the `custom_language_model_id` query parameter. Both custom
+   * models must be based on the same version of the same base model.
    *
    * **See also:** [Train the custom acoustic
    * model](https://cloud.ibm.com/docs/services/speech-to-text/acoustic-create.html#trainModel).
@@ -2586,7 +2588,8 @@ class SpeechToTextV1 extends BaseService {
    * @param {string} [params.custom_language_model_id] - The customization ID (GUID) of a custom language model that is
    * to be used during training of the custom acoustic model. Specify a custom language model that has been trained with
    * verbatim transcriptions of the audio resources or that contains words that are relevant to the contents of the
-   * audio resources.
+   * audio resources. The custom language model must be based on the same version of the same base model as the custom
+   * acoustic model. The credentials specified with the request must own both custom models.
    * @param {Object} [params.headers] - Custom request headers
    * @param {Function} [callback] - The callback that handles the response.
    * @returns {NodeJS.ReadableStream|void}
@@ -2659,7 +2662,12 @@ class SpeechToTextV1 extends BaseService {
    * custom model.
    * @param {string} [params.custom_language_model_id] - If the custom acoustic model was trained with a custom language
    * model, the customization ID (GUID) of that custom language model. The custom language model must be upgraded before
-   * the custom acoustic model can be upgraded.
+   * the custom acoustic model can be upgraded. The credentials specified with the request must own both custom models.
+   * @param {boolean} [params.force] - If `true`, forces the upgrade of a custom acoustic model for which no input data
+   * has been modified since it was last trained. Use this parameter only to force the upgrade of a custom acoustic
+   * model that is trained with a custom language model, and only if you receive a 400 response code and the message `No
+   * input data modified since last training`. See [Upgrading a custom acoustic
+   * model](https://cloud.ibm.com/docs/services/speech-to-text/custom-upgrade.html#upgradeAcoustic).
    * @param {Object} [params.headers] - Custom request headers
    * @param {Function} [callback] - The callback that handles the response.
    * @returns {NodeJS.ReadableStream|void}
@@ -2675,7 +2683,8 @@ class SpeechToTextV1 extends BaseService {
     }
 
     const query = {
-      'custom_language_model_id': _params.custom_language_model_id
+      'custom_language_model_id': _params.custom_language_model_id,
+      'force': _params.force
     };
 
     const path = {
@@ -3710,7 +3719,7 @@ namespace SpeechToTextV1 {
   export interface TrainAcousticModelParams {
     /** The customization ID (GUID) of the custom acoustic model that is to be used for the request. You must make the request with credentials for the instance of the service that owns the custom model. */
     customization_id: string;
-    /** The customization ID (GUID) of a custom language model that is to be used during training of the custom acoustic model. Specify a custom language model that has been trained with verbatim transcriptions of the audio resources or that contains words that are relevant to the contents of the audio resources. */
+    /** The customization ID (GUID) of a custom language model that is to be used during training of the custom acoustic model. Specify a custom language model that has been trained with verbatim transcriptions of the audio resources or that contains words that are relevant to the contents of the audio resources. The custom language model must be based on the same version of the same base model as the custom acoustic model. The credentials specified with the request must own both custom models. */
     custom_language_model_id?: string;
     headers?: Object;
   }
@@ -3719,8 +3728,10 @@ namespace SpeechToTextV1 {
   export interface UpgradeAcousticModelParams {
     /** The customization ID (GUID) of the custom acoustic model that is to be used for the request. You must make the request with credentials for the instance of the service that owns the custom model. */
     customization_id: string;
-    /** If the custom acoustic model was trained with a custom language model, the customization ID (GUID) of that custom language model. The custom language model must be upgraded before the custom acoustic model can be upgraded. */
+    /** If the custom acoustic model was trained with a custom language model, the customization ID (GUID) of that custom language model. The custom language model must be upgraded before the custom acoustic model can be upgraded. The credentials specified with the request must own both custom models. */
     custom_language_model_id?: string;
+    /** If `true`, forces the upgrade of a custom acoustic model for which no input data has been modified since it was last trained. Use this parameter only to force the upgrade of a custom acoustic model that is trained with a custom language model, and only if you receive a 400 response code and the message `No input data modified since last training`. See [Upgrading a custom acoustic model](https://cloud.ibm.com/docs/services/speech-to-text/custom-upgrade.html#upgradeAcoustic). */
+    force?: boolean;
     headers?: Object;
   }
 

speech-to-text/v1-generated.ts

@@ -516,6 +516,18 @@ describe('discovery_integration', function() {
         done();
       });
     });
+    it('should getStopwordListStatus', function(done) {
+      const params = {
+        environment_id,
+        collection_id,
+      };
+      discovery.getStopwordListStatus(params, (err, res) => {
+        expect(err).toBeNull();
+        expect(res.type).toBeDefined();
+        expect(res.status).toBeDefined();
+        done();
+      });
+    });
     it('should deleteStopwordList', function(done) {
       const params = {
         environment_id,

test/integration/discovery.test.js

@@ -282,10 +282,12 @@ describe('getWorkspace', () => {
       const workspace_id = 'fake_workspace_id';
       const _export = 'fake_export';
       const include_audit = 'fake_include_audit';
+      const sort = 'fake_sort';
       const params = {
         workspace_id,
         export: _export,
         include_audit,
+        sort,
       };
 
       // invoke method
@@ -303,6 +305,7 @@ describe('getWorkspace', () => {
       checkMediaHeaders(createRequestMock, expectedAccept, expectedContentType);
       expect(options.qs['export']).toEqual(_export);
       expect(options.qs['include_audit']).toEqual(include_audit);
+      expect(options.qs['sort']).toEqual(sort);
       expect(options.path['workspace_id']).toEqual(workspace_id);
     });
 

test/unit/assistant.v1.test.js

@@ -1903,6 +1903,83 @@ describe('deleteTokenizationDictionary', () => {
     });
   });
 });
+describe('getStopwordListStatus', () => {
+  describe('positive tests', () => {
+    beforeAll(() => {
+      missingParamsMock.mockReturnValue(missingParamsSuccess);
+    });
+    test('should pass the right params to createRequest', () => {
+      // parameters
+      const environment_id = 'fake_environment_id';
+      const collection_id = 'fake_collection_id';
+      const params = {
+        environment_id,
+        collection_id,
+      };
+
+      // invoke method
+      discovery.getStopwordListStatus(params);
+
+      // assert that create request was called
+      expect(createRequestMock).toHaveBeenCalledTimes(1);
+
+      const options = getOptions(createRequestMock);
+
+      checkUrlAndMethod(
+        options,
+        '/v1/environments/{environment_id}/collections/{collection_id}/word_lists/stopwords',
+        'GET'
+      );
+      checkCallback(createRequestMock);
+      const expectedAccept = 'application/json';
+      const expectedContentType = 'application/json';
+      checkMediaHeaders(createRequestMock, expectedAccept, expectedContentType);
+      expect(options.path['environment_id']).toEqual(environment_id);
+      expect(options.path['collection_id']).toEqual(collection_id);
+    });
+
+    test('should prioritize user-given headers', () => {
+      // parameters
+      const environment_id = 'fake_environment_id';
+      const collection_id = 'fake_collection_id';
+      const accept = 'fake/header';
+      const contentType = 'fake/header';
+      const params = {
+        environment_id,
+        collection_id,
+        headers: {
+          Accept: accept,
+          'Content-Type': contentType,
+        },
+      };
+
+      discovery.getStopwordListStatus(params);
+      checkMediaHeaders(createRequestMock, accept, contentType);
+    });
+  });
+  describe('negative tests', () => {
+    beforeAll(() => {
+      missingParamsMock.mockReturnValue(missingParamsError);
+    });
+
+    test('should convert a `null` value for `params` to an empty object', done => {
+      discovery.getStopwordListStatus(null, () => {
+        checkForEmptyObject(missingParamsMock);
+        done();
+      });
+    });
+
+    test('should enforce required parameters', done => {
+      // required parameters for this method
+      const requiredParams = ['environment_id', 'collection_id'];
+
+      discovery.getStopwordListStatus({}, err => {
+        checkRequiredParamsHandling(requiredParams, err, missingParamsMock, createRequestMock);
+        done();
+      });
+    });
+  });
+});
 describe('getTokenizationDictionaryStatus', () => {
   describe('positive tests', () => {
     beforeAll(() => {

test/unit/discovery.v1.test.js

@@ -42,7 +42,7 @@ describe('requestwrapper', () => {
       `watson-apis-node-sdk-${pjson.version} ${os.platform()} ${os.release()} ${process.version}`
     );
     expect(req.headers['X-IBMCloud-SDK-Analytics']).toBe(
-      'service_name=conversation;service_version=v1;operation_id=listIntents,async=true'
+      'service_name=conversation;service_version=v1;operation_id=listIntents;async=true'
     );
   });
 });