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 ef5d8f307792b3983e1cf59e2804e384973a83c7..d40c89f6ff03f53dcd462df60bc36f04a84a5999 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 f1877a7d292f57cb3d7ecd26dd2ef0bb780b756c..e3d9ddb4c84f83b8298426caa74eaf0f2cc35220 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: