From 6de7ce6677ae6fcbe0ea32ac5c5570ac9524883f Mon Sep 17 00:00:00 2001 From: Alex Co Date: Thu, 19 Sep 2024 05:24:20 +0000 Subject: [PATCH] Fix conflicts Signed-off-by: Alex Co --- backend/danswer/indexing/indexing_pipeline.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/backend/danswer/indexing/indexing_pipeline.py b/backend/danswer/indexing/indexing_pipeline.py index a7a781aa03f..c1e66f1fcfb 100644 --- a/backend/danswer/indexing/indexing_pipeline.py +++ b/backend/danswer/indexing/indexing_pipeline.py @@ -48,16 +48,11 @@ class DocumentBatchPrepareContext(BaseModel): class IndexingPipelineProtocol(Protocol): def __call__( -<<<<<<< HEAD self, document_batch: list[Document], index_attempt_metadata: IndexAttemptMetadata, ) -> tuple[int, int]: ... -======= - self, documents: list[Document], index_attempt_metadata: IndexAttemptMetadata - ) -> tuple[int, int]: ... ->>>>>>> 82e0d35b (Stop using redis to test the stability of new postgres connection handling) def upsert_documents_in_db(