From c0a90ece6a598598f2fea1eed334abed33780f69 Mon Sep 17 00:00:00 2001
From: Daniel Nemergut <dnemergu@nrao.edu>
Date: Wed, 13 Sep 2023 12:39:52 -0400
Subject: [PATCH] Revert "Setting the staging_area to the vlbiStagingDirectory
for VLBA and GMVA ingestion"
This reverts commit 559317422f88a92c3ea1915224d2d30f7c014aba.
---
.../pexable/ingest_envoy/ingest_envoy/ingest.py | 5 +----
.../pexable/ingest_envoy/ingest_envoy/solicitor.py | 11 +----------
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/ingest.py b/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/ingest.py
index ef5d8f307..d40c89f6f 100644
--- a/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/ingest.py
+++ b/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/ingest.py
@@ -67,10 +67,7 @@ def _get_settings(
parameters["workflowDir"] = pathlib.Path(source_dir).name
parameters["seciCachePath"] = pathlib.Path(source_dir).parent
- # Use the default staging area if it wasn't set by the solicitor
- if not parameters["staging_area"]:
- parameters["staging_area"] = ingestion_settings.stagingDirectory
-
+ parameters["staging_area"] = ingestion_settings.stagingDirectory
parameters["storage_area"] = ingestion_settings.storageDirectory
parameters["useIngest"] = strtobool(ingestion_settings.useIngest)
parameters["workflowUrl"] = workflow_url
diff --git a/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/solicitor.py b/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/solicitor.py
index f1877a7d2..e3d9ddb4c 100644
--- a/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/solicitor.py
+++ b/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/solicitor.py
@@ -25,8 +25,7 @@ import pathlib
from typing import List, Union
import requests
-from ingest_envoy.utilities import IngestType, Telescope, VLASSIngestType
-from pycapo import CapoConfig
+from ingest_envoy.utilities import IngestType, VLASSIngestType
INVALID_INITIAL_VERSION = "Initial version not valid for ingest"
@@ -218,14 +217,6 @@ class Solicitor:
"project": self.metadata["projectMetadata"]["projectCode"], # needed for post ingestion messaging
}
- # VLBA and GMVA share a non-default staging directory
- if obs["telescope"].upper() in [Telescope.VLBA.value, Telescope.GMVA.value]:
- try:
- obs["staging_area"] = \
- CapoConfig().settings("edu.nrao.workspaces.IngestionSettings").vlbiStagingDirectory
- except KeyError:
- self.logger.info("Couldn't retrieve VLBI staging area from capo, using default staging directory")
-
return {**obs}
def solicit_seci_params(self) -> dict:
--
GitLab