Skip to content

Commit

Permalink
Merge branch 'main' into block_ref
Browse files Browse the repository at this point in the history
  • Loading branch information
nik9000 committed Sep 29, 2023
2 parents 4d81299 + 567ab3a commit 5667c7b
Show file tree
Hide file tree
Showing 91 changed files with 1,469 additions and 1,226 deletions.
5 changes: 5 additions & 0 deletions docs/changelog/100018.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 100018
summary: Improve time-series error and documentation
area: "TSDB"
type: enhancement
issues: []
6 changes: 6 additions & 0 deletions docs/changelog/100020.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 100020
summary: "[CI] `SearchResponseTests#testSerialization` failing resolved"
area: Search
type: bug
issues:
- 100005
6 changes: 6 additions & 0 deletions docs/changelog/99912.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 99912
summary: Represent histogram value count as long
area: Aggregations
type: enhancement
issues:
- 99820
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ PUT /my-time-series-index-0/_bulk
--------------------------------------------------
// NOTCONSOLE

//////////////////////////
To perform a time series aggregation, specify "time_series" as the aggregation type. When the boolean "keyed"
is true, each bucket is given a unique key.

Expand All @@ -85,8 +83,6 @@ GET /_search
--------------------------------------------------
// NOTCONSOLE

//////////////////////////

This will return all results in the time series, however a more typical query will use sub aggregations to reduce the
date returned to something more relevant.

Expand Down
57 changes: 57 additions & 0 deletions docs/reference/inference/delete-inference.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
[role="xpack"]
[[delete-inference-api]]
=== Delete {infer} API

Deletes an {infer} model deployment.


[discrete]
[[delete-inference-api-request]]
==== {api-request-title}

`DELETE /_inference/<task_type>/<model_id>`

[discrete]
[[delete-inference-api-prereqs]]
==== {api-prereq-title}

* Requires the `manage` <<privileges-list-cluster,cluster privilege>>.


[discrete]
[[delete-inference-api-path-params]]
==== {api-path-parms-title}

<model_id>::
(Required, string)
The unique identifier of the {infer} model to delete.

<task_type>::
(Required, string)
The type of {infer} task that the model performs.


[discrete]
[[delete-inference-api-example]]
==== {api-examples-title}

The following API call deletes the `my-elser-model` {infer} model that can
perform `sparse_embedding` tasks.


[source,console]
------------------------------------------------------------
DELETE /_inference/sparse_embedding/my-elser-model
------------------------------------------------------------
// TEST[skip:TBD]


The API returns the following response:

[source,console-result]
------------------------------------------------------------
{
"acknowledged": true
}
------------------------------------------------------------
// NOTCONSOLE
79 changes: 79 additions & 0 deletions docs/reference/inference/get-inference.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
[role="xpack"]
[[get-inference-api]]
=== Get {infer} API

Retrieves {infer} model information.

[discrete]
[[get-inference-api-request]]
==== {api-request-title}

`GET /_inference/_all`

`GET /_inference/<task_type>/_all`

`GET /_inference/<task_type>/<model_id>`

[discrete]
[[get-inference-api-prereqs]]
==== {api-prereq-title}

* Requires the `manage` <<privileges-list-cluster,cluster privilege>>.

[discrete]
[[get-inference-api-desc]]
==== {api-description-title}

You can get information in a single API request for:

* a single {infer} model by providing the task type and the model ID,
* all of the {infer} models for a certain task type by providing the task type
and a wildcard expression,
* all of the {infer} models by using a wildcard expression.


[discrete]
[[get-inference-api-path-params]]
==== {api-path-parms-title}

`<model_id>`::
(Optional, string)
The unique identifier of the {infer} model.


`<task_type>`::
(Optional, string)
The type of {infer} task that the model performs.


[discrete]
[[get-inference-api-example]]
==== {api-examples-title}

The following API call retrives information about the `my-elser-model` {infer}
model that can perform `sparse_embedding` tasks.


[source,console]
------------------------------------------------------------
GET _inference/sparse_embedding/my-elser-model
------------------------------------------------------------
// TEST[skip:TBD]


The API returns the following response:

[source,console-result]
------------------------------------------------------------
{
"model_id": "my-elser-model",
"task_type": "sparse_embedding",
"service": "elser_mlnode",
"service_settings": {
"num_allocations": 1,
"num_threads": 1
},
"task_settings": {}
}
------------------------------------------------------------
// NOTCONSOLE
16 changes: 16 additions & 0 deletions docs/reference/inference/inference-apis.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[role="xpack"]
[[inference-apis]]
== {infer-cap} APIs

You can use the following APIs to manage {infer} models and perform {infer}:

