diff --git a/docs/resources/llama-stack-spec.html b/docs/resources/llama-stack-spec.html
index 886634fba..e790dcff1 100644
--- a/docs/resources/llama-stack-spec.html
+++ b/docs/resources/llama-stack-spec.html
@@ -21,7 +21,7 @@
"info": {
"title": "[DRAFT] Llama Stack Specification",
"version": "0.0.1",
- "description": "This is the specification of the llama stack that provides\n a set of endpoints and their corresponding interfaces that are tailored to\n best leverage Llama Models. The specification is still in draft and subject to change.\n Generated at 2024-10-24 17:40:59.576117"
+ "description": "This is the specification of the llama stack that provides\n a set of endpoints and their corresponding interfaces that are tailored to\n best leverage Llama Models. The specification is still in draft and subject to change.\n Generated at 2024-10-30 16:17:03.919702"
},
"servers": [
{
@@ -934,7 +934,7 @@
"schema": {
"oneOf": [
{
- "$ref": "#/components/schemas/ScoringFunctionDefWithProvider"
+ "$ref": "#/components/schemas/ScoringFnDefWithProvider"
},
{
"type": "null"
@@ -1555,7 +1555,7 @@
"content": {
"application/jsonl": {
"schema": {
- "$ref": "#/components/schemas/ScoringFunctionDefWithProvider"
+ "$ref": "#/components/schemas/ScoringFnDefWithProvider"
}
}
}
@@ -2762,7 +2762,7 @@
"const": "json_schema",
"default": "json_schema"
},
- "schema": {
+ "json_schema": {
"type": "object",
"additionalProperties": {
"oneOf": [
@@ -2791,7 +2791,7 @@
"additionalProperties": false,
"required": [
"type",
- "schema"
+ "json_schema"
]
},
{
@@ -3018,7 +3018,7 @@
"const": "json_schema",
"default": "json_schema"
},
- "schema": {
+ "json_schema": {
"type": "object",
"additionalProperties": {
"oneOf": [
@@ -3047,7 +3047,7 @@
"additionalProperties": false,
"required": [
"type",
- "schema"
+ "json_schema"
]
},
{
@@ -5004,24 +5004,6 @@
"type"
]
},
- {
- "type": "object",
- "properties": {
- "type": {
- "type": "string",
- "const": "custom",
- "default": "custom"
- },
- "validator_class": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "required": [
- "type",
- "validator_class"
- ]
- },
{
"type": "object",
"properties": {
@@ -5304,24 +5286,6 @@
"type"
]
},
- {
- "type": "object",
- "properties": {
- "type": {
- "type": "string",
- "const": "custom",
- "default": "custom"
- },
- "validator_class": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "required": [
- "type",
- "validator_class"
- ]
- },
{
"type": "object",
"properties": {
@@ -5376,7 +5340,7 @@
"type"
]
},
- "ScoringFunctionDefWithProvider": {
+ "ScoringFnDefWithProvider": {
"type": "object",
"properties": {
"identifier": {
@@ -5516,24 +5480,6 @@
"type"
]
},
- {
- "type": "object",
- "properties": {
- "type": {
- "type": "string",
- "const": "custom",
- "default": "custom"
- },
- "validator_class": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "required": [
- "type",
- "validator_class"
- ]
- },
{
"type": "object",
"properties": {
@@ -5586,6 +5532,12 @@
},
"prompt_template": {
"type": "string"
+ },
+ "judge_score_regex": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
}
},
"additionalProperties": false,
@@ -6339,10 +6291,10 @@
"finetuned_model": {
"$ref": "#/components/schemas/URL"
},
- "dataset": {
+ "dataset_id": {
"type": "string"
},
- "validation_dataset": {
+ "validation_dataset_id": {
"type": "string"
},
"algorithm": {
@@ -6412,8 +6364,8 @@
"required": [
"job_uuid",
"finetuned_model",
- "dataset",
- "validation_dataset",
+ "dataset_id",
+ "validation_dataset_id",
"algorithm",
"algorithm_config",
"optimizer_config",
@@ -6595,7 +6547,7 @@
"type": "object",
"properties": {
"function_def": {
- "$ref": "#/components/schemas/ScoringFunctionDefWithProvider"
+ "$ref": "#/components/schemas/ScoringFnDefWithProvider"
}
},
"additionalProperties": false,
@@ -6893,10 +6845,10 @@
"model": {
"type": "string"
},
- "dataset": {
+ "dataset_id": {
"type": "string"
},
- "validation_dataset": {
+ "validation_dataset_id": {
"type": "string"
},
"algorithm": {
@@ -6976,8 +6928,8 @@
"required": [
"job_uuid",
"model",
- "dataset",
- "validation_dataset",
+ "dataset_id",
+ "validation_dataset_id",
"algorithm",
"algorithm_config",
"optimizer_config",
@@ -7103,13 +7055,10 @@
],
"tags": [
{
- "name": "Eval"
+ "name": "Inference"
},
{
- "name": "ScoringFunctions"
- },
- {
- "name": "SyntheticDataGeneration"
+ "name": "Memory"
},
{
"name": "Inspect"
@@ -7120,32 +7069,11 @@
{
"name": "Models"
},
- {
- "name": "Safety"
- },
- {
- "name": "MemoryBanks"
- },
- {
- "name": "DatasetIO"
- },
- {
- "name": "Memory"
- },
{
"name": "Scoring"
},
{
- "name": "Shields"
- },
- {
- "name": "Datasets"
- },
- {
- "name": "Inference"
- },
- {
- "name": "Telemetry"
+ "name": "DatasetIO"
},
{
"name": "BatchInference"
@@ -7153,6 +7081,30 @@
{
"name": "Agents"
},
+ {
+ "name": "Shields"
+ },
+ {
+ "name": "MemoryBanks"
+ },
+ {
+ "name": "Datasets"
+ },
+ {
+ "name": "SyntheticDataGeneration"
+ },
+ {
+ "name": "Eval"
+ },
+ {
+ "name": "Telemetry"
+ },
+ {
+ "name": "ScoringFunctions"
+ },
+ {
+ "name": "Safety"
+ },
{
"name": "BuiltinTool",
"description": ""
@@ -7486,8 +7438,8 @@
"description": ""
},
{
- "name": "ScoringFunctionDefWithProvider",
- "description": ""
+ "name": "ScoringFnDefWithProvider",
+ "description": ""
},
{
"name": "ShieldDefWithProvider",
@@ -7805,7 +7757,7 @@
"ScoreBatchResponse",
"ScoreRequest",
"ScoreResponse",
- "ScoringFunctionDefWithProvider",
+ "ScoringFnDefWithProvider",
"ScoringResult",
"SearchToolDefinition",
"Session",
diff --git a/docs/resources/llama-stack-spec.yaml b/docs/resources/llama-stack-spec.yaml
index 9dcdbb028..67181ab42 100644
--- a/docs/resources/llama-stack-spec.yaml
+++ b/docs/resources/llama-stack-spec.yaml
@@ -360,7 +360,7 @@ components:
oneOf:
- additionalProperties: false
properties:
- schema:
+ json_schema:
additionalProperties:
oneOf:
- type: 'null'
@@ -376,7 +376,7 @@ components:
type: string
required:
- type
- - schema
+ - json_schema
type: object
- additionalProperties: false
properties:
@@ -541,7 +541,7 @@ components:
oneOf:
- additionalProperties: false
properties:
- schema:
+ json_schema:
additionalProperties:
oneOf:
- type: 'null'
@@ -557,7 +557,7 @@ components:
type: string
required:
- type
- - schema
+ - json_schema
type: object
- additionalProperties: false
properties:
@@ -747,18 +747,6 @@ components:
required:
- type
type: object
- - additionalProperties: false
- properties:
- type:
- const: custom
- default: custom
- type: string
- validator_class:
- type: string
- required:
- - type
- - validator_class
- type: object
- additionalProperties: false
properties:
type:
@@ -1575,18 +1563,6 @@ components:
required:
- type
type: object
- - additionalProperties: false
- properties:
- type:
- const: custom
- default: custom
- type: string
- validator_class:
- type: string
- required:
- - type
- - validator_class
- type: object
- additionalProperties: false
properties:
type:
@@ -1724,7 +1700,7 @@ components:
$ref: '#/components/schemas/RLHFAlgorithm'
algorithm_config:
$ref: '#/components/schemas/DPOAlignmentConfig'
- dataset:
+ dataset_id:
type: string
finetuned_model:
$ref: '#/components/schemas/URL'
@@ -1754,13 +1730,13 @@ components:
$ref: '#/components/schemas/OptimizerConfig'
training_config:
$ref: '#/components/schemas/TrainingConfig'
- validation_dataset:
+ validation_dataset_id:
type: string
required:
- job_uuid
- finetuned_model
- - dataset
- - validation_dataset
+ - dataset_id
+ - validation_dataset_id
- algorithm
- algorithm_config
- optimizer_config
@@ -1899,7 +1875,7 @@ components:
additionalProperties: false
properties:
function_def:
- $ref: '#/components/schemas/ScoringFunctionDefWithProvider'
+ $ref: '#/components/schemas/ScoringFnDefWithProvider'
required:
- function_def
type: object
@@ -2121,7 +2097,7 @@ components:
required:
- results
type: object
- ScoringFunctionDefWithProvider:
+ ScoringFnDefWithProvider:
additionalProperties: false
properties:
context:
@@ -2129,6 +2105,10 @@ components:
properties:
judge_model:
type: string
+ judge_score_regex:
+ items:
+ type: string
+ type: array
prompt_template:
type: string
required:
@@ -2219,18 +2199,6 @@ components:
required:
- type
type: object
- - additionalProperties: false
- properties:
- type:
- const: custom
- default: custom
- type: string
- validator_class:
- type: string
- required:
- - type
- - validator_class
- type: object
- additionalProperties: false
properties:
type:
@@ -2484,7 +2452,7 @@ components:
- $ref: '#/components/schemas/LoraFinetuningConfig'
- $ref: '#/components/schemas/QLoraFinetuningConfig'
- $ref: '#/components/schemas/DoraFinetuningConfig'
- dataset:
+ dataset_id:
type: string
hyperparam_search_config:
additionalProperties:
@@ -2514,13 +2482,13 @@ components:
$ref: '#/components/schemas/OptimizerConfig'
training_config:
$ref: '#/components/schemas/TrainingConfig'
- validation_dataset:
+ validation_dataset_id:
type: string
required:
- job_uuid
- model
- - dataset
- - validation_dataset
+ - dataset_id
+ - validation_dataset_id
- algorithm
- algorithm_config
- optimizer_config
@@ -3029,7 +2997,7 @@ info:
description: "This is the specification of the llama stack that provides\n \
\ a set of endpoints and their corresponding interfaces that are tailored\
\ to\n best leverage Llama Models. The specification is still in\
- \ draft and subject to change.\n Generated at 2024-10-24 17:40:59.576117"
+ \ draft and subject to change.\n Generated at 2024-10-30 16:17:03.919702"
title: '[DRAFT] Llama Stack Specification'
version: 0.0.1
jsonSchemaDialect: https://json-schema.org/draft/2020-12/schema
@@ -4122,7 +4090,7 @@ paths:
application/json:
schema:
oneOf:
- - $ref: '#/components/schemas/ScoringFunctionDefWithProvider'
+ - $ref: '#/components/schemas/ScoringFnDefWithProvider'
- type: 'null'
description: OK
tags:
@@ -4142,7 +4110,7 @@ paths:
content:
application/jsonl:
schema:
- $ref: '#/components/schemas/ScoringFunctionDefWithProvider'
+ $ref: '#/components/schemas/ScoringFnDefWithProvider'
description: OK
tags:
- ScoringFunctions
@@ -4308,23 +4276,23 @@ security:
servers:
- url: http://any-hosted-llama-stack.com
tags:
-- name: Eval
-- name: ScoringFunctions
-- name: SyntheticDataGeneration
+- name: Inference
+- name: Memory
- name: Inspect
- name: PostTraining
- name: Models
-- name: Safety
-- name: MemoryBanks
-- name: DatasetIO
-- name: Memory
- name: Scoring
-- name: Shields
-- name: Datasets
-- name: Inference
-- name: Telemetry
+- name: DatasetIO
- name: BatchInference
- name: Agents
+- name: Shields
+- name: MemoryBanks
+- name: Datasets
+- name: SyntheticDataGeneration
+- name: Eval
+- name: Telemetry
+- name: ScoringFunctions
+- name: Safety
- description:
name: BuiltinTool
- description:
name: Parameter
-- description:
- name: ScoringFunctionDefWithProvider
+ name: ScoringFnDefWithProvider
- description:
name: ShieldDefWithProvider
@@ -4844,7 +4812,7 @@ x-tagGroups:
- ScoreBatchResponse
- ScoreRequest
- ScoreResponse
- - ScoringFunctionDefWithProvider
+ - ScoringFnDefWithProvider
- ScoringResult
- SearchToolDefinition
- Session