diff --git a/output/openapi/elasticsearch-openapi.json b/output/openapi/elasticsearch-openapi.json index d23f7e9c9b..5ff43d9639 100644 --- a/output/openapi/elasticsearch-openapi.json +++ b/output/openapi/elasticsearch-openapi.json @@ -86070,12 +86070,12 @@ "peak_throughput_per_minute": { "type": "number" }, - "rejection_execution_count": { + "rejected_execution_count": { "description": "The number of inference requests that were not processed because the queue was full.", "type": "number" }, "routing_state": { - "$ref": "#/components/schemas/ml._types:TrainedModelAssignmentRoutingTable" + "$ref": "#/components/schemas/ml._types:TrainedModelAssignmentRoutingStateAndReason" }, "start_time": { "$ref": "#/components/schemas/_types:EpochTimeUnitMillis" @@ -86098,7 +86098,7 @@ "throughput_last_minute" ] }, - "ml._types:TrainedModelAssignmentRoutingTable": { + "ml._types:TrainedModelAssignmentRoutingStateAndReason": { "type": "object", "properties": { "reason": { @@ -86107,20 +86107,10 @@ }, "routing_state": { "$ref": "#/components/schemas/ml._types:RoutingState" - }, - "current_allocations": { - "description": "Current number of allocations.", - "type": "number" - }, - "target_allocations": { - "description": "Target number of allocations.", - "type": "number" } }, "required": [ - "routing_state", - "current_allocations", - "target_allocations" + "routing_state" ] }, "ml._types:RoutingState": { @@ -87193,6 +87183,31 @@ "task_parameters" ] }, + "ml._types:TrainedModelAssignmentRoutingTable": { + "type": "object", + "properties": { + "reason": { + "description": "The reason for the current state. It is usually populated only when the\n`routing_state` is `failed`.", + "type": "string" + }, + "routing_state": { + "$ref": "#/components/schemas/ml._types:RoutingState" + }, + "current_allocations": { + "description": "Current number of allocations.", + "type": "number" + }, + "target_allocations": { + "description": "Target number of allocations.", + "type": "number" + } + }, + "required": [ + "routing_state", + "current_allocations", + "target_allocations" + ] + }, "ml._types:TrainedModelAssignmentTaskParameters": { "type": "object", "properties": { diff --git a/output/openapi/elasticsearch-serverless-openapi.json b/output/openapi/elasticsearch-serverless-openapi.json index 19e01d82de..e4c98d30db 100644 --- a/output/openapi/elasticsearch-serverless-openapi.json +++ b/output/openapi/elasticsearch-serverless-openapi.json @@ -56082,12 +56082,12 @@ "peak_throughput_per_minute": { "type": "number" }, - "rejection_execution_count": { + "rejected_execution_count": { "description": "The number of inference requests that were not processed because the queue was full.", "type": "number" }, "routing_state": { - "$ref": "#/components/schemas/ml._types:TrainedModelAssignmentRoutingTable" + "$ref": "#/components/schemas/ml._types:TrainedModelAssignmentRoutingStateAndReason" }, "start_time": { "$ref": "#/components/schemas/_types:EpochTimeUnitMillis" @@ -56110,7 +56110,7 @@ "throughput_last_minute" ] }, - "ml._types:TrainedModelAssignmentRoutingTable": { + "ml._types:TrainedModelAssignmentRoutingStateAndReason": { "type": "object", "properties": { "reason": { @@ -56119,20 +56119,10 @@ }, "routing_state": { "$ref": "#/components/schemas/ml._types:RoutingState" - }, - "current_allocations": { - "description": "Current number of allocations.", - "type": "number" - }, - "target_allocations": { - "description": "Target number of allocations.", - "type": "number" } }, "required": [ - "routing_state", - "current_allocations", - "target_allocations" + "routing_state" ] }, "ml._types:RoutingState": { @@ -57127,6 +57117,31 @@ "task_parameters" ] }, + "ml._types:TrainedModelAssignmentRoutingTable": { + "type": "object", + "properties": { + "reason": { + "description": "The reason for the current state. It is usually populated only when the\n`routing_state` is `failed`.", + "type": "string" + }, + "routing_state": { + "$ref": "#/components/schemas/ml._types:RoutingState" + }, + "current_allocations": { + "description": "Current number of allocations.", + "type": "number" + }, + "target_allocations": { + "description": "Target number of allocations.", + "type": "number" + } + }, + "required": [ + "routing_state", + "current_allocations", + "target_allocations" + ] + }, "ml._types:TrainedModelAssignmentTaskParameters": { "type": "object", "properties": { diff --git a/output/schema/schema-serverless.json b/output/schema/schema-serverless.json index 1d02dd3795..5c05799ff0 100644 --- a/output/schema/schema-serverless.json +++ b/output/schema/schema-serverless.json @@ -138924,7 +138924,7 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L487-L496" + "specLocation": "ml/_types/TrainedModel.ts#L499-L508" }, { "kind": "interface", @@ -138945,7 +138945,7 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L479-L481" + "specLocation": "ml/_types/TrainedModel.ts#L491-L493" }, { "kind": "interface", @@ -138966,7 +138966,7 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L483-L485" + "specLocation": "ml/_types/TrainedModel.ts#L495-L497" }, { "kind": "interface", @@ -139383,7 +139383,7 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L451-L458" + "specLocation": "ml/_types/TrainedModel.ts#L463-L470" }, { "kind": "interface", @@ -139558,7 +139558,7 @@ }, { "description": "The number of inference requests that were not processed because the queue was full.", - "name": "rejection_execution_count", + "name": "rejected_execution_count", "required": false, "type": { "kind": "instance_of", @@ -139575,7 +139575,7 @@ "type": { "kind": "instance_of", "type": { - "name": "TrainedModelAssignmentRoutingTable", + "name": "TrainedModelAssignmentRoutingStateAndReason", "namespace": "ml._types" } } @@ -139642,7 +139642,7 @@ { "kind": "interface", "name": { - "name": "TrainedModelAssignmentRoutingTable", + "name": "TrainedModelAssignmentRoutingStateAndReason", "namespace": "ml._types" }, "properties": [ @@ -139669,33 +139669,9 @@ "namespace": "ml._types" } } - }, - { - "description": "Current number of allocations.", - "name": "current_allocations", - "required": true, - "type": { - "kind": "instance_of", - "type": { - "name": "integer", - "namespace": "_types" - } - } - }, - { - "description": "Target number of allocations.", - "name": "target_allocations", - "required": true, - "type": { - "kind": "instance_of", - "type": { - "name": "integer", - "namespace": "_types" - } - } } ], - "specLocation": "ml/_types/TrainedModel.ts#L431-L449" + "specLocation": "ml/_types/TrainedModel.ts#L431-L441" }, { "kind": "interface", @@ -142262,7 +142238,65 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L460-L477" + "specLocation": "ml/_types/TrainedModel.ts#L472-L489" + }, + { + "kind": "interface", + "name": { + "name": "TrainedModelAssignmentRoutingTable", + "namespace": "ml._types" + }, + "properties": [ + { + "description": "The reason for the current state. It is usually populated only when the\n`routing_state` is `failed`.", + "name": "reason", + "required": false, + "type": { + "kind": "instance_of", + "type": { + "name": "string", + "namespace": "_builtins" + } + } + }, + { + "description": "The current routing state.", + "name": "routing_state", + "required": true, + "type": { + "kind": "instance_of", + "type": { + "name": "RoutingState", + "namespace": "ml._types" + } + } + }, + { + "description": "Current number of allocations.", + "name": "current_allocations", + "required": true, + "type": { + "kind": "instance_of", + "type": { + "name": "integer", + "namespace": "_types" + } + } + }, + { + "description": "Target number of allocations.", + "name": "target_allocations", + "required": true, + "type": { + "kind": "instance_of", + "type": { + "name": "integer", + "namespace": "_types" + } + } + } + ], + "specLocation": "ml/_types/TrainedModel.ts#L443-L461" }, { "kind": "interface", diff --git a/output/schema/schema.json b/output/schema/schema.json index 2d6a186fa7..e6e9a7ea00 100644 --- a/output/schema/schema.json +++ b/output/schema/schema.json @@ -175530,7 +175530,41 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L460-L477" + "specLocation": "ml/_types/TrainedModel.ts#L472-L489" + }, + { + "kind": "interface", + "name": { + "name": "TrainedModelAssignmentRoutingStateAndReason", + "namespace": "ml._types" + }, + "properties": [ + { + "description": "The reason for the current state. It is usually populated only when the\n`routing_state` is `failed`.", + "name": "reason", + "required": false, + "type": { + "kind": "instance_of", + "type": { + "name": "string", + "namespace": "_builtins" + } + } + }, + { + "description": "The current routing state.", + "name": "routing_state", + "required": true, + "type": { + "kind": "instance_of", + "type": { + "name": "RoutingState", + "namespace": "ml._types" + } + } + } + ], + "specLocation": "ml/_types/TrainedModel.ts#L431-L441" }, { "kind": "interface", @@ -175588,7 +175622,7 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L431-L449" + "specLocation": "ml/_types/TrainedModel.ts#L443-L461" }, { "kind": "interface", @@ -176139,7 +176173,7 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L451-L458" + "specLocation": "ml/_types/TrainedModel.ts#L463-L470" }, { "kind": "interface", @@ -176329,7 +176363,7 @@ }, { "description": "The number of inference requests that were not processed because the queue was full.", - "name": "rejection_execution_count", + "name": "rejected_execution_count", "required": false, "type": { "kind": "instance_of", @@ -176346,7 +176380,7 @@ "type": { "kind": "instance_of", "type": { - "name": "TrainedModelAssignmentRoutingTable", + "name": "TrainedModelAssignmentRoutingStateAndReason", "namespace": "ml._types" } } @@ -176887,7 +176921,7 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L479-L481" + "specLocation": "ml/_types/TrainedModel.ts#L491-L493" }, { "kind": "interface", @@ -176908,7 +176942,7 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L483-L485" + "specLocation": "ml/_types/TrainedModel.ts#L495-L497" }, { "kind": "interface", @@ -176942,7 +176976,7 @@ } } ], - "specLocation": "ml/_types/TrainedModel.ts#L487-L496" + "specLocation": "ml/_types/TrainedModel.ts#L499-L508" }, { "kind": "interface", diff --git a/output/typescript/types.ts b/output/typescript/types.ts index c7f14ab89f..ddcf19ff1a 100644 --- a/output/typescript/types.ts +++ b/output/typescript/types.ts @@ -15796,6 +15796,11 @@ export interface MlTrainedModelAssignment { task_parameters: MlTrainedModelAssignmentTaskParameters } +export interface MlTrainedModelAssignmentRoutingStateAndReason { + reason?: string + routing_state: MlRoutingState +} + export interface MlTrainedModelAssignmentRoutingTable { reason?: string routing_state: MlRoutingState @@ -15870,8 +15875,8 @@ export interface MlTrainedModelDeploymentNodesStats { number_of_allocations?: integer number_of_pending_requests?: integer peak_throughput_per_minute: long - rejection_execution_count?: integer - routing_state: MlTrainedModelAssignmentRoutingTable + rejected_execution_count?: integer + routing_state: MlTrainedModelAssignmentRoutingStateAndReason start_time?: EpochTime threads_per_allocation?: integer throughput_last_minute: integer diff --git a/specification/ml/_types/TrainedModel.ts b/specification/ml/_types/TrainedModel.ts index acc7fe5c4f..1c48b362f1 100644 --- a/specification/ml/_types/TrainedModel.ts +++ b/specification/ml/_types/TrainedModel.ts @@ -187,9 +187,9 @@ export class TrainedModelDeploymentNodesStats { peak_throughput_per_minute: long /** The number of inference requests that were not processed because the queue was full. */ - rejection_execution_count?: integer + rejected_execution_count?: integer /** The current routing state and reason for the current routing state for this allocation. */ - routing_state: TrainedModelAssignmentRoutingTable + routing_state: TrainedModelAssignmentRoutingStateAndReason /** The epoch timestamp when the allocation started. */ start_time?: EpochTime /** The number of threads used by each allocation during inference. */ @@ -428,6 +428,18 @@ export enum RoutingState { stopping } +export class TrainedModelAssignmentRoutingStateAndReason { + /** + * The reason for the current state. It is usually populated only when the + * `routing_state` is `failed`. + */ + reason?: string + /** + * The current routing state. + */ + routing_state: RoutingState +} + export class TrainedModelAssignmentRoutingTable { /** * The reason for the current state. It is usually populated only when the