Skip to content
Snippets Groups Projects

Implemented manifest generation for EB full curation in ingest_envoy

Merged Sam Kagan requested to merge teach-ingest_envoy-full-curation into 2.8.2.1-DEVELOMENT
5 unresolved threads
Files
2
@@ -194,9 +194,7 @@ class IngestionManifest(ManifestComponentIF):
:return:
"""
me_dict = self.to_dict()
if self.reingest is not None and self.reingest.targets is not None:
output_path = Path.cwd() / CURATOR_MANIFEST_FILENAME
elif self.reingest is not None:
if self.reingest is not None:
output_path = self.destination_dir / CURATOR_MANIFEST_FILENAME
else:
output_path = self.destination_dir / MANIFEST_FILENAME
@@ -293,7 +291,7 @@ class IngestionManifestBuilder:
)
self.curation_source = Path(curate[1]) if curate and curate[1] else None
self.target_list = curate[2]
if self.curation_type == CuratorType.FULL and self.target_list not in [None, []]:
if self.curation_type == CuratorType.FULL and self.target_list:
raise IngestionManifestException(
f"Expected targets=None for full curation, got targets={self.target_list}"
)
@@ -378,7 +376,6 @@ class IngestionManifestBuilder:
artifacts_ap = self._build_artifacts_product()
if artifacts_ap not in manifest.output_group.ancillary_products:
manifest.output_group.ancillary_products.append(artifacts_ap)
destination_dir = (self.manifest_destination_dir,)
if not manifest.output_group.ancillary_products:
manifest.output_group.ancillary_products = []
Loading