Temp commit: Add Tapi

Cargo.toml

@@ -94,6 +94,7 @@ serde = {version = "1.0.137", features = ["rc", "derive"]}
 serde_json = "1.0.81"
 serde_urlencoded = "0.7.1"
 tantivy = {git = "https://github.com/quickwit-oss/tantivy", rev = "182f58cea"}
+tapi = {path = "../tapi/crates/tapi/", package = "tapi", features = ["openapi"]}
 thiserror = "1.0.31"
 tikv-jemallocator = "0.5"
 tokenizers = "0.13.2"

crates/core/Cargo.toml

@@ -88,6 +88,7 @@ serde = {workspace = true}
 serde_json = {workspace = true}
 serde_urlencoded = {workspace = true}
 tantivy = {workspace = true}
+tapi = {workspace = true}
 thiserror = {workspace = true}
 tokenizers = {workspace = true}
 tokio = {workspace = true}

crates/core/src/api/autosuggest.rs

@@ -14,13 +14,11 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-use std::{collections::HashMap, sync::Arc};
-
-use axum::{extract, response::IntoResponse, Json};
+use axum::{extract, Json};
 use serde::Serialize;
 use utoipa::{IntoParams, ToSchema};
 
-use super::State;
+use super::AppState;
 
 const HIGHLIGHTED_PREFIX: &str = "<b style=\"font-weight: 500;\">";
 const HIGHLIGHTED_POSTFIX: &str = "</b>";
@@ -39,17 +37,17 @@ fn highlight(query: &str, suggestion: &str) -> String {
     new_suggestion
 }
 
-#[derive(Serialize, ToSchema)]
+#[derive(Serialize, ToSchema, tapi::Tapi)]
 #[serde(rename_all = "camelCase")]
 pub struct Suggestion {
     highlighted: String,
     raw: String,
 }
 
-#[derive(Debug, serde::Serialize, serde::Deserialize, IntoParams)]
+#[derive(Debug, serde::Serialize, serde::Deserialize, IntoParams, tapi::Tapi)]
 #[serde(rename_all = "camelCase")]
 pub struct AutosuggestQuery {
-    q: String,
+    q: Option<String>,
 }
 
 #[utoipa::path(
@@ -60,12 +58,12 @@ pub struct AutosuggestQuery {
         (status = 200, description = "Autosuggest", body = Vec<Suggestion>),
     )
 )]
-
+#[tapi::tapi(path = "/autosuggest", method = Post, state = AppState)]
 pub async fn route(
-    extract::State(state): extract::State<Arc<State>>,
-    extract::Query(params): extract::Query<HashMap<String, String>>,
-) -> impl IntoResponse {
-    if let Some(query) = params.get("q") {
+    extract::State(state): extract::State<AppState>,
+    extract::Query(params): extract::Query<AutosuggestQuery>,
+) -> Json<Vec<Suggestion>> {
+    if let Some(query) = &params.q {
         let mut suggestions = Vec::new();
 
         for suggestion in state.autosuggest.suggestions(query).unwrap() {
@@ -82,11 +80,12 @@ pub async fn route(
     }
 }
 
+#[tapi::tapi(path = "/autosuggest/browser", method = Post, state = AppState)]
 pub async fn browser(
-    extract::State(state): extract::State<Arc<State>>,
-    extract::Query(params): extract::Query<HashMap<String, String>>,
-) -> impl IntoResponse {
-    if let Some(query) = params.get("q") {
+    extract::State(state): extract::State<AppState>,
+    extract::Query(params): extract::Query<AutosuggestQuery>,
+) -> Json<(String, Vec<String>)> {
+    if let Some(query) = &params.q {
         Json((query.clone(), state.autosuggest.suggestions(query).unwrap()))
     } else {
         Json((String::new(), Vec::new()))

crates/core/src/api/explore.rs

@@ -15,11 +15,10 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 use axum::extract;
-use http::StatusCode;
 use optics::{HostRankings, Optic};
 use utoipa::ToSchema;
 
-#[derive(serde::Deserialize, ToSchema)]
+#[derive(serde::Deserialize, ToSchema, tapi::Tapi)]
 #[serde(rename_all = "camelCase")]
 pub struct ExploreExportOpticParams {
     chosen_hosts: Vec<String>,
@@ -34,12 +33,13 @@ pub struct ExploreExportOpticParams {
         (status = 200, description = "Export explored sites as an optic", body = String),
     )
 )]
+#[tapi::tapi(path = "/expore/export", method = Post)]
 pub async fn explore_export_optic(
     extract::Json(ExploreExportOpticParams {
         chosen_hosts,
         similar_hosts,
     }): extract::Json<ExploreExportOpticParams>,
-) -> Result<String, StatusCode> {
+) -> String {
     let matches = similar_hosts
         .into_iter()
         .chain(chosen_hosts.clone().into_iter())
@@ -69,5 +69,5 @@ pub async fn explore_export_optic(
         ..Default::default()
     };
 
-    Ok(optic.to_string())
+    optic.to_string()
 }