From 6c975a208122689c7ff84a67b4a177b719e89e49 Mon Sep 17 00:00:00 2001 From: Fernando Briano Date: Thu, 30 Jan 2025 12:52:45 +0000 Subject: [PATCH 1/4] [API] Adds keep_alive to async_search.submit --- .../lib/elasticsearch/api/actions/async_search/submit.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/async_search/submit.rb b/elasticsearch-api/lib/elasticsearch/api/actions/async_search/submit.rb index ec6afb755d..5de44d37a1 100644 --- a/elasticsearch-api/lib/elasticsearch/api/actions/async_search/submit.rb +++ b/elasticsearch-api/lib/elasticsearch/api/actions/async_search/submit.rb @@ -27,6 +27,7 @@ module Actions # @option arguments [List] :index A comma-separated list of index names to search; use `_all` or empty string to perform the operation on all indices # @option arguments [Time] :wait_for_completion_timeout Specify the time that the request should block waiting for the final response # @option arguments [Boolean] :keep_on_completion Control whether the response should be stored in the cluster if it completed within the provided [wait_for_completion] time (default: false) + # @option arguments [Time] :keep_alive Update the time interval in which the results (partial or final) for this search will be available # @option arguments [Number] :batched_reduce_size The number of shard results that should be reduced at once on the coordinating node. This value should be used as the granularity at which progress results will be made available. # @option arguments [Boolean] :request_cache Specify if request cache should be used for this request or not, defaults to true # @option arguments [String] :analyzer The analyzer to use for the query string From 1e42cc2c755fa969afdfb9a5ad5a968cc61cd40f Mon Sep 17 00:00:00 2001 From: Fernando Briano Date: Thu, 30 Jan 2025 12:53:35 +0000 Subject: [PATCH 2/4] [API] Adds esql.async_query_stop --- .../api/actions/esql/async_query_stop.rb | 60 +++++++++++++++++++ .../api/actions/esql/async_query_stop_spec.rb | 35 +++++++++++ 2 files changed, 95 insertions(+) create mode 100644 elasticsearch-api/lib/elasticsearch/api/actions/esql/async_query_stop.rb create mode 100644 elasticsearch-api/spec/elasticsearch/api/actions/esql/async_query_stop_spec.rb diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/esql/async_query_stop.rb b/elasticsearch-api/lib/elasticsearch/api/actions/esql/async_query_stop.rb new file mode 100644 index 0000000000..c2d8c4b8f1 --- /dev/null +++ b/elasticsearch-api/lib/elasticsearch/api/actions/esql/async_query_stop.rb @@ -0,0 +1,60 @@ +# Licensed to Elasticsearch B.V. under one or more contributor +# license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright +# ownership. Elasticsearch B.V. licenses this file to you 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. +# +# Auto generated from build hash f284cc16f4d4b4289bc679aa1529bb504190fe80 +# @see https://github.com/elastic/elasticsearch/tree/main/rest-api-spec +# +module Elasticsearch + module API + module Esql + module Actions + # Stops a previously submitted async query request given its ID and collects the results. + # + # @option arguments [String] :id The async query ID + # @option arguments [Hash] :headers Custom HTTP headers + # + # @see https://www.elastic.co/guide/en/elasticsearch/reference/8.17/esql-async-query-stop-api.html + # + def async_query_stop(arguments = {}) + request_opts = { endpoint: arguments[:endpoint] || 'esql.async_query_stop' } + + defined_params = [:id].each_with_object({}) do |variable, set_variables| + set_variables[variable] = arguments[variable] if arguments.key?(variable) + end + request_opts[:defined_params] = defined_params unless defined_params.empty? + + raise ArgumentError, "Required argument 'id' missing" unless arguments[:id] + + arguments = arguments.clone + headers = arguments.delete(:headers) || {} + + body = nil + + _id = arguments.delete(:id) + + method = Elasticsearch::API::HTTP_POST + path = "_query/async/#{Utils.__listify(_id)}/stop" + params = {} + + Elasticsearch::API::Response.new( + perform_request(method, path, params, body, headers, request_opts) + ) + end + end + end + end +end diff --git a/elasticsearch-api/spec/elasticsearch/api/actions/esql/async_query_stop_spec.rb b/elasticsearch-api/spec/elasticsearch/api/actions/esql/async_query_stop_spec.rb new file mode 100644 index 0000000000..48f61e409f --- /dev/null +++ b/elasticsearch-api/spec/elasticsearch/api/actions/esql/async_query_stop_spec.rb @@ -0,0 +1,35 @@ +# Licensed to Elasticsearch B.V. under one or more contributor +# license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright +# ownership. Elasticsearch B.V. licenses this file to you 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. + +require 'spec_helper' + +describe 'client.esql#async_query_stop' do + let(:expected_args) do + [ + 'POST', + '_query/async/foo/stop', + {}, + nil, + {}, + { endpoint: 'esql.async_query_stop', defined_params: { id: 'foo' } } + ] + end + + it 'performs the request' do + expect(client_double.esql.async_query_stop(id: 'foo')).to be_a Elasticsearch::API::Response + end +end From 3668ba36a1054583c377e9cba8728893e33726da Mon Sep 17 00:00:00 2001 From: Fernando Briano Date: Thu, 30 Jan 2025 12:54:50 +0000 Subject: [PATCH 3/4] [API] Adds inference.unified_inference --- .../actions/inference/unified_inference.rb | 68 +++++++++++++++++++ .../inference/unified_inference_spec.rb | 36 ++++++++++ 2 files changed, 104 insertions(+) create mode 100644 elasticsearch-api/lib/elasticsearch/api/actions/inference/unified_inference.rb create mode 100644 elasticsearch-api/spec/elasticsearch/api/actions/inference/unified_inference_spec.rb diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/inference/unified_inference.rb b/elasticsearch-api/lib/elasticsearch/api/actions/inference/unified_inference.rb new file mode 100644 index 0000000000..c4e21cf04f --- /dev/null +++ b/elasticsearch-api/lib/elasticsearch/api/actions/inference/unified_inference.rb @@ -0,0 +1,68 @@ +# Licensed to Elasticsearch B.V. under one or more contributor +# license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright +# ownership. Elasticsearch B.V. licenses this file to you 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. +# +# Auto generated from build hash f284cc16f4d4b4289bc679aa1529bb504190fe80 +# @see https://github.com/elastic/elasticsearch/tree/main/rest-api-spec +# +module Elasticsearch + module API + module Inference + module Actions + # Perform inference using the Unified Schema + # + # @option arguments [String] :inference_id The inference Id + # @option arguments [String] :task_type The task type + # @option arguments [Hash] :headers Custom HTTP headers + # @option arguments [Hash] :body The inference payload + # + # @see https://www.elastic.co/guide/en/elasticsearch/reference/8.17/unified-inference-api.html + # + def unified_inference(arguments = {}) + request_opts = { endpoint: arguments[:endpoint] || 'inference.unified_inference' } + + defined_params = %i[inference_id task_type].each_with_object({}) do |variable, set_variables| + set_variables[variable] = arguments[variable] if arguments.key?(variable) + end + request_opts[:defined_params] = defined_params unless defined_params.empty? + + raise ArgumentError, "Required argument 'inference_id' missing" unless arguments[:inference_id] + + arguments = arguments.clone + headers = arguments.delete(:headers) || {} + + body = arguments.delete(:body) + + _inference_id = arguments.delete(:inference_id) + + _task_type = arguments.delete(:task_type) + + method = Elasticsearch::API::HTTP_POST + path = if _task_type && _inference_id + "_inference/#{Utils.__listify(_task_type)}/#{Utils.__listify(_inference_id)}/_unified" + else + "_inference/#{Utils.__listify(_inference_id)}/_unified" + end + params = {} + + Elasticsearch::API::Response.new( + perform_request(method, path, params, body, headers, request_opts) + ) + end + end + end + end +end diff --git a/elasticsearch-api/spec/elasticsearch/api/actions/inference/unified_inference_spec.rb b/elasticsearch-api/spec/elasticsearch/api/actions/inference/unified_inference_spec.rb new file mode 100644 index 0000000000..daed8332d7 --- /dev/null +++ b/elasticsearch-api/spec/elasticsearch/api/actions/inference/unified_inference_spec.rb @@ -0,0 +1,36 @@ +# Licensed to Elasticsearch B.V. under one or more contributor +# license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright +# ownership. Elasticsearch B.V. licenses this file to you 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. + +require 'spec_helper' + +describe 'client#inference.unified_inference' do + let(:expected_args) do + [ + 'POST', + '_inference/foo/bar/_unified', + {}, + nil, + {}, + { defined_params: { inference_id: 'bar', task_type: 'foo' }, + endpoint: 'inference.unified_inference' } + ] + end + + it 'performs the request' do + expect(client_double.inference.unified_inference(task_type: 'foo', inference_id: 'bar')).to be_a Elasticsearch::API::Response + end +end From e9f1a3a39b1cabdeb97a8fb08bf79a64168c1c92 Mon Sep 17 00:00:00 2001 From: Fernando Briano Date: Fri, 31 Jan 2025 09:55:59 +0000 Subject: [PATCH 4/4] Test Runner: Skips node stats test --- elasticsearch-api/spec/rest_api/skipped_tests_free.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/elasticsearch-api/spec/rest_api/skipped_tests_free.yml b/elasticsearch-api/spec/rest_api/skipped_tests_free.yml index 5369a80e3f..a0d1b139c4 100644 --- a/elasticsearch-api/spec/rest_api/skipped_tests_free.yml +++ b/elasticsearch-api/spec/rest_api/skipped_tests_free.yml @@ -240,3 +240,6 @@ - :file: 'indices.create/10_basic.yml' :description: 'Create lookup index with one shard' +- + :file: 'nodes.stats/11_indices_metrics.yml' + :description: 'indices mappings exact count test for indices level'