ibm_watson 0.14.0 → 0.15.0

data/lib/ibm_watson/assistant_v2.rb

@@ -21,7 +21,6 @@
 require "concurrent"
 require "erb"
 require "json"
-
 require "ibm_cloud_sdk_core"
 require_relative "./common.rb"
 
@@ -97,7 +96,7 @@ module IBMWatson
     # @param assistant_id [String] Unique identifier of the assistant. You can find the assistant ID of an assistant
     #   on the **Assistants** tab of the Watson Assistant tool. For information about
     #   creating assistants, see the
-    #   [documentation](https://console.bluemix.net/docs/services/assistant/create-assistant.html#creating-assistants).
+    #   [documentation](https://console.bluemix.net/docs/services/assistant/assistant-add.html#assistant-add-task).
     #
     #   **Note:** Currently, the v2 API does not support creating assistants.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
@@ -106,7 +105,8 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V2", operation_id: "create_session")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V2", "create_session")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
@@ -131,7 +131,7 @@ module IBMWatson
     # @param assistant_id [String] Unique identifier of the assistant. You can find the assistant ID of an assistant
     #   on the **Assistants** tab of the Watson Assistant tool. For information about
     #   creating assistants, see the
-    #   [documentation](https://console.bluemix.net/docs/services/assistant/create-assistant.html#creating-assistants).
+    #   [documentation](https://console.bluemix.net/docs/services/assistant/assistant-add.html#assistant-add-task).
     #
     #   **Note:** Currently, the v2 API does not support creating assistants.
     # @param session_id [String] Unique identifier of the session.
@@ -143,7 +143,8 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V2", operation_id: "delete_session")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V2", "delete_session")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
@@ -173,12 +174,14 @@ module IBMWatson
     # @param assistant_id [String] Unique identifier of the assistant. You can find the assistant ID of an assistant
     #   on the **Assistants** tab of the Watson Assistant tool. For information about
     #   creating assistants, see the
-    #   [documentation](https://console.bluemix.net/docs/services/assistant/create-assistant.html#creating-assistants).
+    #   [documentation](https://console.bluemix.net/docs/services/assistant/assistant-add.html#assistant-add-task).
     #
     #   **Note:** Currently, the v2 API does not support creating assistants.
     # @param session_id [String] Unique identifier of the session.
     # @param input [MessageInput] An input object that includes the input text.
-    # @param context [MessageContext] State information for the conversation.
+    # @param context [MessageContext] State information for the conversation. The context is stored by the assistant on
+    #   a per-session basis. You can use this property to set or modify context variables,
+    #   which can also be accessed by dialog nodes.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def message(assistant_id:, session_id:, input: nil, context: nil)
       raise ArgumentError.new("assistant_id must be provided") if assistant_id.nil?
@@ -187,7 +190,8 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V2", operation_id: "message")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V2", "message")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version

data/lib/ibm_watson/common.rb

@@ -5,7 +5,8 @@ module IBMWatson
   class Common
     def initialize(*); end
 
-    def get_sdk_headers(headers: {}, service_name: nil, service_version: nil, operation_id: nil)
+    def get_sdk_headers(service_name, service_version, operation_id)
+      headers = {}
       user_agent_string = "watson-apis-ruby-sdk-" + IBMWatson::VERSION + " #{RbConfig::CONFIG["host"]}"
       user_agent_string += " #{RbConfig::CONFIG["RUBY_BASE_NAME"]}-#{RbConfig::CONFIG["RUBY_PROGRAM_VERSION"]}"
 

data/lib/ibm_watson/compare_comply_v1.rb

@@ -20,7 +20,6 @@
 require "concurrent"
 require "erb"
 require "json"
-
 require "ibm_cloud_sdk_core"
 require_relative "./common.rb"
 
@@ -77,27 +76,28 @@ module IBMWatson
     #########################
 
     ##
