Combine docstores and vectorstores within a storages component (#72)

knowledgehub/pipelines/indexing.py

@@ -6,9 +6,8 @@ from pathlib import Path
 from theflow import Node, Param
 
 from ..base import BaseComponent, Document
-from ..docstores import BaseDocumentStore
 from ..embeddings import BaseEmbeddings
-from ..vectorstores import BaseVectorStore
+from ..storages import BaseDocumentStore, BaseVectorStore
 
 VECTOR_STORE_FNAME = "vectorstore"
 DOC_STORE_FNAME = "docstore"

knowledgehub/pipelines/ingest.py

@@ -7,7 +7,6 @@ from theflow import Node
 from theflow.utils.modules import ObjectInitDeclaration as _
 
 from kotaemon.base import BaseComponent
-from kotaemon.docstores import BaseDocumentStore, InMemoryDocumentStore
 from kotaemon.embeddings import AzureOpenAIEmbeddings
 from kotaemon.loaders import (
     AutoReader,
@@ -20,7 +19,12 @@ from kotaemon.parsers.splitter import SimpleNodeParser
 from kotaemon.pipelines.agents import BaseAgent
 from kotaemon.pipelines.indexing import IndexVectorStoreFromDocumentPipeline
 from kotaemon.pipelines.retrieving import RetrieveDocumentFromVectorStorePipeline
-from kotaemon.vectorstores import BaseVectorStore, InMemoryVectorStore
+from kotaemon.storages import (
+    BaseDocumentStore,
+    BaseVectorStore,
+    InMemoryDocumentStore,
+    InMemoryVectorStore,
+)
 
 from .qa import AgentQAPipeline, QuestionAnsweringPipeline
 from .utils import file_names_to_collection_name

knowledgehub/pipelines/qa.py

@@ -7,14 +7,18 @@ from theflow.utils.modules import ObjectInitDeclaration as _
 
 from kotaemon.base import BaseComponent
 from kotaemon.base.schema import RetrievedDocument
-from kotaemon.docstores import BaseDocumentStore, InMemoryDocumentStore
 from kotaemon.embeddings import AzureOpenAIEmbeddings
 from kotaemon.llms import PromptTemplate
 from kotaemon.llms.chats.openai import AzureChatOpenAI
 from kotaemon.pipelines.agents import BaseAgent
 from kotaemon.pipelines.retrieving import RetrieveDocumentFromVectorStorePipeline
 from kotaemon.pipelines.tools import ComponentTool
-from kotaemon.vectorstores import BaseVectorStore, InMemoryVectorStore
+from kotaemon.storages import (
+    BaseDocumentStore,
+    BaseVectorStore,
+    InMemoryDocumentStore,
+    InMemoryVectorStore,
+)
 
 from .utils import file_names_to_collection_name
 

knowledgehub/pipelines/retrieving.py

@@ -7,9 +7,8 @@ from theflow import Node, Param
 
 from ..base import BaseComponent
 from ..base.schema import Document, RetrievedDocument
-from ..docstores import BaseDocumentStore
 from ..embeddings import BaseEmbeddings
-from ..vectorstores import BaseVectorStore
+from ..storages import BaseDocumentStore, BaseVectorStore
 
 VECTOR_STORE_FNAME = "vectorstore"
 DOC_STORE_FNAME = "docstore"