Skip to content

Commit e5d927c

Browse files
Merge branch 'main' into Update-Inference-specification-for-Hugging-Face's-rerank-task
2 parents 8d821cb + 2327392 commit e5d927c

File tree

10 files changed

+974
-1025
lines changed

10 files changed

+974
-1025
lines changed

compiler-rs/clients_schema_to_openapi/src/paths.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,18 +502,20 @@ fn split_summary_desc(desc: &str) -> SplitDesc{
502502

503503
fn add_privileges(privileges: &Option<Privileges>) -> Option<String>{
504504
if let Some(privs) = privileges {
505-
let mut result = "\n\n ## Required authorization\n".to_string();
505+
let mut result = "\n\n## Required authorization\n\n".to_string();
506506
if !privs.index.is_empty() {
507507
result += "* Index privileges: ";
508508
result += &privs.index.iter()
509509
.map(|a| format!("`{a}`"))
510510
.join(",");
511+
result += "\n";
511512
}
512513
if !privs.cluster.is_empty() {
513514
result += "* Cluster privileges: ";
514515
result += &privs.cluster.iter()
515516
.map(|a| format!("`{a}`"))
516517
.join(",");
518+
result += "\n";
517519
}
518520
return Some(result)
519521
}
131 Bytes
Binary file not shown.

output/openapi/elasticsearch-openapi.json

Lines changed: 626 additions & 649 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

output/openapi/elasticsearch-serverless-openapi.json

Lines changed: 297 additions & 297 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

output/schema/schema.json

Lines changed: 30 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

output/schema/validation-errors.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,6 @@
3737
],
3838
"response": []
3939
},
40-
"esql.async_query": {
41-
"request": [
42-
"Request: query parameter 'keep_alive' does not exist in the json spec",
43-
"Request: query parameter 'keep_on_completion' does not exist in the json spec",
44-
"Request: query parameter 'wait_for_completion_timeout' does not exist in the json spec"
45-
],
46-
"response": []
47-
},
4840
"get_source": {
4941
"request": [
5042
"Request: query parameter 'stored_fields' does not exist in the json spec"

output/typescript/types.ts

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

specification/_spec_utils/behaviors.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export interface CommonQueryParameters {
6060
/**
6161
* When set to `true` will return statistics in a format suitable for humans.
6262
* For example `"exists_time": "1h"` for humans and
63-
* `"eixsts_time_in_millis": 3600000` for computers. When disabled the human
63+
* `"exists_time_in_millis": 3600000` for computers. When disabled the human
6464
* readable values will be omitted. This makes sense for responses being consumed
6565
* only by machines.
6666
* @server_default false

specification/esql/async_query/AsyncQueryRequest.ts

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -61,28 +61,6 @@ export interface Request extends RequestBase {
6161
* A short version of the Accept header, for example `json` or `yaml`.
6262
*/
6363
format?: EsqlFormat
64-
/**
65-
* The period for which the query and its results are stored in the cluster.
66-
* The default period is five days.
67-
* When this period expires, the query and its results are deleted, even if the query is still ongoing.
68-
* If the `keep_on_completion` parameter is false, Elasticsearch only stores async queries that do not complete within the period set by the `wait_for_completion_timeout` parameter, regardless of this value.
69-
* @server_default 5d
70-
*/
71-
keep_alive?: Duration
72-
/**
73-
* Indicates whether the query and its results are stored in the cluster.
74-
* If false, the query and its results are stored in the cluster only if the request does not complete during the period set by the `wait_for_completion_timeout` parameter.
75-
* @server_default false
76-
*/
77-
keep_on_completion?: boolean
78-
/**
79-
* The period to wait for the request to finish.
80-
* By default, the request waits for 1 second for the query results.
81-
* If the query completes during this period, results are returned
82-
* Otherwise, a query ID is returned that can later be used to retrieve the results.
83-
* @server_default 1s
84-
*/
85-
wait_for_completion_timeout?: Duration
8664
}
8765
/**
8866
* Use the `query` element to start a query. Use `time_zone` to specify an execution time zone and `columnar` to format the answer.
@@ -137,5 +115,19 @@ export interface Request extends RequestBase {
137115
* @server_default 1s
138116
*/
139117
wait_for_completion_timeout?: Duration
118+
/**
119+
* The period for which the query and its results are stored in the cluster.
120+
* The default period is five days.
121+
* When this period expires, the query and its results are deleted, even if the query is still ongoing.
122+
* If the `keep_on_completion` parameter is false, Elasticsearch only stores async queries that do not complete within the period set by the `wait_for_completion_timeout` parameter, regardless of this value.
123+
* @server_default 5d
124+
*/
125+
keep_alive?: Duration
126+
/**
127+
* Indicates whether the query and its results are stored in the cluster.
128+
* If false, the query and its results are stored in the cluster only if the request does not complete during the period set by the `wait_for_completion_timeout` parameter.
129+
* @server_default false
130+
*/
131+
keep_on_completion?: boolean
140132
}
141133
}

specification/inference/put/PutRequest.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import { TaskType } from '@inference/_types/TaskType'
4040
* * ELSER (`sparse_embedding`)
4141
* * Google AI Studio (`completion`, `text_embedding`)
4242
* * Google Vertex AI (`rerank`, `text_embedding`)
43-
* * Hugging Face (`text_embedding`)
43+
* * Hugging Face (`chat_completion`, `completion`, `rerank`, `sparse_embedding`, `text_embedding`)
4444
* * Mistral (`text_embedding`)
4545
* * OpenAI (`chat_completion`, `completion`, `text_embedding`)
4646
* * VoyageAI (`text_embedding`, `rerank`)

0 commit comments

Comments
 (0)