Skip to content
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.

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

feat(indexing): Add chunker for text with text_splitter #270

Merged
merged 1 commit into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
173 changes: 173 additions & 0 deletions swiftide-indexing/src/transformers/chunk_text.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
//! Chunk text content into smaller pieces
use async_trait::async_trait;
use derive_builder::Builder;
use swiftide_core::{indexing::IndexingStream, indexing::Node, ChunkerTransformer};

#[derive(Debug, Builder)]
#[builder(pattern = "owned", setter(strip_option))]
/// A transformer that chunks text content into smaller pieces.
///
/// The transformer will split the text content into smaller pieces based on the specified
/// `max_characters` or `range` of characters.
///
/// For further customization, you can use the builder to create a custom splitter. Uses
/// `text_splitter` under the hood.
///
/// Technically that might work with every splitter `text_splitter` provides.
pub struct ChunkText {
chunker: text_splitter::TextSplitter<text_splitter::Characters>,
#[builder(default)]
/// The number of concurrent chunks to process.
concurrency: Option<usize>,
/// The splitter is not perfect in skipping min size nodes.
///
/// If you provide a custom chunker, you might want to set the range as well.
#[builder(default)]
range: Option<std::ops::Range<usize>>,
}

impl ChunkText {
/// Create a new transformer with a maximum number of characters per chunk.
pub fn from_max_characters(max_characters: usize) -> Self {
Self {
chunker: text_splitter::TextSplitter::new(max_characters),
concurrency: None,
range: None,
}
}

/// Create a new transformer with a range of characters per chunk.
///
/// Chunks smaller than the range will be ignored.
pub fn from_chunk_range(range: std::ops::Range<usize>) -> Self {
Self {
chunker: text_splitter::TextSplitter::new(range.clone()),
concurrency: None,
range: Some(range),
}
}

/// Build a custom text chunker.
pub fn builder() -> ChunkTextBuilder {
ChunkTextBuilder::default()
}

/// Set the number of concurrent chunks to process.
#[must_use]
pub fn with_concurrency(mut self, concurrency: usize) -> Self {
self.concurrency = Some(concurrency);
self
}

fn min_size(&self) -> usize {
self.range.as_ref().map_or(0, |r| r.start)
}
}

#[async_trait]
impl ChunkerTransformer for ChunkText {
#[tracing::instrument(skip_all, name = "transformers.chunk_text")]
async fn transform_node(&self, node: Node) -> IndexingStream {
let chunks = self
.chunker
.chunks(&node.chunk)
.filter_map(|chunk| {
let trim = chunk.trim();
if trim.is_empty() || trim.len() < self.min_size() {
None
} else {
Some(chunk.to_string())
}
})
.collect::<Vec<String>>();

IndexingStream::iter(chunks.into_iter().map(move |chunk| {
Ok(Node {
chunk,
..node.clone()
})
}))
}

fn concurrency(&self) -> Option<usize> {
self.concurrency
}
}

#[cfg(test)]
mod test {
use super::*;
use futures_util::stream::TryStreamExt;

const TEXT: &str = r"
This is a text.

This is a paragraph.

This is another paragraph.
";

#[tokio::test]
async fn test_transforming_with_max_characters_and_trimming() {
let chunker = ChunkText::from_max_characters(40);

let node = Node {
chunk: TEXT.to_string(),
..Node::default()
};

let nodes: Vec<Node> = chunker
.transform_node(node)
.await
.try_collect()
.await
.unwrap();

for line in TEXT.lines().filter(|line| !line.trim().is_empty()) {
assert!(nodes.iter().any(|node| node.chunk == line.trim()));
}

assert_eq!(nodes.len(), 3);
}

#[tokio::test]
async fn test_always_within_range() {
let ranges = vec![(10..15), (20..25), (30..35), (40..45), (50..55)];
for range in ranges {
let chunker = ChunkText::from_chunk_range(range.clone());
let node = Node {
chunk: TEXT.to_string(),
..Node::default()
};
let nodes: Vec<Node> = chunker
.transform_node(node)
.await
.try_collect()
.await
.unwrap();
// Assert all nodes chunk length within the range
assert!(
nodes.iter().all(|node| {
let len = node.chunk.len();
range.contains(&len)
}),
"{:?}, {:?}",
range,
nodes.iter().filter(|node| {
let len = node.chunk.len();
!range.contains(&len)
})
);
}
}

#[test]
fn test_builder() {
ChunkText::builder()
.chunker(text_splitter::TextSplitter::new(40))
.concurrency(10)
.range(10..20)
.build()
.unwrap();
}
}
2 changes: 2 additions & 0 deletions swiftide-indexing/src/transformers/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//! and tailored, supporting Jinja style templating based on [`tera`]. See [`swiftide::prompt::Prompt`] and [`swiftide::prompt::PromptTemplate`]

pub mod chunk_markdown;
pub mod chunk_text;
pub mod embed;
pub mod metadata_keywords;
pub mod metadata_qa_text;
Expand All @@ -15,6 +16,7 @@ pub mod metadata_title;
pub mod sparse_embed;

pub use chunk_markdown::ChunkMarkdown;
pub use chunk_text::ChunkText;
pub use embed::Embed;
pub use metadata_keywords::MetadataKeywords;
pub use metadata_qa_text::MetadataQAText;
Expand Down