refactor: Refactor datasource module (#1309)

dbgpt/storage/vector_store/base.py

@@ -7,8 +7,7 @@ from concurrent.futures import ThreadPoolExecutor
 from typing import List, Optional
 
 from dbgpt._private.pydantic import BaseModel, Field
-from dbgpt.core import Embeddings
-from dbgpt.rag.chunk import Chunk
+from dbgpt.core import Chunk, Embeddings
 
 logger = logging.getLogger(__name__)
 

dbgpt/storage/vector_store/chroma_store.py

@@ -10,7 +10,7 @@ from dbgpt._private.pydantic import Field
 from dbgpt.configs.model_config import PILOT_PATH
 
 # TODO: Recycle dependency on rag and storage
-from dbgpt.rag.chunk import Chunk
+from dbgpt.core import Chunk
 
 from .base import VectorStoreBase, VectorStoreConfig
 

dbgpt/storage/vector_store/connector.py

@@ -3,7 +3,7 @@
 import os
 from typing import Any, Dict, List, Optional, Type, cast
 
-from dbgpt.rag.chunk import Chunk
+from dbgpt.core import Chunk
 from dbgpt.storage import vector_store
 from dbgpt.storage.vector_store.base import VectorStoreBase, VectorStoreConfig
 

dbgpt/storage/vector_store/milvus_store.py

@@ -7,8 +7,7 @@ import os
 from typing import Any, Iterable, List, Optional
 
 from dbgpt._private.pydantic import Field
-from dbgpt.core import Embeddings
-from dbgpt.rag.chunk import Chunk
+from dbgpt.core import Chunk, Embeddings
 from dbgpt.storage.vector_store.base import VectorStoreBase, VectorStoreConfig
 from dbgpt.util import string_utils
 

dbgpt/storage/vector_store/pgvector_store.py

@@ -4,7 +4,7 @@ from typing import Any, List
 
 from dbgpt._private.config import Config
 from dbgpt._private.pydantic import Field
-from dbgpt.rag.chunk import Chunk
+from dbgpt.core import Chunk
 from dbgpt.storage.vector_store.base import VectorStoreBase, VectorStoreConfig
 
 logger = logging.getLogger(__name__)

dbgpt/storage/vector_store/weaviate_store.py

@@ -5,7 +5,7 @@ from typing import List
 
 from dbgpt._private.config import Config
 from dbgpt._private.pydantic import Field
-from dbgpt.rag.chunk import Chunk
+from dbgpt.core import Chunk
 
 from .base import VectorStoreBase, VectorStoreConfig