SOF-8 Refactor for ingest

app/api/api_v1/routers/cclw_ingest.py

@@ -25,14 +25,14 @@
     CCLWDocumentIngestRow,
     EventIngestRow,
 )
-from app.core.ingestion.cclw.pipeline import generate_pipeline_ingest_input
+from app.core.ingestion.pipeline import generate_pipeline_ingest_input
 from app.core.ingestion.processor import (
     initialise_context,
-    get_document_ingestor,
+    get_cclw_document_ingestor,
     get_document_validator,
     get_event_ingestor,
 )
-from app.core.ingestion.cclw.reader import get_file_contents, read
+from app.core.ingestion.reader import get_file_contents, read
 from app.core.ingestion.utils import (
     IngestContext,
     Result,
@@ -69,7 +69,7 @@ def _start_ingest(
     # TODO: add a way for a user to monitor progress of the ingest
     try:
         context = initialise_context(db, "CCLW")
-        document_ingestor = get_document_ingestor(db, context)
+        document_ingestor = get_cclw_document_ingestor(db, context)
         read(documents_file_contents, context, CCLWDocumentIngestRow, document_ingestor)
         event_ingestor = get_event_ingestor(db)
         read(events_file_contents, context, EventIngestRow, event_ingestor)

app/api/api_v1/routers/unfccc_ingest.py

@@ -24,14 +24,14 @@
     UNFCCCDocumentIngestRow,
 )
 
-from app.core.ingestion.unfccc.pipeline import generate_pipeline_ingest_input
+from app.core.ingestion.pipeline import generate_pipeline_ingest_input
 from app.core.ingestion.processor import (
     get_collection_ingestor,
     initialise_context,
-    get_document_ingestor,
+    get_unfccc_document_ingestor,
     get_document_validator,
 )
-from app.core.ingestion.unfccc.reader import get_file_contents, read
+from app.core.ingestion.reader import get_file_contents, read
 from app.core.ingestion.utils import (
     IngestContext,
     Result,
@@ -56,7 +56,7 @@
 unfccc_ingest_router = r = APIRouter()
 
 
-def _start_ingest(
+def start_unfccc_ingest(
     db: Session,
     s3_client: S3Client,
     s3_prefix: str,
@@ -71,8 +71,7 @@ def _start_ingest(
         collection_ingestor = get_collection_ingestor(db)
         read(collection_file_contents, context, CollectonIngestRow, collection_ingestor)
 
-        # FIXME: Write a unfccc ingestor
-        document_ingestor = get_document_ingestor(db, context)
+        document_ingestor = get_unfccc_document_ingestor(db, context)
         read(
             documents_file_contents, context, UNFCCCDocumentIngestRow, document_ingestor
         )
@@ -334,7 +333,7 @@ def ingest_unfccc_law_policy(
 
     # PHASE 3 - Start the ingest (kick off background task to do the actual ingest)
     background_tasks.add_task(
-        _start_ingest,
+        start_unfccc_ingest,
         db,
         s3_client,
         s3_prefix,

app/core/ingestion/cclw/metadata.py

@@ -17,7 +17,7 @@
 }
 
 
-def add_metadata(
+def add_cclw_metadata(
     db: Session,
     family_import_id: str,
     taxonomy: Taxonomy,

app/core/ingestion/cclw/collection.py → app/core/ingestion/collection.py

@@ -1,9 +1,13 @@
 from typing import Any, Optional
 
 from sqlalchemy.orm import Session
-from app.core.ingestion.cclw.ingest_row_cclw import CCLWDocumentIngestRow
+from app.core.ingestion.params import IngestParameters
 from app.core.ingestion.unfccc.ingest_row_unfccc import CollectonIngestRow
-from app.core.ingestion.utils import create, to_dict, update_if_changed
+from app.core.ingestion.utils import (
+    create,
+    to_dict,
+    update_if_changed,
+)
 
 from app.db.models.law_policy import Collection
 from app.db.models.law_policy.collection import CollectionFamily, CollectionOrganisation
@@ -61,9 +65,9 @@ def create_collection(
     )
 
 
-def handle_collection_from_row(
+def handle_collection_and_link(
     db: Session,
-    row: CCLWDocumentIngestRow,
+    params: IngestParameters,
     org_id: int,
     family_import_id: str,
     result: dict[str, Any],
@@ -81,23 +85,28 @@ def handle_collection_from_row(
     :param [dict[str, Any]]: a result dict in which to record what was created.
     :return [Collection | None]: A collection if one was created, otherwise None.
     """
-    if not row.cpr_collection_id or row.cpr_collection_id == "n/a":
+    if not params.cpr_collection_id or params.cpr_collection_id == "n/a":
         return None
 
     # First check for the actual collection
     existing_collection = (
         db.query(Collection)
-        .filter(Collection.import_id == row.cpr_collection_id)
+        .filter(Collection.import_id == params.cpr_collection_id)
         .one_or_none()
     )
 
     if existing_collection is None:
+        if params.create_collections is False:
+            id = params.cpr_collection_id
+            msg = f"Collection {id} is not pre-exsiting so not linking"
+            raise ValueError(msg)
+
         collection = create(
             db,
             Collection,
-            import_id=row.cpr_collection_id,
-            title=row.collection_name,
-            extra={"description": row.collection_summary},
+            import_id=params.cpr_collection_id,
+            title=params.collection_name,
+            extra={"description": params.collection_summary},
         )
 
         collection_organisation = create(
@@ -112,8 +121,8 @@ def handle_collection_from_row(
     else:
         collection = existing_collection
         updated = {}
-        update_if_changed(updated, "title", row.collection_name, collection)
-        update_if_changed(updated, "description", row.collection_summary, collection)
+        update_if_changed(updated, "title", params.collection_name, collection)
+        update_if_changed(updated, "description", params.collection_summary, collection)
         if len(updated) > 0:
             result["collection"] = updated
             db.add(collection)
@@ -123,8 +132,8 @@ def handle_collection_from_row(
     existing_link = (
         db.query(CollectionFamily)
         .filter_by(
-            collection_import_id=row.cpr_collection_id,
-            family_import_id=row.cpr_family_id,
+            collection_import_id=params.cpr_collection_id,
+            family_import_id=params.cpr_family_id,
         )
         .one_or_none()
     )