snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-07-27 16:51:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Template rendering

Browse Source
This commit is contained in:
Mubelotix
2025-07-17 08:44:04 +02:00
parent f349ba53a0
commit 2d2de778a7
3 changed files with 60 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
crates/milli/src/vector/json_template/mod.rs
View File

@ -14,7 +14,8 @@
#![warn(missing_docs)]
use bumpalo::Bump;
use liquid::{Parser, Template};
use liquid::{Object, Parser, Template};
use serde::Serialize;
use serde_json::{Map, Value};
use crate::prompt::ParseableDocument;
@ -61,20 +62,34 @@ pub struct Error {
impl Error {
/// Produces an error message when the error happened at rendering time.
pub fn rendering_error(&self, root: &str) -> String {
format!(
"in `{}`, error while rendering template: {}",
path_with_root(root, self.path.iter()),
&self.template_error
)
if self.path.is_empty() {
format!(
"error while rendering template: {}",
&self.template_error
)
} else {
format!(
"in `{}`, error while rendering template: {}",
path_with_root(root, self.path.iter()),
&self.template_error
)
}
}
/// Produces an error message when the error happened at parsing time.
pub fn parsing(&self, root: &str) -> String {
format!(
"in `{}`, error while parsing template: {}",
path_with_root(root, self.path.iter()),
&self.template_error
)
pub fn parsing_error(&self, root: &str) -> String {
if self.path.is_empty() {
format!(
"error while parsing template: {}",
&self.template_error
)
} else {
format!(
"in `{}`, error while parsing template: {}",
path_with_root(root, self.path.iter()),
&self.template_error
)
}
}
}
@ -134,6 +149,17 @@ impl JsonTemplate {
self.render(&search_data)
}
/// Renders any serializable value by converting it to a liquid object and rendering it with the template.
/// If its a map, values inside can be accessed directly by their keys.
pub fn render_serializable<T: Serialize>(&self, object: &T) -> Result<Value, Error> {
let object = liquid::to_object(object)
.map_err(|err| Error {
template_error: err,
path: ValuePath::new(),
})?;
self.render(&object)
}
/// The JSON value representing the underlying template
pub fn template(&self) -> &Value {
&self.value

4
crates/milli/src/vector/rest.rs
View File

@ -113,7 +113,7 @@ impl RequestData {
for (name, value) in indexing_fragments {
JsonTemplate::new(value).map_err(|error| {
NewEmbedderError::rest_could_not_parse_template(
error.parsing(&format!(".indexingFragments.{name}")),
error.parsing_error(&format!(".indexingFragments.{name}")),
)
})?;
}
@ -623,7 +623,7 @@ impl RequestFromFragments {
.map(|(name, value)| {
let json_template = JsonTemplate::new(value).map_err(|error| {
NewEmbedderError::rest_could_not_parse_template(
error.parsing(&format!(".searchFragments.{name}")),
error.parsing_error(&format!(".searchFragments.{name}")),
)
})?;
Ok((name, json_template))