[OpenSearch] Small bug fixes in query
This commit is contained in:
@@ -352,7 +352,7 @@ class EmbedChain(JSONSerializable):
|
|||||||
# get existing ids, and discard doc if any common id exist.
|
# get existing ids, and discard doc if any common id exist.
|
||||||
where = {"url": src}
|
where = {"url": src}
|
||||||
if self.config.id is not None:
|
if self.config.id is not None:
|
||||||
where.update({"metadata.app_id": self.config.id})
|
where["app_id"] = self.config.id
|
||||||
|
|
||||||
db_result = self.db.get(ids=ids, where=where) # optional filter
|
db_result = self.db.get(ids=ids, where=where) # optional filter
|
||||||
existing_ids = set(db_result["ids"])
|
existing_ids = set(db_result["ids"])
|
||||||
|
|||||||
@@ -93,7 +93,7 @@ class OpenSearchDB(BaseVectorDB):
|
|||||||
|
|
||||||
if "app_id" in where:
|
if "app_id" in where:
|
||||||
app_id = where["app_id"]
|
app_id = where["app_id"]
|
||||||
query["query"]["bool"]["must"].append({"term": {"metadata.app_id": app_id}})
|
query["query"]["bool"]["must"].append({"term": {"metadata.app_id.keyword": app_id}})
|
||||||
|
|
||||||
# OpenSearch syntax is different from Elasticsearch
|
# OpenSearch syntax is different from Elasticsearch
|
||||||
response = self.client.search(index=self._get_index(), body=query, _source=True, size=limit)
|
response = self.client.search(index=self._get_index(), body=query, _source=True, size=limit)
|
||||||
@@ -168,7 +168,7 @@ class OpenSearchDB(BaseVectorDB):
|
|||||||
pre_filter = {"match_all": {}} # default
|
pre_filter = {"match_all": {}} # default
|
||||||
if "app_id" in where:
|
if "app_id" in where:
|
||||||
app_id = where["app_id"]
|
app_id = where["app_id"]
|
||||||
pre_filter = {"bool": {"must": [{"term": {"metadata.app_id": app_id}}]}}
|
pre_filter = {"bool": {"must": [{"term": {"metadata.app_id.keyword": app_id}}]}}
|
||||||
docs = docsearch.similarity_search(
|
docs = docsearch.similarity_search(
|
||||||
input_query,
|
input_query,
|
||||||
search_type="script_scoring",
|
search_type="script_scoring",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "embedchain"
|
name = "embedchain"
|
||||||
version = "0.0.66"
|
version = "0.0.67"
|
||||||
description = "embedchain is a framework to easily create LLM powered bots over any dataset"
|
description = "embedchain is a framework to easily create LLM powered bots over any dataset"
|
||||||
authors = ["Taranjeet Singh"]
|
authors = ["Taranjeet Singh"]
|
||||||
license = "Apache License"
|
license = "Apache License"
|
||||||
|
|||||||
Reference in New Issue
Block a user