mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-12-24 07:53:56 +00:00
rename UserDefinedToolDef to ToolDef
This commit is contained in:
Dinesh Yeduguru
parent
db0b2a60c1
commit
e3775eb6f6
8 changed files with 180 additions and 322 deletions
|
|
@ -3714,7 +3714,7 @@
|
|||
"client_tools": {
|
||||
"type": "array",
|
||||
"items": {
|
||||
"$ref": "#/components/schemas/UserDefinedToolDef"
|
||||
"$ref": "#/components/schemas/ToolDef"
|
||||
}
|
||||
},
|
||||
"tool_choice": {
|
||||
|
|
@ -3792,60 +3792,9 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
"ToolParameter": {
|
||||
"ToolDef": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"name": {
|
||||
"type": "string"
|
||||
},
|
||||
"parameter_type": {
|
||||
"type": "string"
|
||||
},
|
||||
"description": {
|
||||
"type": "string"
|
||||
},
|
||||
"required": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"default": {
|
||||
"oneOf": [
|
||||
{
|
||||
"type": "null"
|
||||
},
|
||||
{
|
||||
"type": "boolean"
|
||||
},
|
||||
{
|
||||
"type": "number"
|
||||
},
|
||||
{
|
||||
"type": "string"
|
||||
},
|
||||
{
|
||||
"type": "array"
|
||||
},
|
||||
{
|
||||
"type": "object"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"additionalProperties": false,
|
||||
"required": [
|
||||
"name",
|
||||
"parameter_type",
|
||||
"description",
|
||||
"required"
|
||||
]
|
||||
},
|
||||
"UserDefinedToolDef": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"type": {
|
||||
"type": "string",
|
||||
"const": "user_defined",
|
||||
"default": "user_defined"
|
||||
},
|
||||
"name": {
|
||||
"type": "string"
|
||||
},
|
||||
|
|
@ -3890,11 +3839,53 @@
|
|||
},
|
||||
"additionalProperties": false,
|
||||
"required": [
|
||||
"type",
|
||||
"name"
|
||||
]
|
||||
},
|
||||
"ToolParameter": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"name": {
|
||||
"type": "string"
|
||||
},
|
||||
"parameter_type": {
|
||||
"type": "string"
|
||||
},
|
||||
"description": {
|
||||
"type": "string"
|
||||
},
|
||||
"required": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"default": {
|
||||
"oneOf": [
|
||||
{
|
||||
"type": "null"
|
||||
},
|
||||
{
|
||||
"type": "boolean"
|
||||
},
|
||||
{
|
||||
"type": "number"
|
||||
},
|
||||
{
|
||||
"type": "string"
|
||||
},
|
||||
{
|
||||
"type": "array"
|
||||
},
|
||||
{
|
||||
"type": "object"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"additionalProperties": false,
|
||||
"required": [
|
||||
"name",
|
||||
"parameter_type",
|
||||
"description",
|
||||
"parameters",
|
||||
"metadata"
|
||||
"required"
|
||||
]
|
||||
},
|
||||
"CreateAgentRequest": {
|
||||
|
|
@ -4589,49 +4580,6 @@
|
|||
"session_id"
|
||||
]
|
||||
},
|
||||
"BuiltInToolDef": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"type": {
|
||||
"type": "string",
|
||||
"const": "built_in",
|
||||
"default": "built_in"
|
||||
},
|
||||
"built_in_type": {
|
||||
"$ref": "#/components/schemas/BuiltinTool"
|
||||
},
|
||||
"metadata": {
|
||||
"type": "object",
|
||||
"additionalProperties": {
|
||||
"oneOf": [
|
||||
{
|
||||
"type": "null"
|
||||
},
|
||||
{
|
||||
"type": "boolean"
|
||||
},
|
||||
{
|
||||
"type": "number"
|
||||
},
|
||||
{
|
||||
"type": "string"
|
||||
},
|
||||
{
|
||||
"type": "array"
|
||||
},
|
||||
{
|
||||
"type": "object"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
"additionalProperties": false,
|
||||
"required": [
|
||||
"type",
|
||||
"built_in_type"
|
||||
]
|
||||
},
|
||||
"MCPToolGroupDef": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
|
|
@ -4651,16 +4599,6 @@
|
|||
],
|
||||
"title": "A tool group that is defined by in a model context protocol server. Refer to https://modelcontextprotocol.io/docs/concepts/tools for more information."
|
||||
},
|
||||
"ToolDef": {
|
||||
"oneOf": [
|
||||
{
|
||||
"$ref": "#/components/schemas/UserDefinedToolDef"
|
||||
},
|
||||
{
|
||||
"$ref": "#/components/schemas/BuiltInToolDef"
|
||||
}
|
||||
]
|
||||
},
|
||||
"ToolGroupDef": {
|
||||
"oneOf": [
|
||||
{
|
||||
|
|
@ -7436,7 +7374,7 @@
|
|||
"tool_group_id": {
|
||||
"type": "string"
|
||||
},
|
||||
"tool_group": {
|
||||
"tool_group_def": {
|
||||
"$ref": "#/components/schemas/ToolGroupDef"
|
||||
},
|
||||
"provider_id": {
|
||||
|
|
@ -7446,7 +7384,7 @@
|
|||
"additionalProperties": false,
|
||||
"required": [
|
||||
"tool_group_id",
|
||||
"tool_group"
|
||||
"tool_group_def"
|
||||
]
|
||||
},
|
||||
"RunEvalRequest": {
|
||||
|
|
@ -8098,10 +8036,6 @@
|
|||
"name": "BenchmarkEvalTaskConfig",
|
||||
"description": "<SchemaDefinition schemaRef=\"#/components/schemas/BenchmarkEvalTaskConfig\" />"
|
||||
},
|
||||
{
|
||||
"name": "BuiltInToolDef",
|
||||
"description": "<SchemaDefinition schemaRef=\"#/components/schemas/BuiltInToolDef\" />"
|
||||
},
|
||||
{
|
||||
"name": "BuiltinTool",
|
||||
"description": "<SchemaDefinition schemaRef=\"#/components/schemas/BuiltinTool\" />"
|
||||
|
|
@ -8708,10 +8642,6 @@
|
|||
"name": "UnstructuredLogEvent",
|
||||
"description": "<SchemaDefinition schemaRef=\"#/components/schemas/UnstructuredLogEvent\" />"
|
||||
},
|
||||
{
|
||||
"name": "UserDefinedToolDef",
|
||||
"description": "<SchemaDefinition schemaRef=\"#/components/schemas/UserDefinedToolDef\" />"
|
||||
},
|
||||
{
|
||||
"name": "UserDefinedToolGroupDef",
|
||||
"description": "<SchemaDefinition schemaRef=\"#/components/schemas/UserDefinedToolGroupDef\" />"
|
||||
|
|
@ -8792,7 +8722,6 @@
|
|||
"BatchCompletionRequest",
|
||||
"BatchCompletionResponse",
|
||||
"BenchmarkEvalTaskConfig",
|
||||
"BuiltInToolDef",
|
||||
"BuiltinTool",
|
||||
"CancelTrainingJobRequest",
|
||||
"ChatCompletionRequest",
|
||||
|
|
@ -8931,7 +8860,6 @@
|
|||
"UnregisterModelRequest",
|
||||
"UnregisterToolGroupRequest",
|
||||
"UnstructuredLogEvent",
|
||||
"UserDefinedToolDef",
|
||||
"UserDefinedToolGroupDef",
|
||||
"UserMessage",
|
||||
"VectorMemoryBank",
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ components:
|
|||
properties:
|
||||
client_tools:
|
||||
items:
|
||||
$ref: '#/components/schemas/UserDefinedToolDef'
|
||||
$ref: '#/components/schemas/ToolDef'
|
||||
type: array
|
||||
enable_session_persistence:
|
||||
type: boolean
|
||||
|
|
@ -396,29 +396,6 @@ components:
|
|||
- type
|
||||
- eval_candidate
|
||||
type: object
|
||||
BuiltInToolDef:
|
||||
additionalProperties: false
|
||||
properties:
|
||||
built_in_type:
|
||||
$ref: '#/components/schemas/BuiltinTool'
|
||||
metadata:
|
||||
additionalProperties:
|
||||
oneOf:
|
||||
- type: 'null'
|
||||
- type: boolean
|
||||
- type: number
|
||||
- type: string
|
||||
- type: array
|
||||
- type: object
|
||||
type: object
|
||||
type:
|
||||
const: built_in
|
||||
default: built_in
|
||||
type: string
|
||||
required:
|
||||
- type
|
||||
- built_in_type
|
||||
type: object
|
||||
BuiltinTool:
|
||||
enum:
|
||||
- brave_search
|
||||
|
|
@ -1929,13 +1906,13 @@ components:
|
|||
properties:
|
||||
provider_id:
|
||||
type: string
|
||||
tool_group:
|
||||
tool_group_def:
|
||||
$ref: '#/components/schemas/ToolGroupDef'
|
||||
tool_group_id:
|
||||
type: string
|
||||
required:
|
||||
- tool_group_id
|
||||
- tool_group
|
||||
- tool_group_def
|
||||
type: object
|
||||
ResponseFormat:
|
||||
oneOf:
|
||||
|
|
@ -2716,9 +2693,32 @@ components:
|
|||
- required
|
||||
type: string
|
||||
ToolDef:
|
||||
oneOf:
|
||||
- $ref: '#/components/schemas/UserDefinedToolDef'
|
||||
- $ref: '#/components/schemas/BuiltInToolDef'
|
||||
additionalProperties: false
|
||||
properties:
|
||||
description:
|
||||
type: string
|
||||
metadata:
|
||||
additionalProperties:
|
||||
oneOf:
|
||||
- type: 'null'
|
||||
- type: boolean
|
||||
- type: number
|
||||
- type: string
|
||||
- type: array
|
||||
- type: object
|
||||
type: object
|
||||
name:
|
||||
type: string
|
||||
parameters:
|
||||
items:
|
||||
$ref: '#/components/schemas/ToolParameter'
|
||||
type: array
|
||||
tool_prompt_format:
|
||||
$ref: '#/components/schemas/ToolPromptFormat'
|
||||
default: json
|
||||
required:
|
||||
- name
|
||||
type: object
|
||||
ToolDefinition:
|
||||
additionalProperties: false
|
||||
properties:
|
||||
|
|
@ -3087,41 +3087,6 @@ components:
|
|||
- message
|
||||
- severity
|
||||
type: object
|
||||
UserDefinedToolDef:
|
||||
additionalProperties: false
|
||||
properties:
|
||||
description:
|
||||
type: string
|
||||
metadata:
|
||||
additionalProperties:
|
||||
oneOf:
|
||||
- type: 'null'
|
||||
- type: boolean
|
||||
- type: number
|
||||
- type: string
|
||||
- type: array
|
||||
- type: object
|
||||
type: object
|
||||
name:
|
||||
type: string
|
||||
parameters:
|
||||
items:
|
||||
$ref: '#/components/schemas/ToolParameter'
|
||||
type: array
|
||||
tool_prompt_format:
|
||||
$ref: '#/components/schemas/ToolPromptFormat'
|
||||
default: json
|
||||
type:
|
||||
const: user_defined
|
||||
default: user_defined
|
||||
type: string
|
||||
required:
|
||||
- type
|
||||
- name
|
||||
- description
|
||||
- parameters
|
||||
- metadata
|
||||
type: object
|
||||
UserDefinedToolGroupDef:
|
||||
additionalProperties: false
|
||||
properties:
|
||||
|
|
@ -4823,8 +4788,6 @@ tags:
|
|||
- description: <SchemaDefinition schemaRef="#/components/schemas/BenchmarkEvalTaskConfig"
|
||||
/>
|
||||
name: BenchmarkEvalTaskConfig
|
||||
- description: <SchemaDefinition schemaRef="#/components/schemas/BuiltInToolDef" />
|
||||
name: BuiltInToolDef
|
||||
- description: <SchemaDefinition schemaRef="#/components/schemas/BuiltinTool" />
|
||||
name: BuiltinTool
|
||||
- description: <SchemaDefinition schemaRef="#/components/schemas/CancelTrainingJobRequest"
|
||||
|
|
@ -5251,9 +5214,6 @@ tags:
|
|||
- description: <SchemaDefinition schemaRef="#/components/schemas/UnstructuredLogEvent"
|
||||
/>
|
||||
name: UnstructuredLogEvent
|
||||
- description: <SchemaDefinition schemaRef="#/components/schemas/UserDefinedToolDef"
|
||||
/>
|
||||
name: UserDefinedToolDef
|
||||
- description: <SchemaDefinition schemaRef="#/components/schemas/UserDefinedToolGroupDef"
|
||||
/>
|
||||
name: UserDefinedToolGroupDef
|
||||
|
|
@ -5316,7 +5276,6 @@ x-tagGroups:
|
|||
- BatchCompletionRequest
|
||||
- BatchCompletionResponse
|
||||
- BenchmarkEvalTaskConfig
|
||||
- BuiltInToolDef
|
||||
- BuiltinTool
|
||||
- CancelTrainingJobRequest
|
||||
- ChatCompletionRequest
|
||||
|
|
@ -5455,7 +5414,6 @@ x-tagGroups:
|
|||
- UnregisterModelRequest
|
||||
- UnregisterToolGroupRequest
|
||||
- UnstructuredLogEvent
|
||||
- UserDefinedToolDef
|
||||
- UserDefinedToolGroupDef
|
||||
- UserMessage
|
||||
- VectorMemoryBank
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue