resolved conflict

embedchain/data_formatter/data_formatter.py

@@ -1,11 +1,4 @@
-from embedchain.loaders.youtube_video import YoutubeVideoLoader
-from embedchain.loaders.pdf_file import PdfFileLoader
-from embedchain.loaders.web_page import WebPageLoader
-from embedchain.loaders.local_qna_pair import LocalQnaPairLoader
-from embedchain.loaders.local_text import LocalTextLoader
-from embedchain.loaders.docx_file import DocxFileLoader
-from embedchain.loaders.site_map import SitemapLoader
-from embedchain.chunkers.youtube_video import YoutubeVideoChunker
+from embedchain.chunkers.docx_file import DocxFileChunker
 from embedchain.chunkers.pdf_file import PdfFileChunker
 from embedchain.chunkers.qna_pair import QnaPairChunker
 from embedchain.chunkers.text import TextChunker
@@ -16,6 +9,7 @@
 from embedchain.loaders.local_qna_pair import LocalQnaPairLoader
 from embedchain.loaders.local_text import LocalTextLoader
 from embedchain.loaders.pdf_file import PdfFileLoader
+from embedchain.loaders.site_map import SitemapLoader
 from embedchain.loaders.web_page import WebPageLoader
 from embedchain.loaders.youtube_video import YoutubeVideoLoader
 
@@ -40,13 +34,13 @@ def _get_loader(self, data_type, config):
  :raises ValueError: If an unsupported data type is provided.
  """
  loaders = {
- 'youtube_video': YoutubeVideoLoader(),
- 'pdf_file': PdfFileLoader(),
- 'web_page': WebPageLoader(),
- 'qna_pair': LocalQnaPairLoader(),
- 'text': LocalTextLoader(),
- 'docx': DocxFileLoader(),
- 'site_map': SitemapLoader(),
+ "youtube_video": YoutubeVideoLoader(),
+ "pdf_file": PdfFileLoader(),
+ "web_page": WebPageLoader(),
+ "qna_pair": LocalQnaPairLoader(),
+ "text": LocalTextLoader(),
+ "docx": DocxFileLoader(),
+ "site_map": SitemapLoader(),
  }
  if data_type in loaders:
  return loaders[data_type]
@@ -62,13 +56,13 @@ def _get_chunker(self, data_type, config):
  :raises ValueError: If an unsupported data type is provided.
  """
  chunkers = {
- 'youtube_video': YoutubeVideoChunker(),
- 'pdf_file': PdfFileChunker(),
- 'web_page': WebPageChunker(),
- 'qna_pair': QnaPairChunker(),
- 'text': TextChunker(),
- 'docx': DocxFileChunker(),
- 'site_map': WebPageChunker(),
+ "youtube_video": YoutubeVideoChunker(config),
+ "pdf_file": PdfFileChunker(config),
+ "web_page": WebPageChunker(config),
+ "qna_pair": QnaPairChunker(config),
+ "text": TextChunker(config),
+ "docx": DocxFileChunker(config),
+ "site_map": WebPageChunker(config),
  }
  if data_type in chunkers:
  return chunkers[data_type]