Skip to content

Add basic-search-count CLI endpoint #135

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.

Sign up for GitHub

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

Merged
JJ-Pineda merged 1 commit into from
Jan 10, 2025
Merged

Add basic-search-count CLI endpoint #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 40 additions & 0 deletions src/command_line/search/basic_search_count.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
use crate::command_line::prelude::*;
use crate::search::basic_search::basic_search_count;

pub const NAME: &str = "basic-search-count";

pub fn command() -> Command {
Command::new(NAME)
.arg(
Arg::new("index")
.required(true)
.long("index")
.short('i')
.num_args(1),
)
.arg(
Arg::new("query")
.required(true)
.long("query")
.short('q')
.num_args(1),
)
}

pub fn action(matches: &ArgMatches) -> eyre::Result<()> {
let index_path = matches
.get_one::<String>("index")
.ok_or(eyre::eyre!("Failed to extract index path"))?;
let query = matches
.get_one::<String>("query")
.ok_or(eyre::eyre!("Failed to extract query"))?;

let index = open_index(index_path)?;
let reader = index.reader()?;
let searcher = reader.searcher();
let result_count = basic_search_count(&searcher, query)?;

log::info!("{:#?}", result_count);

Ok(())
}
1 change: 1 addition & 0 deletions src/command_line/search/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
pub mod basic_search;
pub mod basic_search_count;
pub mod cli_structure_search;
pub mod identity_search;
pub mod similarity_search;
Expand Down
4 changes: 4 additions & 0 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ async fn main() -> eyre::Result<()> {
.subcommand(command_line::pubchem::fetch_pubchem::command())
.subcommand(command_line::pubchem::stream_pubchem_sdf::command())
.subcommand(command_line::search::basic_search::command())
.subcommand(command_line::search::basic_search_count::command())
.subcommand(command_line::search::substructure_search::command())
.subcommand(command_line::search::superstructure_search::command())
.subcommand(command_line::search::similarity_search::command())
Expand Down Expand Up @@ -59,6 +60,9 @@ async fn main() -> eyre::Result<()> {
(command_line::search::basic_search::NAME, matches) => {
command_line::search::basic_search::action(matches)
}
(command_line::search::basic_search_count::NAME, matches) => {
command_line::search::basic_search_count::action(matches)
}
(command_line::search::substructure_search::NAME, matches) => {
command_line::search::substructure_search::action(matches)
}
Expand Down
13 changes: 12 additions & 1 deletion src/search/basic_search.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use crate::search::sort_docs;
use rayon::prelude::*;
use tantivy::{collector::TopDocs, query::QueryParser, DocAddress, Searcher};
use tantivy::collector::{Count, TopDocs};
use tantivy::{query::QueryParser, DocAddress, Searcher};

#[allow(clippy::ptr_arg)]
pub fn basic_search(
Expand All @@ -20,3 +21,13 @@ pub fn basic_search(
sort_docs(&mut final_results);
Ok(final_results)
}

#[allow(clippy::ptr_arg)]
pub fn basic_search_count(searcher: &Searcher, query: &String) -> eyre::Result<usize> {
let index = searcher.index();
let query_parser = QueryParser::for_index(index, vec![]);
let query = query_parser.parse_query(query)?;
let result_count = searcher.search(&query, &Count)?;

Ok(result_count)
}
Loading