Skip to content

Commit 6d7162d

Browse files
authored
Merge branch '9.1' into backport-5052-to-9.1
2 parents 40291d1 + e7b4d13 commit 6d7162d

File tree

9 files changed

+1032
-159
lines changed

9 files changed

+1032
-159
lines changed

compiler/src/steps/validate-model.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,13 @@ export default async function validateModel (apiModel: model.Model, restSpec: Ma
186186
apiModel.endpoints.filter(ep => readyForValidation(ep)).forEach(validateEndpoint)
187187
apiModel.endpoints.filter(ep => !readyForValidation(ep)).forEach(validateEndpoint)
188188

189+
// Check types are used
190+
for (const type of apiModel.types) {
191+
if (!typesSeen.has(fqn(type.name))) {
192+
errors.addGeneralError(`Dangling type '${fqn(type.name)}'`)
193+
}
194+
}
195+
189196
// Removes types that we've not seen
190197
apiModel.types = apiModel.types.filter(type => typesSeen.has(fqn(type.name)))
191198

output/openapi/elasticsearch-openapi.json

Lines changed: 358 additions & 16 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: 356 additions & 14 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: 208 additions & 91 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 94 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,97 @@
11
{
22
"endpointErrors": {},
3-
"generalErrors": []
3+
"generalErrors": [
4+
"Dangling type '_global.scripts_painless_execute:PainlessExecutionPosition'",
5+
"Dangling type '_global.scripts_painless_execute:PainlessScript'",
6+
"Dangling type '_global.search._types:HitMetadata'",
7+
"Dangling type '_global.search._types:SmoothingModel'",
8+
"Dangling type '_spec_utils:Setting'",
9+
"Dangling type '_types:ActionIds'",
10+
"Dangling type '_types:CustomResponseBuilderBase'",
11+
"Dangling type '_types:DistanceParsed'",
12+
"Dangling type '_types:DynamicResponseBase'",
13+
"Dangling type '_types:ElasticsearchResponseBase'",
14+
"Dangling type '_types:ElasticsearchUrlFormatter'",
15+
"Dangling type '_types:HttpMethod'",
16+
"Dangling type '_types:IndexMetrics'",
17+
"Dangling type '_types:LatLon'",
18+
"Dangling type '_types:LogLevel'",
19+
"Dangling type '_types:LongId'",
20+
"Dangling type '_types:Transform'",
21+
"Dangling type '_types:UnitFloatSeconds'",
22+
"Dangling type '_types:Uri'",
23+
"Dangling type '_types:UrlParameter'",
24+
"Dangling type '_types:VersionNumbers'",
25+
"Dangling type '_types:VersionStrings'",
26+
"Dangling type '_types.aggregations:AggregationVisitorScope'",
27+
"Dangling type '_types.mapping:GeoTree'",
28+
"Dangling type '_types.mapping:PropertyWithClrOrigin'",
29+
"Dangling type '_types.query_dsl:CharacterType'",
30+
"Dangling type '_types.query_dsl:FieldNameQuery'",
31+
"Dangling type '_types.query_dsl:GeoFormat'",
32+
"Dangling type '_types.query_dsl:Intervals'",
33+
"Dangling type '_types.query_dsl:RewriteMultiTerm'",
34+
"Dangling type '_types.query_dsl:SpanSubQuery'",
35+
"Dangling type '_types.query_dsl:TokenType'",
36+
"Dangling type '_types.query_dsl:VisitorScope'",
37+
"Dangling type 'cat.transforms:TransformState'",
38+
"Dangling type 'cat.transforms:TransformType'",
39+
"Dangling type 'cluster.allocation_explain:StoreCopy'",
40+
"Dangling type 'cluster.reroute:CommandAction'",
41+
"Dangling type 'esql._types:DataPartitioning'",
42+
"Dangling type 'ilm._types:Configurations'",
43+
"Dangling type 'ilm._types:ForceMergeConfiguration'",
44+
"Dangling type 'ilm._types:ShrinkConfiguration'",
45+
"Dangling type 'indices._types:Fielddata'",
46+
"Dangling type 'indices._types:FielddataFilter'",
47+
"Dangling type 'indices._types:FielddataLoading'",
48+
"Dangling type 'indices._types:FielddataRegexFilter'",
49+
"Dangling type 'indices._types:FielddataSettings'",
50+
"Dangling type 'indices._types:GeoPointFielddataFormat'",
51+
"Dangling type 'indices._types:IndicesCircuitBreakerSettings'",
52+
"Dangling type 'indices._types:IndicesModuleSettings'",
53+
"Dangling type 'indices._types:IndicesRecoverySettings'",
54+
"Dangling type 'indices._types:OverlappingIndexTemplate'",
55+
"Dangling type 'indices._types:StringFielddata'",
56+
"Dangling type 'indices._types:StringFielddataFormat'",
57+
"Dangling type 'indices.stats:ShardFielddata'",
58+
"Dangling type 'inference._types:AmazonSageMakerElasticServiceSettings'",
59+
"Dangling type 'inference._types:AmazonSageMakerElasticTaskSettings'",
60+
"Dangling type 'inference._types:AmazonSageMakerElementType'",
61+
"Dangling type 'inference._types:AmazonSageMakerOpenAiTaskSettings'",
62+
"Dangling type 'inference._types:AmazonSageMakerSimilarity'",
63+
"Dangling type 'ingest._types:PipelineFailure'",
64+
"Dangling type 'ml._types:CountFunction'",
65+
"Dangling type 'ml._types:DistinctCountFunction'",
66+
"Dangling type 'ml._types:GeographicFunction'",
67+
"Dangling type 'ml._types:InfoContentFunction'",
68+
"Dangling type 'ml._types:MetricFunction'",
69+
"Dangling type 'ml._types:ModelPlotConfigEnabled'",
70+
"Dangling type 'ml._types:NlpInferenceConfigUpdateContainer'",
71+
"Dangling type 'ml._types:NlpTokenizationUpdateContainer'",
72+
"Dangling type 'ml._types:NonNullSumFunction'",
73+
"Dangling type 'ml._types:NonZeroCountFunction'",
74+
"Dangling type 'ml._types:RareFunction'",
75+
"Dangling type 'ml._types:SumFunction'",
76+
"Dangling type 'search_application._types:AnalyticsEvent'",
77+
"Dangling type 'transform._types:Sync'",
78+
"Dangling type 'watcher._types:Interval'",
79+
"Dangling type 'watcher._types:IntervalUnit'",
80+
"Dangling type 'watcher._types:JiraAction'",
81+
"Dangling type 'watcher._types:JiraIssueAssignee'",
82+
"Dangling type 'watcher._types:JiraIssueFields'",
83+
"Dangling type 'watcher._types:JiraIssuePriority'",
84+
"Dangling type 'watcher._types:JiraIssueProject'",
85+
"Dangling type 'watcher._types:JiraIssueReporter'",
86+
"Dangling type 'watcher._types:JiraIssueType'",
87+
"Dangling type 'watcher._types:PagerDutySentEvent'",
88+
"Dangling type 'watcher._types:SimpleInput'",
89+
"Dangling type 'watcher._types:SlackActionMessageResult'",
90+
"Dangling type 'watcher._types:TriggerEvent'",
91+
"Dangling type 'xpack.usage:Alerting'",
92+
"Dangling type 'xpack.usage:AlertingExecution'",
93+
"Dangling type 'xpack.usage:AlertingInput'",
94+
"Dangling type 'xpack.usage:ExecutionAction'",
95+
"Dangling type 'xpack.usage:ForecastStatistics'"
96+
]
497
}

output/typescript/types.ts

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

specification/_global/bulk/BulkRequest.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ import { OperationContainer, UpdateAction } from './types'
9696
* * JavaScript: Check out `client.helpers.*`
9797
* * .NET: Check out `BulkAllObservable`
9898
* * PHP: Check out bulk indexing.
99+
* * Ruby: Check out `Elasticsearch::Helpers::BulkHelper`
99100
*
100101
* **Submitting bulk requests with cURL**
101102
*

specification/_types/aggregations/Aggregate.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ type Percentiles = KeyedPercentiles | Array<ArrayPercentilesItem>
157157
// <key_name>_as_string? string - present if a format was provided
158158
//
159159
// Note: defined as type alias and not inline, as some clients may want to implement it in a more usable way.
160-
type KeyedPercentiles = Dictionary<string, string | long | null>
160+
type KeyedPercentiles = Dictionary<string, string | double | null>
161161

162162
export class ArrayPercentilesItem {
163163
key: string

specification/inference/_types/CommonTypes.ts

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,18 +1149,6 @@ export class CustomTaskSettings {
11491149
parameters?: UserDefinedValue
11501150
}
11511151

1152-
export class EisServiceSettings {
1153-
/**
1154-
* The name of the model to use for the inference task.
1155-
*/
1156-
model_id: string
1157-
/**
1158-
* This setting helps to minimize the number of rate limit errors returned.
1159-
* By default, the `elastic` service sets the number of requests allowed per minute to `240` in case of `chat_completion`.
1160-
*/
1161-
rate_limit?: RateLimitSetting
1162-
}
1163-
11641152
export class DeepSeekServiceSettings {
11651153
/**
11661154
* A valid API key for your DeepSeek account.
@@ -1189,27 +1177,6 @@ export enum DeepSeekServiceType {
11891177
deepseek
11901178
}
11911179

1192-
export enum EisTaskType {
1193-
chat_completion,
1194-
rerank
1195-
}
1196-
1197-
export enum EisServiceType {
1198-
elastic
1199-
}
1200-
1201-
export class EisTaskSettings {
1202-
/**
1203-
* For a `rerank` task, return doc text within the results.
1204-
*/
1205-
return_documents?: boolean
1206-
1207-
/**
1208-
* For a `rerank` task, the number of the top N documents that should be returned.
1209-
*/
1210-
top_n?: integer
1211-
}
1212-
12131180
export class ElasticsearchServiceSettings {
12141181
/**
12151182
* Adaptive allocations configuration details.

0 commit comments

Comments
 (0)