Merge branch 'main' into inference-spec

elastic · Nov 15, 2023 · 7dd93e6 · 7dd93e6
2 parents 13b9e8e + 126f6d1
commit 7dd93e6
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 7 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,6 @@
 output/dangling-types/dangling.csv linguist-generated=true
 output/schema/schema.json linguist-generated=true
+output/openapi/elasticsearch-serverless-openapi.json linguist-generated=true
 output/schema/import-type-graph.json linguist-generated=true
 output/schema/import-namespace-graph-compact.json linguist-generated=true
 output/schema/import-namespace-graph-expanded.json linguist-generated=true

diff --git a/output/openapi/elasticsearch-serverless-openapi.json b/output/openapi/elasticsearch-serverless-openapi.json
diff --git a/output/schema/schema.json b/output/schema/schema.json
diff --git a/output/typescript/types.ts b/output/typescript/types.ts
diff --git a/specification/_types/mapping/Property.ts b/specification/_types/mapping/Property.ts
@@ -48,6 +48,7 @@ import {
   ScaledFloatNumberProperty,
   SearchAsYouTypeProperty,
   ShortNumberProperty,
+  SparseVectorProperty,
   TextProperty,
   UnsignedLongNumberProperty,
   VersionProperty,
@@ -117,6 +118,7 @@ export type Property =
   // complex
   | AggregateMetricDoubleProperty
   | DenseVectorProperty
+  | SparseVectorProperty
   | FlattenedProperty
   | NestedProperty
   | ObjectProperty

diff --git a/specification/ingest/_types/Pipeline.ts b/specification/ingest/_types/Pipeline.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { VersionNumber } from '@_types/common'
+import { VersionNumber, Metadata } from '@_types/common'
 import { ProcessorContainer } from './Processors'
 
 export class Pipeline {
@@ -38,6 +38,10 @@ export class Pipeline {
    * Version number used by external systems to track ingest pipelines.
    */
   version?: VersionNumber
+  /**
+   * Arbitrary metadata about the ingest pipeline. This map is not automatically generated by Elasticsearch.
+   */
+  _meta: Metadata
 }
 
 // Unused .. but let's keep it for now