Skip to content

Commit

Permalink
release: 0.18.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@ppodolsky
ppodolsky committed Aug 29, 2023
1 parent fe7e279 commit 209e1e4
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 50 deletions.
2 changes: 1 addition & 1 deletion summa-core/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "summa-core"
version = "0.18.1"
version = "0.18.2"
authors = ["Pasha Podolsky <ppodolsky@me.com>"]
edition = "2021"
license-file = "LICENSE"
Expand Down
7 changes: 3 additions & 4 deletions summa-core/src/components/fruit_extractors.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,9 @@ pub fn build_fruit_extractor(
scorer: Some(proto::scorer::Scorer::EvalExpr(ref eval_expr)),
}) => {
let eval_scorer_seed = EvalScorer::new(eval_expr, searcher.schema())?;
let top_docs_collector =
tantivy::collector::TopDocs::with_limit((top_docs_collector_proto.limit + 1) as usize)
.and_offset(top_docs_collector_proto.offset as usize)
.tweak_score(EvalScorerTweaker::new(eval_scorer_seed));
let top_docs_collector = tantivy::collector::TopDocs::with_limit((top_docs_collector_proto.limit + 1) as usize)
.and_offset(top_docs_collector_proto.offset as usize)
.tweak_score(EvalScorerTweaker::new(eval_scorer_seed));
Box::new(
TopDocsBuilder::default()
.handle(multi_collector.add_collector(top_docs_collector))
Expand Down
73 changes: 34 additions & 39 deletions summa-core/src/components/index_registry.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,47 +159,42 @@ impl IndexRegistry {
let extraction_tooling_ref = &extraction_tooling;
let snippet_generator_ref = &snippet_generator;

let scored_documents = join_all(
scored_doc_address_refs
.into_iter()
.enumerate()
.map(|(position, scored_doc_address_ref)| {
let doc_address = scored_doc_address_ref.doc_address();
let searcher = extraction_tooling_ref.searcher.clone();
async move {
#[cfg(feature = "tokio-rt")]
let document = tokio::task::spawn_blocking(move || searcher.doc(doc_address)).await??;
#[cfg(not(feature = "tokio-rt"))]
let document = searcher.doc_async(doc_address).await?;
Ok(proto::ScoredDocument {
document: NamedFieldDocument::from_document(
extraction_tooling.searcher.schema(),
&extraction_tooling.query_fields,
&extraction_tooling.multi_fields,
&document,
)
.to_json_string(),
score: scored_doc_address_ref.score().clone(),
position: position as u32,
snippets: snippet_generator_ref
.as_ref()
.map(|snippet_generator_ref| {
snippet_generator_ref
.iter()
.map(|(field_name, snippet_generator)| {
(
field_name.to_string(),
Wrapper::from(snippet_generator.snippet_from_doc(&document)).into_inner(),
)
})
.collect()
let scored_documents = join_all(scored_doc_address_refs.into_iter().enumerate().map(|(position, scored_doc_address_ref)| {
let doc_address = scored_doc_address_ref.doc_address();
let searcher = extraction_tooling_ref.searcher.clone();
async move {
#[cfg(feature = "tokio-rt")]
let document = tokio::task::spawn_blocking(move || searcher.doc(doc_address)).await??;
#[cfg(not(feature = "tokio-rt"))]
let document = searcher.doc_async(doc_address).await?;
Ok(proto::ScoredDocument {
document: NamedFieldDocument::from_document(
extraction_tooling.searcher.schema(),
&extraction_tooling.query_fields,
&extraction_tooling.multi_fields,
&document,
)
.to_json_string(),
score: scored_doc_address_ref.score().clone(),
position: position as u32,
snippets: snippet_generator_ref
.as_ref()
.map(|snippet_generator_ref| {
snippet_generator_ref
.iter()
.map(|(field_name, snippet_generator)| {
(
field_name.to_string(),
Wrapper::from(snippet_generator.snippet_from_doc(&document)).into_inner(),
)
})
.unwrap_or_default(),
index_alias: scored_doc_address_ref.index_alias.to_string(),
.collect()
})
}
}),
)
.unwrap_or_default(),
index_alias: scored_doc_address_ref.index_alias.to_string(),
})
}
}))
.await
.into_iter()
.collect::<SummaResult<Vec<_>>>()?;
Expand Down
4 changes: 2 additions & 2 deletions summa-embed-py/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ pyo3-asyncio = { version = "0.19", features = ["attributes", "tokio-runtime"] }
pyo3-log = "0.8"
pythonize = "0.19"
serde_json = "1.0"
summa-core = { version = "0.18.1", path = "../summa-core", default_features = false, features = ["fs", "hyper-external-request", "tokio-rt"] }
summa-server = { version = "0.18.1", path = "../summa-server", default_features = false }
summa-core = { version = "0.18.2", path = "../summa-core", default_features = false, features = ["fs", "hyper-external-request", "tokio-rt"] }
summa-server = { version = "0.18.2", path = "../summa-server", default_features = false }
summa-proto = { workspace = true }
tantivy = { workspace = true }
tokio = { workspace = true }
6 changes: 3 additions & 3 deletions summa-server/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
edition = "2021"
name = "summa-server"
version = "0.18.1"
version = "0.18.2"
license-file = "LICENSE"
description = "Fast full-text search server"
homepage = "https://github.com/izihawa/summa"
Expand Down Expand Up @@ -30,7 +30,7 @@ maintenance = { status = "actively-developed" }
tonic-build = { version = "0.9.1", default-features = false, features = ["prost", "transport"] }

[dev-dependencies]
summa-core = { version = "0.18.1", path = "../summa-core", features = ["fs", "hyper-external-request", "tokio-rt"] }
summa-core = { version = "0.18.2", path = "../summa-core", features = ["fs", "hyper-external-request", "tokio-rt"] }
tempdir = "0.3.7"

[dependencies]
Expand Down Expand Up @@ -59,7 +59,7 @@ serde = { workspace = true }
serde_derive = "1.0"
serde_json = { workspace = true }
serde_yaml = { workspace = true }
summa-core = { version = "0.18.1", path = "../summa-core", features = ["fs", "hyper-external-request", "tokio-rt"] }
summa-core = { version = "0.18.2", path = "../summa-core", features = ["fs", "hyper-external-request", "tokio-rt"] }
summa-proto = { workspace = true, features = ["grpc"] }
take_mut = { workspace = true }
tantivy = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion summa-wasm/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ prost = { workspace = true }
serde = { workspace = true }
serde-wasm-bindgen = "0.5"
strfmt = { workspace = true }
summa-core = { version = "0.18.1", path = "../summa-core", default_features = false }
summa-core = { version = "0.18.2", path = "../summa-core", default_features = false }
summa-proto = { workspace = true }
tantivy = { workspace = true, features = ["wasm"] }
thiserror = { workspace = true }
Expand Down

0 comments on commit 209e1e4

Please sign in to comment.