diff --git a/docs/resources/llama-stack-spec.html b/docs/resources/llama-stack-spec.html index c8c5ebae8..7108ee9a5 100644 --- a/docs/resources/llama-stack-spec.html +++ b/docs/resources/llama-stack-spec.html @@ -5047,40 +5047,42 @@ "type": "object", "properties": { "payload": { - "oneOf": [ - { - "$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" - } - } + "$ref": "#/components/schemas/AgentTurnResponseEventPayload" } }, "additionalProperties": false, "required": [ "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": { "type": "object", @@ -5677,44 +5679,12 @@ "default": "app" }, "eval_candidate": { - "oneOf": [ - { - "$ref": "#/components/schemas/ModelCandidate" - }, - { - "$ref": "#/components/schemas/AgentCandidate" - } - ], - "discriminator": { - "propertyName": "type", - "mapping": { - "model": "#/components/schemas/ModelCandidate", - "agent": "#/components/schemas/AgentCandidate" - } - } + "$ref": "#/components/schemas/EvalCandidate" }, "scoring_params": { "type": "object", "additionalProperties": { - "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" - } - } + "$ref": "#/components/schemas/ScoringFnParams" } }, "num_examples": { @@ -5757,21 +5727,7 @@ "default": "benchmark" }, "eval_candidate": { - "oneOf": [ - { - "$ref": "#/components/schemas/ModelCandidate" - }, - { - "$ref": "#/components/schemas/AgentCandidate" - } - ], - "discriminator": { - "propertyName": "type", - "mapping": { - "model": "#/components/schemas/ModelCandidate", - "agent": "#/components/schemas/AgentCandidate" - } - } + "$ref": "#/components/schemas/EvalCandidate" }, "num_examples": { "type": "integer" @@ -5783,6 +5739,40 @@ "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": { "type": "object", "properties": { @@ -5867,6 +5857,27 @@ "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": { "type": "object", "properties": { @@ -5905,21 +5916,7 @@ } }, "task_config": { - "oneOf": [ - { - "$ref": "#/components/schemas/BenchmarkEvalTaskConfig" - }, - { - "$ref": "#/components/schemas/AppEvalTaskConfig" - } - ], - "discriminator": { - "propertyName": "type", - "mapping": { - "benchmark": "#/components/schemas/BenchmarkEvalTaskConfig", - "app": "#/components/schemas/AppEvalTaskConfig" - } - } + "$ref": "#/components/schemas/EvalTaskConfig" } }, "additionalProperties": false, @@ -6571,25 +6568,7 @@ "$ref": "#/components/schemas/ParamType" }, "params": { - "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" - } - } + "$ref": "#/components/schemas/ScoringFnParams" } }, "additionalProperties": false, @@ -7503,6 +7482,27 @@ "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": { "type": "string", "enum": [ @@ -7668,21 +7668,7 @@ "default": "structured_log" }, "payload": { - "oneOf": [ - { - "$ref": "#/components/schemas/SpanStartPayload" - }, - { - "$ref": "#/components/schemas/SpanEndPayload" - } - ], - "discriminator": { - "propertyName": "type", - "mapping": { - "span_start": "#/components/schemas/SpanStartPayload", - "span_end": "#/components/schemas/SpanEndPayload" - } - } + "$ref": "#/components/schemas/StructuredLogPayload" } }, "additionalProperties": false, @@ -7694,6 +7680,23 @@ "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": { "type": "object", "properties": { @@ -7758,25 +7761,7 @@ "type": "object", "properties": { "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" - } - } + "$ref": "#/components/schemas/Event" }, "ttl_seconds": { "type": "integer" @@ -8495,25 +8480,7 @@ "type": "string" }, "params": { - "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" - } - } + "$ref": "#/components/schemas/ScoringFnParams" } }, "additionalProperties": false, @@ -8639,21 +8606,7 @@ "type": "object", "properties": { "task_config": { - "oneOf": [ - { - "$ref": "#/components/schemas/BenchmarkEvalTaskConfig" - }, - { - "$ref": "#/components/schemas/AppEvalTaskConfig" - } - ], - "discriminator": { - "propertyName": "type", - "mapping": { - "benchmark": "#/components/schemas/BenchmarkEvalTaskConfig", - "app": "#/components/schemas/AppEvalTaskConfig" - } - } + "$ref": "#/components/schemas/EvalTaskConfig" } }, "additionalProperties": false, @@ -8792,25 +8745,7 @@ "additionalProperties": { "oneOf": [ { - "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" - } - } + "$ref": "#/components/schemas/ScoringFnParams" }, { "type": "null" @@ -8851,25 +8786,7 @@ "additionalProperties": { "oneOf": [ { - "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" - } - } + "$ref": "#/components/schemas/ScoringFnParams" }, { "type": "null" @@ -8906,6 +8823,23 @@ "results" ] }, + "AlgorithmConfig": { + "oneOf": [ + { + "$ref": "#/components/schemas/LoraFinetuningConfig" + }, + { + "$ref": "#/components/schemas/QATFinetuningConfig" + } + ], + "discriminator": { + "propertyName": "type", + "mapping": { + "LoRA": "#/components/schemas/LoraFinetuningConfig", + "QAT": "#/components/schemas/QATFinetuningConfig" + } + } + }, "LoraFinetuningConfig": { "type": "object", "properties": { @@ -9039,21 +8973,7 @@ "type": "string" }, "algorithm_config": { - "oneOf": [ - { - "$ref": "#/components/schemas/LoraFinetuningConfig" - }, - { - "$ref": "#/components/schemas/QATFinetuningConfig" - } - ], - "discriminator": { - "propertyName": "type", - "mapping": { - "LoRA": "#/components/schemas/LoraFinetuningConfig", - "QAT": "#/components/schemas/QATFinetuningConfig" - } - } + "$ref": "#/components/schemas/AlgorithmConfig" } }, "additionalProperties": false, @@ -9210,7 +9130,11 @@ }, { "name": "AgentTurnResponseEvent", - "description": "Streamed agent execution response.\n\n" + "description": "" + }, + { + "name": "AgentTurnResponseEventPayload", + "description": "" }, { "name": "AgentTurnResponseStepCompletePayload", @@ -9243,6 +9167,10 @@ "name": "AggregationFunctionType", "description": "" }, + { + "name": "AlgorithmConfig", + "description": "" + }, { "name": "AppEvalTaskConfig", "description": "" @@ -9399,10 +9327,18 @@ { "name": "Eval" }, + { + "name": "EvalCandidate", + "description": "" + }, { "name": "EvalTask", "description": "" }, + { + "name": "EvalTaskConfig", + "description": "" + }, { "name": "EvalTasks" }, @@ -9414,6 +9350,10 @@ "name": "EvaluateRowsRequest", "description": "" }, + { + "name": "Event", + "description": "" + }, { "name": "GrammarResponseFormat", "description": "" @@ -9760,6 +9700,10 @@ "name": "ScoringFn", "description": "" }, + { + "name": "ScoringFnParams", + "description": "" + }, { "name": "ScoringFunctions" }, @@ -9814,6 +9758,10 @@ "name": "StructuredLogEvent", "description": "" }, + { + "name": "StructuredLogPayload", + "description": "" + }, { "name": "SupervisedFineTuneRequest", "description": "" @@ -10010,6 +9958,7 @@ "AgentTool", "AgentTurnInputType", "AgentTurnResponseEvent", + "AgentTurnResponseEventPayload", "AgentTurnResponseStepCompletePayload", "AgentTurnResponseStepProgressPayload", "AgentTurnResponseStepStartPayload", @@ -10017,6 +9966,7 @@ "AgentTurnResponseTurnCompletePayload", "AgentTurnResponseTurnStartPayload", "AggregationFunctionType", + "AlgorithmConfig", "AppEvalTaskConfig", "AppendRowsRequest", "ArrayType", @@ -10053,9 +10003,12 @@ "EfficiencyConfig", "EmbeddingsRequest", "EmbeddingsResponse", + "EvalCandidate", "EvalTask", + "EvalTaskConfig", "EvaluateResponse", "EvaluateRowsRequest", + "Event", "GrammarResponseFormat", "GreedySamplingStrategy", "HealthInfo", @@ -10138,6 +10091,7 @@ "ScoreRequest", "ScoreResponse", "ScoringFn", + "ScoringFnParams", "ScoringResult", "Session", "Shield", @@ -10150,6 +10104,7 @@ "StopReason", "StringType", "StructuredLogEvent", + "StructuredLogPayload", "SupervisedFineTuneRequest", "SyntheticDataGenerateRequest", "SyntheticDataGenerationResponse", diff --git a/docs/resources/llama-stack-spec.yaml b/docs/resources/llama-stack-spec.yaml index b53a02c46..a7095716c 100644 --- a/docs/resources/llama-stack-spec.yaml +++ b/docs/resources/llama-stack-spec.yaml @@ -125,24 +125,25 @@ components: additionalProperties: false properties: payload: - 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' + $ref: '#/components/schemas/AgentTurnResponseEventPayload' required: - payload - title: Streamed agent execution response. 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: additionalProperties: false properties: @@ -275,32 +276,25 @@ components: - categorical_count - accuracy 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: additionalProperties: false properties: eval_candidate: - discriminator: - mapping: - agent: '#/components/schemas/AgentCandidate' - model: '#/components/schemas/ModelCandidate' - propertyName: type - oneOf: - - $ref: '#/components/schemas/ModelCandidate' - - $ref: '#/components/schemas/AgentCandidate' + $ref: '#/components/schemas/EvalCandidate' num_examples: type: integer scoring_params: additionalProperties: - 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' + $ref: '#/components/schemas/ScoringFnParams' type: object type: const: app @@ -434,14 +428,7 @@ components: additionalProperties: false properties: eval_candidate: - discriminator: - mapping: - agent: '#/components/schemas/AgentCandidate' - model: '#/components/schemas/ModelCandidate' - propertyName: type - oneOf: - - $ref: '#/components/schemas/ModelCandidate' - - $ref: '#/components/schemas/AgentCandidate' + $ref: '#/components/schemas/EvalCandidate' num_examples: type: integer type: @@ -859,6 +846,15 @@ components: required: - embeddings 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: additionalProperties: false properties: @@ -897,6 +893,15 @@ components: - scoring_functions - metadata 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: additionalProperties: false properties: @@ -940,19 +945,23 @@ components: type: string type: array task_config: - discriminator: - mapping: - app: '#/components/schemas/AppEvalTaskConfig' - benchmark: '#/components/schemas/BenchmarkEvalTaskConfig' - propertyName: type - oneOf: - - $ref: '#/components/schemas/BenchmarkEvalTaskConfig' - - $ref: '#/components/schemas/AppEvalTaskConfig' + $ref: '#/components/schemas/EvalTaskConfig' required: - input_rows - scoring_functions - task_config 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: additionalProperties: false properties: @@ -1339,16 +1348,7 @@ components: additionalProperties: false properties: 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' + $ref: '#/components/schemas/Event' ttl_seconds: type: integer required: @@ -2048,16 +2048,7 @@ components: description: type: string params: - 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' + $ref: '#/components/schemas/ScoringFnParams' provider_id: type: string provider_scoring_fn_id: @@ -2162,14 +2153,7 @@ components: additionalProperties: false properties: task_config: - discriminator: - mapping: - app: '#/components/schemas/AppEvalTaskConfig' - benchmark: '#/components/schemas/BenchmarkEvalTaskConfig' - propertyName: type - oneOf: - - $ref: '#/components/schemas/BenchmarkEvalTaskConfig' - - $ref: '#/components/schemas/AppEvalTaskConfig' + $ref: '#/components/schemas/EvalTaskConfig' required: - task_config type: object @@ -2277,16 +2261,7 @@ components: scoring_functions: additionalProperties: oneOf: - - 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' + - $ref: '#/components/schemas/ScoringFnParams' - type: 'null' type: object required: @@ -2324,16 +2299,7 @@ components: scoring_functions: additionalProperties: oneOf: - - 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' + - $ref: '#/components/schemas/ScoringFnParams' - type: 'null' type: object required: @@ -2368,16 +2334,7 @@ components: - type: object type: object params: - 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' + $ref: '#/components/schemas/ScoringFnParams' provider_id: type: string provider_resource_id: @@ -2396,6 +2353,17 @@ components: - metadata - return_type 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: additionalProperties: false properties: @@ -2631,14 +2599,7 @@ components: - type: object type: object payload: - discriminator: - mapping: - span_end: '#/components/schemas/SpanEndPayload' - span_start: '#/components/schemas/SpanStartPayload' - propertyName: type - oneOf: - - $ref: '#/components/schemas/SpanStartPayload' - - $ref: '#/components/schemas/SpanEndPayload' + $ref: '#/components/schemas/StructuredLogPayload' span_id: type: string timestamp: @@ -2657,18 +2618,20 @@ components: - type - payload 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: additionalProperties: false properties: algorithm_config: - discriminator: - mapping: - LoRA: '#/components/schemas/LoraFinetuningConfig' - QAT: '#/components/schemas/QATFinetuningConfig' - propertyName: type - oneOf: - - $ref: '#/components/schemas/LoraFinetuningConfig' - - $ref: '#/components/schemas/QATFinetuningConfig' + $ref: '#/components/schemas/AlgorithmConfig' checkpoint_dir: type: string hyperparam_search_config: @@ -5786,11 +5749,12 @@ tags: - description: name: AgentTurnInputType -- description: 'Streamed agent execution response. - - - ' +- description: name: AgentTurnResponseEvent +- description: + name: AgentTurnResponseEventPayload - description: name: AgentTurnResponseStepCompletePayload @@ -5816,6 +5780,9 @@ tags: - description: name: AggregationFunctionType +- description: + name: AlgorithmConfig - description: name: AppEvalTaskConfig @@ -5936,8 +5903,12 @@ tags: /> name: EmbeddingsResponse - name: Eval +- description: + name: EvalCandidate - description: name: EvalTask +- description: + name: EvalTaskConfig - name: EvalTasks - description: @@ -5945,6 +5916,8 @@ tags: - description: name: EvaluateRowsRequest +- description: + name: Event - description: name: GrammarResponseFormat @@ -6173,6 +6146,9 @@ tags: - name: Scoring - description: name: ScoringFn +- description: + name: ScoringFnParams - name: ScoringFunctions - description: name: ScoringResult @@ -6207,6 +6183,9 @@ tags: - description: name: StructuredLogEvent +- description: + name: StructuredLogPayload - description: name: SupervisedFineTuneRequest @@ -6344,6 +6323,7 @@ x-tagGroups: - AgentTool - AgentTurnInputType - AgentTurnResponseEvent + - AgentTurnResponseEventPayload - AgentTurnResponseStepCompletePayload - AgentTurnResponseStepProgressPayload - AgentTurnResponseStepStartPayload @@ -6351,6 +6331,7 @@ x-tagGroups: - AgentTurnResponseTurnCompletePayload - AgentTurnResponseTurnStartPayload - AggregationFunctionType + - AlgorithmConfig - AppEvalTaskConfig - AppendRowsRequest - ArrayType @@ -6387,9 +6368,12 @@ x-tagGroups: - EfficiencyConfig - EmbeddingsRequest - EmbeddingsResponse + - EvalCandidate - EvalTask + - EvalTaskConfig - EvaluateResponse - EvaluateRowsRequest + - Event - GrammarResponseFormat - GreedySamplingStrategy - HealthInfo @@ -6472,6 +6456,7 @@ x-tagGroups: - ScoreRequest - ScoreResponse - ScoringFn + - ScoringFnParams - ScoringResult - Session - Shield @@ -6484,6 +6469,7 @@ x-tagGroups: - StopReason - StringType - StructuredLogEvent + - StructuredLogPayload - SupervisedFineTuneRequest - SyntheticDataGenerateRequest - SyntheticDataGenerationResponse diff --git a/llama_stack/apis/agents/agents.py b/llama_stack/apis/agents/agents.py index 9b77ab8c7..f62d78390 100644 --- a/llama_stack/apis/agents/agents.py +++ b/llama_stack/apis/agents/agents.py @@ -229,11 +229,8 @@ class AgentTurnResponseTurnCompletePayload(BaseModel): turn: Turn -@json_schema_type -class AgentTurnResponseEvent(BaseModel): - """Streamed agent execution response.""" - - payload: Annotated[ +AgentTurnResponseEventPayload = register_schema( + Annotated[ Union[ AgentTurnResponseStepStartPayload, AgentTurnResponseStepProgressPayload, @@ -242,7 +239,14 @@ class AgentTurnResponseEvent(BaseModel): AgentTurnResponseTurnCompletePayload, ], Field(discriminator="event_type"), - ] + ], + name="AgentTurnResponseEventPayload", +) + + +@json_schema_type +class AgentTurnResponseEvent(BaseModel): + payload: AgentTurnResponseEventPayload @json_schema_type diff --git a/llama_stack/apis/eval/eval.py b/llama_stack/apis/eval/eval.py index c9d2fb70b..dfeff0918 100644 --- a/llama_stack/apis/eval/eval.py +++ b/llama_stack/apis/eval/eval.py @@ -6,7 +6,7 @@ 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 typing_extensions import Annotated @@ -31,9 +31,10 @@ class AgentCandidate(BaseModel): config: AgentConfig -EvalCandidate = Annotated[ - Union[ModelCandidate, AgentCandidate], Field(discriminator="type") -] +EvalCandidate = register_schema( + Annotated[Union[ModelCandidate, AgentCandidate], Field(discriminator="type")], + name="EvalCandidate", +) @json_schema_type @@ -61,9 +62,12 @@ class AppEvalTaskConfig(BaseModel): # we could optinally add any specific dataset config here -EvalTaskConfig = Annotated[ - Union[BenchmarkEvalTaskConfig, AppEvalTaskConfig], Field(discriminator="type") -] +EvalTaskConfig = register_schema( + Annotated[ + Union[BenchmarkEvalTaskConfig, AppEvalTaskConfig], Field(discriminator="type") + ], + name="EvalTaskConfig", +) @json_schema_type diff --git a/llama_stack/apis/post_training/post_training.py b/llama_stack/apis/post_training/post_training.py index b9aa3bbde..675488ada 100644 --- a/llama_stack/apis/post_training/post_training.py +++ b/llama_stack/apis/post_training/post_training.py @@ -8,7 +8,7 @@ from datetime import datetime from enum import Enum 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 typing_extensions import Annotated @@ -88,9 +88,12 @@ class QATFinetuningConfig(BaseModel): group_size: int -AlgorithmConfig = Annotated[ - Union[LoraFinetuningConfig, QATFinetuningConfig], Field(discriminator="type") -] +AlgorithmConfig = register_schema( + Annotated[ + Union[LoraFinetuningConfig, QATFinetuningConfig], Field(discriminator="type") + ], + name="AlgorithmConfig", +) @json_schema_type diff --git a/llama_stack/apis/scoring_functions/scoring_functions.py b/llama_stack/apis/scoring_functions/scoring_functions.py index 3089dc0a4..b2e85f855 100644 --- a/llama_stack/apis/scoring_functions/scoring_functions.py +++ b/llama_stack/apis/scoring_functions/scoring_functions.py @@ -16,7 +16,7 @@ from typing import ( 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 typing_extensions import Annotated @@ -82,14 +82,17 @@ class BasicScoringFnParams(BaseModel): ) -ScoringFnParams = Annotated[ - Union[ - LLMAsJudgeScoringFnParams, - RegexParserScoringFnParams, - BasicScoringFnParams, +ScoringFnParams = register_schema( + Annotated[ + Union[ + LLMAsJudgeScoringFnParams, + RegexParserScoringFnParams, + BasicScoringFnParams, + ], + Field(discriminator="type"), ], - Field(discriminator="type"), -] + name="ScoringFnParams", +) class CommonScoringFnFields(BaseModel): diff --git a/llama_stack/apis/telemetry/telemetry.py b/llama_stack/apis/telemetry/telemetry.py index 30a4e2342..284e3a970 100644 --- a/llama_stack/apis/telemetry/telemetry.py +++ b/llama_stack/apis/telemetry/telemetry.py @@ -17,7 +17,7 @@ from typing import ( 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 typing_extensions import Annotated @@ -115,13 +115,16 @@ class SpanEndPayload(BaseModel): status: SpanStatus -StructuredLogPayload = Annotated[ - Union[ - SpanStartPayload, - SpanEndPayload, +StructuredLogPayload = register_schema( + Annotated[ + Union[ + SpanStartPayload, + SpanEndPayload, + ], + Field(discriminator="type"), ], - Field(discriminator="type"), -] + name="StructuredLogPayload", +) @json_schema_type @@ -130,14 +133,17 @@ class StructuredLogEvent(EventCommon): payload: StructuredLogPayload -Event = Annotated[ - Union[ - UnstructuredLogEvent, - MetricEvent, - StructuredLogEvent, +Event = register_schema( + Annotated[ + Union[ + UnstructuredLogEvent, + MetricEvent, + StructuredLogEvent, + ], + Field(discriminator="type"), ], - Field(discriminator="type"), -] + name="Event", +) @json_schema_type