Merge pull request #778 from watson-developer-cloud/regenerate-sdk-release-7

Regenerate sdk release 7

Author: dpopp07

assistant/v1.ts

@@ -601,13 +601,11 @@ class DiscoveryV1 extends BaseService {
     if (missingParams) {
       return _callback(missingParams);
     }
-
     if (_params.file && !_params.filename) {
       console.warn(
         'WARNING: `filename` should be provided if `file` is not null. This will be REQUIRED in the next major release.'
       );
     }
-
     const formData = {
       'configuration': _params.configuration,
       'file': {
@@ -1101,13 +1099,11 @@ class DiscoveryV1 extends BaseService {
     if (missingParams) {
       return _callback(missingParams);
     }
-
     if (_params.file && !_params.filename) {
       console.warn(
         'WARNING: `filename` should be provided if `file` is not null. This will be REQUIRED in the next major release.'
       );
     }
-
     const formData = {
       'file': {
         data: _params.file,
@@ -1256,13 +1252,11 @@ class DiscoveryV1 extends BaseService {
     if (missingParams) {
       return _callback(missingParams);
     }
-
     if (_params.file && !_params.filename) {
       console.warn(
         'WARNING: `filename` should be provided if `file` is not null. This will be REQUIRED in the next major release.'
       );
     }
-
     const formData = {
       'file': {
         data: _params.file,
@@ -4325,6 +4319,8 @@ namespace DiscoveryV1 {
 
   /** An object that indicates the Categories enrichment will be applied to the specified field. */
   export interface NluEnrichmentCategories {
+    /** NluEnrichmentCategories accepts additional properties. */
+    [propName: string]: any;
   }
 
   /** An object specifying the emotion detection enrichment and related parameters. */
@@ -4548,6 +4544,8 @@ namespace DiscoveryV1 {
     sha1?: string;
     /** Array of notices for the document. */
     notices?: Notice[];
+    /** QueryNoticesResult accepts additional properties. */
+    [propName: string]: any;
   }
 
   /** QueryPassages. */
@@ -4631,6 +4629,8 @@ namespace DiscoveryV1 {
     collection_id?: string;
     /** Metadata of the query result. */
     result_metadata?: QueryResultResultMetadata;
+    /** QueryResult accepts additional properties. */
+    [propName: string]: any;
   }
 
   /** Metadata of a query result. */

conversation/v1-generated.ts

@@ -199,6 +199,9 @@ class LanguageTranslatorV2 extends BaseService {
    * are treated as a parallel corpus instead of a glossary.
    * @param {NodeJS.ReadableStream|FileObject|Buffer} [params.monolingual_corpus] - A UTF-8 encoded plain text file that
    * is used to customize the target language model.
+   * @param {string} [params.forced_glossary_filename] - The filename for forced_glossary.
+   * @param {string} [params.parallel_corpus_filename] - The filename for parallel_corpus.
+   * @param {string} [params.monolingual_corpus_filename] - The filename for monolingual_corpus.
    * @param {Object} [params.headers] - Custom request headers
    * @param {Function} [callback] - The callback that handles the response.
    * @returns {NodeJS.ReadableStream|void}
@@ -214,14 +217,17 @@ class LanguageTranslatorV2 extends BaseService {
     const formData = {
       'forced_glossary': {
         data: _params.forced_glossary,
+        filename: _params.forced_glossary_filename,
         contentType: 'application/octet-stream'
       },
       'parallel_corpus': {
         data: _params.parallel_corpus,
+        filename: _params.parallel_corpus_filename,
         contentType: 'application/octet-stream'
       },
       'monolingual_corpus': {
         data: _params.monolingual_corpus,
+        filename: _params.monolingual_corpus_filename,
         contentType: 'text/plain'
       }
     };
@@ -428,6 +434,12 @@ namespace LanguageTranslatorV2 {
     parallel_corpus?: NodeJS.ReadableStream|FileObject|Buffer;
     /** A UTF-8 encoded plain text file that is used to customize the target language model. */
     monolingual_corpus?: NodeJS.ReadableStream|FileObject|Buffer;
+    /** The filename for forced_glossary. */
+    forced_glossary_filename?: string;
+    /** The filename for parallel_corpus. */
+    parallel_corpus_filename?: string;
+    /** The filename for monolingual_corpus. */
+    monolingual_corpus_filename?: string;
     headers?: Object;
   }
 

discovery/v1-generated.ts

@@ -216,6 +216,8 @@ class LanguageTranslatorV3 extends BaseService {
    * source and target language. You can upload multiple parallel_corpus files in one request. All uploaded
    * parallel_corpus files combined, your parallel corpus must contain at least 5,000 parallel sentences to train
    * successfully.
+   * @param {string} [params.forced_glossary_filename] - The filename for forced_glossary.
+   * @param {string} [params.parallel_corpus_filename] - The filename for parallel_corpus.
    * @param {Object} [params.headers] - Custom request headers
    * @param {Function} [callback] - The callback that handles the response.
    * @returns {NodeJS.ReadableStream|void}
@@ -231,10 +233,12 @@ class LanguageTranslatorV3 extends BaseService {
     const formData = {
       'forced_glossary': {
         data: _params.forced_glossary,
+        filename: _params.forced_glossary_filename,
         contentType: 'application/octet-stream'
       },
       'parallel_corpus': {
         data: _params.parallel_corpus,
+        filename: _params.parallel_corpus_filename,
         contentType: 'application/octet-stream'
       }
     };
@@ -442,6 +446,10 @@ namespace LanguageTranslatorV3 {
     forced_glossary?: NodeJS.ReadableStream|FileObject|Buffer;
     /** A TMX file with parallel sentences for source and target language. You can upload multiple parallel_corpus files in one request. All uploaded parallel_corpus files combined, your parallel corpus must contain at least 5,000 parallel sentences to train successfully. */
     parallel_corpus?: NodeJS.ReadableStream|FileObject|Buffer;
+    /** The filename for forced_glossary. */
+    forced_glossary_filename?: string;
+    /** The filename for parallel_corpus. */
+    parallel_corpus_filename?: string;
     headers?: Object;
   }
 

language-translator/v2-generated.ts

@@ -73,13 +73,19 @@ function hasCredentials(obj: any): boolean {
 }
 
 function hasBasicCredentials(obj: any): boolean {
-  return obj && obj.username && obj.password && obj.username !== 'apikey';
+  return obj && obj.username && obj.password && !usesBasicForIam(obj);
 }
 
 function hasIamCredentials(obj: any): boolean {
   return obj && (obj.iam_apikey || obj.iam_access_token);
 }
 
+// returns true if the user provides basic auth creds with the intention
+// of using IAM auth
+function usesBasicForIam(obj: any): boolean {
+  return obj.username === 'apikey' && !obj.password.startsWith('icp-');
+}
+
 export class BaseService {
   static URL: string;
   name: string;
@@ -135,7 +141,7 @@ export class BaseService {
         iamAccessToken: _options.iam_access_token,
         iamUrl: _options.iam_url
       });
-    } else if (_options.username === 'apikey') {
+    } else if (usesBasicForIam(_options)) {
       this.tokenManager = new IamTokenManagerV1({
         iamApikey: _options.password,
         iamUrl: _options.iam_url
@@ -280,7 +286,7 @@ export class BaseService {
           'api_key, and iam_access_token.';
         throw new Error(errorMessage);
       }
-      if (!hasIamCredentials(_options) && _options.username !== 'apikey') {
+      if (!hasIamCredentials(_options) && !usesBasicForIam(_options)) {
         if (hasBasicCredentials(_options)) {
           // Calculate and add Authorization header to base options
           const encodedCredentials = bufferFrom(

language-translator/v3.ts

@@ -165,6 +165,8 @@ class NaturalLanguageClassifierV1 extends BaseService {
    * @param {NodeJS.ReadableStream|FileObject|Buffer} params.training_data - Training data in CSV format. Each text
    * value must have at least one class. The data can include up to 20,000 records. For details, see [Data
    * preparation](https://console.bluemix.net/docs/services/natural-language-classifier/using-your-data.html).
+   * @param {string} [params.metadata_filename] - The filename for training_metadata.
+   * @param {string} [params.training_data_filename] - The filename for training_data.
    * @param {Object} [params.headers] - Custom request headers
    * @param {Function} [callback] - The callback that handles the response.
    * @returns {NodeJS.ReadableStream|void}
@@ -180,10 +182,12 @@ class NaturalLanguageClassifierV1 extends BaseService {
     const formData = {
       'training_metadata': {
         data: _params.metadata,
+        filename: _params.metadata_filename,
         contentType: 'application/json'
       },
       'training_data': {
         data: _params.training_data,
+        filename: _params.training_data_filename,
         contentType: 'text/csv'
       }
     };
@@ -362,6 +366,10 @@ namespace NaturalLanguageClassifierV1 {
     metadata: NodeJS.ReadableStream|FileObject|Buffer;
     /** Training data in CSV format. Each text value must have at least one class. The data can include up to 20,000 records. For details, see [Data preparation](https://console.bluemix.net/docs/services/natural-language-classifier/using-your-data.html). */
     training_data: NodeJS.ReadableStream|FileObject|Buffer;
+    /** The filename for training_metadata. */
+    metadata_filename?: string;
+    /** The filename for training_data. */
+    training_data_filename?: string;
     headers?: Object;
   }
 

lib/base_service.ts

@@ -104,14 +104,21 @@ class NaturalLanguageUnderstandingV1 extends BaseService {
    *
    * @param {Object} params - The parameters to send to the service.
    * @param {Features} params.features - Specific features to analyze the document for.
-   * @param {string} [params.text] - The plain text to analyze.
-   * @param {string} [params.html] - The HTML file to analyze.
-   * @param {string} [params.url] - The web page to analyze.
+   * @param {string} [params.text] - The plain text to analyze. One of the `text`, `html`, or `url` parameters is
+   * required.
+   * @param {string} [params.html] - The HTML file to analyze. One of the `text`, `html`, or `url` parameters is
+   * required.
+   * @param {string} [params.url] - The web page to analyze. One of the `text`, `html`, or `url` parameters is required.
    * @param {boolean} [params.clean] - Remove website elements, such as links, ads, etc.
-   * @param {string} [params.xpath] - XPath query for targeting nodes in HTML.
+   * @param {string} [params.xpath] - An [XPath query](https://www.w3.org/TR/xpath/) to perform on `html` or `url`
+   * input. Results of the query will be appended to the cleaned webpage text before it is analyzed. To analyze only the
+   * results of the XPath query, set the `clean` parameter to `false`.
    * @param {boolean} [params.fallback_to_raw] - Whether to use raw HTML content if text cleaning fails.
    * @param {boolean} [params.return_analyzed_text] - Whether or not to return the analyzed text.
-   * @param {string} [params.language] - ISO 639-1 code indicating the language to use in the analysis.
+   * @param {string} [params.language] - ISO 639-1 code that specifies the language of your text. This overrides
+   * automatic language detection. Language support differs depending on the features you include in your analysis. See
+   * [Language support](https://www.bluemix.net/docs/services/natural-language-understanding/language-support.html) for
+   * more information.
    * @param {number} [params.limit_text_characters] - Sets the maximum number of characters that are processed by the
    * service.
    * @param {Object} [params.headers] - Custom request headers
@@ -264,21 +271,21 @@ namespace NaturalLanguageUnderstandingV1 {
   export interface AnalyzeParams {
     /** Specific features to analyze the document for. */
     features: Features;
-    /** The plain text to analyze. */
+    /** The plain text to analyze. One of the `text`, `html`, or `url` parameters is required. */
     text?: string;
-    /** The HTML file to analyze. */
+    /** The HTML file to analyze. One of the `text`, `html`, or `url` parameters is required. */
     html?: string;
-    /** The web page to analyze. */
+    /** The web page to analyze. One of the `text`, `html`, or `url` parameters is required. */
     url?: string;
     /** Remove website elements, such as links, ads, etc. */
     clean?: boolean;
-    /** XPath query for targeting nodes in HTML. */
+    /** An [XPath query](https://www.w3.org/TR/xpath/) to perform on `html` or `url` input. Results of the query will be appended to the cleaned webpage text before it is analyzed. To analyze only the results of the XPath query, set the `clean` parameter to `false`. */
     xpath?: string;
     /** Whether to use raw HTML content if text cleaning fails. */
     fallback_to_raw?: boolean;
     /** Whether or not to return the analyzed text. */
     return_analyzed_text?: boolean;
-    /** ISO 639-1 code indicating the language to use in the analysis. */
+    /** ISO 639-1 code that specifies the language of your text. This overrides automatic language detection. Language support differs depending on the features you include in your analysis. See [Language support](https://www.bluemix.net/docs/services/natural-language-understanding/language-support.html) for more information. */
     language?: string;
     /** Sets the maximum number of characters that are processed by the service. */
     limit_text_characters?: number;
@@ -339,6 +346,8 @@ namespace NaturalLanguageUnderstandingV1 {
 
   /** The hierarchical 5-level taxonomy the content is categorized into. */
   export interface CategoriesOptions {
+    /** CategoriesOptions accepts additional properties. */
+    [propName: string]: any;
   }
 
   /** The hierarchical 5-level taxonomy the content is categorized into. */
@@ -397,7 +406,7 @@ namespace NaturalLanguageUnderstandingV1 {
 
   /** Whether or not to return emotion analysis of the content. */
   export interface EmotionOptions {
-    /** Set this to false to hide document-level emotion results. */
+    /** Set this to `false` to hide document-level emotion results. */
     document?: boolean;
     /** Emotion results will be returned for each target string that is found in the document. */
     targets?: string[];
@@ -429,13 +438,13 @@ namespace NaturalLanguageUnderstandingV1 {
   export interface EntitiesOptions {
     /** Maximum number of entities to return. */
     limit?: number;
-    /** Set this to true to return locations of entity mentions. */
+    /** Set this to `true` to return locations of entity mentions. */
     mentions?: boolean;
-    /** Enter a custom model ID to override the standard entity detection model. */
+    /** Enter a [custom model](https://www.bluemix.net/docs/services/natural-language-understanding/customizing.html) ID to override the standard entity detection model. */
     model?: string;
-    /** Set this to true to return sentiment information for detected entities. */
+    /** Set this to `true` to return sentiment information for detected entities. */
     sentiment?: boolean;
-    /** Set this to true to analyze emotion for detected keywords. */
+    /** Set this to `true` to analyze emotion for detected keywords. */
     emotion?: boolean;
   }
 
@@ -505,9 +514,9 @@ namespace NaturalLanguageUnderstandingV1 {
   export interface KeywordsOptions {
     /** Maximum number of keywords to return. */
     limit?: number;
-    /** Set this to true to return sentiment information for detected keywords. */
+    /** Set this to `true` to return sentiment information for detected keywords. */
     sentiment?: boolean;
-    /** Set this to true to analyze emotion for detected keywords. */
+    /** Set this to `true` to analyze emotion for detected keywords. */
     emotion?: boolean;
   }
 
@@ -530,6 +539,8 @@ namespace NaturalLanguageUnderstandingV1 {
 
   /** The Authors, Publication Date, and Title of the document. Supports URL and HTML input types. */
   export interface MetadataOptions {
+    /** MetadataOptions accepts additional properties. */
+    [propName: string]: any;
   }
 
   /** The Authors, Publication Date, and Title of the document. Supports URL and HTML input types. */
@@ -577,7 +588,7 @@ namespace NaturalLanguageUnderstandingV1 {
 
   /** An option specifying if the relationships found between entities in the analyzed content should be returned. */
   export interface RelationsOptions {
-    /** Enter a custom model ID to override the default model. */
+    /** Enter a [custom model](https://www.bluemix.net/docs/services/natural-language-understanding/customizing.html) ID to override the default model. */
     model?: string;
   }
 
@@ -627,9 +638,9 @@ namespace NaturalLanguageUnderstandingV1 {
   export interface SemanticRolesOptions {
     /** Maximum number of semantic_roles results to return. */
     limit?: number;
-    /** Set this to true to return keyword information for subjects and objects. */
+    /** Set this to `true` to return keyword information for subjects and objects. */
     keywords?: boolean;
-    /** Set this to true to return entity information for subjects and objects. */
+    /** Set this to `true` to return entity information for subjects and objects. */
     entities?: boolean;
   }
 
@@ -663,7 +674,7 @@ namespace NaturalLanguageUnderstandingV1 {
 
   /** An option specifying if sentiment of detected entities, keywords, or phrases should be returned. */
   export interface SentimentOptions {
-    /** Set this to false to hide document-level sentiment results. */
+    /** Set this to `false` to hide document-level sentiment results. */
     document?: boolean;
     /** Sentiment results will be returned for each target string that is found in the document. */
     targets?: string[];