-    # @!method convert_to_html(file:, model_id: nil, file_content_type: nil, filename: nil)
-    # Convert file to HTML.
-    # Convert an uploaded file to HTML.
-    # @param file [File] The file to convert.
-    # @param model_id [String] The analysis model to be used by the service. For the `/v1/element_classification`
-    #   and `/v1/comparison` methods, the default is `contracts`. For the `/v1/tables`
-    #   method, the default is `tables`. These defaults apply to the standalone methods as
-    #   well as to the methods' use in batch-processing requests.
-    # @param file_content_type [String] The content type of file.
+    # @!method convert_to_html(file:, filename: nil, file_content_type: nil, model: nil)
+    # Convert document to HTML.
+    # Converts a document to HTML.
+    # @param file [File] The document to convert.
     # @param filename [String] The filename for file.
+    # @param file_content_type [String] The content type of file.
+    # @param model [String] The analysis model to be used by the service. For the **Element classification**
+    #   and **Compare two documents** methods, the default is `contracts`. For the
+    #   **Extract tables** method, the default is `tables`. These defaults apply to the
+    #   standalone methods as well as to the methods' use in batch-processing requests.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def convert_to_html(file:, model_id: nil, file_content_type: nil, filename: nil)
+    def convert_to_html(file:, filename: nil, file_content_type: nil, model: nil)
       raise ArgumentError.new("file must be provided") if file.nil?
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "compare-comply", service_version: "V1", operation_id: "convert_to_html")
+      sdk_headers = Common.new.get_sdk_headers("compare-comply", "V1", "convert_to_html")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
-        "model_id" => model_id
+        "model" => model
       }
 
       form_data = {}
@@ -125,27 +125,27 @@ module IBMWatson
     #########################
 
     ##
-    # @!method classify_elements(file:, model_id: nil, file_content_type: nil, filename: nil)
+    # @!method classify_elements(file:, file_content_type: nil, model: nil)
     # Classify the elements of a document.
-    # Analyze an uploaded file's structural and semantic elements.
-    # @param file [File] The file to classify.
-    # @param model_id [String] The analysis model to be used by the service. For the `/v1/element_classification`
-    #   and `/v1/comparison` methods, the default is `contracts`. For the `/v1/tables`
-    #   method, the default is `tables`. These defaults apply to the standalone methods as
-    #   well as to the methods' use in batch-processing requests.
+    # Analyzes the structural and semantic elements of a document.
+    # @param file [File] The document to classify.
     # @param file_content_type [String] The content type of file.
-    # @param filename [String] The filename for file.
+    # @param model [String] The analysis model to be used by the service. For the **Element classification**
+    #   and **Compare two documents** methods, the default is `contracts`. For the
+    #   **Extract tables** method, the default is `tables`. These defaults apply to the
+    #   standalone methods as well as to the methods' use in batch-processing requests.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def classify_elements(file:, model_id: nil, file_content_type: nil, filename: nil)
+    def classify_elements(file:, file_content_type: nil, model: nil)
       raise ArgumentError.new("file must be provided") if file.nil?
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "compare-comply", service_version: "V1", operation_id: "classify_elements")
+      sdk_headers = Common.new.get_sdk_headers("compare-comply", "V1", "classify_elements")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
-        "model_id" => model_id
+        "model" => model
       }
 
       form_data = {}
@@ -153,8 +153,7 @@ module IBMWatson
       unless file.instance_of?(StringIO) || file.instance_of?(File)
         file = file.respond_to?(:to_json) ? StringIO.new(file.to_json) : StringIO.new(file)
       end
-      filename = file.path if filename.nil? && file.respond_to?(:path)
-      form_data[:file] = HTTP::FormData::File.new(file, content_type: file_content_type.nil? ? "application/octet-stream" : file_content_type, filename: filename)
+      form_data[:file] = HTTP::FormData::File.new(file, content_type: file_content_type.nil? ? "application/octet-stream" : file_content_type, filename: file.respond_to?(:path) ? file.path : nil)
 
       method_url = "/v1/element_classification"
 
@@ -173,27 +172,27 @@ module IBMWatson
     #########################
 
     ##
-    # @!method extract_tables(file:, model_id: nil, file_content_type: nil, filename: nil)
+    # @!method extract_tables(file:, file_content_type: nil, model: nil)
     # Extract a document's tables.
