Skip to content

Commit 58d6a81

Browse files
committed
Merge remote-tracking branch 'origin/main' into google-model-garden-integration
2 parents 3b92227 + 003b872 commit 58d6a81

File tree

381 files changed

+2605
-786
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

381 files changed

+2605
-786
lines changed

.backportrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"repoOwner": "elastic",
33
"repoName": "elasticsearch-specification",
4-
"targetBranchChoices": ["9.1", "9.0", "8.19", "8.18"],
4+
"targetBranchChoices": ["9.2", "9.1", "9.0", "8.19"],
55
"fork": false
66
}

.github/workflows/update-rest-api-json.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
branch: ['main', '9.1', '9.0', '8.19', '8.18']
16+
branch: ['main', '9.2', '9.1', '9.0', '8.19']
1717

1818
steps:
1919
- uses: actions/checkout@v5

.github/workflows/validate-apis.yml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ jobs:
4141
with:
4242
node-version: 22
4343

44-
- name: Cache JSON report
45-
id: cache-json-report
46-
uses: actions/cache@v4
44+
- name: Restore JSON report
45+
if: github.event_name == 'pull_request'
46+
uses: actions/cache/restore@v4
4747
with:
4848
path: ./clients-flight-recorder/recordings/types-validation/types-validation.json
49-
key: types-validation-json-${{ github.event_name == 'pull_request' && format('{0}-{1}', github.base_ref, github.event.pull_request.base.sha) || format('{0}-{1}', github.ref_name, github.sha) }}
49+
key: types-validation-json-${{ format('{0}-{1}', github.base_ref, github.event.pull_request.base.sha) }}
5050
restore-keys: |
51-
types-validation-json-${{ github.event_name == 'pull_request' && github.base_ref || github.ref_name }}-
51+
types-validation-json-${{ github.base_ref }}-
5252
5353
- name: Install deps 1/2
5454
working-directory: ./clients-flight-recorder
@@ -87,11 +87,20 @@ jobs:
8787
BRANCH: ${{ github.ref_name }}
8888
run: node index.js --generate-report --ci --branch $BRANCH
8989

90+
- name: Save JSON report
91+
if: github.event_name == 'push'
92+
uses: actions/cache/save@v4
93+
with:
94+
path: ./clients-flight-recorder/recordings/types-validation/types-validation.json
95+
key: types-validation-json-${{ format('{0}-{1}', github.ref_name, github.sha) }}
96+
restore-keys: |
97+
types-validation-json-${{ github.ref_name }}-
98+
9099
- name: Run validation (PR)
91100
if: github.event_name == 'pull_request'
92101
id: validation
93102
working-directory: ./elasticsearch-specification
94-
run: node .github/validate-pr --token ${{ secrets.GITHUB_TOKEN }}
103+
run: node .github/validate-pr
95104

96105
- name: Find existing comment
97106
if: github.event_name == 'pull_request'

compiler/src/model/build-model.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,7 @@ function compileClassOrInterfaceDeclaration (declaration: ClassDeclaration | Int
306306

307307
// validate body
308308
if (bodyMember != null) {
309+
mapping.requestBodyRequired = !(bodyMember as PropertySignature).hasQuestionToken()
309310
assert(
310311
bodyMember,
311312
methods.some(method => ['POST', 'PUT', 'DELETE'].includes(method)),

docs/overlays/elasticsearch-shared-overlays.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,9 @@ actions:
129129
Inference APIs enable you to use certain services, such as built-in machine learning models (ELSER, E5), models uploaded through Eland, Cohere, OpenAI, Azure, Google AI Studio or Hugging Face.
130130
For built-in models and models uploaded through Eland, the inference APIs offer an alternative way to use and manage trained models.
131131
However, if you do not plan to use the inference APIs to use these models or if you want to use non-NLP models, use the machine learning trained model APIs.
132+
externalDocs:
133+
url: https://www.elastic.co/docs/explore-analyze/elastic-inference/inference-api
134+
description: Learn about default inference endpoints, adaptive allocations, and chunking.
132135
- name: info
133136
x-displayName: Info
134137
description: >
@@ -187,6 +190,10 @@ actions:
187190
x-displayName: Node lifecycle
188191
description: >
189192
The node lifecycle APIs enable you to prepare nodes for temporary or permanent shutdown, monitor the shutdown status, and enable a previously shut-down node to resume normal operations.
193+
# P
194+
- name: project
195+
x-displayName: Project
196+
# description:
190197
# Q
191198
- name: query_rules
192199
x-displayName: Query rules

0 commit comments

Comments
 (0)