This commit is contained in:
Xi Yan 2025-02-13 09:53:03 -08:00
parent 39980dc83f
commit 139d5bded6
2 changed files with 20 additions and 147 deletions

View file

@ -40,7 +40,6 @@
} }
], ],
"paths": { "paths": {
<<<<<<< HEAD
"/v1/eval/tasks/{task_id}/evaluations": { "/v1/eval/tasks/{task_id}/evaluations": {
"post": { "post": {
"responses": { "responses": {
@ -235,8 +234,6 @@
"deprecated": true "deprecated": true
} }
}, },
=======
>>>>>>> 974941be (deprecation in OpenAPI spec)
"/v1/eval-tasks": { "/v1/eval-tasks": {
"get": { "get": {
"responses": { "responses": {
@ -245,27 +242,18 @@
"content": { "content": {
"application/json": { "application/json": {
"schema": { "schema": {
<<<<<<< HEAD
"$ref": "#/components/schemas/ListBenchmarksResponse" "$ref": "#/components/schemas/ListBenchmarksResponse"
=======
"$ref": "#/components/schemas/ListEvalTasksResponse"
>>>>>>> 974941be (deprecation in OpenAPI spec)
} }
} }
} }
} }
}, },
"tags": [ "tags": [
<<<<<<< HEAD
"Benchmarks" "Benchmarks"
=======
"EvalTasks"
>>>>>>> 974941be (deprecation in OpenAPI spec)
], ],
"description": "", "description": "",
"parameters": [], "parameters": [],
"deprecated": true "deprecated": true
<<<<<<< HEAD
}, },
"post": { "post": {
"responses": { "responses": {
@ -330,8 +318,6 @@
"required": true "required": true
}, },
"deprecated": true "deprecated": true
=======
>>>>>>> 974941be (deprecation in OpenAPI spec)
} }
}, },
"/v1/datasetio/rows": { "/v1/datasetio/rows": {
@ -2659,50 +2645,7 @@
"jsonSchemaDialect": "https://json-schema.org/draft/2020-12/schema", "jsonSchemaDialect": "https://json-schema.org/draft/2020-12/schema",
"components": { "components": {
"schemas": { "schemas": {
<<<<<<< HEAD
"AgentCandidate": { "AgentCandidate": {
=======
"EvalTask": {
"type": "object",
"properties": {
"type": {
"type": "string",
"const": "eval_task",
"default": "eval_task"
},
"dataset_id": {
"type": "string"
},
"config": {
"$ref": "#/components/schemas/AgentConfig"
}
},
"additionalProperties": false,
"required": [
"type",
"config"
]
},
"ListEvalTasksResponse": {
"type": "object",
"properties": {
"sampling_params": {
"$ref": "#/components/schemas/SamplingParams"
},
"input_shields": {
"type": "array",
"items": {
"$ref": "#/components/schemas/EvalTask"
}
}
},
"additionalProperties": false,
"required": [
"data"
]
},
"AppendRowsRequest": {
>>>>>>> 974941be (deprecation in OpenAPI spec)
"type": "object", "type": "object",
"properties": { "properties": {
"type": { "type": {
@ -2729,7 +2672,7 @@
"input_shields": { "input_shields": {
"type": "array", "type": "array",
"items": { "items": {
"$ref": "#/components/schemas/ToolDef" "type": "string"
} }
}, },
"output_shields": { "output_shields": {

View file

@ -10,7 +10,6 @@ info:
servers: servers:
- url: http://any-hosted-llama-stack.com - url: http://any-hosted-llama-stack.com
paths: paths:
<<<<<<< HEAD
/v1/eval/tasks/{task_id}/evaluations: /v1/eval/tasks/{task_id}/evaluations:
post: post:
responses: responses:
@ -126,8 +125,6 @@ paths:
schema: schema:
type: string type: string
deprecated: true deprecated: true
=======
>>>>>>> 974941be (deprecation in OpenAPI spec)
/v1/eval-tasks: /v1/eval-tasks:
get: get:
responses: responses:
@ -136,7 +133,6 @@ paths:
content: content:
application/json: application/json:
schema: schema:
<<<<<<< HEAD
$ref: '#/components/schemas/ListBenchmarksResponse' $ref: '#/components/schemas/ListBenchmarksResponse'
tags: tags:
- Benchmarks - Benchmarks
@ -183,14 +179,6 @@ paths:
$ref: '#/components/schemas/DeprecatedRunEvalRequest' $ref: '#/components/schemas/DeprecatedRunEvalRequest'
required: true required: true
deprecated: true deprecated: true
=======
$ref: '#/components/schemas/ListEvalTasksResponse'
tags:
- EvalTasks
description: ''
parameters: []
deprecated: true
>>>>>>> 974941be (deprecation in OpenAPI spec)
/v1/datasetio/rows: /v1/datasetio/rows:
get: get:
responses: responses:
@ -1610,52 +1598,7 @@ jsonSchemaDialect: >-
https://json-schema.org/draft/2020-12/schema https://json-schema.org/draft/2020-12/schema
components: components:
schemas: schemas:
<<<<<<< HEAD
AgentCandidate: AgentCandidate:
=======
EvalTask:
type: object
properties:
type:
type: string
const: eval_task
default: eval_task
dataset_id:
type: string
scoring_functions:
type: array
items:
type: string
metadata:
type: object
additionalProperties:
oneOf:
- type: 'null'
- type: boolean
- type: number
- type: string
- type: array
- type: object
additionalProperties: false
required:
- type
- dataset_id
- scoring_functions
- metadata
ListEvalTasksResponse:
type: object
properties:
sampling_params:
$ref: '#/components/schemas/SamplingParams'
input_shields:
type: array
items:
$ref: '#/components/schemas/EvalTask'
additionalProperties: false
required:
- data
AppendRowsRequest:
>>>>>>> 974941be (deprecation in OpenAPI spec)
type: object type: object
properties: properties:
type: type:
@ -2922,47 +2865,34 @@ components:
TextDelta: TextDelta:
type: object type: object
properties: properties:
name: type:
type: string type: string
description: const: text
default: text
text:
type: string type: string
parameters:
type: array
items:
$ref: '#/components/schemas/ToolParameter'
metadata:
type: object
additionalProperties:
oneOf:
- type: 'null'
- type: boolean
- type: number
- type: string
- type: array
- type: object
additionalProperties: false additionalProperties: false
required: required:
- name - type
ToolParameter: - text
ToolCallDelta:
type: object type: object
properties: properties:
name: type:
type: string type: string
parameter_type: const: tool_call
type: string default: tool_call
description: tool_call:
type: string
required:
type: boolean
default: true
default:
oneOf: oneOf:
- type: 'null'
- type: boolean
- type: number
- type: string - type: string
- type: array - $ref: '#/components/schemas/ToolCall'
- type: object parse_status:
type: string
enum:
- started
- in_progress
- failed
- succeeded
additionalProperties: false additionalProperties: false
required: required:
- type - type