Refactor BaseVectorIndex delete method (#1853)

This commit is contained in:
waltcow 2023-12-30 21:49:01 +08:00 committed by GitHub
parent 936c3cc4d7
commit 06d2d8cea3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -6,7 +6,6 @@ from typing import List, Any, cast
from langchain.embeddings.base import Embeddings from langchain.embeddings.base import Embeddings
from langchain.schema import Document, BaseRetriever from langchain.schema import Document, BaseRetriever
from langchain.vectorstores import VectorStore from langchain.vectorstores import VectorStore
from weaviate import UnexpectedStatusCodeException
from core.index.base import BaseIndex from core.index.base import BaseIndex
from extensions.ext_database import db from extensions.ext_database import db
@ -139,10 +138,8 @@ class BaseVectorIndex(BaseIndex):
try: try:
self.delete() self.delete()
except UnexpectedStatusCodeException as e: except Exception as e:
if e.status_code != 400: raise e
# 400 means index not exists
raise e
dataset_documents = db.session.query(DatasetDocument).filter( dataset_documents = db.session.query(DatasetDocument).filter(
DatasetDocument.dataset_id == dataset.id, DatasetDocument.dataset_id == dataset.id,
@ -194,10 +191,8 @@ class BaseVectorIndex(BaseIndex):
try: try:
self.delete() self.delete()
except UnexpectedStatusCodeException as e: except Exception as e:
if e.status_code != 400: raise e
# 400 means index not exists
raise e
dataset_documents = db.session.query(DatasetDocument).filter( dataset_documents = db.session.query(DatasetDocument).filter(
DatasetDocument.dataset_id == dataset.id, DatasetDocument.dataset_id == dataset.id,