Skip to content

fix(get_mappings tool): fallback to raw JSON when mapping deserialization fails #179

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(get_mappings tool): fallback to raw JSON when mapping deserialization fails #179

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 17 additions & 17 deletions src/servers/elasticsearch/base_tools.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,20 +125,31 @@ impl EsBaseTools {
Parameters(GetMappingsParams { index }): Parameters<GetMappingsParams>,
) -> Result<CallToolResult, rmcp::Error> {
let es_client = self.es_client.get(req_ctx);

let response = es_client
.indices()
.get_mapping(IndicesGetMappingParts::Index(&[&index]))
.send()
.await;

let response: MappingResponse = read_json(response).await?;
// Read response as raw JSON once
let response = read_json::<serde_json::Value>(response).await?;

// use the first mapping (we can have many if the name is a wildcard)
let mapping = response.values().next().unwrap();
// Try strict deserialization first
let parsed = match serde_json::from_value::<HashMap<String, Mappings>>(response.clone()) {
Ok(map_response) => {
let mapping = map_response.values().next().unwrap();
Content::json(mapping)?
}
Err(_) => {
// Fallback: Return the raw mapping JSON
Content::json(&response)?
}
};

Ok(CallToolResult::success(vec![
Content::text(format!("Mappings for index {index}:")),
Content::json(mapping)?,
parsed,
]))
}

Expand Down Expand Up @@ -355,26 +366,15 @@ pub struct CatShardsResponse {

//----- Index mappings

pub type MappingResponse = HashMap<String, Mappings>;

#[derive(Serialize, Deserialize)]
pub struct Mappings {
pub mappings: Mapping,
}

#[derive(Serialize, Deserialize)]
#[derive(Serialize, Deserialize, Debug)]
pub struct Mapping {
#[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
pub meta: Option<JsonObject>,
properties: HashMap<String, MappingProperty>,
}

#[derive(Serialize, Deserialize)]
pub struct MappingProperty {
#[serde(rename = "type")]
pub type_: String,
#[serde(flatten)]
pub settings: HashMap<String, serde_json::Value>,
pub other: HashMap<String, serde_json::Value>,
}

//----- ES|QL
Expand Down