diff --git a/output/openapi/elasticsearch-openapi.json b/output/openapi/elasticsearch-openapi.json index b8066625f9..7016158943 100644 --- a/output/openapi/elasticsearch-openapi.json +++ b/output/openapi/elasticsearch-openapi.json @@ -73964,11 +73964,7 @@ "$ref": "#/components/schemas/_types:Id" }, "node": { - "description": "For started datafeeds only, this information pertains to the node upon which the datafeed is started.", - "type": "object", - "additionalProperties": { - "$ref": "#/components/schemas/ml._types:DiscoveryNode" - } + "$ref": "#/components/schemas/ml._types:DiscoveryNode" }, "state": { "$ref": "#/components/schemas/ml._types:DatafeedState" @@ -73994,6 +73990,9 @@ "ephemeral_id": { "$ref": "#/components/schemas/_types:Id" }, + "id": { + "$ref": "#/components/schemas/_types:Id" + }, "transport_address": { "$ref": "#/components/schemas/_types:TransportAddress" }, @@ -74024,8 +74023,7 @@ }, "required": [ "ephemeral_id", - "transport_address", - "roles" + "transport_address" ] }, "ml._types:DatafeedTimingStats": { @@ -74038,6 +74036,9 @@ "exponential_average_search_time_per_hour_ms": { "$ref": "#/components/schemas/_types:DurationValueUnitFloatMillis" }, + "exponential_average_calculation_context": { + "$ref": "#/components/schemas/ml._types:ExponentialAverageCalculationContext" + }, "job_id": { "$ref": "#/components/schemas/_types:Id" }, @@ -74071,6 +74072,23 @@ "description": "Time unit for fractional milliseconds", "type": "number" }, + "ml._types:ExponentialAverageCalculationContext": { + "type": "object", + "properties": { + "incremental_metric_value_ms": { + "type": "number" + }, + "latest_timestamp": { + "$ref": "#/components/schemas/_types:EpochTimeUnitMillis" + }, + "previous_exponential_average_ms": { + "$ref": "#/components/schemas/_types:DurationValueUnitFloatMillis" + } + }, + "required": [ + "incremental_metric_value_ms" + ] + }, "ml._types:DatafeedRunningState": { "type": "object", "properties": { @@ -74361,11 +74379,7 @@ "$ref": "#/components/schemas/ml._types:ModelSizeStats" }, "node": { - "description": "Contains properties for the node that runs the job.\nThis information is available only for open jobs.", - "type": "object", - "additionalProperties": { - "$ref": "#/components/schemas/ml._types:DiscoveryNode" - } + "$ref": "#/components/schemas/ml._types:DiscoveryNode" }, "open_time": { "$ref": "#/components/schemas/_types:DateTime" @@ -74968,10 +74982,7 @@ "$ref": "#/components/schemas/ml._types:SnapshotUpgradeState" }, "node": { - "type": "object", - "additionalProperties": { - "$ref": "#/components/schemas/ml._types:DiscoveryNode" - } + "$ref": "#/components/schemas/ml._types:DiscoveryNode" }, "assignment_explanation": { "type": "string" @@ -76124,11 +76135,7 @@ "type": "number" }, "node": { - "description": "Information pertaining to the node.", - "type": "object", - "additionalProperties": { - "$ref": "#/components/schemas/ml._types:DiscoveryNode" - } + "$ref": "#/components/schemas/ml._types:DiscoveryNode" }, "number_of_allocations": { "description": "The number of allocations assigned to this node.", @@ -77215,12 +77222,26 @@ "ml._types:TrainedModelAssignment": { "type": "object", "properties": { + "adaptive_allocations": { + "oneOf": [ + { + "$ref": "#/components/schemas/ml._types:AdaptiveAllocationsSettings" + }, + { + "nullable": true, + "type": "string" + } + ] + }, "assignment_state": { "$ref": "#/components/schemas/ml._types:DeploymentAssignmentState" }, "max_assigned_allocations": { "type": "number" }, + "reason": { + "type": "string" + }, "routing_table": { "description": "The allocation state for each node.", "type": "object", @@ -77265,6 +77286,12 @@ "priority": { "$ref": "#/components/schemas/ml._types:TrainingPriority" }, + "per_deployment_memory_bytes": { + "type": "number" + }, + "per_allocation_memory_bytes": { + "type": "number" + }, "queue_capacity": { "description": "Number of inference requests are allowed in the queue at a time.", "type": "number" @@ -77278,9 +77305,10 @@ "model_bytes", "model_id", "deployment_id", - "cache_size", "number_of_allocations", "priority", + "per_deployment_memory_bytes", + "per_allocation_memory_bytes", "queue_capacity", "threads_per_allocation" ] diff --git a/output/openapi/elasticsearch-serverless-openapi.json b/output/openapi/elasticsearch-serverless-openapi.json index c1ef877196..1425648077 100644 --- a/output/openapi/elasticsearch-serverless-openapi.json +++ b/output/openapi/elasticsearch-serverless-openapi.json @@ -49524,6 +49524,9 @@ "exponential_average_search_time_per_hour_ms": { "$ref": "#/components/schemas/_types:DurationValueUnitFloatMillis" }, + "exponential_average_calculation_context": { + "$ref": "#/components/schemas/ml._types:ExponentialAverageCalculationContext" + }, "job_id": { "$ref": "#/components/schemas/_types:Id" }, @@ -49557,6 +49560,23 @@ "description": "Time unit for fractional milliseconds", "type": "number" }, + "ml._types:ExponentialAverageCalculationContext": { + "type": "object", + "properties": { + "incremental_metric_value_ms": { + "type": "number" + }, + "latest_timestamp": { + "$ref": "#/components/schemas/_types:EpochTimeUnitMillis" + }, + "previous_exponential_average_ms": { + "$ref": "#/components/schemas/_types:DurationValueUnitFloatMillis" + } + }, + "required": [ + "incremental_metric_value_ms" + ] + }, "ml._types:DatafeedRunningState": { "type": "object", "properties": { @@ -52057,12 +52077,26 @@ "ml._types:TrainedModelAssignment": { "type": "object", "properties": { + "adaptive_allocations": { + "oneOf": [ + { + "$ref": "#/components/schemas/ml._types:AdaptiveAllocationsSettings" + }, + { + "nullable": true, + "type": "string" + } + ] + }, "assignment_state": { "$ref": "#/components/schemas/ml._types:DeploymentAssignmentState" }, "max_assigned_allocations": { "type": "number" }, + "reason": { + "type": "string" + }, "routing_table": { "description": "The allocation state for each node.", "type": "object", @@ -52107,6 +52141,12 @@ "priority": { "$ref": "#/components/schemas/ml._types:TrainingPriority" }, + "per_deployment_memory_bytes": { + "type": "number" + }, + "per_allocation_memory_bytes": { + "type": "number" + }, "queue_capacity": { "description": "Number of inference requests are allowed in the queue at a time.", "type": "number" @@ -52120,9 +52160,10 @@ "model_bytes", "model_id", "deployment_id", - "cache_size", "number_of_allocations", "priority", + "per_deployment_memory_bytes", + "per_allocation_memory_bytes", "queue_capacity", "threads_per_allocation" ] diff --git a/output/schema/schema-serverless.json b/output/schema/schema-serverless.json index 442466436e..5449836565 100644 --- a/output/schema/schema-serverless.json +++ b/output/schema/schema-serverless.json @@ -94919,7 +94919,7 @@ "name": "CategorizationStatus", "namespace": "ml._types" }, - "specLocation": "ml/_types/Model.ts#L84-L87" + "specLocation": "ml/_types/Model.ts#L83-L86" }, { "kind": "enum", @@ -94938,7 +94938,7 @@ "name": "ChunkingMode", "namespace": "ml._types" }, - "specLocation": "ml/_types/Datafeed.ts#L235-L239" + "specLocation": "ml/_types/Datafeed.ts#L245-L249" }, { "kind": "enum", @@ -94994,7 +94994,7 @@ "name": "DatafeedState", "namespace": "ml._types" }, - "specLocation": "ml/_types/Datafeed.ts#L135-L140" + "specLocation": "ml/_types/Datafeed.ts#L136-L141" }, { "kind": "enum", @@ -95203,7 +95203,7 @@ "name": "MemoryStatus", "namespace": "ml._types" }, - "specLocation": "ml/_types/Model.ts#L89-L93" + "specLocation": "ml/_types/Model.ts#L88-L92" }, { "kind": "type_alias", @@ -95263,7 +95263,7 @@ "name": "RoutingState", "namespace": "ml._types" }, - "specLocation": "ml/_types/TrainedModel.ts#L371-L392" + "specLocation": "ml/_types/TrainedModel.ts#L374-L395" }, { "kind": "enum", @@ -95303,7 +95303,7 @@ "name": "SnapshotUpgradeState", "namespace": "ml._types" }, - "specLocation": "ml/_types/Model.ts#L95-L100" + "specLocation": "ml/_types/Model.ts#L94-L99" }, { "kind": "enum", @@ -129969,7 +129969,7 @@ } } ], - "specLocation": "ml/_types/Datafeed.ts#L142-L171" + "specLocation": "ml/_types/Datafeed.ts#L143-L172" }, { "kind": "interface", @@ -130011,6 +130011,17 @@ } } }, + { + "name": "exponential_average_calculation_context", + "required": false, + "type": { + "kind": "instance_of", + "type": { + "name": "ExponentialAverageCalculationContext", + "namespace": "ml._types" + } + } + }, { "description": "Identifier for the anomaly detection job.", "name": "job_id", @@ -130078,7 +130089,68 @@ } } ], - "specLocation": "ml/_types/Datafeed.ts#L173-L198" + "specLocation": "ml/_types/Datafeed.ts#L174-L202" + }, + { + "kind": "interface", + "name": { + "name": "ExponentialAverageCalculationContext", + "namespace": "ml._types" + }, + "properties": [ + { + "name": "incremental_metric_value_ms", + "required": true, + "type": { + "kind": "instance_of", + "type": { + "name": "double", + "namespace": "_types" + } + } + }, + { + "name": "latest_timestamp", + "required": false, + "type": { + "generics": [ + { + "kind": "instance_of", + "type": { + "name": "UnitMillis", + "namespace": "_types" + } + } + ], + "kind": "instance_of", + "type": { + "name": "EpochTime", + "namespace": "_types" + } + } + }, + { + "name": "previous_exponential_average_ms", + "required": false, + "type": { + "generics": [ + { + "kind": "instance_of", + "type": { + "name": "UnitFloatMillis", + "namespace": "_types" + } + } + ], + "kind": "instance_of", + "type": { + "name": "DurationValue", + "namespace": "_types" + } + } + } + ], + "specLocation": "ml/_types/Datafeed.ts#L204-L208" }, { "kind": "interface", @@ -130124,7 +130196,7 @@ } } ], - "specLocation": "ml/_types/Datafeed.ts#L200-L214" + "specLocation": "ml/_types/Datafeed.ts#L210-L224" }, { "kind": "interface", @@ -130200,7 +130272,7 @@ } } ], - "specLocation": "ml/_types/Datafeed.ts#L216-L233" + "specLocation": "ml/_types/Datafeed.ts#L226-L243" }, { "kind": "interface", @@ -130420,7 +130492,7 @@ } } ], - "specLocation": "ml/_types/Datafeed.ts#L36-L60" + "specLocation": "ml/_types/Datafeed.ts#L37-L61" }, { "kind": "interface", @@ -130504,7 +130576,7 @@ } } ], - "specLocation": "ml/_types/Datafeed.ts#L241-L254" + "specLocation": "ml/_types/Datafeed.ts#L251-L264" }, { "kind": "interface", @@ -130538,7 +130610,7 @@ } } ], - "specLocation": "ml/_types/Datafeed.ts#L121-L132" + "specLocation": "ml/_types/Datafeed.ts#L122-L133" }, { "description": "Controls how to deal with unavailable concrete indices (closed or missing), how wildcard expressions are expanded\nto actual indices (all, closed or open indices) and how to deal with wildcard expressions that resolve to no indices.", @@ -131367,7 +131439,7 @@ } } ], - "specLocation": "ml/_types/Model.ts#L60-L82" + "specLocation": "ml/_types/Model.ts#L59-L81" }, { "kind": "interface", @@ -133595,7 +133667,7 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L440-L442" + "specLocation": "ml/_types/TrainedModel.ts#L445-L447" }, { "kind": "interface", @@ -133616,7 +133688,7 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L444-L446" + "specLocation": "ml/_types/TrainedModel.ts#L449-L451" }, { "kind": "interface", @@ -133650,7 +133722,7 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L448-L457" + "specLocation": "ml/_types/TrainedModel.ts#L453-L462" }, { "kind": "interface", @@ -134053,7 +134125,7 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L414-L421" + "specLocation": "ml/_types/TrainedModel.ts#L417-L424" }, { "kind": "interface", @@ -134356,7 +134428,7 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L394-L412" + "specLocation": "ml/_types/TrainedModel.ts#L397-L415" }, { "kind": "interface", @@ -135609,7 +135681,7 @@ } } ], - "specLocation": "ml/_types/Datafeed.ts#L62-L119" + "specLocation": "ml/_types/Datafeed.ts#L63-L120" }, { "kind": "interface", @@ -136819,6 +136891,29 @@ "namespace": "ml._types" }, "properties": [ + { + "name": "adaptive_allocations", + "required": false, + "type": { + "items": [ + { + "kind": "instance_of", + "type": { + "name": "AdaptiveAllocationsSettings", + "namespace": "ml._types" + } + }, + { + "kind": "instance_of", + "type": { + "name": "null", + "namespace": "_builtins" + } + } + ], + "kind": "union_of" + } + }, { "description": "The overall assignment state.", "name": "assignment_state", @@ -136842,6 +136937,17 @@ } } }, + { + "name": "reason", + "required": false, + "type": { + "kind": "instance_of", + "type": { + "name": "string", + "namespace": "_builtins" + } + } + }, { "description": "The allocation state for each node.", "name": "routing_table", @@ -136889,7 +136995,7 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L423-L438" + "specLocation": "ml/_types/TrainedModel.ts#L426-L443" }, { "kind": "interface", @@ -136943,7 +137049,7 @@ }, "description": "The size of the trained model cache.", "name": "cache_size", - "required": true, + "required": false, "type": { "kind": "instance_of", "type": { @@ -136975,6 +137081,28 @@ } } }, + { + "name": "per_deployment_memory_bytes", + "required": true, + "type": { + "kind": "instance_of", + "type": { + "name": "long", + "namespace": "_types" + } + } + }, + { + "name": "per_allocation_memory_bytes", + "required": true, + "type": { + "kind": "instance_of", + "type": { + "name": "long", + "namespace": "_types" + } + } + }, { "description": "Number of inference requests are allowed in the queue at a time.", "name": "queue_capacity", @@ -137000,7 +137128,7 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L336-L369" + "specLocation": "ml/_types/TrainedModel.ts#L336-L372" }, { "kind": "interface", diff --git a/output/schema/schema.json b/output/schema/schema.json index 46c9550b12..698ffb8eb4 100644 --- a/output/schema/schema.json +++ b/output/schema/schema.json @@ -151112,7 +151112,7 @@ "name": "CategorizationStatus", "namespace": "ml._types" }, - "specLocation": "ml/_types/Model.ts#L84-L87" + "specLocation": "ml/_types/Model.ts#L83-L86" }, { "kind": "interface", @@ -151328,7 +151328,7 @@ } } ], - "specLocation": "ml/_types/Datafeed.ts#L241-L254" + "specLocation": "ml/_types/Datafeed.ts#L251-L264" }, { "kind": "enum", @@ -151347,7 +151347,7 @@ "name": "ChunkingMode", "namespace": "ml._types" }, - "specLocation": "ml/_types/Datafeed.ts#L235-L239" + "specLocation": "ml/_types/Datafeed.ts#L245-L249" }, { "kind": "interface", @@ -151952,7 +151952,7 @@ } } ], - "specLocation": "ml/_types/Datafeed.ts#L36-L60" + "specLocation": "ml/_types/Datafeed.ts#L37-L61" }, { "kind": "interface", @@ -152207,7 +152207,7 @@ } } ], - "specLocation": "ml/_types/Datafeed.ts#L62-L119" + "specLocation": "ml/_types/Datafeed.ts#L63-L120" }, { "kind": "interface", @@ -152253,7 +152253,7 @@ } } ], - "specLocation": "ml/_types/Datafeed.ts#L200-L214" + "specLocation": "ml/_types/Datafeed.ts#L210-L224" }, { "kind": "enum", @@ -152275,7 +152275,7 @@ "name": "DatafeedState", "namespace": "ml._types" }, - "specLocation": "ml/_types/Datafeed.ts#L135-L140" + "specLocation": "ml/_types/Datafeed.ts#L136-L141" }, { "kind": "interface", @@ -152316,21 +152316,10 @@ "name": "node", "required": false, "type": { - "kind": "dictionary_of", - "key": { - "kind": "instance_of", - "type": { - "name": "Id", - "namespace": "_types" - } - }, - "singleKey": false, - "value": { - "kind": "instance_of", - "type": { - "name": "DiscoveryNode", - "namespace": "ml._types" - } + "kind": "instance_of", + "type": { + "name": "DiscoveryNode", + "namespace": "ml._types" } } }, @@ -152371,7 +152360,7 @@ } } ], - "specLocation": "ml/_types/Datafeed.ts#L142-L171" + "specLocation": "ml/_types/Datafeed.ts#L143-L172" }, { "kind": "interface", @@ -152413,6 +152402,17 @@ } } }, + { + "name": "exponential_average_calculation_context", + "required": false, + "type": { + "kind": "instance_of", + "type": { + "name": "ExponentialAverageCalculationContext", + "namespace": "ml._types" + } + } + }, { "description": "Identifier for the anomaly detection job.", "name": "job_id", @@ -152480,7 +152480,7 @@ } } ], - "specLocation": "ml/_types/Datafeed.ts#L173-L198" + "specLocation": "ml/_types/Datafeed.ts#L174-L202" }, { "kind": "interface", @@ -154742,7 +154742,7 @@ } } ], - "specLocation": "ml/_types/Datafeed.ts#L121-L132" + "specLocation": "ml/_types/Datafeed.ts#L122-L133" }, { "kind": "enum", @@ -155177,6 +155177,17 @@ } } }, + { + "name": "id", + "required": false, + "type": { + "kind": "instance_of", + "type": { + "name": "Id", + "namespace": "_types" + } + } + }, { "name": "transport_address", "required": true, @@ -155223,7 +155234,7 @@ }, { "name": "roles", - "required": true, + "required": false, "type": { "kind": "array_of", "value": { @@ -155269,7 +155280,7 @@ } } ], - "specLocation": "ml/_types/DiscoveryNode.ts#L25-L35" + "specLocation": "ml/_types/DiscoveryNode.ts#L25-L36" }, { "kind": "enum", @@ -155293,6 +155304,67 @@ }, "specLocation": "ml/_types/Detector.ts#L127-L132" }, + { + "kind": "interface", + "name": { + "name": "ExponentialAverageCalculationContext", + "namespace": "ml._types" + }, + "properties": [ + { + "name": "incremental_metric_value_ms", + "required": true, + "type": { + "kind": "instance_of", + "type": { + "name": "double", + "namespace": "_types" + } + } + }, + { + "name": "latest_timestamp", + "required": false, + "type": { + "kind": "instance_of", + "generics": [ + { + "kind": "instance_of", + "type": { + "name": "UnitMillis", + "namespace": "_types" + } + } + ], + "type": { + "name": "EpochTime", + "namespace": "_types" + } + } + }, + { + "name": "previous_exponential_average_ms", + "required": false, + "type": { + "kind": "instance_of", + "generics": [ + { + "kind": "instance_of", + "type": { + "name": "UnitFloatMillis", + "namespace": "_types" + } + } + ], + "type": { + "name": "DurationValue", + "namespace": "_types" + } + } + } + ], + "specLocation": "ml/_types/Datafeed.ts#L204-L208" + }, { "kind": "interface", "description": "Fill mask inference options", @@ -157271,21 +157343,10 @@ "name": "node", "required": false, "type": { - "kind": "dictionary_of", - "key": { - "kind": "instance_of", - "type": { - "name": "Id", - "namespace": "_types" - } - }, - "singleKey": false, - "value": { - "kind": "instance_of", - "type": { - "name": "DiscoveryNode", - "namespace": "ml._types" - } + "kind": "instance_of", + "type": { + "name": "DiscoveryNode", + "namespace": "ml._types" } } }, @@ -157509,7 +157570,7 @@ "name": "MemoryStatus", "namespace": "ml._types" }, - "specLocation": "ml/_types/Model.ts#L89-L93" + "specLocation": "ml/_types/Model.ts#L88-L92" }, { "kind": "interface", @@ -157810,7 +157871,7 @@ } } ], - "specLocation": "ml/_types/Model.ts#L60-L82" + "specLocation": "ml/_types/Model.ts#L59-L81" }, { "kind": "interface", @@ -157940,7 +158001,7 @@ } } ], - "specLocation": "ml/_types/Model.ts#L26-L47" + "specLocation": "ml/_types/Model.ts#L25-L46" }, { "kind": "interface", @@ -157989,21 +158050,10 @@ "name": "node", "required": true, "type": { - "kind": "dictionary_of", - "key": { - "kind": "instance_of", - "type": { - "name": "Id", - "namespace": "_types" - } - }, - "singleKey": false, - "value": { - "kind": "instance_of", - "type": { - "name": "DiscoveryNode", - "namespace": "ml._types" - } + "kind": "instance_of", + "type": { + "name": "DiscoveryNode", + "namespace": "ml._types" } } }, @@ -158019,7 +158069,7 @@ } } ], - "specLocation": "ml/_types/Model.ts#L49-L58" + "specLocation": "ml/_types/Model.ts#L48-L57" }, { "kind": "interface", @@ -158908,7 +158958,7 @@ "name": "RoutingState", "namespace": "ml._types" }, - "specLocation": "ml/_types/TrainedModel.ts#L371-L392" + "specLocation": "ml/_types/TrainedModel.ts#L374-L395" }, { "kind": "enum", @@ -159048,7 +159098,7 @@ } } ], - "specLocation": "ml/_types/Datafeed.ts#L216-L233" + "specLocation": "ml/_types/Datafeed.ts#L226-L243" }, { "kind": "enum", @@ -159070,7 +159120,7 @@ "name": "SnapshotUpgradeState", "namespace": "ml._types" }, - "specLocation": "ml/_types/Model.ts#L95-L100" + "specLocation": "ml/_types/Model.ts#L94-L99" }, { "kind": "interface", @@ -159661,6 +159711,29 @@ "namespace": "ml._types" }, "properties": [ + { + "name": "adaptive_allocations", + "required": false, + "type": { + "kind": "union_of", + "items": [ + { + "kind": "instance_of", + "type": { + "name": "AdaptiveAllocationsSettings", + "namespace": "ml._types" + } + }, + { + "kind": "instance_of", + "type": { + "name": "null", + "namespace": "_builtins" + } + } + ] + } + }, { "description": "The overall assignment state.", "name": "assignment_state", @@ -159684,6 +159757,17 @@ } } }, + { + "name": "reason", + "required": false, + "type": { + "kind": "instance_of", + "type": { + "name": "string", + "namespace": "_builtins" + } + } + }, { "description": "The allocation state for each node.", "name": "routing_table", @@ -159731,7 +159815,7 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L423-L438" + "specLocation": "ml/_types/TrainedModel.ts#L426-L443" }, { "kind": "interface", @@ -159789,7 +159873,7 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L394-L412" + "specLocation": "ml/_types/TrainedModel.ts#L397-L415" }, { "kind": "interface", @@ -159843,7 +159927,7 @@ }, "description": "The size of the trained model cache.", "name": "cache_size", - "required": true, + "required": false, "type": { "kind": "instance_of", "type": { @@ -159875,6 +159959,28 @@ } } }, + { + "name": "per_deployment_memory_bytes", + "required": true, + "type": { + "kind": "instance_of", + "type": { + "name": "long", + "namespace": "_types" + } + } + }, + { + "name": "per_allocation_memory_bytes", + "required": true, + "type": { + "kind": "instance_of", + "type": { + "name": "long", + "namespace": "_types" + } + } + }, { "description": "Number of inference requests are allowed in the queue at a time.", "name": "queue_capacity", @@ -159900,7 +160006,7 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L336-L369" + "specLocation": "ml/_types/TrainedModel.ts#L336-L372" }, { "kind": "interface", @@ -160296,7 +160402,7 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L414-L421" + "specLocation": "ml/_types/TrainedModel.ts#L417-L424" }, { "kind": "interface", @@ -160433,21 +160539,10 @@ "name": "node", "required": false, "type": { - "kind": "dictionary_of", - "key": { - "kind": "instance_of", - "type": { - "name": "Id", - "namespace": "_types" - } - }, - "singleKey": false, - "value": { - "kind": "instance_of", - "type": { - "name": "DiscoveryNode", - "namespace": "ml._types" - } + "kind": "instance_of", + "type": { + "name": "DiscoveryNode", + "namespace": "ml._types" } } }, @@ -161035,7 +161130,7 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L440-L442" + "specLocation": "ml/_types/TrainedModel.ts#L445-L447" }, { "kind": "interface", @@ -161056,7 +161151,7 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L444-L446" + "specLocation": "ml/_types/TrainedModel.ts#L449-L451" }, { "kind": "interface", @@ -161090,7 +161185,7 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L448-L457" + "specLocation": "ml/_types/TrainedModel.ts#L453-L462" }, { "kind": "interface", diff --git a/output/typescript/types.ts b/output/typescript/types.ts index 5d82410aea..8c00455c93 100644 --- a/output/typescript/types.ts +++ b/output/typescript/types.ts @@ -13884,7 +13884,7 @@ export type MlDatafeedState = 'started' | 'stopped' | 'starting' | 'stopping' export interface MlDatafeedStats { assignment_explanation?: string datafeed_id: Id - node?: Record + node?: MlDiscoveryNode state: MlDatafeedState timing_stats?: MlDatafeedTimingStats running_state?: MlDatafeedRunningState @@ -13893,6 +13893,7 @@ export interface MlDatafeedStats { export interface MlDatafeedTimingStats { bucket_count: long exponential_average_search_time_per_hour_ms: DurationValue + exponential_average_calculation_context?: MlExponentialAverageCalculationContext job_id: Id search_count: long total_search_time_ms: DurationValue @@ -14193,10 +14194,11 @@ export interface MlDetectorRead { export interface MlDiscoveryNode { name?: Name ephemeral_id: Id + id?: Id transport_address: TransportAddress external_id?: string attributes?: Record - roles: string[] + roles?: string[] version?: VersionString min_index_version?: integer max_index_version?: integer @@ -14204,6 +14206,12 @@ export interface MlDiscoveryNode { export type MlExcludeFrequent = 'all' | 'none' | 'by' | 'over' +export interface MlExponentialAverageCalculationContext { + incremental_metric_value_ms: double + latest_timestamp?: EpochTime + previous_exponential_average_ms?: DurationValue +} + export interface MlFillMaskInferenceOptions { mask_token?: string num_top_classes?: integer @@ -14396,7 +14404,7 @@ export interface MlJobStats { forecasts_stats: MlJobForecastStatistics job_id: string model_size_stats: MlModelSizeStats - node?: Record + node?: MlDiscoveryNode open_time?: DateTime state: MlJobState timing_stats: MlJobTimingStats @@ -14463,7 +14471,7 @@ export interface MlModelSnapshotUpgrade { job_id: Id snapshot_id: Id state: MlSnapshotUpgradeState - node: Record + node: MlDiscoveryNode assignment_explanation: string } @@ -14658,8 +14666,10 @@ export interface MlTotalFeatureImportanceStatistics { } export interface MlTrainedModelAssignment { + adaptive_allocations?: MlAdaptiveAllocationsSettings | null assignment_state: MlDeploymentAssignmentState max_assigned_allocations?: integer + reason?: string routing_table: Record start_time: DateTime task_parameters: MlTrainedModelAssignmentTaskParameters @@ -14676,9 +14686,11 @@ export interface MlTrainedModelAssignmentTaskParameters { model_bytes: integer model_id: Id deployment_id: Id - cache_size: ByteSize + cache_size?: ByteSize number_of_allocations: integer priority: MlTrainingPriority + per_deployment_memory_bytes: long + per_allocation_memory_bytes: long queue_capacity: integer threads_per_allocation: integer } @@ -14731,7 +14743,7 @@ export interface MlTrainedModelDeploymentNodesStats { inference_cache_hit_count?: long inference_cache_hit_count_last_minute?: long last_access?: long - node?: Record + node?: MlDiscoveryNode number_of_allocations?: integer number_of_pending_requests?: integer peak_throughput_per_minute: long diff --git a/specification/ml/_types/Datafeed.ts b/specification/ml/_types/Datafeed.ts index 7b6c2d6981..77e1c8b7ac 100644 --- a/specification/ml/_types/Datafeed.ts +++ b/specification/ml/_types/Datafeed.ts @@ -22,12 +22,13 @@ import { Dictionary } from '@spec_utils/Dictionary' import { AggregationContainer } from '@_types/aggregations/AggregationContainer' import { Id, Indices, IndicesOptions } from '@_types/common' import { RuntimeFields } from '@_types/mapping/RuntimeFields' -import { integer, long } from '@_types/Numeric' +import { double, integer, long } from '@_types/Numeric' import { QueryContainer } from '@_types/query_dsl/abstractions' import { ScriptField } from '@_types/Scripting' import { Duration, DurationValue, + EpochTime, UnitFloatMillis, UnitMillis } from '@_types/Time' @@ -154,7 +155,7 @@ export class DatafeedStats { * For started datafeeds only, this information pertains to the node upon which the datafeed is started. * @availability stack */ - node?: Dictionary + node?: DiscoveryNode /** * The status of the datafeed, which can be one of the following values: `starting`, `started`, `stopping`, `stopped`. */ @@ -179,6 +180,9 @@ export class DatafeedTimingStats { * The exponential average search time per hour, in milliseconds. */ exponential_average_search_time_per_hour_ms: DurationValue + + exponential_average_calculation_context?: ExponentialAverageCalculationContext + /** * Identifier for the anomaly detection job. */ @@ -197,6 +201,12 @@ export class DatafeedTimingStats { average_search_time_per_bucket_ms?: DurationValue } +export class ExponentialAverageCalculationContext { + incremental_metric_value_ms: double + latest_timestamp?: EpochTime + previous_exponential_average_ms?: DurationValue +} + export class DatafeedRunningState { /** * Indicates if the datafeed is "real-time"; meaning that the datafeed has no configured `end` time. diff --git a/specification/ml/_types/DiscoveryNode.ts b/specification/ml/_types/DiscoveryNode.ts index 12fb7060cd..d548ad9dfa 100644 --- a/specification/ml/_types/DiscoveryNode.ts +++ b/specification/ml/_types/DiscoveryNode.ts @@ -25,10 +25,11 @@ import { integer } from '@_types/Numeric' export class DiscoveryNode { name?: Name ephemeral_id: Id + id?: Id transport_address: TransportAddress external_id?: string attributes?: Dictionary - roles: string[] + roles?: string[] version?: VersionString min_index_version?: integer max_index_version?: integer diff --git a/specification/ml/_types/Job.ts b/specification/ml/_types/Job.ts index 364f70be8e..b15656ac05 100644 --- a/specification/ml/_types/Job.ts +++ b/specification/ml/_types/Job.ts @@ -310,7 +310,7 @@ export class JobStats { * This information is available only for open jobs. * @availability stack */ - node?: Dictionary + node?: DiscoveryNode /** * For open jobs only, the elapsed time for which the job has been open. */ diff --git a/specification/ml/_types/Model.ts b/specification/ml/_types/Model.ts index ea47bedafc..806d14faf2 100644 --- a/specification/ml/_types/Model.ts +++ b/specification/ml/_types/Model.ts @@ -18,7 +18,6 @@ */ import { DiscoveryNode } from '@ml/_types/DiscoveryNode' -import { Dictionary } from '@spec_utils/Dictionary' import { ByteSize, Id, VersionString } from '@_types/common' import { integer, long } from '@_types/Numeric' import { DateTime } from '@_types/Time' @@ -53,7 +52,7 @@ export class ModelSnapshotUpgrade { /** * @availability stack */ - node: Dictionary + node: DiscoveryNode assignment_explanation: string } diff --git a/specification/ml/_types/TrainedModel.ts b/specification/ml/_types/TrainedModel.ts index fe151089ef..779e986811 100644 --- a/specification/ml/_types/TrainedModel.ts +++ b/specification/ml/_types/TrainedModel.ts @@ -162,7 +162,7 @@ export class TrainedModelDeploymentNodesStats { * Information pertaining to the node. * @availability stack */ - node?: Dictionary + node?: DiscoveryNode /** * The number of allocations assigned to this node. */ @@ -351,13 +351,16 @@ export class TrainedModelAssignmentTaskParameters { * @availability stack since=8.4.0 * @availability serverless */ - cache_size: ByteSize + cache_size?: ByteSize /** * The total number of allocations this model is assigned across ML nodes. */ number_of_allocations: integer priority: TrainingPriority + per_deployment_memory_bytes: long + per_allocation_memory_bytes: long + /** * Number of inference requests are allowed in the queue at a time. */ @@ -421,11 +424,13 @@ export class TrainedModelDeploymentAllocationStatus { } export class TrainedModelAssignment { + adaptive_allocations?: AdaptiveAllocationsSettings | null /** * The overall assignment state. */ assignment_state: DeploymentAssignmentState max_assigned_allocations?: integer + reason?: string /** * The allocation state for each node. */