format: separate routes in file system
This commit is contained in:
@@ -0,0 +1,44 @@
|
|||||||
|
use axum::{Json, extract::State};
|
||||||
|
use serde_json::Value;
|
||||||
|
|
||||||
|
use crate::errors::OllamaError;
|
||||||
|
use crate::state::app_state::AppState;
|
||||||
|
|
||||||
|
pub async fn completions(
|
||||||
|
State(state): State<AppState>,
|
||||||
|
Json(body): Json<Value>,
|
||||||
|
) -> Result<Json<Value>, (axum::http::StatusCode, String)> {
|
||||||
|
match state.ollama.completions(body).await {
|
||||||
|
Ok(response) => Ok(Json(response)),
|
||||||
|
Err(OllamaError::MissingPrompt) => Err((
|
||||||
|
axum::http::StatusCode::BAD_REQUEST,
|
||||||
|
"prompt is required and cannot be empty".to_string(),
|
||||||
|
)),
|
||||||
|
Err(OllamaError::ModelNotFound(m)) => Err((
|
||||||
|
axum::http::StatusCode::UNPROCESSABLE_ENTITY,
|
||||||
|
format!("model '{m}' is not available — run `ollama pull {m}` first"),
|
||||||
|
)),
|
||||||
|
Err(e) => Err((axum::http::StatusCode::INTERNAL_SERVER_ERROR, e.to_string())),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn chat_completions(
|
||||||
|
State(state): State<AppState>,
|
||||||
|
Json(body): Json<Value>,
|
||||||
|
) -> Result<Json<Value>, (axum::http::StatusCode, String)> {
|
||||||
|
match state.ollama.chat_completions(body).await {
|
||||||
|
Ok(response) => Ok(Json(response)),
|
||||||
|
Err(OllamaError::MissingMessages) => Err((
|
||||||
|
axum::http::StatusCode::BAD_REQUEST,
|
||||||
|
"messages must be a non-empty array with at least one user message".to_string(),
|
||||||
|
)),
|
||||||
|
Err(OllamaError::ModelNotFound(m)) => Err((
|
||||||
|
axum::http::StatusCode::UNPROCESSABLE_ENTITY,
|
||||||
|
format!("model '{m}' is not available — run `ollama pull {m}` first"),
|
||||||
|
)),
|
||||||
|
Err(OllamaError::Http(e)) => {
|
||||||
|
Err((axum::http::StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))
|
||||||
|
}
|
||||||
|
Err(e) => Err((axum::http::StatusCode::BAD_REQUEST, e.to_string())),
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
pub mod chat;
|
||||||
pub mod models;
|
pub mod models;
|
||||||
|
|
||||||
use crate::auth::middleware::auth_middleware;
|
use crate::auth::middleware::auth_middleware;
|
||||||
@@ -7,7 +8,7 @@ use axum::{Router, middleware, routing::get, routing::post};
|
|||||||
pub fn router() -> Router<AppState> {
|
pub fn router() -> Router<AppState> {
|
||||||
Router::new()
|
Router::new()
|
||||||
.route("/models", get(models::list_models))
|
.route("/models", get(models::list_models))
|
||||||
.route("/completions", post(models::completions))
|
.route("/completions", post(chat::completions))
|
||||||
.route("/chat/completions", post(models::chat_completions))
|
.route("/chat/completions", post(chat::chat_completions))
|
||||||
.layer(middleware::from_fn(auth_middleware))
|
.layer(middleware::from_fn(auth_middleware))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
use axum::{Json, extract::State};
|
use axum::{Json, extract::State};
|
||||||
use serde_json::Value;
|
use serde_json::Value;
|
||||||
|
|
||||||
use crate::errors::OllamaError;
|
|
||||||
use crate::state::app_state::AppState;
|
use crate::state::app_state::AppState;
|
||||||
|
|
||||||
pub async fn list_models(
|
pub async fn list_models(
|
||||||
@@ -15,42 +14,3 @@ pub async fn list_models(
|
|||||||
)),
|
)),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn completions(
|
|
||||||
State(state): State<AppState>,
|
|
||||||
Json(body): Json<Value>,
|
|
||||||
) -> Result<Json<Value>, (axum::http::StatusCode, String)> {
|
|
||||||
match state.ollama.completions(body).await {
|
|
||||||
Ok(response) => Ok(Json(response)),
|
|
||||||
Err(OllamaError::MissingPrompt) => Err((
|
|
||||||
axum::http::StatusCode::BAD_REQUEST,
|
|
||||||
"prompt is required and cannot be empty".to_string(),
|
|
||||||
)),
|
|
||||||
Err(OllamaError::ModelNotFound(m)) => Err((
|
|
||||||
axum::http::StatusCode::UNPROCESSABLE_ENTITY,
|
|
||||||
format!("model '{m}' is not available — run `ollama pull {m}` first"),
|
|
||||||
)),
|
|
||||||
Err(e) => Err((axum::http::StatusCode::INTERNAL_SERVER_ERROR, e.to_string())),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn chat_completions(
|
|
||||||
State(state): State<AppState>,
|
|
||||||
Json(body): Json<Value>,
|
|
||||||
) -> Result<Json<Value>, (axum::http::StatusCode, String)> {
|
|
||||||
match state.ollama.chat_completions(body).await {
|
|
||||||
Ok(response) => Ok(Json(response)),
|
|
||||||
Err(OllamaError::MissingMessages) => Err((
|
|
||||||
axum::http::StatusCode::BAD_REQUEST,
|
|
||||||
"messages must be a non-empty array with at least one user message".to_string(),
|
|
||||||
)),
|
|
||||||
Err(OllamaError::ModelNotFound(m)) => Err((
|
|
||||||
axum::http::StatusCode::UNPROCESSABLE_ENTITY,
|
|
||||||
format!("model '{m}' is not available — run `ollama pull {m}` first"),
|
|
||||||
)),
|
|
||||||
Err(OllamaError::Http(e)) => {
|
|
||||||
Err((axum::http::StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))
|
|
||||||
}
|
|
||||||
Err(e) => Err((axum::http::StatusCode::BAD_REQUEST, e.to_string())),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user