Update private_gpt/server/ingest/ingest_router.py

private_gpt/server/ingest/ingest_router.py

@@ -1,13 +1,13 @@
-from typing import Literal
+from typing import Literal, List
 
 from fastapi import APIRouter, Depends, HTTPException, Request, UploadFile
 from pydantic import BaseModel
 
 from private_gpt.server.ingest.ingest_service import IngestService
 from private_gpt.server.ingest.model import IngestedDoc
-from private_gpt.server.utils.auth import authenticated
-
-ingest_router = APIRouter(prefix="/v1", dependencies=[Depends(authenticated)])
+#from private_gpt.server.utils.auth import authenticated
+from private_gpt.server.utils.authentication import get_current_user
+ingest_router = APIRouter(prefix="/v1", dependencies=[Depends(get_current_user)])
 
 
 class IngestResponse(BaseModel):
@@ -52,12 +52,36 @@ def list_ingested(request: Request) -> IngestResponse:
     return IngestResponse(object="list", model="private-gpt", data=ingested_documents)
 
 
-@ingest_router.delete("/ingest/{doc_id}", tags=["Ingestion"])
-def delete_ingested(request: Request, doc_id: str) -> None:
-    """Delete the specified ingested Document.
+@ingest_router.delete("/ingest/{file_name}", tags=["Ingestion"])
+def delete_ingested(request: Request, file_name: str) -> None:
+    """Delete all ingested Documents with the specified file name.
+
+    The `file_name` can be obtained from the `GET /ingest/list` endpoint.
+    All documents with the specified file name will be effectively deleted from your storage context.
+    """
+    service = request.state.injector.get(IngestService)
+
+    # Find all doc_ids with the specified file_name
+    ingested_documents = service.list_ingested()
+    documents_to_delete = [doc.doc_id for doc in ingested_documents if doc.doc_metadata.get("file_name") == file_name]
+
+    # Delete all documents with the specified file_name
+    for doc_id_to_delete in documents_to_delete:
+        service.delete(doc_id_to_delete)
+
+
+@ingest_router.get("/ingest/list_filenames", tags=["Ingestion"], response_model=List[str])
+def list_ingested(request: Request) -> List[str]:
+    """Lists already ingested Documents including their Document ID and metadata.
 
-    The `doc_id` can be obtained from the `GET /ingest/list` endpoint.
-    The document will be effectively deleted from your storage context.
+    Those IDs can be used to filter the context used to create responses
+    in `/chat/completions`, `/completions`, and `/chunks` APIs.
     """
     service = request.state.injector.get(IngestService)
-    service.delete(doc_id)
+    ingested_documents: List[IngestedDoc] = service.list_ingested()
+
+    # Extract unique filenames
+    unique_filenames = set(doc.doc_metadata.get("file_name", "") for doc in ingested_documents)
+    unique_filenames_list = list(unique_filenames)
+
+    return unique_filenames_list