refactor(personality-insights): v4 changes

Author: dpopp07

personality-insights/v3-generated.ts

@@ -16,8 +16,9 @@
 
 import { AxiosResponse } from 'axios';
 import * as extend from 'extend';
-import { BaseService, FileObject, getMissingParams } from 'ibm-cloud-sdk-core';
+import { BaseService, getMissingParams } from 'ibm-cloud-sdk-core';
 import { getSdkHeaders } from '../lib/common';
+import { FileObject } from 'ibm-cloud-sdk-core';
 
 /**
  * The IBM Watson™ Personality Insights service enables applications to derive insights from social media, enterprise data, or other digital communications. The service uses linguistic analytics to infer individuals' intrinsic personality characteristics, including Big Five, Needs, and Values, from digital communications such as email, text messages, tweets, and forum posts.  The service can automatically infer, from potentially noisy social media, portraits of individuals that reflect their personality characteristics. The service can infer consumption preferences based on the results of its analysis and, for JSON content that is timestamped, can report temporal behavior. * For information about the meaning of the models that the service uses to describe personality characteristics, see [Personality models](https://cloud.ibm.com/docs/services/personality-insights/models.html). * For information about the meaning of the consumption preferences, see [Consumption preferences](https://cloud.ibm.com/docs/services/personality-insights/preferences.html).   **Note:** Request logging is disabled for the Personality Insights service. Regardless of whether you set the `X-Watson-Learning-Opt-Out` request header, the service does not log or retain data from requests and responses.
@@ -100,10 +101,6 @@ class PersonalityInsightsV3 extends BaseService {
    * less text; for more information, see [Providing sufficient
    * input](https://cloud.ibm.com/docs/services/personality-insights/input.html#sufficient). For JSON input, provide an
    * object of type `Content`.
-   * @param {string} [params.content_type] - The type of the input. For more information, see **Content types** in the
-   * method description.
-   *
-   * Default: `text/plain`.
    * @param {string} [params.content_language] - The language of the input text for the request: Arabic, English,
    * Japanese, Korean, or Spanish. Regional variants are treated as their parent language; for example, `en-US` is
    * interpreted as `en`.
@@ -124,9 +121,13 @@ class PersonalityInsightsV3 extends BaseService {
    * default, no column labels are returned. Applies only when the response type is CSV (`text/csv`).
    * @param {boolean} [params.consumption_preferences] - Indicates whether consumption preferences are returned with the
    * results. By default, no consumption preferences are returned.
+   * @param {string} [params.content_type] - The type of the input. For more information, see **Content types** in the
+   * method description.
+   *
+   * Default: `text/plain`.
    * @param {Object} [params.headers] - Custom request headers
    * @param {Function} [callback] - The callback that handles the response.
-   * @returns {NodeJS.ReadableStream|void}
+   * @returns {Promise<any>|void}
    */
   public profile(params: PersonalityInsightsV3.ProfileParams, callback?: PersonalityInsightsV3.Callback<PersonalityInsightsV3.Profile>): Promise<any> | void {
     const _params = extend({}, params);
@@ -154,21 +155,20 @@ class PersonalityInsightsV3 extends BaseService {
     };
 
     const sdkHeaders = getSdkHeaders('personality_insights', 'v3', 'profile');
- 
+
     const parameters = {
       options: {
         url: '/v3/profile',
         method: 'POST',
-        json: (_params.content_type === 'application/json'),
         body,
         qs: query,
       },
       defaultOptions: extend(true, {}, this._options, {
         headers: extend(true, sdkHeaders, {
           'Accept': 'application/json',
-          'Content-Type': _params.content_type,
           'Content-Language': _params.content_language,
-          'Accept-Language': _params.accept_language
+          'Accept-Language': _params.accept_language,
+          'Content-Type': _params.content_type
         }, _params.headers),
       }),
     };
@@ -216,10 +216,6 @@ class PersonalityInsightsV3 extends BaseService {
    * less text; for more information, see [Providing sufficient
    * input](https://cloud.ibm.com/docs/services/personality-insights/input.html#sufficient). For JSON input, provide an
    * object of type `Content`.
-   * @param {string} [params.content_type] - The type of the input. For more information, see **Content types** in the
-   * method description.
-   *
-   * Default: `text/plain`.
    * @param {string} [params.content_language] - The language of the input text for the request: Arabic, English,
    * Japanese, Korean, or Spanish. Regional variants are treated as their parent language; for example, `en-US` is
    * interpreted as `en`.
@@ -240,9 +236,13 @@ class PersonalityInsightsV3 extends BaseService {
    * default, no column labels are returned. Applies only when the response type is CSV (`text/csv`).
    * @param {boolean} [params.consumption_preferences] - Indicates whether consumption preferences are returned with the
    * results. By default, no consumption preferences are returned.
+   * @param {string} [params.content_type] - The type of the input. For more information, see **Content types** in the
+   * method description.
+   *
+   * Default: `text/plain`.
    * @param {Object} [params.headers] - Custom request headers
    * @param {Function} [callback] - The callback that handles the response.
-   * @returns {NodeJS.ReadableStream|void}
+   * @returns {Promise<any>|void}
    */
   public profileAsCsv(params: PersonalityInsightsV3.ProfileAsCsvParams, callback?: PersonalityInsightsV3.Callback<NodeJS.ReadableStream|FileObject|Buffer>): Promise<any> | void {
     const _params = extend({}, params);
@@ -270,21 +270,20 @@ class PersonalityInsightsV3 extends BaseService {
     };
 
     const sdkHeaders = getSdkHeaders('personality_insights', 'v3', 'profileAsCsv');
- 
+
     const parameters = {
       options: {
         url: '/v3/profile',
         method: 'POST',
-        json: (_params.content_type === 'application/json'),
         body,
         qs: query,
       },
       defaultOptions: extend(true, {}, this._options, {
         headers: extend(true, sdkHeaders, {
           'Accept': 'text/csv',
-          'Content-Type': _params.content_type,
           'Content-Language': _params.content_language,
-          'Accept-Language': _params.accept_language
+          'Accept-Language': _params.accept_language,
+          'Content-Type': _params.content_type
         }, _params.headers),
       }),
     };
@@ -330,8 +329,6 @@ namespace PersonalityInsightsV3 {
   export interface ProfileParams {
     /** A maximum of 20 MB of content to analyze, though the service requires much less text; for more information, see [Providing sufficient input](https://cloud.ibm.com/docs/services/personality-insights/input.html#sufficient). For JSON input, provide an object of type `Content`. */
     content: Content|string;
-    /** The type of the input. For more information, see **Content types** in the method description. Default: `text/plain`. */
-    content_type?: ProfileConstants.ContentType | string;
     /** The language of the input text for the request: Arabic, English, Japanese, Korean, or Spanish. Regional variants are treated as their parent language; for example, `en-US` is interpreted as `en`. The effect of the **Content-Language** parameter depends on the **Content-Type** parameter. When **Content-Type** is `text/plain` or `text/html`, **Content-Language** is the only way to specify the language. When **Content-Type** is `application/json`, **Content-Language** overrides a language specified with the `language` parameter of a `ContentItem` object, and content items that specify a different language are ignored; omit this parameter to base the language on the specification of the content items. You can specify any combination of languages for **Content-Language** and **Accept-Language**. */
     content_language?: ProfileConstants.ContentLanguage | string;
     /** The desired language of the response. For two-character arguments, regional variants are treated as their parent language; for example, `en-US` is interpreted as `en`. You can specify any combination of languages for the input and response content. */
@@ -342,18 +339,14 @@ namespace PersonalityInsightsV3 {
     csv_headers?: boolean;
     /** Indicates whether consumption preferences are returned with the results. By default, no consumption preferences are returned. */
     consumption_preferences?: boolean;
+    /** The type of the input. For more information, see **Content types** in the method description. Default: `text/plain`. */
+    content_type?: ProfileConstants.ContentType | string;
     headers?: Object;
     return_response?: boolean;
   }
 
   /** Constants for the `profile` operation. */
   export namespace ProfileConstants {
-    /** The type of the input. For more information, see **Content types** in the method description. Default: `text/plain`. */
-    export enum ContentType {
-      APPLICATION_JSON = 'application/json',
-      TEXT_HTML = 'text/html',
-      TEXT_PLAIN = 'text/plain',
-    }
     /** The language of the input text for the request: Arabic, English, Japanese, Korean, or Spanish. Regional variants are treated as their parent language; for example, `en-US` is interpreted as `en`. The effect of the **Content-Language** parameter depends on the **Content-Type** parameter. When **Content-Type** is `text/plain` or `text/html`, **Content-Language** is the only way to specify the language. When **Content-Type** is `application/json`, **Content-Language** overrides a language specified with the `language` parameter of a `ContentItem` object, and content items that specify a different language are ignored; omit this parameter to base the language on the specification of the content items. You can specify any combination of languages for **Content-Language** and **Accept-Language**. */
     export enum ContentLanguage {
       AR = 'ar',
@@ -376,14 +369,18 @@ namespace PersonalityInsightsV3 {
       ZH_CN = 'zh-cn',
       ZH_TW = 'zh-tw',
     }
+    /** The type of the input. For more information, see **Content types** in the method description. Default: `text/plain`. */
+    export enum ContentType {
+      APPLICATION_JSON = 'application/json',
+      TEXT_HTML = 'text/html',
+      TEXT_PLAIN = 'text/plain',
+    }
   }
 
   /** Parameters for the `profileAsCsv` operation. */
   export interface ProfileAsCsvParams {
     /** A maximum of 20 MB of content to analyze, though the service requires much less text; for more information, see [Providing sufficient input](https://cloud.ibm.com/docs/services/personality-insights/input.html#sufficient). For JSON input, provide an object of type `Content`. */
     content: Content|string;
-    /** The type of the input. For more information, see **Content types** in the method description. Default: `text/plain`. */
-    content_type?: ProfileAsCsvConstants.ContentType | string;
     /** The language of the input text for the request: Arabic, English, Japanese, Korean, or Spanish. Regional variants are treated as their parent language; for example, `en-US` is interpreted as `en`. The effect of the **Content-Language** parameter depends on the **Content-Type** parameter. When **Content-Type** is `text/plain` or `text/html`, **Content-Language** is the only way to specify the language. When **Content-Type** is `application/json`, **Content-Language** overrides a language specified with the `language` parameter of a `ContentItem` object, and content items that specify a different language are ignored; omit this parameter to base the language on the specification of the content items. You can specify any combination of languages for **Content-Language** and **Accept-Language**. */
     content_language?: ProfileAsCsvConstants.ContentLanguage | string;
     /** The desired language of the response. For two-character arguments, regional variants are treated as their parent language; for example, `en-US` is interpreted as `en`. You can specify any combination of languages for the input and response content. */
@@ -394,18 +391,14 @@ namespace PersonalityInsightsV3 {
     csv_headers?: boolean;
     /** Indicates whether consumption preferences are returned with the results. By default, no consumption preferences are returned. */
     consumption_preferences?: boolean;
+    /** The type of the input. For more information, see **Content types** in the method description. Default: `text/plain`. */
+    content_type?: ProfileAsCsvConstants.ContentType | string;
     headers?: Object;
     return_response?: boolean;
   }
 
   /** Constants for the `profileAsCsv` operation. */
   export namespace ProfileAsCsvConstants {
-    /** The type of the input. For more information, see **Content types** in the method description. Default: `text/plain`. */
-    export enum ContentType {
-      APPLICATION_JSON = 'application/json',
-      TEXT_HTML = 'text/html',
-      TEXT_PLAIN = 'text/plain',
-    }
     /** The language of the input text for the request: Arabic, English, Japanese, Korean, or Spanish. Regional variants are treated as their parent language; for example, `en-US` is interpreted as `en`. The effect of the **Content-Language** parameter depends on the **Content-Type** parameter. When **Content-Type** is `text/plain` or `text/html`, **Content-Language** is the only way to specify the language. When **Content-Type** is `application/json`, **Content-Language** overrides a language specified with the `language` parameter of a `ContentItem` object, and content items that specify a different language are ignored; omit this parameter to base the language on the specification of the content items. You can specify any combination of languages for **Content-Language** and **Accept-Language**. */
     export enum ContentLanguage {
       AR = 'ar',
@@ -428,6 +421,12 @@ namespace PersonalityInsightsV3 {
       ZH_CN = 'zh-cn',
       ZH_TW = 'zh-tw',
     }
+    /** The type of the input. For more information, see **Content types** in the method description. Default: `text/plain`. */
+    export enum ContentType {
+      APPLICATION_JSON = 'application/json',
+      TEXT_HTML = 'text/html',
+      TEXT_PLAIN = 'text/plain',
+    }
   }
 
   /*************************

test/integration/personality_insights.v3.test.js

@@ -12,7 +12,7 @@ describe('personality_insights_v3_integration', function() {
   jest.setTimeout(TWENTY_SECONDS);
 
   const mobydick = fs.readFileSync(path.join(__dirname, '../resources/mobydick.txt'), 'utf8');
-  auth.personality_insights.version = '2016-10-19';
+  auth.personality_insights.version = '2019-03-27';
   const personality_insights = new PersonalityInsightsV3(auth.personality_insights);
 
   it('profile with text content', function(done) {