phoenix-oss/llama-stack-mirror
0
0
Fork 1
mirror of https://github.com/meta-llama/llama-stack.git synced 2025-08-07 02:58:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More changes to make things ergonomic

Browse source
This commit is contained in:
Ashwin Bharambe 2025-01-26 12:07:59 -08:00
parent b9bb6eee39
commit 4b7efd9f60
7 changed files with 360 additions and 399 deletions
Download patch file Download diff file Expand all files Collapse all files

421
docs/resources/llama-stack-spec.html
View file

@ -5047,40 +5047,42 @@
"type": "object", "type": "object",
"properties": { "properties": {
"payload": { "payload": {
"oneOf": [ "$ref": "#/components/schemas/AgentTurnResponseEventPayload"
{
"$ref": "#/components/schemas/AgentTurnResponseStepStartPayload"
},
{
"$ref": "#/components/schemas/AgentTurnResponseStepProgressPayload"
},
{
"$ref": "#/components/schemas/AgentTurnResponseStepCompletePayload"
},
{
"$ref": "#/components/schemas/AgentTurnResponseTurnStartPayload"
},
{
"$ref": "#/components/schemas/AgentTurnResponseTurnCompletePayload"
}
],
"discriminator": {
"propertyName": "event_type",
"mapping": {
"step_start": "#/components/schemas/AgentTurnResponseStepStartPayload",
"step_progress": "#/components/schemas/AgentTurnResponseStepProgressPayload",
"step_complete": "#/components/schemas/AgentTurnResponseStepCompletePayload",
"turn_start": "#/components/schemas/AgentTurnResponseTurnStartPayload",
"turn_complete": "#/components/schemas/AgentTurnResponseTurnCompletePayload"
}
}
} }
}, },
"additionalProperties": false, "additionalProperties": false,
"required": [ "required": [
"payload" "payload"
]
},
"AgentTurnResponseEventPayload": {
"oneOf": [
{
"$ref": "#/components/schemas/AgentTurnResponseStepStartPayload"
},
{
"$ref": "#/components/schemas/AgentTurnResponseStepProgressPayload"
},
{
"$ref": "#/components/schemas/AgentTurnResponseStepCompletePayload"
},
{
"$ref": "#/components/schemas/AgentTurnResponseTurnStartPayload"
},
{
"$ref": "#/components/schemas/AgentTurnResponseTurnCompletePayload"
}
], ],
"title": "Streamed agent execution response." "discriminator": {
"propertyName": "event_type",
"mapping": {
"step_start": "#/components/schemas/AgentTurnResponseStepStartPayload",
"step_progress": "#/components/schemas/AgentTurnResponseStepProgressPayload",
"step_complete": "#/components/schemas/AgentTurnResponseStepCompletePayload",
"turn_start": "#/components/schemas/AgentTurnResponseTurnStartPayload",
"turn_complete": "#/components/schemas/AgentTurnResponseTurnCompletePayload"
}
}
}, },
"AgentTurnResponseStepCompletePayload": { "AgentTurnResponseStepCompletePayload": {
"type": "object", "type": "object",
@ -5677,44 +5679,12 @@
"default": "app" "default": "app"
}, },
"eval_candidate": { "eval_candidate": {
"oneOf": [ "$ref": "#/components/schemas/EvalCandidate"
{
"$ref": "#/components/schemas/ModelCandidate"
},
{
"$ref": "#/components/schemas/AgentCandidate"
}
],
"discriminator": {
"propertyName": "type",
"mapping": {
"model": "#/components/schemas/ModelCandidate",
"agent": "#/components/schemas/AgentCandidate"
}
}
}, },
"scoring_params": { "scoring_params": {
"type": "object", "type": "object",
"additionalProperties": { "additionalProperties": {
"oneOf": [ "$ref": "#/components/schemas/ScoringFnParams"
{
"$ref": "#/components/schemas/LLMAsJudgeScoringFnParams"
},
{
"$ref": "#/components/schemas/RegexParserScoringFnParams"
},
{
"$ref": "#/components/schemas/BasicScoringFnParams"
}
],
"discriminator": {
"propertyName": "type",
"mapping": {
"llm_as_judge": "#/components/schemas/LLMAsJudgeScoringFnParams",
"regex_parser": "#/components/schemas/RegexParserScoringFnParams",
"basic": "#/components/schemas/BasicScoringFnParams"
}
}
} }
}, },
"num_examples": { "num_examples": {
@ -5757,21 +5727,7 @@
"default": "benchmark" "default": "benchmark"
}, },
"eval_candidate": { "eval_candidate": {
"oneOf": [ "$ref": "#/components/schemas/EvalCandidate"
{
"$ref": "#/components/schemas/ModelCandidate"
},
{
"$ref": "#/components/schemas/AgentCandidate"
}
],
"discriminator": {
"propertyName": "type",
"mapping": {
"model": "#/components/schemas/ModelCandidate",
"agent": "#/components/schemas/AgentCandidate"
}
}
}, },
"num_examples": { "num_examples": {
"type": "integer" "type": "integer"
@ -5783,6 +5739,40 @@
"eval_candidate" "eval_candidate"
] ]
}, },
"EvalCandidate": {
"oneOf": [
{
"$ref": "#/components/schemas/ModelCandidate"
},
{
"$ref": "#/components/schemas/AgentCandidate"
}
],
"discriminator": {
"propertyName": "type",
"mapping": {
"model": "#/components/schemas/ModelCandidate",
"agent": "#/components/schemas/AgentCandidate"
}
}
},
"EvalTaskConfig": {
"oneOf": [
{
"$ref": "#/components/schemas/BenchmarkEvalTaskConfig"
},
{
"$ref": "#/components/schemas/AppEvalTaskConfig"
}
],
"discriminator": {
"propertyName": "type",
"mapping": {
"benchmark": "#/components/schemas/BenchmarkEvalTaskConfig",
"app": "#/components/schemas/AppEvalTaskConfig"
}
}
},
"LLMAsJudgeScoringFnParams": { "LLMAsJudgeScoringFnParams": {
"type": "object", "type": "object",
"properties": { "properties": {
@ -5867,6 +5857,27 @@
"type" "type"
] ]
}, },
"ScoringFnParams": {
"oneOf": [
{
"$ref": "#/components/schemas/LLMAsJudgeScoringFnParams"
},
{
"$ref": "#/components/schemas/RegexParserScoringFnParams"
},
{
"$ref": "#/components/schemas/BasicScoringFnParams"
}
],
"discriminator": {
"propertyName": "type",
"mapping": {
"llm_as_judge": "#/components/schemas/LLMAsJudgeScoringFnParams",
"regex_parser": "#/components/schemas/RegexParserScoringFnParams",
"basic": "#/components/schemas/BasicScoringFnParams"
}
}
},
"EvaluateRowsRequest": { "EvaluateRowsRequest": {
"type": "object", "type": "object",
"properties": { "properties": {
@ -5905,21 +5916,7 @@
} }
}, },
"task_config": { "task_config": {
"oneOf": [ "$ref": "#/components/schemas/EvalTaskConfig"
{
"$ref": "#/components/schemas/BenchmarkEvalTaskConfig"
},
{
"$ref": "#/components/schemas/AppEvalTaskConfig"
}
],
"discriminator": {
"propertyName": "type",
"mapping": {
"benchmark": "#/components/schemas/BenchmarkEvalTaskConfig",
"app": "#/components/schemas/AppEvalTaskConfig"
}
}
} }
}, },
"additionalProperties": false, "additionalProperties": false,
@ -6571,25 +6568,7 @@
"$ref": "#/components/schemas/ParamType" "$ref": "#/components/schemas/ParamType"
}, },
"params": { "params": {
"oneOf": [ "$ref": "#/components/schemas/ScoringFnParams"
{
"$ref": "#/components/schemas/LLMAsJudgeScoringFnParams"
},
{
"$ref": "#/components/schemas/RegexParserScoringFnParams"
},
{
"$ref": "#/components/schemas/BasicScoringFnParams"
}
],
"discriminator": {
"propertyName": "type",
"mapping": {
"llm_as_judge": "#/components/schemas/LLMAsJudgeScoringFnParams",
"regex_parser": "#/components/schemas/RegexParserScoringFnParams",
"basic": "#/components/schemas/BasicScoringFnParams"
}
}
} }
}, },
"additionalProperties": false, "additionalProperties": false,
@ -7503,6 +7482,27 @@
"data" "data"
] ]
}, },
"Event": {
"oneOf": [
{
"$ref": "#/components/schemas/UnstructuredLogEvent"
},
{
"$ref": "#/components/schemas/MetricEvent"
},
{
"$ref": "#/components/schemas/StructuredLogEvent"
}
],
"discriminator": {
"propertyName": "type",
"mapping": {
"unstructured_log": "#/components/schemas/UnstructuredLogEvent",
"metric": "#/components/schemas/MetricEvent",
"structured_log": "#/components/schemas/StructuredLogEvent"
}
}
},
"LogSeverity": { "LogSeverity": {
"type": "string", "type": "string",
"enum": [ "enum": [
@ -7668,21 +7668,7 @@
"default": "structured_log" "default": "structured_log"
}, },
"payload": { "payload": {
"oneOf": [ "$ref": "#/components/schemas/StructuredLogPayload"
{
"$ref": "#/components/schemas/SpanStartPayload"
},
{
"$ref": "#/components/schemas/SpanEndPayload"
}
],
"discriminator": {
"propertyName": "type",
"mapping": {
"span_start": "#/components/schemas/SpanStartPayload",
"span_end": "#/components/schemas/SpanEndPayload"
}
}
} }
}, },
"additionalProperties": false, "additionalProperties": false,
@ -7694,6 +7680,23 @@
"payload" "payload"
] ]
}, },
"StructuredLogPayload": {
"oneOf": [
{
"$ref": "#/components/schemas/SpanStartPayload"
},
{
"$ref": "#/components/schemas/SpanEndPayload"
}
],
"discriminator": {
"propertyName": "type",
"mapping": {
"span_start": "#/components/schemas/SpanStartPayload",
"span_end": "#/components/schemas/SpanEndPayload"
}
}
},
"UnstructuredLogEvent": { "UnstructuredLogEvent": {
"type": "object", "type": "object",
"properties": { "properties": {
@ -7758,25 +7761,7 @@
"type": "object", "type": "object",
"properties": { "properties": {
"event": { "event": {
"oneOf": [ "$ref": "#/components/schemas/Event"
{
"$ref": "#/components/schemas/UnstructuredLogEvent"
},
{
"$ref": "#/components/schemas/MetricEvent"
},
{
"$ref": "#/components/schemas/StructuredLogEvent"
}
],
"discriminator": {
"propertyName": "type",
"mapping": {
"unstructured_log": "#/components/schemas/UnstructuredLogEvent",
"metric": "#/components/schemas/MetricEvent",
"structured_log": "#/components/schemas/StructuredLogEvent"
}
}
}, },
"ttl_seconds": { "ttl_seconds": {
"type": "integer" "type": "integer"
@ -8495,25 +8480,7 @@
"type": "string" "type": "string"
}, },
"params": { "params": {
"oneOf": [ "$ref": "#/components/schemas/ScoringFnParams"
{
"$ref": "#/components/schemas/LLMAsJudgeScoringFnParams"
},
{
"$ref": "#/components/schemas/RegexParserScoringFnParams"
},
{
"$ref": "#/components/schemas/BasicScoringFnParams"
}
],
"discriminator": {
"propertyName": "type",
"mapping": {
"llm_as_judge": "#/components/schemas/LLMAsJudgeScoringFnParams",
"regex_parser": "#/components/schemas/RegexParserScoringFnParams",
"basic": "#/components/schemas/BasicScoringFnParams"
}
}
} }
}, },
"additionalProperties": false, "additionalProperties": false,
@ -8639,21 +8606,7 @@
"type": "object", "type": "object",
"properties": { "properties": {
"task_config": { "task_config": {
"oneOf": [ "$ref": "#/components/schemas/EvalTaskConfig"
{
"$ref": "#/components/schemas/BenchmarkEvalTaskConfig"
},
{
"$ref": "#/components/schemas/AppEvalTaskConfig"
}
],
"discriminator": {
"propertyName": "type",
"mapping": {
"benchmark": "#/components/schemas/BenchmarkEvalTaskConfig",
"app": "#/components/schemas/AppEvalTaskConfig"
}
}
} }
}, },
"additionalProperties": false, "additionalProperties": false,
@ -8792,25 +8745,7 @@
"additionalProperties": { "additionalProperties": {
"oneOf": [ "oneOf": [
{ {
"oneOf": [ "$ref": "#/components/schemas/ScoringFnParams"
{
"$ref": "#/components/schemas/LLMAsJudgeScoringFnParams"
},
{
"$ref": "#/components/schemas/RegexParserScoringFnParams"
},
{
"$ref": "#/components/schemas/BasicScoringFnParams"
}
],
"discriminator": {
"propertyName": "type",
"mapping": {
"llm_as_judge": "#/components/schemas/LLMAsJudgeScoringFnParams",
"regex_parser": "#/components/schemas/RegexParserScoringFnParams",
"basic": "#/components/schemas/BasicScoringFnParams"
}
}
}, },
{ {
"type": "null" "type": "null"
@ -8851,25 +8786,7 @@
"additionalProperties": { "additionalProperties": {
"oneOf": [ "oneOf": [
{ {
"oneOf": [ "$ref": "#/components/schemas/ScoringFnParams"
{
"$ref": "#/components/schemas/LLMAsJudgeScoringFnParams"
},
{
"$ref": "#/components/schemas/RegexParserScoringFnParams"
},
{
"$ref": "#/components/schemas/BasicScoringFnParams"
}
],
"discriminator": {
"propertyName": "type",
"mapping": {
"llm_as_judge": "#/components/schemas/LLMAsJudgeScoringFnParams",
"regex_parser": "#/components/schemas/RegexParserScoringFnParams",
"basic": "#/components/schemas/BasicScoringFnParams"
}
}
}, },
{ {
"type": "null" "type": "null"
@ -8906,6 +8823,23 @@
"results" "results"
] ]
}, },
"AlgorithmConfig": {
"oneOf": [
{
"$ref": "#/components/schemas/LoraFinetuningConfig"
},
{
"$ref": "#/components/schemas/QATFinetuningConfig"
}
],
"discriminator": {
"propertyName": "type",
"mapping": {
"LoRA": "#/components/schemas/LoraFinetuningConfig",
"QAT": "#/components/schemas/QATFinetuningConfig"
}
}
},
"LoraFinetuningConfig": { "LoraFinetuningConfig": {
"type": "object", "type": "object",
"properties": { "properties": {
@ -9039,21 +8973,7 @@
"type": "string" "type": "string"
}, },
"algorithm_config": { "algorithm_config": {
"oneOf": [ "$ref": "#/components/schemas/AlgorithmConfig"
{
"$ref": "#/components/schemas/LoraFinetuningConfig"
},
{
"$ref": "#/components/schemas/QATFinetuningConfig"
}
],
"discriminator": {
"propertyName": "type",
"mapping": {
"LoRA": "#/components/schemas/LoraFinetuningConfig",
"QAT": "#/components/schemas/QATFinetuningConfig"
}
}
} }
}, },
"additionalProperties": false, "additionalProperties": false,
@ -9210,7 +9130,11 @@
}, },
{ {
"name": "AgentTurnResponseEvent", "name": "AgentTurnResponseEvent",
"description": "Streamed agent execution response.\n\n<SchemaDefinition schemaRef=\"#/components/schemas/AgentTurnResponseEvent\" />" "description": "<SchemaDefinition schemaRef=\"#/components/schemas/AgentTurnResponseEvent\" />"
},
{
"name": "AgentTurnResponseEventPayload",
"description": "<SchemaDefinition schemaRef=\"#/components/schemas/AgentTurnResponseEventPayload\" />"
}, },
{ {
"name": "AgentTurnResponseStepCompletePayload", "name": "AgentTurnResponseStepCompletePayload",
@ -9243,6 +9167,10 @@
"name": "AggregationFunctionType", "name": "AggregationFunctionType",
"description": "<SchemaDefinition schemaRef=\"#/components/schemas/AggregationFunctionType\" />" "description": "<SchemaDefinition schemaRef=\"#/components/schemas/AggregationFunctionType\" />"
}, },
{
"name": "AlgorithmConfig",
"description": "<SchemaDefinition schemaRef=\"#/components/schemas/AlgorithmConfig\" />"
},
{ {
"name": "AppEvalTaskConfig", "name": "AppEvalTaskConfig",
"description": "<SchemaDefinition schemaRef=\"#/components/schemas/AppEvalTaskConfig\" />" "description": "<SchemaDefinition schemaRef=\"#/components/schemas/AppEvalTaskConfig\" />"
@ -9399,10 +9327,18 @@
{ {
"name": "Eval" "name": "Eval"
}, },
{
"name": "EvalCandidate",
"description": "<SchemaDefinition schemaRef=\"#/components/schemas/EvalCandidate\" />"
},
{ {
"name": "EvalTask", "name": "EvalTask",
"description": "<SchemaDefinition schemaRef=\"#/components/schemas/EvalTask\" />" "description": "<SchemaDefinition schemaRef=\"#/components/schemas/EvalTask\" />"
}, },
{
"name": "EvalTaskConfig",
"description": "<SchemaDefinition schemaRef=\"#/components/schemas/EvalTaskConfig\" />"
},
{ {
"name": "EvalTasks" "name": "EvalTasks"
}, },
@ -9414,6 +9350,10 @@
"name": "EvaluateRowsRequest", "name": "EvaluateRowsRequest",
"description": "<SchemaDefinition schemaRef=\"#/components/schemas/EvaluateRowsRequest\" />" "description": "<SchemaDefinition schemaRef=\"#/components/schemas/EvaluateRowsRequest\" />"
}, },
{
"name": "Event",
"description": "<SchemaDefinition schemaRef=\"#/components/schemas/Event\" />"
},
{ {
"name": "GrammarResponseFormat", "name": "GrammarResponseFormat",
"description": "<SchemaDefinition schemaRef=\"#/components/schemas/GrammarResponseFormat\" />" "description": "<SchemaDefinition schemaRef=\"#/components/schemas/GrammarResponseFormat\" />"
@ -9760,6 +9700,10 @@
"name": "ScoringFn", "name": "ScoringFn",
"description": "<SchemaDefinition schemaRef=\"#/components/schemas/ScoringFn\" />" "description": "<SchemaDefinition schemaRef=\"#/components/schemas/ScoringFn\" />"
}, },
{
"name": "ScoringFnParams",
"description": "<SchemaDefinition schemaRef=\"#/components/schemas/ScoringFnParams\" />"
},
{ {
"name": "ScoringFunctions" "name": "ScoringFunctions"
}, },
@ -9814,6 +9758,10 @@
"name": "StructuredLogEvent", "name": "StructuredLogEvent",
"description": "<SchemaDefinition schemaRef=\"#/components/schemas/StructuredLogEvent\" />" "description": "<SchemaDefinition schemaRef=\"#/components/schemas/StructuredLogEvent\" />"
}, },
{
"name": "StructuredLogPayload",
"description": "<SchemaDefinition schemaRef=\"#/components/schemas/StructuredLogPayload\" />"
},
{ {
"name": "SupervisedFineTuneRequest", "name": "SupervisedFineTuneRequest",
"description": "<SchemaDefinition schemaRef=\"#/components/schemas/SupervisedFineTuneRequest\" />" "description": "<SchemaDefinition schemaRef=\"#/components/schemas/SupervisedFineTuneRequest\" />"
@ -10010,6 +9958,7 @@
"AgentTool", "AgentTool",
"AgentTurnInputType", "AgentTurnInputType",
"AgentTurnResponseEvent", "AgentTurnResponseEvent",
"AgentTurnResponseEventPayload",
"AgentTurnResponseStepCompletePayload", "AgentTurnResponseStepCompletePayload",
"AgentTurnResponseStepProgressPayload", "AgentTurnResponseStepProgressPayload",
"AgentTurnResponseStepStartPayload", "AgentTurnResponseStepStartPayload",
@ -10017,6 +9966,7 @@
"AgentTurnResponseTurnCompletePayload", "AgentTurnResponseTurnCompletePayload",
"AgentTurnResponseTurnStartPayload", "AgentTurnResponseTurnStartPayload",
"AggregationFunctionType", "AggregationFunctionType",
"AlgorithmConfig",
"AppEvalTaskConfig", "AppEvalTaskConfig",
"AppendRowsRequest", "AppendRowsRequest",
"ArrayType", "ArrayType",
@ -10053,9 +10003,12 @@
"EfficiencyConfig", "EfficiencyConfig",
"EmbeddingsRequest", "EmbeddingsRequest",
"EmbeddingsResponse", "EmbeddingsResponse",
"EvalCandidate",
"EvalTask", "EvalTask",
"EvalTaskConfig",
"EvaluateResponse", "EvaluateResponse",
"EvaluateRowsRequest", "EvaluateRowsRequest",
"Event",
"GrammarResponseFormat", "GrammarResponseFormat",
"GreedySamplingStrategy", "GreedySamplingStrategy",
"HealthInfo", "HealthInfo",
@ -10138,6 +10091,7 @@
"ScoreRequest", "ScoreRequest",
"ScoreResponse", "ScoreResponse",
"ScoringFn", "ScoringFn",
"ScoringFnParams",
"ScoringResult", "ScoringResult",
"Session", "Session",
"Shield", "Shield",
@ -10150,6 +10104,7 @@
"StopReason", "StopReason",
"StringType", "StringType",
"StructuredLogEvent", "StructuredLogEvent",
"StructuredLogPayload",
"SupervisedFineTuneRequest", "SupervisedFineTuneRequest",
"SyntheticDataGenerateRequest", "SyntheticDataGenerateRequest",
"SyntheticDataGenerationResponse", "SyntheticDataGenerationResponse",

240
docs/resources/llama-stack-spec.yaml
View file

@ -125,24 +125,25 @@ components:
additionalProperties: false additionalProperties: false
properties: properties:
payload: payload:
discriminator: $ref: '#/components/schemas/AgentTurnResponseEventPayload'
mapping:
step_complete: '#/components/schemas/AgentTurnResponseStepCompletePayload'
step_progress: '#/components/schemas/AgentTurnResponseStepProgressPayload'
step_start: '#/components/schemas/AgentTurnResponseStepStartPayload'
turn_complete: '#/components/schemas/AgentTurnResponseTurnCompletePayload'
turn_start: '#/components/schemas/AgentTurnResponseTurnStartPayload'
propertyName: event_type
oneOf:
- $ref: '#/components/schemas/AgentTurnResponseStepStartPayload'
- $ref: '#/components/schemas/AgentTurnResponseStepProgressPayload'
- $ref: '#/components/schemas/AgentTurnResponseStepCompletePayload'
- $ref: '#/components/schemas/AgentTurnResponseTurnStartPayload'
- $ref: '#/components/schemas/AgentTurnResponseTurnCompletePayload'
required: required:
- payload - payload
title: Streamed agent execution response.
type: object type: object
AgentTurnResponseEventPayload:
discriminator:
mapping:
step_complete: '#/components/schemas/AgentTurnResponseStepCompletePayload'
step_progress: '#/components/schemas/AgentTurnResponseStepProgressPayload'
step_start: '#/components/schemas/AgentTurnResponseStepStartPayload'
turn_complete: '#/components/schemas/AgentTurnResponseTurnCompletePayload'
turn_start: '#/components/schemas/AgentTurnResponseTurnStartPayload'
propertyName: event_type
oneOf:
- $ref: '#/components/schemas/AgentTurnResponseStepStartPayload'
- $ref: '#/components/schemas/AgentTurnResponseStepProgressPayload'
- $ref: '#/components/schemas/AgentTurnResponseStepCompletePayload'
- $ref: '#/components/schemas/AgentTurnResponseTurnStartPayload'
- $ref: '#/components/schemas/AgentTurnResponseTurnCompletePayload'
AgentTurnResponseStepCompletePayload: AgentTurnResponseStepCompletePayload:
additionalProperties: false additionalProperties: false
properties: properties:
@ -275,32 +276,25 @@ components:
- categorical_count - categorical_count
- accuracy - accuracy
type: string type: string
AlgorithmConfig:
discriminator:
mapping:
LoRA: '#/components/schemas/LoraFinetuningConfig'
QAT: '#/components/schemas/QATFinetuningConfig'
propertyName: type
oneOf:
- $ref: '#/components/schemas/LoraFinetuningConfig'
- $ref: '#/components/schemas/QATFinetuningConfig'
AppEvalTaskConfig: AppEvalTaskConfig:
additionalProperties: false additionalProperties: false
properties: properties:
eval_candidate: eval_candidate:
discriminator: $ref: '#/components/schemas/EvalCandidate'
mapping:
agent: '#/components/schemas/AgentCandidate'
model: '#/components/schemas/ModelCandidate'
propertyName: type
oneOf:
- $ref: '#/components/schemas/ModelCandidate'
- $ref: '#/components/schemas/AgentCandidate'
num_examples: num_examples:
type: integer type: integer
scoring_params: scoring_params:
additionalProperties: additionalProperties:
discriminator: $ref: '#/components/schemas/ScoringFnParams'
mapping:
basic: '#/components/schemas/BasicScoringFnParams'
llm_as_judge: '#/components/schemas/LLMAsJudgeScoringFnParams'
regex_parser: '#/components/schemas/RegexParserScoringFnParams'
propertyName: type
oneOf:
- $ref: '#/components/schemas/LLMAsJudgeScoringFnParams'
- $ref: '#/components/schemas/RegexParserScoringFnParams'
- $ref: '#/components/schemas/BasicScoringFnParams'
type: object type: object
type: type:
const: app const: app
@ -434,14 +428,7 @@ components:
additionalProperties: false additionalProperties: false
properties: properties:
eval_candidate: eval_candidate:
discriminator: $ref: '#/components/schemas/EvalCandidate'
mapping:
agent: '#/components/schemas/AgentCandidate'
model: '#/components/schemas/ModelCandidate'
propertyName: type
oneOf:
- $ref: '#/components/schemas/ModelCandidate'
- $ref: '#/components/schemas/AgentCandidate'
num_examples: num_examples:
type: integer type: integer
type: type:
@ -859,6 +846,15 @@ components:
required: required:
- embeddings - embeddings
type: object type: object
EvalCandidate:
discriminator:
mapping:
agent: '#/components/schemas/AgentCandidate'
model: '#/components/schemas/ModelCandidate'
propertyName: type
oneOf:
- $ref: '#/components/schemas/ModelCandidate'
- $ref: '#/components/schemas/AgentCandidate'
EvalTask: EvalTask:
additionalProperties: false additionalProperties: false
properties: properties:
@ -897,6 +893,15 @@ components:
- scoring_functions - scoring_functions
- metadata - metadata
type: object type: object
EvalTaskConfig:
discriminator:
mapping:
app: '#/components/schemas/AppEvalTaskConfig'
benchmark: '#/components/schemas/BenchmarkEvalTaskConfig'
propertyName: type
oneOf:
- $ref: '#/components/schemas/BenchmarkEvalTaskConfig'
- $ref: '#/components/schemas/AppEvalTaskConfig'
EvaluateResponse: EvaluateResponse:
additionalProperties: false additionalProperties: false
properties: properties:
@ -940,19 +945,23 @@ components:
type: string type: string
type: array type: array
task_config: task_config:
discriminator: $ref: '#/components/schemas/EvalTaskConfig'
mapping:
app: '#/components/schemas/AppEvalTaskConfig'
benchmark: '#/components/schemas/BenchmarkEvalTaskConfig'
propertyName: type
oneOf:
- $ref: '#/components/schemas/BenchmarkEvalTaskConfig'
- $ref: '#/components/schemas/AppEvalTaskConfig'
required: required:
- input_rows - input_rows
- scoring_functions - scoring_functions
- task_config - task_config
type: object type: object
Event:
discriminator:
mapping:
metric: '#/components/schemas/MetricEvent'
structured_log: '#/components/schemas/StructuredLogEvent'
unstructured_log: '#/components/schemas/UnstructuredLogEvent'
propertyName: type
oneOf:
- $ref: '#/components/schemas/UnstructuredLogEvent'
- $ref: '#/components/schemas/MetricEvent'
- $ref: '#/components/schemas/StructuredLogEvent'
GrammarResponseFormat: GrammarResponseFormat:
additionalProperties: false additionalProperties: false
properties: properties:
@ -1339,16 +1348,7 @@ components:
additionalProperties: false additionalProperties: false
properties: properties:
event: event:
discriminator: $ref: '#/components/schemas/Event'
mapping:
metric: '#/components/schemas/MetricEvent'
structured_log: '#/components/schemas/StructuredLogEvent'
unstructured_log: '#/components/schemas/UnstructuredLogEvent'
propertyName: type
oneOf:
- $ref: '#/components/schemas/UnstructuredLogEvent'
- $ref: '#/components/schemas/MetricEvent'
- $ref: '#/components/schemas/StructuredLogEvent'
ttl_seconds: ttl_seconds:
type: integer type: integer
required: required:
@ -2048,16 +2048,7 @@ components:
description: description:
type: string type: string
params: params:
discriminator: $ref: '#/components/schemas/ScoringFnParams'
mapping:
basic: '#/components/schemas/BasicScoringFnParams'
llm_as_judge: '#/components/schemas/LLMAsJudgeScoringFnParams'
regex_parser: '#/components/schemas/RegexParserScoringFnParams'
propertyName: type
oneOf:
- $ref: '#/components/schemas/LLMAsJudgeScoringFnParams'
- $ref: '#/components/schemas/RegexParserScoringFnParams'
- $ref: '#/components/schemas/BasicScoringFnParams'
provider_id: provider_id:
type: string type: string
provider_scoring_fn_id: provider_scoring_fn_id:
@ -2162,14 +2153,7 @@ components:
additionalProperties: false additionalProperties: false
properties: properties:
task_config: task_config:
discriminator: $ref: '#/components/schemas/EvalTaskConfig'
mapping:
app: '#/components/schemas/AppEvalTaskConfig'
benchmark: '#/components/schemas/BenchmarkEvalTaskConfig'
propertyName: type
oneOf:
- $ref: '#/components/schemas/BenchmarkEvalTaskConfig'
- $ref: '#/components/schemas/AppEvalTaskConfig'
required: required:
- task_config - task_config
type: object type: object
@ -2277,16 +2261,7 @@ components:
scoring_functions: scoring_functions:
additionalProperties: additionalProperties:
oneOf: oneOf:
- discriminator: - $ref: '#/components/schemas/ScoringFnParams'
mapping:
basic: '#/components/schemas/BasicScoringFnParams'
llm_as_judge: '#/components/schemas/LLMAsJudgeScoringFnParams'
regex_parser: '#/components/schemas/RegexParserScoringFnParams'
propertyName: type
oneOf:
- $ref: '#/components/schemas/LLMAsJudgeScoringFnParams'
- $ref: '#/components/schemas/RegexParserScoringFnParams'
- $ref: '#/components/schemas/BasicScoringFnParams'
- type: 'null' - type: 'null'
type: object type: object
required: required:
@ -2324,16 +2299,7 @@ components:
scoring_functions: scoring_functions:
additionalProperties: additionalProperties:
oneOf: oneOf:
- discriminator: - $ref: '#/components/schemas/ScoringFnParams'
mapping:
basic: '#/components/schemas/BasicScoringFnParams'
llm_as_judge: '#/components/schemas/LLMAsJudgeScoringFnParams'
regex_parser: '#/components/schemas/RegexParserScoringFnParams'
propertyName: type
oneOf:
- $ref: '#/components/schemas/LLMAsJudgeScoringFnParams'
- $ref: '#/components/schemas/RegexParserScoringFnParams'
- $ref: '#/components/schemas/BasicScoringFnParams'
- type: 'null' - type: 'null'
type: object type: object
required: required:
@ -2368,16 +2334,7 @@ components:
- type: object - type: object
type: object type: object
params: params:
discriminator: $ref: '#/components/schemas/ScoringFnParams'
mapping:
basic: '#/components/schemas/BasicScoringFnParams'
llm_as_judge: '#/components/schemas/LLMAsJudgeScoringFnParams'
regex_parser: '#/components/schemas/RegexParserScoringFnParams'
propertyName: type
oneOf:
- $ref: '#/components/schemas/LLMAsJudgeScoringFnParams'
- $ref: '#/components/schemas/RegexParserScoringFnParams'
- $ref: '#/components/schemas/BasicScoringFnParams'
provider_id: provider_id:
type: string type: string
provider_resource_id: provider_resource_id:
@ -2396,6 +2353,17 @@ components:
- metadata - metadata
- return_type - return_type
type: object type: object
ScoringFnParams:
discriminator:
mapping:
basic: '#/components/schemas/BasicScoringFnParams'
llm_as_judge: '#/components/schemas/LLMAsJudgeScoringFnParams'
regex_parser: '#/components/schemas/RegexParserScoringFnParams'
propertyName: type
oneOf:
- $ref: '#/components/schemas/LLMAsJudgeScoringFnParams'
- $ref: '#/components/schemas/RegexParserScoringFnParams'
- $ref: '#/components/schemas/BasicScoringFnParams'
ScoringResult: ScoringResult:
additionalProperties: false additionalProperties: false
properties: properties:
@ -2631,14 +2599,7 @@ components:
- type: object - type: object
type: object type: object
payload: payload:
discriminator: $ref: '#/components/schemas/StructuredLogPayload'
mapping:
span_end: '#/components/schemas/SpanEndPayload'
span_start: '#/components/schemas/SpanStartPayload'
propertyName: type
oneOf:
- $ref: '#/components/schemas/SpanStartPayload'
- $ref: '#/components/schemas/SpanEndPayload'
span_id: span_id:
type: string type: string
timestamp: timestamp:
@ -2657,18 +2618,20 @@ components:
- type - type
- payload - payload
type: object type: object
StructuredLogPayload:
discriminator:
mapping:
span_end: '#/components/schemas/SpanEndPayload'
span_start: '#/components/schemas/SpanStartPayload'
propertyName: type
oneOf:
- $ref: '#/components/schemas/SpanStartPayload'
- $ref: '#/components/schemas/SpanEndPayload'
SupervisedFineTuneRequest: SupervisedFineTuneRequest:
additionalProperties: false additionalProperties: false
properties: properties:
algorithm_config: algorithm_config:
discriminator: $ref: '#/components/schemas/AlgorithmConfig'
mapping:
LoRA: '#/components/schemas/LoraFinetuningConfig'
QAT: '#/components/schemas/QATFinetuningConfig'
propertyName: type
oneOf:
- $ref: '#/components/schemas/LoraFinetuningConfig'
- $ref: '#/components/schemas/QATFinetuningConfig'
checkpoint_dir: checkpoint_dir:
type: string type: string
hyperparam_search_config: hyperparam_search_config:
@ -5786,11 +5749,12 @@ tags:
- description: <SchemaDefinition schemaRef="#/components/schemas/AgentTurnInputType" - description: <SchemaDefinition schemaRef="#/components/schemas/AgentTurnInputType"
/> />
name: AgentTurnInputType name: AgentTurnInputType
- description: 'Streamed agent execution response. - description: <SchemaDefinition schemaRef="#/components/schemas/AgentTurnResponseEvent"
/>
<SchemaDefinition schemaRef="#/components/schemas/AgentTurnResponseEvent" />'
name: AgentTurnResponseEvent name: AgentTurnResponseEvent
- description: <SchemaDefinition schemaRef="#/components/schemas/AgentTurnResponseEventPayload"
/>
name: AgentTurnResponseEventPayload
- description: <SchemaDefinition schemaRef="#/components/schemas/AgentTurnResponseStepCompletePayload" - description: <SchemaDefinition schemaRef="#/components/schemas/AgentTurnResponseStepCompletePayload"
/> />
name: AgentTurnResponseStepCompletePayload name: AgentTurnResponseStepCompletePayload
@ -5816,6 +5780,9 @@ tags:
- description: <SchemaDefinition schemaRef="#/components/schemas/AggregationFunctionType" - description: <SchemaDefinition schemaRef="#/components/schemas/AggregationFunctionType"
/> />
name: AggregationFunctionType name: AggregationFunctionType
- description: <SchemaDefinition schemaRef="#/components/schemas/AlgorithmConfig"
/>
name: AlgorithmConfig
- description: <SchemaDefinition schemaRef="#/components/schemas/AppEvalTaskConfig" - description: <SchemaDefinition schemaRef="#/components/schemas/AppEvalTaskConfig"
/> />
name: AppEvalTaskConfig name: AppEvalTaskConfig
@ -5936,8 +5903,12 @@ tags:
/> />
name: EmbeddingsResponse name: EmbeddingsResponse
- name: Eval - name: Eval
- description: <SchemaDefinition schemaRef="#/components/schemas/EvalCandidate" />
name: EvalCandidate
- description: <SchemaDefinition schemaRef="#/components/schemas/EvalTask" /> - description: <SchemaDefinition schemaRef="#/components/schemas/EvalTask" />
name: EvalTask name: EvalTask
- description: <SchemaDefinition schemaRef="#/components/schemas/EvalTaskConfig" />
name: EvalTaskConfig
- name: EvalTasks - name: EvalTasks
- description: <SchemaDefinition schemaRef="#/components/schemas/EvaluateResponse" - description: <SchemaDefinition schemaRef="#/components/schemas/EvaluateResponse"
/> />
@ -5945,6 +5916,8 @@ tags:
- description: <SchemaDefinition schemaRef="#/components/schemas/EvaluateRowsRequest" - description: <SchemaDefinition schemaRef="#/components/schemas/EvaluateRowsRequest"
/> />
name: EvaluateRowsRequest name: EvaluateRowsRequest
- description: <SchemaDefinition schemaRef="#/components/schemas/Event" />
name: Event
- description: <SchemaDefinition schemaRef="#/components/schemas/GrammarResponseFormat" - description: <SchemaDefinition schemaRef="#/components/schemas/GrammarResponseFormat"
/> />
name: GrammarResponseFormat name: GrammarResponseFormat
@ -6173,6 +6146,9 @@ tags:
- name: Scoring - name: Scoring
- description: <SchemaDefinition schemaRef="#/components/schemas/ScoringFn" /> - description: <SchemaDefinition schemaRef="#/components/schemas/ScoringFn" />
name: ScoringFn name: ScoringFn
- description: <SchemaDefinition schemaRef="#/components/schemas/ScoringFnParams"
/>
name: ScoringFnParams
- name: ScoringFunctions - name: ScoringFunctions
- description: <SchemaDefinition schemaRef="#/components/schemas/ScoringResult" /> - description: <SchemaDefinition schemaRef="#/components/schemas/ScoringResult" />
name: ScoringResult name: ScoringResult
@ -6207,6 +6183,9 @@ tags:
- description: <SchemaDefinition schemaRef="#/components/schemas/StructuredLogEvent" - description: <SchemaDefinition schemaRef="#/components/schemas/StructuredLogEvent"
/> />
name: StructuredLogEvent name: StructuredLogEvent
- description: <SchemaDefinition schemaRef="#/components/schemas/StructuredLogPayload"
/>
name: StructuredLogPayload
- description: <SchemaDefinition schemaRef="#/components/schemas/SupervisedFineTuneRequest" - description: <SchemaDefinition schemaRef="#/components/schemas/SupervisedFineTuneRequest"
/> />
name: SupervisedFineTuneRequest name: SupervisedFineTuneRequest
@ -6344,6 +6323,7 @@ x-tagGroups:
- AgentTool - AgentTool
- AgentTurnInputType - AgentTurnInputType
- AgentTurnResponseEvent - AgentTurnResponseEvent
- AgentTurnResponseEventPayload
- AgentTurnResponseStepCompletePayload - AgentTurnResponseStepCompletePayload
- AgentTurnResponseStepProgressPayload - AgentTurnResponseStepProgressPayload
- AgentTurnResponseStepStartPayload - AgentTurnResponseStepStartPayload
@ -6351,6 +6331,7 @@ x-tagGroups:
- AgentTurnResponseTurnCompletePayload - AgentTurnResponseTurnCompletePayload
- AgentTurnResponseTurnStartPayload - AgentTurnResponseTurnStartPayload
- AggregationFunctionType - AggregationFunctionType
- AlgorithmConfig
- AppEvalTaskConfig - AppEvalTaskConfig
- AppendRowsRequest - AppendRowsRequest
- ArrayType - ArrayType
@ -6387,9 +6368,12 @@ x-tagGroups:
- EfficiencyConfig - EfficiencyConfig
- EmbeddingsRequest - EmbeddingsRequest
- EmbeddingsResponse - EmbeddingsResponse
- EvalCandidate
- EvalTask - EvalTask
- EvalTaskConfig
- EvaluateResponse - EvaluateResponse
- EvaluateRowsRequest - EvaluateRowsRequest
- Event
- GrammarResponseFormat - GrammarResponseFormat
- GreedySamplingStrategy - GreedySamplingStrategy
- HealthInfo - HealthInfo
@ -6472,6 +6456,7 @@ x-tagGroups:
- ScoreRequest - ScoreRequest
- ScoreResponse - ScoreResponse
- ScoringFn - ScoringFn
- ScoringFnParams
- ScoringResult - ScoringResult
- Session - Session
- Shield - Shield
@ -6484,6 +6469,7 @@ x-tagGroups:
- StopReason - StopReason
- StringType - StringType
- StructuredLogEvent - StructuredLogEvent
- StructuredLogPayload
- SupervisedFineTuneRequest - SupervisedFineTuneRequest
- SyntheticDataGenerateRequest - SyntheticDataGenerateRequest
- SyntheticDataGenerationResponse - SyntheticDataGenerationResponse

16
llama_stack/apis/agents/agents.py
View file

@ -229,11 +229,8 @@ class AgentTurnResponseTurnCompletePayload(BaseModel):
turn: Turn turn: Turn
@json_schema_type AgentTurnResponseEventPayload = register_schema(
class AgentTurnResponseEvent(BaseModel): Annotated[
"""Streamed agent execution response."""
payload: Annotated[
Union[ Union[
AgentTurnResponseStepStartPayload, AgentTurnResponseStepStartPayload,
AgentTurnResponseStepProgressPayload, AgentTurnResponseStepProgressPayload,
@ -242,7 +239,14 @@ class AgentTurnResponseEvent(BaseModel):
AgentTurnResponseTurnCompletePayload, AgentTurnResponseTurnCompletePayload,
], ],
Field(discriminator="event_type"), Field(discriminator="event_type"),
] ],
name="AgentTurnResponseEventPayload",
)
@json_schema_type
class AgentTurnResponseEvent(BaseModel):
payload: AgentTurnResponseEventPayload
@json_schema_type @json_schema_type

18
llama_stack/apis/eval/eval.py
View file

@ -6,7 +6,7 @@
from typing import Any, Dict, List, Literal, Optional, Protocol, Union from typing import Any, Dict, List, Literal, Optional, Protocol, Union
from llama_models.schema_utils import json_schema_type, webmethod from llama_models.schema_utils import json_schema_type, register_schema, webmethod
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from typing_extensions import Annotated from typing_extensions import Annotated
@ -31,9 +31,10 @@ class AgentCandidate(BaseModel):
config: AgentConfig config: AgentConfig
EvalCandidate = Annotated[ EvalCandidate = register_schema(
Union[ModelCandidate, AgentCandidate], Field(discriminator="type") Annotated[Union[ModelCandidate, AgentCandidate], Field(discriminator="type")],
] name="EvalCandidate",
)
@json_schema_type @json_schema_type
@ -61,9 +62,12 @@ class AppEvalTaskConfig(BaseModel):
# we could optinally add any specific dataset config here # we could optinally add any specific dataset config here
EvalTaskConfig = Annotated[ EvalTaskConfig = register_schema(
Union[BenchmarkEvalTaskConfig, AppEvalTaskConfig], Field(discriminator="type") Annotated[
] Union[BenchmarkEvalTaskConfig, AppEvalTaskConfig], Field(discriminator="type")
],
name="EvalTaskConfig",
)
@json_schema_type @json_schema_type

11
llama_stack/apis/post_training/post_training.py
View file

@ -8,7 +8,7 @@ from datetime import datetime
from enum import Enum from enum import Enum
from typing import Any, Dict, List, Literal, Optional, Protocol, Union from typing import Any, Dict, List, Literal, Optional, Protocol, Union
from llama_models.schema_utils import json_schema_type, webmethod from llama_models.schema_utils import json_schema_type, register_schema, webmethod
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from typing_extensions import Annotated from typing_extensions import Annotated
@ -88,9 +88,12 @@ class QATFinetuningConfig(BaseModel):
group_size: int group_size: int
AlgorithmConfig = Annotated[ AlgorithmConfig = register_schema(
Union[LoraFinetuningConfig, QATFinetuningConfig], Field(discriminator="type") Annotated[
] Union[LoraFinetuningConfig, QATFinetuningConfig], Field(discriminator="type")
],
name="AlgorithmConfig",
)
@json_schema_type @json_schema_type

19
llama_stack/apis/scoring_functions/scoring_functions.py
View file

@ -16,7 +16,7 @@ from typing import (
Union, Union,
) )
from llama_models.schema_utils import json_schema_type, webmethod from llama_models.schema_utils import json_schema_type, register_schema, webmethod
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from typing_extensions import Annotated from typing_extensions import Annotated
@ -82,14 +82,17 @@ class BasicScoringFnParams(BaseModel):
) )
ScoringFnParams = Annotated[ ScoringFnParams = register_schema(
Union[ Annotated[
LLMAsJudgeScoringFnParams, Union[
RegexParserScoringFnParams, LLMAsJudgeScoringFnParams,
BasicScoringFnParams, RegexParserScoringFnParams,
BasicScoringFnParams,
],
Field(discriminator="type"),
], ],
Field(discriminator="type"), name="ScoringFnParams",
] )
class CommonScoringFnFields(BaseModel): class CommonScoringFnFields(BaseModel):

34
llama_stack/apis/telemetry/telemetry.py
View file

@ -17,7 +17,7 @@ from typing import (
Union, Union,
) )
from llama_models.schema_utils import json_schema_type, webmethod from llama_models.schema_utils import json_schema_type, register_schema, webmethod
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from typing_extensions import Annotated from typing_extensions import Annotated
@ -115,13 +115,16 @@ class SpanEndPayload(BaseModel):
status: SpanStatus status: SpanStatus
StructuredLogPayload = Annotated[ StructuredLogPayload = register_schema(
Union[ Annotated[
SpanStartPayload, Union[
SpanEndPayload, SpanStartPayload,
SpanEndPayload,
],
Field(discriminator="type"),
], ],
Field(discriminator="type"), name="StructuredLogPayload",
] )
@json_schema_type @json_schema_type
@ -130,14 +133,17 @@ class StructuredLogEvent(EventCommon):
payload: StructuredLogPayload payload: StructuredLogPayload
Event = Annotated[ Event = register_schema(
Union[ Annotated[
UnstructuredLogEvent, Union[
MetricEvent, UnstructuredLogEvent,
StructuredLogEvent, MetricEvent,
StructuredLogEvent,
],
Field(discriminator="type"),
], ],
Field(discriminator="type"), name="Event",
] )
@json_schema_type @json_schema_type