Skip to content
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
19 changes: 18 additions & 1 deletion crates/tokenizer/src/cache/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ use crate::{
chat_template::{
ChatTemplateContentFormat, ChatTemplateParams, ThinkingKeyName, ThinkingToggle,
},
traits::{Decoder, Encoder, Encoding, SpecialTokens, TokenIdType, Tokenizer},
traits::{Decoder, Encoder, Encoding, PromptSegment, SpecialTokens, TokenIdType, Tokenizer},
};

/// Configuration for the tokenizer cache
Expand Down Expand Up @@ -248,6 +248,15 @@ impl Encoder for CachedTokenizer {
.map(|&input| self.encode(input, add_special_tokens))
.collect()
}

fn encode_segments(&self, segments: &[PromptSegment]) -> Result<Encoding> {
// A single control segment is the flat prompt the caches are keyed on.
// Mixed segments are encoded piecewise by the inner tokenizer, uncached.
match segments {
[only] if only.allow_special => self.encode(&only.text, false),
_ => self.inner.encode_segments(segments),
}
}
}

impl Decoder for CachedTokenizer {
Expand Down Expand Up @@ -286,6 +295,14 @@ impl Tokenizer for CachedTokenizer {
self.inner.apply_chat_template(messages, params)
}

fn apply_chat_template_segments(
&self,
messages: &[serde_json::Value],
params: ChatTemplateParams,
) -> Result<Vec<PromptSegment>> {
self.inner.apply_chat_template_segments(messages, params)
}

fn chat_template_content_format(&self) -> ChatTemplateContentFormat {
self.inner.chat_template_content_format()
}
Expand Down
Loading
Loading