-    # Extract and analyze an uploaded file's tables.
-    # @param file [File] The file on which to run table extraction.
-    # @param model_id [String] The analysis model to be used by the service. For the `/v1/element_classification`
-    #   and `/v1/comparison` methods, the default is `contracts`. For the `/v1/tables`
-    #   method, the default is `tables`. These defaults apply to the standalone methods as
-    #   well as to the methods' use in batch-processing requests.
+    # Analyzes the tables in a document.
+    # @param file [File] The document on which to run table extraction.
     # @param file_content_type [String] The content type of file.
-    # @param filename [String] The filename for file.
+    # @param model [String] The analysis model to be used by the service. For the **Element classification**
+    #   and **Compare two documents** methods, the default is `contracts`. For the
+    #   **Extract tables** method, the default is `tables`. These defaults apply to the
+    #   standalone methods as well as to the methods' use in batch-processing requests.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def extract_tables(file:, model_id: nil, file_content_type: nil, filename: nil)
+    def extract_tables(file:, file_content_type: nil, model: nil)
       raise ArgumentError.new("file must be provided") if file.nil?
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "compare-comply", service_version: "V1", operation_id: "extract_tables")
+      sdk_headers = Common.new.get_sdk_headers("compare-comply", "V1", "extract_tables")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
-        "model_id" => model_id
+        "model" => model
       }
 
       form_data = {}
@@ -201,8 +200,7 @@ module IBMWatson
       unless file.instance_of?(StringIO) || file.instance_of?(File)
         file = file.respond_to?(:to_json) ? StringIO.new(file.to_json) : StringIO.new(file)
       end
-      filename = file.path if filename.nil? && file.respond_to?(:path)
-      form_data[:file] = HTTP::FormData::File.new(file, content_type: file_content_type.nil? ? "application/octet-stream" : file_content_type, filename: filename)
+      form_data[:file] = HTTP::FormData::File.new(file, content_type: file_content_type.nil? ? "application/octet-stream" : file_content_type, filename: file.respond_to?(:path) ? file.path : nil)
 
       method_url = "/v1/tables"
 
@@ -221,36 +219,35 @@ module IBMWatson
     #########################
 
     ##
-    # @!method compare_documents(file_1:, file_2:, file_1_label: nil, file_2_label: nil, model_id: nil, file_1_content_type: nil, file_1_filename: nil, file_2_content_type: nil, file_2_filename: nil)
+    # @!method compare_documents(file_1:, file_2:, file_1_content_type: nil, file_2_content_type: nil, file_1_label: nil, file_2_label: nil, model: nil)
     # Compare two documents.
-    # Compare two uploaded input files. Uploaded files must be in the same file format.
-    # @param file_1 [File] The first file to compare.
-    # @param file_2 [File] The second file to compare.
-    # @param file_1_label [String] A text label for the first file.
-    # @param file_2_label [String] A text label for the second file.
-    # @param model_id [String] The analysis model to be used by the service. For the `/v1/element_classification`
-    #   and `/v1/comparison` methods, the default is `contracts`. For the `/v1/tables`
-    #   method, the default is `tables`. These defaults apply to the standalone methods as
-    #   well as to the methods' use in batch-processing requests.
+    # Compares two input documents. Documents must be in the same format.
+    # @param file_1 [File] The first document to compare.
+    # @param file_2 [File] The second document to compare.
     # @param file_1_content_type [String] The content type of file_1.
-    # @param file_1_filename [String] The filename for file_1.
     # @param file_2_content_type [String] The content type of file_2.
-    # @param file_2_filename [String] The filename for file_2.
+    # @param file_1_label [String] A text label for the first document.
+    # @param file_2_label [String] A text label for the second document.
+    # @param model [String] The analysis model to be used by the service. For the **Element classification**
+    #   and **Compare two documents** methods, the default is `contracts`. For the
+    #   **Extract tables** method, the default is `tables`. These defaults apply to the
+    #   standalone methods as well as to the methods' use in batch-processing requests.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def compare_documents(file_1:, file_2:, file_1_label: nil, file_2_label: nil, model_id: nil, file_1_content_type: nil, file_1_filename: nil, file_2_content_type: nil, file_2_filename: nil)
+    def compare_documents(file_1:, file_2:, file_1_content_type: nil, file_2_content_type: nil, file_1_label: nil, file_2_label: nil, model: nil)
       raise ArgumentError.new("file_1 must be provided") if file_1.nil?
 
       raise ArgumentError.new("file_2 must be provided") if file_2.nil?
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "compare-comply", service_version: "V1", operation_id: "compare_documents")
+      sdk_headers = Common.new.get_sdk_headers("compare-comply", "V1", "compare_documents")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
         "file_1_label" => file_1_label,
         "file_2_label" => file_2_label,
