Skip to content

Change v3 to v1 #4294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
atobiszei wants to merge 2 commits into
base: main
Choose a base branch
from
+22 −15
Draft

Change v3 to v1 #4294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3123946
Change v3 to v1
atobiszei Jun 17, 2026
be13e03
Add /v1/ URI support to LLM servable endpoint checks
atobiszei Jun 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/http_rest_api_handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ namespace ovms {
const std::string HttpRestApiHandler::predictionRegexExp =
R"((.?)\/v1\/models\/([^\/:]+)(?:(?:\/versions\/(\d+))|(?:\/labels\/(\w+)))?:(classify|regress|predict))";
const std::string HttpRestApiHandler::modelstatusRegexExp =
R"((.?)\/v1\/models(?:\/([^\/:]+))?(?:(?:\/versions\/(\d+))|(?:\/labels\/(\w+)))?(?:\/(metadata))?)";
R"((.?)\/v1\/models\/([^\/:]+)(?:(?:\/versions\/(\d+))|(?:\/labels\/(\w+))|(?:\/(metadata))))";
const std::string HttpRestApiHandler::configReloadRegexExp = R"((.?)\/v1\/config\/reload)";
const std::string HttpRestApiHandler::configStatusRegexExp = R"((.?)\/v1\/config)";

Expand All @@ -121,11 +121,11 @@ const std::string HttpRestApiHandler::kfs_servermetadataRegexExp =
R"(/v2)";

const std::string HttpRestApiHandler::v3_ListModelsRegexExp =
R"(/v3/(v1/)?models)";
R"((?:/v3/|/v1/)(v1/)?models)";
const std::string HttpRestApiHandler::v3_RetrieveModelRegexExp =
R"(/v3/(v1/)?models/(.+))";
R"((?:/v3/|/v1/)(v1/)?models/(.+))";
const std::string HttpRestApiHandler::v3_RegexExp =
R"(/v3/.*?(/|$))";
R"((?:/v3/|/v1/).*?(/|$))";

const std::string HttpRestApiHandler::metricsRegexExp = R"((.?)\/metrics(\?(.*))?)";

Expand Down Expand Up @@ -1022,6 +1022,10 @@ Status HttpRestApiHandler::parseRequestComponents(HttpRequestComponents& request
return status;
return StatusCode::OK;
}
if (std::regex_match(request_path, sm, configReloadRegex)) {
requestComponents.type = ConfigReload;
return StatusCode::OK;
}
if (std::regex_match(request_path, sm, v3_Regex)) {
requestComponents.type = V3;
auto status = parseInferenceHeaderContentLength(requestComponents, headers);
Expand All @@ -1030,10 +1034,6 @@ Status HttpRestApiHandler::parseRequestComponents(HttpRequestComponents& request
requestComponents.headers = headers;
return StatusCode::OK;
}
if (std::regex_match(request_path, sm, configReloadRegex)) {
requestComponents.type = ConfigReload;
return StatusCode::OK;
}
return (std::regex_match(request_path, sm, modelstatusRegex) ||
std::regex_match(request_path, sm, kfs_serverliveRegex) ||
std::regex_match(request_path, sm, configStatusRegex) ||
Expand Down
9 changes: 6 additions & 3 deletions src/llm/servable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,14 @@ absl::Status GenAiServable::loadRequest(std::shared_ptr<GenAiServableExecutionCo
if (payload.parsedJson->HasParseError()) {
return absl::InvalidArgumentError("Non-json request received in text generation calculator");
}
if (payload.uri == "/v3/chat/completions" || payload.uri == "/v3/v1/chat/completions") {
if (payload.uri == "/v3/chat/completions" || payload.uri == "/v3/v1/chat/completions" ||
payload.uri == "/v1/chat/completions" || payload.uri == "/v1/v1/chat/completions") {
executionContext->endpoint = Endpoint::CHAT_COMPLETIONS;
} else if (payload.uri == "/v3/completions" || payload.uri == "/v3/v1/completions") {
} else if (payload.uri == "/v3/completions" || payload.uri == "/v3/v1/completions" ||
payload.uri == "/v1/completions" || payload.uri == "/v1/v1/completions") {
executionContext->endpoint = Endpoint::COMPLETIONS;
} else if (payload.uri == "/v3/responses" || payload.uri == "/v3/v1/responses") {
} else if (payload.uri == "/v3/responses" || payload.uri == "/v3/v1/responses" ||
payload.uri == "/v1/responses" || payload.uri == "/v1/v1/responses") {
executionContext->endpoint = Endpoint::RESPONSES;
} else if (TokenizeParser::isTokenizeEndpoint(payload.uri)) {
executionContext->endpoint = Endpoint::TOKENIZE;
Expand Down
6 changes: 4 additions & 2 deletions src/llm/visual_language_model/continuous_batching/servable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,11 @@ absl::Status VisualLanguageModelServable::loadRequest(std::shared_ptr<GenAiServa
if (payload.parsedJson->HasParseError()) {
return absl::InvalidArgumentError("Non-json request received in text generation calculator");
}
if (payload.uri == "/v3/chat/completions" || payload.uri == "/v3/v1/chat/completions") {
if (payload.uri == "/v3/chat/completions" || payload.uri == "/v3/v1/chat/completions" ||
payload.uri == "/v1/chat/completions" || payload.uri == "/v1/v1/chat/completions") {
executionContext->endpoint = Endpoint::CHAT_COMPLETIONS;
} else if (payload.uri == "/v3/responses" || payload.uri == "/v3/v1/responses") {
} else if (payload.uri == "/v3/responses" || payload.uri == "/v3/v1/responses" ||
payload.uri == "/v1/responses" || payload.uri == "/v1/v1/responses") {
executionContext->endpoint = Endpoint::RESPONSES;
} else if (TokenizeParser::isTokenizeEndpoint(payload.uri)) {
executionContext->endpoint = Endpoint::TOKENIZE;
Expand Down
6 changes: 4 additions & 2 deletions src/llm/visual_language_model/legacy/servable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@ absl::Status VisualLanguageModelLegacyServable::loadRequest(std::shared_ptr<GenA
if (payload.parsedJson->HasParseError()) {
return absl::InvalidArgumentError("Non-json request received in text generation calculator");
}
if (payload.uri == "/v3/chat/completions" || payload.uri == "/v3/v1/chat/completions") {
if (payload.uri == "/v3/chat/completions" || payload.uri == "/v3/v1/chat/completions" ||
payload.uri == "/v1/chat/completions" || payload.uri == "/v1/v1/chat/completions") {
executionContext->endpoint = Endpoint::CHAT_COMPLETIONS;
} else if (payload.uri == "/v3/responses" || payload.uri == "/v3/v1/responses") {
} else if (payload.uri == "/v3/responses" || payload.uri == "/v3/v1/responses" ||
payload.uri == "/v1/responses" || payload.uri == "/v1/v1/responses") {
executionContext->endpoint = Endpoint::RESPONSES;
} else if (TokenizeParser::isTokenizeEndpoint(payload.uri)) {
executionContext->endpoint = Endpoint::TOKENIZE;
Expand Down