AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-12 04:58:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix SQL parser Error in MyScale vdb. (#7255)

Browse Source
This commit is contained in:
mochi 2024-08-14 16:41:18 +08:00 committed by GitHub
parent 3a27166c2e
commit ba79088ffc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/core/rag/datasource/vdb/myscale/myscale_vector.py
View File

@ -93,7 +93,7 @@ class MyScaleVector(BaseVector):
@staticmethod @staticmethod
def escape_str(value: Any) -> str: def escape_str(value: Any) -> str:
return "".join(f"\\{c}" if c in ("\\", "'") else c for c in str(value)) return "".join(" " if c in ("\\", "'") else c for c in str(value))
def text_exists(self, id: str) -> bool: def text_exists(self, id: str) -> bool:
results = self._client.query(f"SELECT id FROM {self._config.database}.{self._collection_name} WHERE id='{id}'") results = self._client.query(f"SELECT id FROM {self._config.database}.{self._collection_name} WHERE id='{id}'")
@ -118,7 +118,7 @@ class MyScaleVector(BaseVector):
return self._search(f"distance(vector, {str(query_vector)})", self._vec_order, **kwargs) return self._search(f"distance(vector, {str(query_vector)})", self._vec_order, **kwargs)
def search_by_full_text(self, query: str, **kwargs: Any) -> list[Document]: def search_by_full_text(self, query: str, **kwargs: Any) -> list[Document]:
return self._search(f"TextSearch(text, '{query}')", SortOrder.DESC, **kwargs) return self._search(f"TextSearch('enable_nlq=false')(text, '{query}')", SortOrder.DESC, **kwargs)
def _search(self, dist: str, order: SortOrder, **kwargs: Any) -> list[Document]: def _search(self, dist: str, order: SortOrder, **kwargs: Any) -> list[Document]:
top_k = kwargs.get("top_k", 5) top_k = kwargs.get("top_k", 5)

2
docker/docker-compose.yaml
View File

@ -587,7 +587,7 @@ services:
# MyScale vector database # MyScale vector database
myscale: myscale:
container_name: myscale container_name: myscale
image: myscale/myscaledb:1.6 image: myscale/myscaledb:1.6.4
profiles: profiles:
- myscale - myscale
restart: always restart: always