-        "model_id" => model_id
+        "model" => model
       }
 
       form_data = {}
@@ -258,14 +255,12 @@ module IBMWatson
       unless file_1.instance_of?(StringIO) || file_1.instance_of?(File)
         file_1 = file_1.respond_to?(:to_json) ? StringIO.new(file_1.to_json) : StringIO.new(file_1)
       end
-      file_1_filename = file_1.path if file_1_filename.nil? && file_1.respond_to?(:path)
-      form_data[:file_1] = HTTP::FormData::File.new(file_1, content_type: file_1_content_type.nil? ? "application/octet-stream" : file_1_content_type, filename: file_1_filename)
+      form_data[:file_1] = HTTP::FormData::File.new(file_1, content_type: file_1_content_type.nil? ? "application/octet-stream" : file_1_content_type, filename: file_1.respond_to?(:path) ? file_1.path : nil)
 
       unless file_2.instance_of?(StringIO) || file_2.instance_of?(File)
         file_2 = file_2.respond_to?(:to_json) ? StringIO.new(file_2.to_json) : StringIO.new(file_2)
       end
-      file_2_filename = file_2.path if file_2_filename.nil? && file_2.respond_to?(:path)
-      form_data[:file_2] = HTTP::FormData::File.new(file_2, content_type: file_2_content_type.nil? ? "application/octet-stream" : file_2_content_type, filename: file_2_filename)
+      form_data[:file_2] = HTTP::FormData::File.new(file_2, content_type: file_2_content_type.nil? ? "application/octet-stream" : file_2_content_type, filename: file_2.respond_to?(:path) ? file_2.path : nil)
 
       method_url = "/v1/comparison"
 
@@ -300,7 +295,8 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "compare-comply", service_version: "V1", operation_id: "add_feedback")
+      sdk_headers = Common.new.get_sdk_headers("compare-comply", "V1", "add_feedback")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
@@ -325,9 +321,80 @@ module IBMWatson
       response
     end
 
+    ##
+    # @!method delete_feedback(feedback_id:, model: nil)
+    # Delete a specified feedback entry.
+    # Deletes a feedback entry with a specified `feedback_id`.
+    # @param feedback_id [String] A string that specifies the feedback entry to be deleted from the document.
+    # @param model [String] The analysis model to be used by the service. For the **Element classification**
+    #   and **Compare two documents** methods, the default is `contracts`. For the
+    #   **Extract tables** method, the default is `tables`. These defaults apply to the
+    #   standalone methods as well as to the methods' use in batch-processing requests.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
+    def delete_feedback(feedback_id:, model: nil)
+      raise ArgumentError.new("feedback_id must be provided") if feedback_id.nil?
+
+      headers = {
+      }
+      sdk_headers = Common.new.get_sdk_headers("compare-comply", "V1", "delete_feedback")
+      headers.merge!(sdk_headers)
+
+      params = {
+        "version" => @version,
+        "model" => model
+      }
+
+      method_url = "/v1/feedback/%s" % [ERB::Util.url_encode(feedback_id)]
+
+      response = request(
+        method: "DELETE",
+        url: method_url,
+        headers: headers,
+        params: params,
+        accept_json: true
+      )
+      response
+    end
+
+    ##
+    # @!method get_feedback(feedback_id:, model: nil)
+    # List a specified feedback entry.
+    # Lists a feedback entry with a specified `feedback_id`.
+    # @param feedback_id [String] A string that specifies the feedback entry to be included in the output.
+    # @param model [String] The analysis model to be used by the service. For the **Element classification**
+    #   and **Compare two documents** methods, the default is `contracts`. For the
+    #   **Extract tables** method, the default is `tables`. These defaults apply to the
+    #   standalone methods as well as to the methods' use in batch-processing requests.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
+    def get_feedback(feedback_id:, model: nil)
+      raise ArgumentError.new("feedback_id must be provided") if feedback_id.nil?
+
+      headers = {
+      }
+      sdk_headers = Common.new.get_sdk_headers("compare-comply", "V1", "get_feedback")
+      headers.merge!(sdk_headers)
+
+      params = {
+        "version" => @version,
+        "model" => model
+      }
+
+      method_url = "/v1/feedback/%s" % [ERB::Util.url_encode(feedback_id)]
+
+      response = request(
+        method: "GET",
+        url: method_url,
+        headers: headers,
+        params: params,
+        accept_json: true
+      )
+      response
+    end
+
     ##
     # @!method list_feedback(feedback_type: nil, before: nil, after: nil, document_title: nil, model_id: nil, model_version: nil, category_removed: nil, category_added: nil, category_not_changed: nil, type_removed: nil, type_added: nil, type_not_changed: nil, page_limit: nil, cursor: nil, sort: nil, include_total: nil)