* <<delete-inference-api>>
* <<get-inference-api>>
* <<post-inference-api>>
* <<put-inference-api>>


include::delete-inference.asciidoc[]
include::get-inference.asciidoc[]
include::post-inference.asciidoc[]
include::put-inference.asciidoc[]
97 changes: 97 additions & 0 deletions docs/reference/inference/post-inference.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
[role="xpack"]
[[post-inference-api]]
=== Perform inference API

Performs an inference task on an input text by using an {infer} model.


[discrete]
[[post-inference-api-request]]
==== {api-request-title}

`POST /_inference/<task_type>/<model_id>`


[discrete]
[[post-inference-api-prereqs]]
==== {api-prereq-title}

* Requires the `manage` <<privileges-list-cluster,cluster privilege>>.


[discrete]
[[post-inference-api-desc]]
==== {api-description-title}

The perform {infer} API enables you to use {infer} models to perform specific
tasks on data that you provide as an input. The API returns a response with the
resutls of the tasks. The {infer} model you use can perform one specific task
that has been defined when the model was created with the <<put-inference-api>>.


[discrete]
[[post-inference-api-path-params]]
==== {api-path-parms-title}

`<model_id>`::
(Required, string)
The unique identifier of the {infer} model.


`<task_type>`::
(Required, string)
The type of {infer} task that the model performs.


[discrete]
[[post-inference-api-request-body]]
== {api-request-body-title}

`input`::
(Required, string)
The text on which you want to perform the {infer} task.


[discrete]
[[post-inference-api-example]]
==== {api-examples-title}

The following example performs sparse embedding on the example sentence.


[source,console]
------------------------------------------------------------
POST _inference/sparse_embedding/my-elser-model
{
"input": "The sky above the port was the color of television tuned to a dead channel."
}
------------------------------------------------------------
// TEST[skip:TBD]


The API returns the following response:


[source,console-result]
------------------------------------------------------------
{
"sparse_embedding": {
"port": 2.1259406,
"sky": 1.7073475,
"color": 1.6922266,
"dead": 1.6247464,
"television": 1.3525393,
"above": 1.2425821,
"tuned": 1.1440028,
"colors": 1.1218185,
"tv": 1.0111054,
"ports": 1.0067928,
"poem": 1.0042328,
"channel": 0.99471164,
"tune": 0.96235967,
"scene": 0.9020516,
(...)
}
}
------------------------------------------------------------
// NOTCONSOLE
104 changes: 104 additions & 0 deletions docs/reference/inference/put-inference.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
[role="xpack"]
[[put-inference-api]]
=== Create {infer} API

Creates a model to perform an {infer} task.


[discrete]
[[put-inference-api-request]]
==== {api-request-title}

`PUT /_inference/<task_type>/<model_id>`


[discrete]
[[put-inference-api-prereqs]]
==== {api-prereq-title}

* Requires the `manage` <<privileges-list-cluster,cluster privilege>>.

[discrete]
[[put-inference-api-desc]]
==== {api-description-title}

The create {infer} API enables you to create and configure an {infer} model to
perform a specific {infer} task.


[discrete]
[[put-inference-api-path-params]]
==== {api-path-parms-title}


`<model_id>`::
(Required, string)
The unique identifier of the model.

`<task_type>`::
(Required, string)
The type of the {infer} task that the model will perform. Available task types:
* `sparse_embedding`,
* `text_embedding`.


[discrete]
[[put-inference-api-request-body]]
== {api-request-body-title}

`service`::
(Required, string)
The type of service supported for the specified task type.
Available services:
* `elser`,
* `elser_mlnode`.

`service_settings`::
(Required, object)
Settings used to install the {infer} model. These settings are specific to the
`service` you specified.

`task_settings`::
(Optional, object)
Settings to configure the {infer} task. These settings are specific to the
`<task_type>` you specified.


[discrete]
[[put-inference-api-example]]
==== {api-examples-title}

The following example shows how to create an {infer} model called
`my-elser-model` to perform a `sparse_embedding` task type.

[source,console]
------------------------------------------------------------
PUT _inference/sparse_embedding/my-elser-model
{
"service": "elser_mlnode",
"service_settings": {
"num_allocations": 1,
"num_threads": 1
},
"task_settings": {}
}
------------------------------------------------------------
// TEST[skip:TBD]


Example response:

[source,console-result]
------------------------------------------------------------
{
"model_id": "my-elser-model",
"task_type": "sparse_embedding",
"service": "elser_mlnode",
"service_settings": {
"num_allocations": 1,
"num_threads": 1
},
"task_settings": {}
}
------------------------------------------------------------
// NOTCONSOLE
Loading

0 comments on commit 5667c7b

Please sign in to comment.