fix: fix openapi schema (#1586)
This commit is contained in:
parent
9c1cb81cd8
commit
010508cec8
|
@ -637,6 +637,35 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"ChatCompletionComplete": {
|
||||
"type": "object",
|
||||
"required": [
|
||||
"index",
|
||||
"message",
|
||||
"finish_reason"
|
||||
],
|
||||
"properties": {
|
||||
"finish_reason": {
|
||||
"type": "string"
|
||||
},
|
||||
"index": {
|
||||
"type": "integer",
|
||||
"format": "int32",
|
||||
"minimum": 0
|
||||
},
|
||||
"logprobs": {
|
||||
"allOf": [
|
||||
{
|
||||
"$ref": "#/components/schemas/ChatCompletionLogprobs"
|
||||
}
|
||||
],
|
||||
"nullable": true
|
||||
},
|
||||
"message": {
|
||||
"$ref": "#/components/schemas/Message"
|
||||
}
|
||||
}
|
||||
},
|
||||
"ChatCompletionDelta": {
|
||||
"type": "object",
|
||||
"required": [
|
||||
|
@ -654,6 +683,59 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"ChatCompletionLogprob": {
|
||||
"type": "object",
|
||||
"required": [
|
||||
"token",
|
||||
"logprob",
|
||||
"top_logprobs"
|
||||
],
|
||||
"properties": {
|
||||
"logprob": {
|
||||
"type": "number",
|
||||
"format": "float"
|
||||
},
|
||||
"token": {
|
||||
"type": "string"
|
||||
},
|
||||
"top_logprobs": {
|
||||
"type": "array",
|
||||
"items": {
|
||||
"$ref": "#/components/schemas/ChatCompletionTopLogprob"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"ChatCompletionLogprobs": {
|
||||
"type": "object",
|
||||
"required": [
|
||||
"content"
|
||||
],
|
||||
"properties": {
|
||||
"content": {
|
||||
"type": "array",
|
||||
"items": {
|
||||
"$ref": "#/components/schemas/ChatCompletionLogprob"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"ChatCompletionTopLogprob": {
|
||||
"type": "object",
|
||||
"required": [
|
||||
"token",
|
||||
"logprob"
|
||||
],
|
||||
"properties": {
|
||||
"logprob": {
|
||||
"type": "number",
|
||||
"format": "float"
|
||||
},
|
||||
"token": {
|
||||
"type": "string"
|
||||
}
|
||||
}
|
||||
},
|
||||
"ChatRequest": {
|
||||
"type": "object",
|
||||
"required": [
|
||||
|
@ -1038,15 +1120,7 @@
|
|||
]
|
||||
},
|
||||
"value": {
|
||||
"type": "string",
|
||||
"description": "A string that represents a [JSON Schema](https://json-schema.org/).\n\nJSON Schema is a declarative language that allows to annotate JSON documents\nwith types and descriptions.",
|
||||
"example": {
|
||||
"properties": {
|
||||
"location": {
|
||||
"type": "string"
|
||||
}
|
||||
}
|
||||
}
|
||||
"description": "A string that represents a [JSON Schema](https://json-schema.org/).\n\nJSON Schema is a declarative language that allows to annotate JSON documents\nwith types and descriptions."
|
||||
}
|
||||
}
|
||||
},
|
||||
|
@ -1362,6 +1436,31 @@
|
|||
"items": {
|
||||
"$ref": "#/components/schemas/SimpleToken"
|
||||
}
|
||||
},
|
||||
"Usage": {
|
||||
"type": "object",
|
||||
"required": [
|
||||
"prompt_tokens",
|
||||
"completion_tokens",
|
||||
"total_tokens"
|
||||
],
|
||||
"properties": {
|
||||
"completion_tokens": {
|
||||
"type": "integer",
|
||||
"format": "int32",
|
||||
"minimum": 0
|
||||
},
|
||||
"prompt_tokens": {
|
||||
"type": "integer",
|
||||
"format": "int32",
|
||||
"minimum": 0
|
||||
},
|
||||
"total_tokens": {
|
||||
"type": "integer",
|
||||
"format": "int32",
|
||||
"minimum": 0
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
@ -347,7 +347,7 @@ pub(crate) struct ChatCompletionTopLogprob {
|
|||
logprob: f32,
|
||||
}
|
||||
|
||||
#[derive(Clone, Deserialize, Serialize)]
|
||||
#[derive(Clone, Deserialize, Serialize, ToSchema)]
|
||||
pub(crate) struct Usage {
|
||||
pub prompt_tokens: u32,
|
||||
pub completion_tokens: u32,
|
||||
|
|
|
@ -3,11 +3,12 @@ use crate::health::Health;
|
|||
use crate::infer::{InferError, InferResponse, InferStreamResponse};
|
||||
use crate::validation::ValidationError;
|
||||
use crate::{
|
||||
BestOfSequence, ChatCompletion, ChatCompletionChoice, ChatCompletionChunk, ChatCompletionDelta,
|
||||
ChatCompletionLogprobs, ChatRequest, CompatGenerateRequest, Details, ErrorResponse,
|
||||
BestOfSequence, ChatCompletion, ChatCompletionChoice, ChatCompletionChunk,
|
||||
ChatCompletionComplete, ChatCompletionDelta, ChatCompletionLogprob, ChatCompletionLogprobs,
|
||||
ChatCompletionTopLogprob, ChatRequest, CompatGenerateRequest, Details, ErrorResponse,
|
||||
FinishReason, GenerateParameters, GenerateRequest, GenerateResponse, GrammarType, HubModelInfo,
|
||||
HubTokenizerConfig, Infer, Info, Message, PrefillToken, SimpleToken, StreamDetails,
|
||||
StreamResponse, Token, TokenizeResponse, Validation, VertexRequest, VertexResponse,
|
||||
StreamResponse, Token, TokenizeResponse, Usage, Validation, VertexRequest, VertexResponse,
|
||||
};
|
||||
use axum::extract::Extension;
|
||||
use axum::http::{HeaderMap, Method, StatusCode};
|
||||
|
@ -896,9 +897,13 @@ pub async fn run(
|
|||
GrammarType,
|
||||
ChatRequest,
|
||||
Message,
|
||||
ChatCompletionComplete,
|
||||
ChatCompletionChoice,
|
||||
ChatCompletionDelta,
|
||||
ChatCompletionChunk,
|
||||
ChatCompletionLogprob,
|
||||
ChatCompletionLogprobs,
|
||||
ChatCompletionTopLogprob,
|
||||
ChatCompletion,
|
||||
GenerateParameters,
|
||||
PrefillToken,
|
||||
|
@ -913,6 +918,7 @@ pub async fn run(
|
|||
StreamDetails,
|
||||
ErrorResponse,
|
||||
GrammarType,
|
||||
Usage,
|
||||
)
|
||||
),
|
||||
tags(
|
||||
|
|
Loading…
Reference in New Issue