-    # List the feedback in documents.
+    # List the feedback in a document.
+    # Lists the feedback in a document.
     # @param feedback_type [String] An optional string that filters the output to include only feedback with the
     #   specified feedback type. The only permitted value is `element_classification`.
     # @param before [Time] An optional string in the format `YYYY-MM-DD` that filters the output to include
@@ -373,7 +440,8 @@ module IBMWatson
     def list_feedback(feedback_type: nil, before: nil, after: nil, document_title: nil, model_id: nil, model_version: nil, category_removed: nil, category_added: nil, category_not_changed: nil, type_removed: nil, type_added: nil, type_not_changed: nil, page_limit: nil, cursor: nil, sort: nil, include_total: nil)
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "compare-comply", service_version: "V1", operation_id: "list_feedback")
+      sdk_headers = Common.new.get_sdk_headers("compare-comply", "V1", "list_feedback")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
@@ -406,78 +474,12 @@ module IBMWatson
       )
       response
     end
-
-    ##
-    # @!method get_feedback(feedback_id:, model_id: nil)
-    # List a specified feedback entry.
-    # @param feedback_id [String] A string that specifies the feedback entry to be included in the output.
-    # @param model_id [String] The analysis model to be used by the service. For the `/v1/element_classification`
-    #   and `/v1/comparison` methods, the default is `contracts`. For the `/v1/tables`
-    #   method, the default is `tables`. These defaults apply to the standalone methods as
-    #   well as to the methods' use in batch-processing requests.
-    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def get_feedback(feedback_id:, model_id: nil)
-      raise ArgumentError.new("feedback_id must be provided") if feedback_id.nil?
-
-      headers = {
-      }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "compare-comply", service_version: "V1", operation_id: "get_feedback")
-
-      params = {
-        "version" => @version,
-        "model_id" => model_id
-      }
-
-      method_url = "/v1/feedback/%s" % [ERB::Util.url_encode(feedback_id)]
-
-      response = request(
-        method: "GET",
-        url: method_url,
-        headers: headers,
-        params: params,
-        accept_json: true
-      )
-      response
-    end
-
-    ##
-    # @!method delete_feedback(feedback_id:, model_id: nil)
-    # Deletes a specified feedback entry.
-    # @param feedback_id [String] A string that specifies the feedback entry to be deleted from the document.
-    # @param model_id [String] The analysis model to be used by the service. For the `/v1/element_classification`
-    #   and `/v1/comparison` methods, the default is `contracts`. For the `/v1/tables`
-    #   method, the default is `tables`. These defaults apply to the standalone methods as
-    #   well as to the methods' use in batch-processing requests.
-    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def delete_feedback(feedback_id:, model_id: nil)
-      raise ArgumentError.new("feedback_id must be provided") if feedback_id.nil?
-
-      headers = {
-      }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "compare-comply", service_version: "V1", operation_id: "delete_feedback")
-
-      params = {
-        "version" => @version,
-        "model_id" => model_id
-      }
-
-      method_url = "/v1/feedback/%s" % [ERB::Util.url_encode(feedback_id)]
-
-      response = request(
-        method: "DELETE",
-        url: method_url,
-        headers: headers,
-        params: params,
-        accept_json: true
-      )
-      response
-    end
     #########################
     # Batches
     #########################
 
     ##
