address feedback

This commit is contained in:
Dinesh Yeduguru 2025-03-06 10:15:25 -08:00 committed by Ashwin Bharambe
parent 3a82b57a26
commit 7073efede5
3 changed files with 41 additions and 524 deletions

View file

@ -4945,11 +4945,7 @@
"metrics": { "metrics": {
"type": "array", "type": "array",
"items": { "items": {
<<<<<<< HEAD
"$ref": "#/components/schemas/MetricInResponse" "$ref": "#/components/schemas/MetricInResponse"
=======
"$ref": "#/components/schemas/MetricEvent"
>>>>>>> 6ab59fb65 (return metric labels as list)
} }
}, },
"content": { "content": {
@ -5277,11 +5273,7 @@
"metrics": { "metrics": {
"type": "array", "type": "array",
"items": { "items": {
<<<<<<< HEAD
"$ref": "#/components/schemas/MetricInResponse" "$ref": "#/components/schemas/MetricInResponse"
=======
"$ref": "#/components/schemas/MetricEvent"
>>>>>>> 6ab59fb65 (return metric labels as list)
} }
}, },
"delta": { "delta": {
@ -7628,7 +7620,7 @@
"end_time": { "end_time": {
"type": "integer" "type": "integer"
}, },
"step": { "granularity": {
"type": "string" "type": "string"
}, },
"query_type": { "query_type": {
@ -7683,8 +7675,7 @@
"type": "object", "type": "object",
"properties": { "properties": {
"timestamp": { "timestamp": {
"type": "string", "type": "integer"
"format": "date-time"
}, },
"value": { "value": {
"type": "number" "type": "number"
@ -7697,6 +7688,23 @@
], ],
"title": "MetricDataPoint" "title": "MetricDataPoint"
}, },
"MetricLabel": {
"type": "object",
"properties": {
"name": {
"type": "string"
},
"value": {
"type": "string"
}
},
"additionalProperties": false,
"required": [
"name",
"value"
],
"title": "MetricLabel"
},
"MetricSeries": { "MetricSeries": {
"type": "object", "type": "object",
"properties": { "properties": {
@ -7704,9 +7712,9 @@
"type": "string" "type": "string"
}, },
"labels": { "labels": {
"type": "object", "type": "array",
"additionalProperties": { "items": {
"type": "string" "$ref": "#/components/schemas/MetricLabel"
} }
}, },
"values": { "values": {
@ -7975,301 +7983,6 @@
} }
} }
}, },
<<<<<<< HEAD
=======
"StringType": {
"type": "object",
"properties": {
"type": {
"type": "string",
"const": "string",
"default": "string"
}
},
"additionalProperties": false,
"required": [
"type"
],
"title": "StringType"
},
"UnionType": {
"type": "object",
"properties": {
"type": {
"type": "string",
"const": "union",
"default": "union"
}
},
"additionalProperties": false,
"required": [
"type"
],
"title": "UnionType"
},
"MetricLabelMatcher": {
"type": "object",
"properties": {
"name": {
"type": "string"
},
"value": {
"type": "string"
},
"operator": {
"$ref": "#/components/schemas/MetricLabelOperator",
"default": "="
}
},
"additionalProperties": false,
"required": [
"name",
"value",
"operator"
],
"title": "MetricLabelMatcher"
},
"MetricLabelOperator": {
"type": "string",
"enum": [
"=",
"!=",
"=~",
"!~"
],
"title": "MetricLabelOperator"
},
"MetricQueryType": {
"type": "string",
"enum": [
"range",
"instant"
],
"title": "MetricQueryType"
},
"GetMetricsRequest": {
"type": "object",
"properties": {
"start_time": {
"type": "integer"
},
"end_time": {
"type": "integer"
},
"step": {
"type": "string"
},
"query_type": {
"$ref": "#/components/schemas/MetricQueryType"
},
"label_matchers": {
"type": "array",
"items": {
"$ref": "#/components/schemas/MetricLabelMatcher"
}
}
},
"additionalProperties": false,
"required": [
"start_time",
"query_type"
],
"title": "GetMetricsRequest"
},
"GetMetricsResponse": {
"type": "object",
"properties": {
"data": {
"type": "array",
"items": {
"$ref": "#/components/schemas/MetricSeries"
}
}
},
"additionalProperties": false,
"required": [
"data"
],
"title": "GetMetricsResponse"
},
"MetricDataPoint": {
"type": "object",
"properties": {
"timestamp": {
"type": "string",
"format": "date-time"
},
"value": {
"type": "number"
}
},
"additionalProperties": false,
"required": [
"timestamp",
"value"
],
"title": "MetricDataPoint"
},
"MetricLabel": {
"type": "object",
"properties": {
"name": {
"type": "string"
},
"value": {
"type": "string"
}
},
"additionalProperties": false,
"required": [
"name",
"value"
],
"title": "MetricLabel"
},
"MetricSeries": {
"type": "object",
"properties": {
"metric": {
"type": "string"
},
"labels": {
"type": "array",
"items": {
"$ref": "#/components/schemas/MetricLabel"
}
},
"values": {
"type": "array",
"items": {
"$ref": "#/components/schemas/MetricDataPoint"
}
}
},
"additionalProperties": false,
"required": [
"metric",
"labels",
"values"
],
"title": "MetricSeries"
},
"Model": {
"type": "object",
"properties": {
"identifier": {
"type": "string"
},
"provider_resource_id": {
"type": "string"
},
"provider_id": {
"type": "string"
},
"type": {
"type": "string",
"const": "model",
"default": "model"
},
"metadata": {
"type": "object",
"additionalProperties": {
"oneOf": [
{
"type": "null"
},
{
"type": "boolean"
},
{
"type": "number"
},
{
"type": "string"
},
{
"type": "array"
},
{
"type": "object"
}
]
}
},
"model_type": {
"$ref": "#/components/schemas/ModelType",
"default": "llm"
}
},
"additionalProperties": false,
"required": [
"identifier",
"provider_resource_id",
"provider_id",
"type",
"metadata",
"model_type"
],
"title": "Model"
},
"ModelType": {
"type": "string",
"enum": [
"llm",
"embedding"
],
"title": "ModelType"
},
"PaginatedRowsResult": {
"type": "object",
"properties": {
"rows": {
"type": "array",
"items": {
"type": "object",
"additionalProperties": {
"oneOf": [
{
"type": "null"
},
{
"type": "boolean"
},
{
"type": "number"
},
{
"type": "string"
},
{
"type": "array"
},
{
"type": "object"
}
]
}
},
"description": "The rows in the current page."
},
"total_count": {
"type": "integer",
"description": "The total number of rows in the dataset."
},
"next_page_token": {
"type": "string",
"description": "The token to get the next page of rows."
}
},
"additionalProperties": false,
"required": [
"rows",
"total_count"
],
"title": "PaginatedRowsResult",
"description": "A paginated list of rows from a dataset."
},
>>>>>>> 6ab59fb65 (return metric labels as list)
"ScoringFn": { "ScoringFn": {
"type": "object", "type": "object",
"properties": { "properties": {

View file

@ -3434,11 +3434,7 @@ components:
metrics: metrics:
type: array type: array
items: items:
<<<<<<< HEAD
$ref: '#/components/schemas/MetricInResponse' $ref: '#/components/schemas/MetricInResponse'
=======
$ref: '#/components/schemas/MetricEvent'
>>>>>>> 6ab59fb65 (return metric labels as list)
content: content:
type: string type: string
description: The generated completion text description: The generated completion text
@ -3712,11 +3708,7 @@ components:
metrics: metrics:
type: array type: array
items: items:
<<<<<<< HEAD
$ref: '#/components/schemas/MetricInResponse' $ref: '#/components/schemas/MetricInResponse'
=======
$ref: '#/components/schemas/MetricEvent'
>>>>>>> 6ab59fb65 (return metric labels as list)
delta: delta:
type: string type: string
description: >- description: >-
@ -5322,7 +5314,7 @@ components:
type: integer type: integer
end_time: end_time:
type: integer type: integer
step: granularity:
type: string type: string
query_type: query_type:
type: string type: string
@ -5363,8 +5355,7 @@ components:
type: object type: object
properties: properties:
timestamp: timestamp:
type: string type: integer
format: date-time
value: value:
type: number type: number
additionalProperties: false additionalProperties: false
@ -5372,15 +5363,27 @@ components:
- timestamp - timestamp
- value - value
title: MetricDataPoint title: MetricDataPoint
MetricLabel:
type: object
properties:
name:
type: string
value:
type: string
additionalProperties: false
required:
- name
- value
title: MetricLabel
MetricSeries: MetricSeries:
type: object type: object
properties: properties:
metric: metric:
type: string type: string
labels: labels:
type: object type: array
additionalProperties: items:
type: string $ref: '#/components/schemas/MetricLabel'
values: values:
type: array type: array
items: items:
@ -5556,205 +5559,6 @@ components:
chat_completion_input: '#/components/schemas/ChatCompletionInputType' chat_completion_input: '#/components/schemas/ChatCompletionInputType'
completion_input: '#/components/schemas/CompletionInputType' completion_input: '#/components/schemas/CompletionInputType'
agent_turn_input: '#/components/schemas/AgentTurnInputType' agent_turn_input: '#/components/schemas/AgentTurnInputType'
<<<<<<< HEAD
=======
StringType:
type: object
properties:
type:
type: string
const: string
default: string
additionalProperties: false
required:
- type
title: StringType
UnionType:
type: object
properties:
type:
type: string
const: union
default: union
additionalProperties: false
required:
- type
title: UnionType
MetricLabelMatcher:
type: object
properties:
name:
type: string
value:
type: string
operator:
$ref: '#/components/schemas/MetricLabelOperator'
default: '='
additionalProperties: false
required:
- name
- value
- operator
title: MetricLabelMatcher
MetricLabelOperator:
type: string
enum:
- '='
- '!='
- =~
- '!~'
title: MetricLabelOperator
MetricQueryType:
type: string
enum:
- range
- instant
title: MetricQueryType
GetMetricsRequest:
type: object
properties:
start_time:
type: integer
end_time:
type: integer
step:
type: string
query_type:
$ref: '#/components/schemas/MetricQueryType'
label_matchers:
type: array
items:
$ref: '#/components/schemas/MetricLabelMatcher'
additionalProperties: false
required:
- start_time
- query_type
title: GetMetricsRequest
GetMetricsResponse:
type: object
properties:
data:
type: array
items:
$ref: '#/components/schemas/MetricSeries'
additionalProperties: false
required:
- data
title: GetMetricsResponse
MetricDataPoint:
type: object
properties:
timestamp:
type: string
format: date-time
value:
type: number
additionalProperties: false
required:
- timestamp
- value
title: MetricDataPoint
MetricLabel:
type: object
properties:
name:
type: string
value:
type: string
additionalProperties: false
required:
- name
- value
title: MetricLabel
MetricSeries:
type: object
properties:
metric:
type: string
labels:
type: array
items:
$ref: '#/components/schemas/MetricLabel'
values:
type: array
items:
$ref: '#/components/schemas/MetricDataPoint'
additionalProperties: false
required:
- metric
- labels
- values
title: MetricSeries
Model:
type: object
properties:
identifier:
type: string
provider_resource_id:
type: string
provider_id:
type: string
type:
type: string
const: model
default: model
metadata:
type: object
additionalProperties:
oneOf:
- type: 'null'
- type: boolean
- type: number
- type: string
- type: array
- type: object
model_type:
$ref: '#/components/schemas/ModelType'
default: llm
additionalProperties: false
required:
- identifier
- provider_resource_id
- provider_id
- type
- metadata
- model_type
title: Model
ModelType:
type: string
enum:
- llm
- embedding
title: ModelType
PaginatedRowsResult:
type: object
properties:
rows:
type: array
items:
type: object
additionalProperties:
oneOf:
- type: 'null'
- type: boolean
- type: number
- type: string
- type: array
- type: object
description: The rows in the current page.
total_count:
type: integer
description: The total number of rows in the dataset.
next_page_token:
type: string
description: The token to get the next page of rows.
additionalProperties: false
required:
- rows
- total_count
title: PaginatedRowsResult
description: A paginated list of rows from a dataset.
>>>>>>> 6ab59fb65 (return metric labels as list)
ScoringFn: ScoringFn:
type: object type: object
properties: properties:

View file

@ -229,7 +229,7 @@ class MetricLabel(BaseModel):
@json_schema_type @json_schema_type
class MetricDataPoint(BaseModel): class MetricDataPoint(BaseModel):
timestamp: datetime timestamp: int
value: float value: float
@ -295,7 +295,7 @@ class Telemetry(Protocol):
metric_name: str, metric_name: str,
start_time: int, start_time: int,
end_time: int | None = None, end_time: int | None = None,
step: str | None = "1d", granularity: str | None = "1d",
query_type: MetricQueryType = MetricQueryType.RANGE, query_type: MetricQueryType = MetricQueryType.RANGE,
label_matchers: list[MetricLabelMatcher] | None = None, label_matchers: list[MetricLabelMatcher] | None = None,
) -> GetMetricsResponse: ... ) -> GetMetricsResponse: ...