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
4 changes: 2 additions & 2 deletions python/cocoindex/query.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ def internal_handler(self) -> _engine.SimpleSemanticsQueryHandler:
return self._lazy_query_handler()

def search(self, query: str, limit: int, vector_field_name: str | None = None,
similarity_matric: index.VectorSimilarityMetric | None = None) -> tuple[list[QueryResult], SimpleSemanticsQueryInfo]:
similarity_metric: index.VectorSimilarityMetric | None = None) -> tuple[list[QueryResult], SimpleSemanticsQueryInfo]:
"""
Search the index with the given query, limit, vector field name, and similarity metric.
"""
internal_results, internal_info = self.internal_handler().search(
query, limit, vector_field_name,
similarity_matric.value if similarity_matric is not None else None)
similarity_metric.value if similarity_metric is not None else None)
fields = [field['name'] for field in internal_results['fields']]
results = [QueryResult(data=dict(zip(fields, result['data'])), score=result['score']) for result in internal_results['results']]
info = SimpleSemanticsQueryInfo(
Expand Down
4 changes: 2 additions & 2 deletions src/execution/query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ impl SimpleSemanticsQueryHandler {
query: String,
limit: u32,
vector_field_name: Option<String>,
similarity_matric: Option<VectorSimilarityMetric>,
similarity_metric: Option<VectorSimilarityMetric>,
) -> Result<(QueryResults, SimpleSemanticsQueryInfo)> {
let query_results = evaluate_transient_flow(
&self.query_transform_flow,
Expand Down Expand Up @@ -106,7 +106,7 @@ impl SimpleSemanticsQueryHandler {
.or(self.default_vector_field_name.clone())
.ok_or_else(|| api_error!("vector field name must be provided"))?;

let similarity_metric = similarity_matric.unwrap_or(self.default_similarity_metric);
let similarity_metric = similarity_metric.unwrap_or(self.default_similarity_metric);
let info = SimpleSemanticsQueryInfo {
similarity_metric,
query_vector: vector.clone(),
Expand Down
6 changes: 3 additions & 3 deletions src/py/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -255,14 +255,14 @@ impl SimpleSemanticsQueryHandler {
Ok(())
}

#[pyo3(signature = (query, limit, vector_field_name = None, similarity_matric = None))]
#[pyo3(signature = (query, limit, vector_field_name = None, similarity_metric = None))]
pub fn search(
&self,
py: Python<'_>,
query: String,
limit: u32,
vector_field_name: Option<String>,
similarity_matric: Option<Pythonized<VectorSimilarityMetric>>,
similarity_metric: Option<Pythonized<VectorSimilarityMetric>>,
) -> PyResult<(
Pythonized<QueryResults>,
Pythonized<query::SimpleSemanticsQueryInfo>,
Expand All @@ -275,7 +275,7 @@ impl SimpleSemanticsQueryHandler {
query,
limit,
vector_field_name,
similarity_matric.map(|m| m.0),
similarity_metric.map(|m| m.0),
)
.await
})
Expand Down