-    # @!method create_batch(function:, input_credentials_file:, input_bucket_location:, input_bucket_name:, output_credentials_file:, output_bucket_location:, output_bucket_name:, model_id: nil, input_credentials_filename: nil, output_credentials_filename: nil)
+    # @!method create_batch(function:, input_credentials_file:, input_bucket_location:, input_bucket_name:, output_credentials_file:, output_bucket_location:, output_bucket_name:, model: nil)
     # Submit a batch-processing request.
     # Run Compare and Comply methods over a collection of input documents.
     #   **Important:** Batch processing requires the use of the [IBM Cloud Object Storage
@@ -500,14 +502,12 @@ module IBMWatson
     #   the **Endpoint** tab of your Cloud Object Storage instance; for example, `us-geo`,
     #   `eu-geo`, or `ap-geo`.
     # @param output_bucket_name [String] The name of the Cloud Object Storage output bucket.
-    # @param model_id [String] The analysis model to be used by the service. For the `/v1/element_classification`
-    #   and `/v1/comparison` methods, the default is `contracts`. For the `/v1/tables`
-    #   method, the default is `tables`. These defaults apply to the standalone methods as
-    #   well as to the methods' use in batch-processing requests.
-    # @param input_credentials_filename [String] The filename for input_credentials_file.
-    # @param output_credentials_filename [String] The filename for output_credentials_file.
+    # @param model [String] The analysis model to be used by the service. For the **Element classification**
+    #   and **Compare two documents** methods, the default is `contracts`. For the
+    #   **Extract tables** method, the default is `tables`. These defaults apply to the
+    #   standalone methods as well as to the methods' use in batch-processing requests.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def create_batch(function:, input_credentials_file:, input_bucket_location:, input_bucket_name:, output_credentials_file:, output_bucket_location:, output_bucket_name:, model_id: nil, input_credentials_filename: nil, output_credentials_filename: nil)
+    def create_batch(function:, input_credentials_file:, input_bucket_location:, input_bucket_name:, output_credentials_file:, output_bucket_location:, output_bucket_name:, model: nil)
       raise ArgumentError.new("function must be provided") if function.nil?
 
       raise ArgumentError.new("input_credentials_file must be provided") if input_credentials_file.nil?
@@ -524,12 +524,13 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "compare-comply", service_version: "V1", operation_id: "create_batch")
+      sdk_headers = Common.new.get_sdk_headers("compare-comply", "V1", "create_batch")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
         "function" => function,
-        "model_id" => model_id
+        "model" => model
       }
 
       form_data = {}
@@ -537,8 +538,7 @@ module IBMWatson
       unless input_credentials_file.instance_of?(StringIO) || input_credentials_file.instance_of?(File)
         input_credentials_file = input_credentials_file.respond_to?(:to_json) ? StringIO.new(input_credentials_file.to_json) : StringIO.new(input_credentials_file)
       end
-      input_credentials_filename = input_credentials_file.path if input_credentials_filename.nil? && input_credentials_file.respond_to?(:path)
-      form_data[:input_credentials_file] = HTTP::FormData::File.new(input_credentials_file, content_type: "application/json", filename: input_credentials_filename)
+      form_data[:input_credentials_file] = HTTP::FormData::File.new(input_credentials_file, content_type: "application/json", filename: input_credentials_file.respond_to?(:path) ? input_credentials_file.path : nil)
 
       form_data[:input_bucket_location] = HTTP::FormData::Part.new(input_bucket_location.to_s, content_type: "text/plain")
 
@@ -547,8 +547,7 @@ module IBMWatson
       unless output_credentials_file.instance_of?(StringIO) || output_credentials_file.instance_of?(File)
         output_credentials_file = output_credentials_file.respond_to?(:to_json) ? StringIO.new(output_credentials_file.to_json) : StringIO.new(output_credentials_file)
       end
-      output_credentials_filename = output_credentials_file.path if output_credentials_filename.nil? && output_credentials_file.respond_to?(:path)
-      form_data[:output_credentials_file] = HTTP::FormData::File.new(output_credentials_file, content_type: "application/json", filename: output_credentials_filename)
+      form_data[:output_credentials_file] = HTTP::FormData::File.new(output_credentials_file, content_type: "application/json", filename: output_credentials_file.respond_to?(:path) ? output_credentials_file.path : nil)
 
       form_data[:output_bucket_location] = HTTP::FormData::Part.new(output_bucket_location.to_s, content_type: "text/plain")
 
