ripvec_core/encoder/ripvec/dense.rs
1//! Static encoder: in-process `StaticEmbedModel` reimplementation.
2//!
3//! Port of `~/src/semble/src/semble/index/dense.py`. Wraps
4//! [`StaticEmbedModel`] loaded with `minishlab/potion-base-32M`
5//! (256-dim, L2-normalized). Implements [`VectorEncoder`] for the
6//! `--model ripvec` path. CPU-only; no batching ring buffer.
7//!
8//! Default was bumped to `potion-base-32M` in v1.3.0 after the
9//! gutenberg + python-repos matrix showed 32M winning prose by
10//! 0.058 NDCG@10 while losing code by only 0.004 — a clear
11//! single-default win once the i64 mapping bug and the reranker
12//! pooler / sigmoid / truncation bugs were fixed. The code-tuned
13//! `potion-code-16M` is still available via `--model-repo`.
14//!
15//! ## Why not `model2vec-rs`?
16//!
17//! The previous wave used the upstream `model2vec-rs` crate. Two real
18//! problems pushed us to reimplement (see
19//! `crates/ripvec-core/src/encoder/semble/static_model.rs` for the
20//! full design rationale):
21//!
22//! 1. `model2vec_rs::StaticModel::encode_with_args` runs `pool_ids`
23//! in a serial inner loop while `tokenizers::encode_batch_fast`
24//! spawns its own rayon pool. Wrapping that path in our outer
25//! `par_chunks` produced 60% `__psynch_cvwait` in the linux-corpus
26//! profile — nested rayon scopes parking on each other. The
27//! reimplementation does ONE big tokenize plus a `par_iter` over
28//! `pool_ids` — no nested rayon, no parking.
29//! 2. `model2vec-rs 0.2` pinned `ndarray 0.15`; ripvec-core uses
30//! `ndarray 0.17`. The two `Array2<f32>` types were not
31//! interchangeable, forcing a `Vec<Vec<f32>>` shim. Owning the
32//! load path eliminates the mismatch.
33
34use std::path::{Path, PathBuf};
35use std::sync::Mutex;
36
37use crossbeam_channel::bounded;
38use hf_hub::api::sync::Api;
39use rayon::prelude::*;
40
41use crate::chunk::CodeChunk;
42use crate::embed::SearchConfig;
43use crate::encoder::VectorEncoder;
44use crate::encoder::ripvec::chunking::{DEFAULT_DESIRED_CHUNK_CHARS, chunk_source};
45use crate::encoder::ripvec::static_model::StaticEmbedModel;
46use crate::languages::config_for_extension;
47use crate::profile::Profiler;
48use crate::walk::collect_files_with_options;
49
50/// Encode batch size used by the streaming pipeline. Matches
51/// `StaticEmbedModel`'s internal `BATCH_SIZE` so each emitted batch
52/// is exactly one `encode_batch_fast` call's worth of work.
53const PIPELINE_BATCH_SIZE: usize = 1024;
54
55/// Number of full batches allowed in-flight from chunker to encoder.
56/// Provides enough pipeline depth for the encoder to stay busy while
57/// the chunker fills the next batch; small enough that peak memory
58/// stays bounded.
59const PIPELINE_RING_SIZE: usize = 4;
60
61/// Default model repo identifier for the ripvec path. This is the HF
62/// repo string used as `identity()`; the loader reads files from a
63/// local path passed via `--model-repo`.
64pub const DEFAULT_MODEL_REPO: &str = "minishlab/potion-base-32M";
65
66/// Default hidden dimension for [`DEFAULT_MODEL_REPO`].
67pub const DEFAULT_HIDDEN_DIM: usize = 256;
68
69/// Maximum source file size to read, in bytes (mirrors semble's
70/// `_MAX_FILE_BYTES = 1_000_000` from `index/create.py:16`).
71const MAX_FILE_BYTES: u64 = 1_000_000;
72
73/// CPU-only static encoder.
74///
75/// Owns a loaded [`StaticEmbedModel`] plus identity metadata. The
76/// embedder is constructed by `main.rs::load_pipeline` via
77/// [`StaticEncoder::from_pretrained`], passing either a local path
78/// containing the Model2Vec files or (planned) an HF repo ID.
79pub struct StaticEncoder {
80 model: StaticEmbedModel,
81 model_repo: String,
82 hidden_dim: usize,
83}
84
85impl StaticEncoder {
86 /// Encode a query string into a single embedding row.
87 ///
88 /// Used by `RipvecIndex::search` for hybrid/semantic dispatch.
89 #[must_use]
90 pub fn encode_query(&self, query: &str) -> Vec<f32> {
91 self.model.encode_query(query)
92 }
93
94 /// Load a model by HuggingFace repo ID or local path.
95 ///
96 /// Two acceptance shapes:
97 ///
98 /// 1. **Local path** — if `model_repo` names an existing directory,
99 /// load directly from it. Used by the parity test fixture path
100 /// (`/tmp/potion-base-32M`) and any user pre-staging files.
101 /// 2. **HuggingFace repo ID** — otherwise treat as `org/repo`,
102 /// download `config.json` / `tokenizer.json` / `model.safetensors`
103 /// via `hf-hub` into `~/.cache/huggingface/hub/`, and load from
104 /// there. Matches `load_classic_cpu` / `load_modernbert_cpu`'s
105 /// behaviour so the user-facing API is consistent: bare `--model
106 /// ripvec` with no `--model-repo` flag works.
107 ///
108 /// # Errors
109 ///
110 /// Propagates the underlying I/O, download, or parse error if the
111 /// files cannot be obtained or the safetensors layout is
112 /// unrecognized.
113 pub fn from_pretrained(model_repo: &str) -> crate::Result<Self> {
114 let resolved = Self::resolve_model_dir(model_repo)?;
115 let model = StaticEmbedModel::from_path(&resolved, Some(true))
116 .map_err(|e| crate::Error::Other(anyhow::anyhow!("static model load failed: {e}")))?;
117 let hidden_dim = model.hidden_dim();
118 Ok(Self {
119 model,
120 model_repo: model_repo.to_string(),
121 hidden_dim,
122 })
123 }
124
125 /// Resolve `model_repo` to a directory containing the model files.
126 ///
127 /// If `model_repo` is an existing local directory, returns it as-is.
128 /// Otherwise downloads via `hf-hub` and returns the cache directory.
129 fn resolve_model_dir(model_repo: &str) -> crate::Result<PathBuf> {
130 let local = Path::new(model_repo);
131 if local.is_dir() {
132 return Ok(local.to_path_buf());
133 }
134
135 // HuggingFace repo path. Download the three required files and
136 // return the directory `hf-hub` cached them into. All files
137 // land in the same snapshot directory.
138 let api = Api::new().map_err(|e| crate::Error::Download(e.to_string()))?;
139 let repo = api.model(model_repo.to_string());
140 let _ = repo
141 .get("config.json")
142 .map_err(|e| crate::Error::Download(e.to_string()))?;
143 let _ = repo
144 .get("tokenizer.json")
145 .map_err(|e| crate::Error::Download(e.to_string()))?;
146 let weights_path = repo
147 .get("model.safetensors")
148 .map_err(|e| crate::Error::Download(e.to_string()))?;
149 // hf-hub returns the file path; the snapshot directory is its parent.
150 weights_path
151 .parent()
152 .map(std::path::Path::to_path_buf)
153 .ok_or_else(|| {
154 crate::Error::Other(anyhow::anyhow!(
155 "hf-hub returned root path for {model_repo}; cannot resolve snapshot dir"
156 ))
157 })
158 }
159
160 /// Chunk + embed an explicit list of files, skipping the walk.
161 ///
162 /// Used by [`RipvecIndex::apply_diff`](crate::encoder::ripvec::index::RipvecIndex::apply_diff)
163 /// to incrementally re-embed just the files that changed since the
164 /// last reconcile. `root` is the corpus root the paths are
165 /// relative to (used for the chunker's `rel_path` field, matching
166 /// what [`VectorEncoder::embed_root`] writes for unchanged files).
167 ///
168 /// Returns `(chunks, embeddings)` in flat lists; ordering mirrors
169 /// the per-file traversal order of `paths`. Files that fail to
170 /// read or chunk are silently skipped (same policy as
171 /// [`chunk_one_file`]).
172 ///
173 /// # Why a separate method
174 ///
175 /// [`VectorEncoder::embed_root`] is a heavy three-stage pipeline
176 /// optimized for full-corpus builds (thousands of files). For the
177 /// "1-50 files changed" case that drives reconciliation, the
178 /// sequential single-batch path here is simpler and faster: no
179 /// rayon pool spin-up, no bounded channels, no inter-stage
180 /// hand-off cost. The batch encode is a single [`encode_batch`]
181 /// call.
182 ///
183 /// # Errors
184 ///
185 /// Returns the underlying error if `encode_batch` fails.
186 pub fn embed_paths(
187 &self,
188 root: &Path,
189 paths: &[std::path::PathBuf],
190 profiler: &Profiler,
191 ) -> crate::Result<(Vec<CodeChunk>, Vec<Vec<f32>>)> {
192 let _guard = profiler.phase("embed_paths");
193 let mut chunks_out: Vec<CodeChunk> = Vec::new();
194 let mut texts: Vec<String> = Vec::new();
195 for path in paths {
196 let (file_chunks, file_texts) = chunk_one_file(root, path);
197 chunks_out.extend(file_chunks);
198 texts.extend(file_texts);
199 }
200 if chunks_out.is_empty() {
201 return Ok((Vec::new(), Vec::new()));
202 }
203 let text_refs: Vec<&str> = texts.iter().map(String::as_str).collect();
204 let embeddings = self.model.encode_batch(&text_refs);
205 debug_assert_eq!(embeddings.len(), chunks_out.len());
206 Ok((chunks_out, embeddings))
207 }
208}
209
210impl VectorEncoder for StaticEncoder {
211 /// Three-stage bounded-queue pipeline:
212 ///
213 /// 1. **Chunk producer** — rayon `par_iter` over the file list. Each
214 /// file is read, parsed by tree-sitter (or line-merged on
215 /// fallback), and emitted as `(CodeChunk, String)` pairs into a
216 /// bounded channel of capacity `PIPELINE_BATCH_SIZE * 8`.
217 /// 2. **Batch accumulator** — a single scoped thread drains the
218 /// chunk channel, packs `PIPELINE_BATCH_SIZE` pairs per batch,
219 /// and forwards into a bounded channel of capacity
220 /// `PIPELINE_RING_SIZE`.
221 /// 3. **Encode worker** — a single scoped thread receives batches
222 /// and calls `StaticEmbedModel::encode_batch`, whose internal
223 /// `par_iter` lights up rayon for the pool_ids kernel.
224 ///
225 /// Why this shape:
226 ///
227 /// - The previous "chunk all, then embed all" implementation held
228 /// the entire `Vec<String>` of chunk contents in memory between
229 /// phases. On the linux corpus that was ~400 MB peak. The
230 /// bounded queues cap in-flight memory at
231 /// `PIPELINE_BATCH_SIZE * 8 + PIPELINE_RING_SIZE * PIPELINE_BATCH_SIZE`
232 /// chunks regardless of corpus size — under 15 MB.
233 /// - The chunk phase (13s on linux) is hidden inside the embed
234 /// phase (70s) instead of serializing before it. Pre-pipeline
235 /// profile showed user-time at 394s on 82s wall = 4.8x
236 /// parallelism on 12 cores; pipeline lets idle cores chew on
237 /// chunking while embed runs.
238 /// - Mirrors `embed::embed_all_streaming`'s shape so the two
239 /// pipelines (BERT + semble) share architectural conventions.
240 fn embed_root(
241 &self,
242 root: &Path,
243 cfg: &SearchConfig,
244 profiler: &Profiler,
245 ) -> crate::Result<(Vec<CodeChunk>, Vec<Vec<f32>>)> {
246 // Phase 1: walk (still serial-to-pipeline because we need the
247 // full file list to par_iter over; the walk itself is rayon).
248 let walk_options = cfg.walk_options();
249 let file_paths = {
250 let _guard = profiler.phase("walk");
251 collect_files_with_options(root, &walk_options)
252 };
253 if file_paths.is_empty() {
254 return Ok((Vec::new(), Vec::new()));
255 }
256
257 // Bounded channels. See module constants for the rationale on
258 // PIPELINE_BATCH_SIZE and PIPELINE_RING_SIZE.
259 let (chunk_tx, chunk_rx) = bounded::<(CodeChunk, String)>(PIPELINE_BATCH_SIZE * 8);
260 let (batch_tx, batch_rx) = bounded::<Vec<(CodeChunk, String)>>(PIPELINE_RING_SIZE);
261
262 // The encoder stage writes ordered output behind a Mutex. Order
263 // across files isn't meaningful (RipvecIndex doesn't rely on
264 // chunk order), only the chunk[i] <-> embedding[i] pairing
265 // matters — which we preserve trivially by pushing in lockstep.
266 let output: Mutex<Vec<(CodeChunk, Vec<f32>)>> = Mutex::new(Vec::new());
267 let model = &self.model;
268
269 // Stage 1 runs on a DEDICATED rayon thread pool. If we used
270 // the global pool, Stage 1's par_iter workers would park on
271 // full `chunk_tx.send()` calls, and Stage 3's
272 // `encode_batch` → `pool_ids` par_iter would have no rayon
273 // workers available (they're all parked). That's a classic
274 // nested-rayon deadlock — observed in profiling as PID stuck
275 // at 0% CPU with 16 parked threads.
276 //
277 // Half the cores for chunking, half remain in the global pool
278 // for the encode worker's pool_ids. The chunk phase (tree-
279 // sitter + I/O bound) doesn't need full parallelism to
280 // pipeline cleanly behind embed.
281 let num_cores = rayon::current_num_threads().max(2);
282 let chunk_threads = (num_cores / 2).max(1);
283 let chunk_pool = rayon::ThreadPoolBuilder::new()
284 .num_threads(chunk_threads)
285 .thread_name(|i| format!("semble-chunk-{i}"))
286 .build()
287 .map_err(|e| crate::Error::Other(anyhow::anyhow!("chunk thread pool build: {e}")))?;
288
289 let _phase_guard = profiler.phase("pipeline");
290 std::thread::scope(|scope| {
291 // Stage 1: chunk producer on the dedicated pool.
292 let chunk_tx_owned = chunk_tx;
293 scope.spawn(move || {
294 chunk_pool.install(|| {
295 file_paths.par_iter().for_each(|full| {
296 let (chunks, contents) = chunk_one_file(root, full);
297 for (chunk, content) in chunks.into_iter().zip(contents) {
298 if chunk_tx_owned.send((chunk, content)).is_err() {
299 return;
300 }
301 }
302 });
303 });
304 // chunk_tx_owned drops here, closing the channel.
305 });
306
307 // Stage 2: batch accumulator.
308 let batch_tx_owned = batch_tx;
309 scope.spawn(move || {
310 let mut buf: Vec<(CodeChunk, String)> = Vec::with_capacity(PIPELINE_BATCH_SIZE);
311 for pair in chunk_rx {
312 buf.push(pair);
313 if buf.len() >= PIPELINE_BATCH_SIZE {
314 let batch =
315 std::mem::replace(&mut buf, Vec::with_capacity(PIPELINE_BATCH_SIZE));
316 if batch_tx_owned.send(batch).is_err() {
317 return;
318 }
319 }
320 }
321 if !buf.is_empty() {
322 let _ = batch_tx_owned.send(buf);
323 }
324 // batch_tx_owned drops here, closing the channel.
325 });
326
327 // Stage 3: encode worker.
328 scope.spawn(|| {
329 for batch in batch_rx {
330 if batch.is_empty() {
331 continue;
332 }
333 let mut chunks = Vec::with_capacity(batch.len());
334 let mut texts: Vec<String> = Vec::with_capacity(batch.len());
335 for (chunk, text) in batch {
336 chunks.push(chunk);
337 texts.push(text);
338 }
339 let text_refs: Vec<&str> = texts.iter().map(String::as_str).collect();
340 let embeddings = model.encode_batch(&text_refs);
341 debug_assert_eq!(embeddings.len(), chunks.len());
342 let mut out = output.lock().expect("output mutex poisoned");
343 for (chunk, emb) in chunks.into_iter().zip(embeddings) {
344 out.push((chunk, emb));
345 }
346 }
347 });
348 });
349
350 let collected = output.into_inner().expect("output mutex poisoned");
351 let mut chunks_out = Vec::with_capacity(collected.len());
352 let mut embs_out = Vec::with_capacity(collected.len());
353 for (chunk, emb) in collected {
354 chunks_out.push(chunk);
355 embs_out.push(emb);
356 }
357 Ok((chunks_out, embs_out))
358 }
359
360 fn hidden_dim(&self) -> usize {
361 self.hidden_dim
362 }
363
364 fn identity(&self) -> &str {
365 &self.model_repo
366 }
367}
368
369/// Chunk one file. Returns `(file_chunks, file_contents)` — empty
370/// when the file is too large, can't be read, or has no chunks.
371fn chunk_one_file(root: &Path, full: &Path) -> (Vec<CodeChunk>, Vec<String>) {
372 match std::fs::metadata(full) {
373 Ok(meta) if meta.len() > MAX_FILE_BYTES => return (Vec::new(), Vec::new()),
374 Err(_) => return (Vec::new(), Vec::new()),
375 _ => {}
376 }
377 let Ok(source) = std::fs::read_to_string(full) else {
378 return (Vec::new(), Vec::new());
379 };
380
381 let ext = full
382 .extension()
383 .and_then(|e| e.to_str())
384 .unwrap_or_default();
385 let lang_cfg = config_for_extension(ext);
386 let language = lang_cfg.as_ref().map(|c| &c.language);
387
388 let rel_path = full
389 .strip_prefix(root)
390 .unwrap_or(full)
391 .display()
392 .to_string();
393
394 let boundaries = chunk_source(&source, language, DEFAULT_DESIRED_CHUNK_CHARS);
395 let mut chunks = Vec::with_capacity(boundaries.len());
396 let mut contents = Vec::with_capacity(boundaries.len());
397 for b in boundaries {
398 let text = b.content(&source).to_string();
399 if text.trim().is_empty() {
400 continue;
401 }
402 contents.push(text.clone());
403 chunks.push(CodeChunk {
404 file_path: rel_path.clone(),
405 name: String::new(),
406 kind: String::new(),
407 start_line: b.start_line,
408 end_line: b.end_line,
409 content: text.clone(),
410 enriched_content: text,
411 });
412 }
413 (chunks, contents)
414}
415
416#[cfg(test)]
417mod tests {
418 use super::*;
419 use crate::encoder::VectorEncoder;
420
421 /// `StaticEncoder` implements `VectorEncoder` + Send + Sync.
422 /// Compile-time check (`test:static-encoder-implements-vector-encoder`).
423 #[test]
424 fn static_encoder_implements_vector_encoder() {
425 fn assert_trait_object<T: VectorEncoder + Send + Sync>() {}
426 assert_trait_object::<StaticEncoder>();
427 }
428
429 /// `from_pretrained` returns the right hidden_dim from a probe encode.
430 /// Ignored by default because it requires a model download (~16 MB).
431 ///
432 /// Corresponds to acceptance `test:static-encoder-hidden-dim-256` and
433 /// `test:static-encoder-loads-potion-code-16m` and
434 /// `test:static-encoder-output-is-l2-normalized`.
435 #[test]
436 #[ignore = "requires local model files at RIPVEC_SEMBLE_MODEL_PATH"]
437 fn static_encoder_loads_potion_code_16m() {
438 let Ok(path) = std::env::var("RIPVEC_SEMBLE_MODEL_PATH") else {
439 eprintln!("RIPVEC_SEMBLE_MODEL_PATH not set; skipping");
440 return;
441 };
442 let enc = StaticEncoder::from_pretrained(&path).expect("model load should succeed");
443 assert_eq!(enc.hidden_dim(), DEFAULT_HIDDEN_DIM);
444 // identity() reflects what the caller passed (typically the
445 // local path under test).
446 assert_eq!(enc.identity(), path);
447
448 // Verify L2-normalized output via the public encode_query path.
449 let row = enc.encode_query("hello world");
450 let norm: f32 = row.iter().map(|x| x * x).sum::<f32>().sqrt();
451 assert!(
452 (norm - 1.0).abs() < 1e-3,
453 "expected L2-normalized output; got norm={norm}"
454 );
455 }
456}