From 5634d2e89dcf243543f0d013ae9436a6a731d255 Mon Sep 17 00:00:00 2001
From: Daniel Nemergut <dnemergu@nrao.edu>
Date: Wed, 11 Oct 2023 18:42:43 -0400
Subject: [PATCH] Setting ngas_ingest=False when
archive-ingestion.skipNGAS=true exists in the capo config, otherwise defaults
to ngas_ingest=True (current behavior)
---
.../ingest_envoy/ingest_envoy/ingestion_manifest.py | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/ingestion_manifest.py b/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/ingestion_manifest.py
index 59c28cf91..26b1c7a21 100644
--- a/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/ingestion_manifest.py
+++ b/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/ingestion_manifest.py
@@ -21,6 +21,7 @@ import logging
import sys
import tarfile
from pathlib import Path
+from pycapo import CapoConfig
# pylint: disable=C0301, E0401, R0903, R1721
from typing import Tuple
@@ -87,6 +88,12 @@ class IngestionManifest(ManifestComponentIF):
self.output_group = output_group
self.telescope = telescope
+ # Check if NGAS ingestion should be disabled for all manifests in this environment
+ try:
+ self.ngas_ingest = not CapoConfig().getboolean("archive-ingestion.skipNGAS")
+ except (KeyError, ValueError):
+ self.ngas_ingest = True
+
self.parameters = self.build_ingest_parameters(additional_metadata)
self.files_found = [file for file in self.staging_source_dir.iterdir()]
@@ -108,7 +115,7 @@ class IngestionManifest(ManifestComponentIF):
params = ManifestParameters(
telescope=self.telescope,
reingest=False,
- ngas_ingest=True,
+ ngas_ingest=self.ngas_ingest,
calibrate=False,
staging_source_dir=self.staging_source_dir,
additional_metadata=additional_metadata,
@@ -118,7 +125,7 @@ class IngestionManifest(ManifestComponentIF):
params = ManifestParameters(
telescope=self.telescope,
reingest=False,
- ngas_ingest=True,
+ ngas_ingest=self.ngas_ingest,
calibrate=False,
staging_source_dir=self.staging_source_dir,
)
@@ -127,7 +134,7 @@ class IngestionManifest(ManifestComponentIF):
params = ManifestParameters(
telescope=self.telescope,
reingest=False,
- ngas_ingest=True,
+ ngas_ingest=self.ngas_ingest,
staging_source_dir=self.staging_source_dir,
)
--
GitLab