Skip to content
Snippets Groups Projects

WS-601: Rewrite/refactor ingestion manifest builder to pass disabled tests, part two

Merged Janet Goldstein requested to merge WS-601-ingestion-manifest-resolve-part-deux into main
1 unresolved thread
6 files
+ 136
93
Compare changes
  • Side-by-side
  • Inline
Files
6
@@ -7,7 +7,7 @@ import tarfile
from pathlib import Path
# pylint: disable=E0401, R0903, R1721
from typing import Tuple, List
from typing import Tuple
import pendulum
from pendulum import DateTime
@@ -15,7 +15,6 @@ from pendulum import DateTime
from ingest_envoy.manifest_components import (
INGESTION_ARTIFACTS_NAME,
TARFILE_EXT,
WEBLOG_FILENAME,
JSON,
IngestionManifestKey,
ManifestComponentIF,
@@ -29,6 +28,7 @@ from ingest_envoy.manifest_components import (
ParamsKey,
)
from ingest_envoy.schema import AbstractTextFile
from ingest_envoy.std_img_manifest_utils import ImageIngestionProductsFinder
from ingest_envoy.utilities import (
ScienceProductType,
Telescope,
@@ -36,7 +36,6 @@ from ingest_envoy.utilities import (
AncillaryProductType,
find_output_tars,
)
from ingest_envoy.std_img_manifest_utils import ImageIngestionProductsFinder
logger = logging.getLogger(__name__)
logger.setLevel(logging.INFO)
@@ -188,11 +187,13 @@ class IngestionManifestBuilder:
input_group=self._build_input_group(),
output_group=self._build_evla_cal_output_group(),
)
manifest_file = manifest.write()
artifacts_tar = self.write_ingestion_artifacts_tar()
manifest.output_group.ancillary_products.append(
AncillaryProduct(AncillaryProductType.INGESTION_ARTIFACTS, filename=str(artifacts_tar))
artifacts_ap = AncillaryProduct(
AncillaryProductType.INGESTION_ARTIFACTS, filename=str(artifacts_tar)
)
manifest_file = manifest.write()
manifest.output_group.ancillary_products = [artifacts_ap]
return manifest, manifest_file
Loading