Merge branch 'main' into main

Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "rag-api-server"
-version = "0.6.6"
+version = "0.7.0"
 edition = "2021"
 
 [dependencies]
-endpoints = { version = "=0.8.1" }
-chat-prompts = { version = "=0.8.0" }
-llama-core = { version = "=0.11.2", features = ["logging"] }
+endpoints = { version = "=0.9.0" }
+chat-prompts = { version = "=0.8.1" }
+llama-core = { version = "=0.11.3", features = ["logging"] }
 futures = { version = "0.3.6", default-features = false, features = ["async-await", "std"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

src/main.rs

@@ -19,7 +19,7 @@ use hyper::{
 use llama_core::MetadataBuilder;
 use once_cell::sync::OnceCell;
 use serde::{Deserialize, Serialize};
-use std::{net::SocketAddr, path::PathBuf};
+use std::{collections::HashMap, net::SocketAddr, path::PathBuf};
 use utils::{is_valid_url, qdrant_up, LogLevel};
 
 type Error = Box<dyn std::error::Error + Send + Sync + 'static>;
@@ -360,13 +360,26 @@ async fn main() -> Result<(), ServerError> {
     // log socket address
     info!(target: "server_config", "socket_address: {}", addr.to_string());
 
+    // get the environment variable `NODE_VERSION`
+    // Note that this is for satisfying the requirement of `gaianet-node` project.
+    let node = std::env::var("NODE_VERSION").ok();
+    if node.is_some() {
+        // log node version
+        info!(target: "server_config", "gaianet_node_version: {}", node.as_ref().unwrap());
+    }
+
     // create server info
     let server_info = ServerInfo {
-        version: env!("CARGO_PKG_VERSION").to_string(),
-        plugin_version,
-        port,
+        node,
+        server: ApiServer {
+            ty: "rag".to_string(),
+            version: env!("CARGO_PKG_VERSION").to_string(),
+            plugin_version,
+            port,
+        },
         rag_config,
         qdrant_config,
+        extras: HashMap::new(),
     };
     SERVER_INFO
         .set(server_info)
@@ -520,18 +533,31 @@ pub(crate) struct ModelConfig {
 
 #[derive(Debug, Serialize, Deserialize)]
 pub(crate) struct ServerInfo {
-    version: String,
-    plugin_version: String,
-    port: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(rename = "node_version")]
+    node: Option<String>,
+    #[serde(rename = "api_server")]
+    server: ApiServer,
     #[serde(flatten)]
     rag_config: RagConfig,
-    #[serde(flatten)]
     qdrant_config: QdrantConfig,
+    extras: HashMap<String, String>,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub(crate) struct ApiServer {
+    #[serde(rename = "type")]
+    ty: String,
+    version: String,
+    #[serde(rename = "ggml_plugin_version")]
+    plugin_version: String,
+    port: String,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
 pub(crate) struct RagConfig {
     pub chat_model: ModelConfig,
     pub embedding_model: ModelConfig,
+    #[serde(rename = "rag_policy")]
     pub policy: MergeRagContextPolicy,
 }