@@ -568,20 +567,24 @@ module IBMWatson
     end
 
     ##
-    # @!method list_batches
-    # List submitted batch-processing jobs.
-    # List the batch-processing jobs submitted by users.
+    # @!method get_batch(batch_id:)
+    # Get information about a specific batch-processing job.
+    # Gets information about a batch-processing job with a specified ID.
+    # @param batch_id [String] The ID of the batch-processing job whose information you want to retrieve.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def list_batches
+    def get_batch(batch_id:)
+      raise ArgumentError.new("batch_id must be provided") if batch_id.nil?
+
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "compare-comply", service_version: "V1", operation_id: "list_batches")
+      sdk_headers = Common.new.get_sdk_headers("compare-comply", "V1", "get_batch")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      method_url = "/v1/batches"
+      method_url = "/v1/batches/%s" % [ERB::Util.url_encode(batch_id)]
 
       response = request(
         method: "GET",
@@ -594,23 +597,21 @@ module IBMWatson
     end
 
     ##
-    # @!method get_batch(batch_id:)
-    # Get information about a specific batch-processing request.
-    # Get information about a batch-processing request with a specified ID.
-    # @param batch_id [String] The ID of the batch-processing request whose information you want to retrieve.
+    # @!method list_batches
+    # List submitted batch-processing jobs.
+    # Lists batch-processing jobs submitted by users.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def get_batch(batch_id:)
-      raise ArgumentError.new("batch_id must be provided") if batch_id.nil?
-
+    def list_batches
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "compare-comply", service_version: "V1", operation_id: "get_batch")
+      sdk_headers = Common.new.get_sdk_headers("compare-comply", "V1", "list_batches")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      method_url = "/v1/batches/%s" % [ERB::Util.url_encode(batch_id)]
+      method_url = "/v1/batches"
 
       response = request(
         method: "GET",
@@ -623,30 +624,31 @@ module IBMWatson
     end
 
     ##
-    # @!method update_batch(batch_id:, action:, model_id: nil)
-    # Update a pending or active batch-processing request.
-    # Update a pending or active batch-processing request. You can rescan the input
-    #   bucket to check for new documents or cancel a request.
-    # @param batch_id [String] The ID of the batch-processing request you want to update.
-    # @param action [String] The action you want to perform on the specified batch-processing request.
-    # @param model_id [String] The analysis model to be used by the service. For the `/v1/element_classification`
-    #   and `/v1/comparison` methods, the default is `contracts`. For the `/v1/tables`
-    #   method, the default is `tables`. These defaults apply to the standalone methods as
-    #   well as to the methods' use in batch-processing requests.
+    # @!method update_batch(batch_id:, action:, model: nil)
+    # Update a pending or active batch-processing job.
+    # Updates a pending or active batch-processing job. You can rescan the input bucket
+    #   to check for new documents or cancel a job.
+    # @param batch_id [String] The ID of the batch-processing job you want to update.
+    # @param action [String] The action you want to perform on the specified batch-processing job.
+    # @param model [String] The analysis model to be used by the service. For the **Element classification**
+    #   and **Compare two documents** methods, the default is `contracts`. For the
+    #   **Extract tables** method, the default is `tables`. These defaults apply to the
+    #   standalone methods as well as to the methods' use in batch-processing requests.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def update_batch(batch_id:, action:, model_id: nil)
+    def update_batch(batch_id:, action:, model: nil)
       raise ArgumentError.new("batch_id must be provided") if batch_id.nil?
 
       raise ArgumentError.new("action must be provided") if action.nil?
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "compare-comply", service_version: "V1", operation_id: "update_batch")
+      sdk_headers = Common.new.get_sdk_headers("compare-comply", "V1", "update_batch")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
         "action" => action,
-        "model_id" => model_id
+        "model" => model
       }
 
       method_url = "/v1/batches/%s" % [ERB::Util.url_encode(batch_id)]