refactor: simplify apis

counit-server/src/main.rs

@@ -27,8 +27,7 @@ async fn main() -> anyhow::Result<()> {
 
     let mut config: Configuration;
     if config_file.exists() {
-        let config_string = std::fs::read_to_string(config_file)?;
-        config = serde_json::from_str(&config_string)?;
+        config = serde_json::from_str(&std::fs::read_to_string(config_file)?)?;
         info!("Configuration loaded from public/config.json");
     } else {
         config = Configuration::default()
@@ -37,9 +36,9 @@ async fn main() -> anyhow::Result<()> {
     let bind = SocketAddr::new(config.host.parse()?, config.port);
     let app = Application::initialize(config).await?;
 
-    let mut api = Router::new()
-        .with_state(app.clone())
+    let mut api = Router::new().with_state(app.clone())
         .route("/", get(root))
+        // core api for query
         .route("/query", get(semantic_api::query))
         .route("/text-embedding", get(semantic_api::embedding))
 
@@ -48,6 +47,7 @@ async fn main() -> anyhow::Result<()> {
 
         // knowledge init
         .nest("/translate/domain-language", translate_api::router())
+
         //align to archguard api
         .nest("/scanner", archguard_api::router())
         ;
@@ -60,7 +60,8 @@ async fn main() -> anyhow::Result<()> {
         .layer(CorsLayer::permissive())
         .layer(CatchPanicLayer::new());
 
-    let mut router = Router::new().nest("/api", api);
+    let mut router = Router::new()
+        .nest("/api", api);
 
     info!(%bind, "starting webserver");
 

counit-server/src/model/dto/mod.rs

@@ -0,0 +1 @@
+pub mod query;

counit-server/src/model/dto/query.rs

@@ -0,0 +1,6 @@
+use serde::Deserialize;
+
+#[derive(Debug, Deserialize)]
+pub struct SimpleQuery {
+    pub q: String,
+}

counit-server/src/model/mod.rs

@@ -1,8 +1,10 @@
+pub use archguard_model::*;
+pub use chapi_model::*;
+
 pub mod analyser;
 
 pub mod chapi_model;
 
-pub use chapi_model::*;
 pub mod archguard_model;
-pub use archguard_model::*;
 pub mod archguard_openapi;
+pub mod dto;

counit-server/src/server/agent_api.rs

@@ -4,6 +4,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::agent::prompts::tool_prompt;
 use crate::dsl::query_description::QAExample;
+use crate::model::dto::query::SimpleQuery;
 
 pub(crate) fn router() -> Router {
     use axum::routing::*;
@@ -14,18 +15,13 @@ pub(crate) fn router() -> Router {
         .route("/prompt/functions/matching", post(tool_prompter))
 }
 
-#[derive(Debug, Deserialize)]
-pub struct PromptQuery {
-    pub q: String,
-}
-
 #[derive(Serialize)]
 pub struct PromptResult {
     pub prompt: String,
 }
 
 pub(crate) async fn explain_query(
-    Query(args): Query<PromptQuery>,
+    Query(args): Query<SimpleQuery>,
 ) -> (StatusCode, Json<PromptResult>) {
     let output = PromptResult {
         prompt: QAExample::prompt(&args.q),
@@ -40,7 +36,7 @@ pub struct PathListArgs {
 }
 
 pub(crate) async fn tool_prompter(
-    Query(args): Query<PromptQuery>,
+    Query(args): Query<SimpleQuery>,
 ) -> (StatusCode, Json<PromptResult>) {
     let paths = vec![args.q];
     let output = PromptResult {

counit-server/src/server/semantic_api.rs

@@ -4,6 +4,7 @@ use axum::{
 use serde::{Deserialize, Serialize};
 
 use crate::application::Application;
+use crate::model::dto::query::SimpleQuery;
 use crate::repository::{
     payload::CodePayload, semantic_query::SemanticQuery,
 };
@@ -57,12 +58,6 @@ pub struct EmbeddingResponse {
     pub data: Embedding,
 }
 
-
-#[derive(Debug, Deserialize)]
-pub struct SimpleQuery {
-    pub q: String,
-}
-
 #[derive(Debug, Deserialize)]
 pub struct ApiQuery {
     pub q: String,