From bebf8e9eb18dbbe7ef7e1ac0216fee5cfd245721 Mon Sep 17 00:00:00 2001 From: Brandon Hancock Date: Mon, 23 Dec 2024 13:10:29 -0500 Subject: [PATCH] resolve conflicts --- .../source/base_file_knowledge_source.py | 18 ++++++++---------- .../knowledge/source/crew_docling_source.py | 8 ++++---- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/crewai/knowledge/source/base_file_knowledge_source.py b/src/crewai/knowledge/source/base_file_knowledge_source.py index b863197da..e086cbf65 100644 --- a/src/crewai/knowledge/source/base_file_knowledge_source.py +++ b/src/crewai/knowledge/source/base_file_knowledge_source.py @@ -86,15 +86,13 @@ class BaseFileKnowledgeSource(BaseKnowledgeSource, ABC): else: if self.file_paths is None: raise ValueError("Your source must be provided with a file_paths: []") - paths = ( - [self.file_paths] - if isinstance(self.file_paths, (str, Path)) - else self.file_paths - ) - - if not isinstance(paths, list): - raise ValueError( - "file_path/file_paths must be a Path, str, or a list of these types" - ) + elif isinstance(self.file_paths, list) and len(self.file_paths) == 0: + raise ValueError("Empty file_paths are not allowed") + else: + paths = ( + [self.file_paths] + if isinstance(self.file_paths, (str, Path)) + else self.file_paths + ) return [self.convert_to_path(path) for path in paths] diff --git a/src/crewai/knowledge/source/crew_docling_source.py b/src/crewai/knowledge/source/crew_docling_source.py index 5027ca7dd..8b197168b 100644 --- a/src/crewai/knowledge/source/crew_docling_source.py +++ b/src/crewai/knowledge/source/crew_docling_source.py @@ -50,11 +50,11 @@ class CrewDoclingSource(BaseKnowledgeSource): ) self.file_paths = self.file_path self.safe_file_paths = self.validate_content() - self.content = self.load_content() + self.content = self._load_content() - def load_content(self) -> List[DoclingDocument]: + def _load_content(self) -> List[DoclingDocument]: try: - return self.convert_source_to_docling_documents() + return self._convert_source_to_docling_documents() except ConversionError as e: self._logger.log( "error", @@ -74,7 +74,7 @@ class CrewDoclingSource(BaseKnowledgeSource): self.chunks.extend(list(new_chunks_iterable)) self._save_documents() - def convert_source_to_docling_documents(self) -> List[DoclingDocument]: + def _convert_source_to_docling_documents(self) -> List[DoclingDocument]: conv_results_iter = self.document_converter.convert_all(self.safe_file_paths) return [result.document for result in conv_results_iter]