Skip to content
Snippets Groups Projects
Commit 657c7842 authored by Sam Kagan's avatar Sam Kagan
Browse files

Corrected sample metadata.json and related test

parent 801c3366
No related branches found
No related tags found
2 merge requests!1605Merge 2.8.2.3 work to main,!1523Added support to ingest_envoy for file_list and product_group in "reingest"
Pipeline #13029 passed
Stage: pull-db
Stage: build-packages
Stage: push-packages
Hide whitespace changes
Inline Side-by-side
apps/cli/executables/pexable/ingest_envoy/test/input_files/test-full-curation-image-evla-metadata.json
+ 21
− 21
View file @ 657c7842
{
"product_group": 267420,
"product_type": "image",
"input_group_locator": "22A-362.sb41228982.eb41696449.59652.07394940972",
"projectMetadata": {
"telescope": "EVLA",
"projectCode": "20A-156"
"projectCode": "20B-377"
},
"product_group": 328918,
"file_list": [
"oussid.SDSS_J0952-013_sci.C_band.cont.I.tt0.fits",
"weblog.tgz",
"oussid.SDSS_J1017-000_sci.C_band.cont.I.tt0.fits",
"oussid.SDSS_J1017-000_sci.C_band.cont.I.tt1.fits",
"oussid.SDSS_J0940-000_sci.C_band.cont.I.tt1.fits",
"oussid.SDSS_J0909-010_sci.C_band.cont.I.tt0.fits",
"oussid.SDSS_J0907+042_sci.C_band.cont.I.tt1.fits",
"oussid.SDSS_J0851+024_sci.C_band.cont.I.tt1.fits",
"oussid.SDSS_J0940-000_sci.C_band.cont.I.tt0.fits",
"oussid.SDSS_J0910+021_sci.C_band.cont.I.tt0.fits",
"oussid.SDSS_J0851+024_sci.C_band.cont.I.tt0.fits",
"ingestion_artifacts_2022_04_28T12_57_00.186.tar",
"pipeline_artifacts_2022_04_25T17_26_07.tar",
"oussid.SDSS_J0910+021_sci.C_band.cont.I.tt1.fits",
"oussid.SDSS_J0952-013_sci.C_band.cont.I.tt1.fits",
"oussid.SDSS_J0907+042_sci.C_band.cont.I.tt0.fits",
"oussid.SDSS_J0909-010_sci.C_band.cont.I.tt1.fits"
]
"20B-377.MJD59909.70629903935.AT2019teq_sci.X_band.cont.I.mask.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.X_band.cont.I.tt1.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.X_band.cont.I.pbcor.tt0.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.X_band.cont.I.pb.tt0.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.X_band.cont.I.alpha.error.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.X_band.cont.I.alpha.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.X_band.cont.I.tt0.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.C_band.cont.I.pb.tt0.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.C_band.cont.I.alpha.error.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.C_band.cont.I.pbcor.tt0.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.C_band.cont.I.tt0.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.C_band.cont.I.alpha.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.C_band.cont.I.tt1.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.C_band.cont.I.mask.fits",
"ingestion_artifacts_2022_12_14T06_22_03.874.tar",
"weblog.tgz",
"pipeline_artifacts_2022_12_09T19_08_32.tar"
],
"input_group_locator": "uid://evla/calibration/620195ad-1d11-49f4-be1f-3532092565c1"
}
apps/cli/executables/pexable/ingest_envoy/test/test_solicitor.py
+ 27
− 20
View file @ 657c7842
......@@ -115,33 +115,40 @@ class TestSolicitor:
filename = "test/input_files/test-full-curation-image-evla-metadata.json"
expected_parameters = {
"telescope": "EVLA",
"project": "20A-156",
"product_group": 267420,
"project": "20B-377",
"product_group": 328918,
"product_type": "image",
"curation_source": None,
"target_list": None,
"spl": None,
"input_group_locator": "22A-362.sb41228982.eb41696449.59652.07394940972",
"input_group_locator": "uid://evla/calibration/620195ad-1d11-49f4-be1f-3532092565c1",
"file_list": [
"oussid.SDSS_J0952-013_sci.C_band.cont.I.tt0.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.X_band.cont.I.mask.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.X_band.cont.I.tt1.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.X_band.cont.I.pbcor.tt0.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.X_band.cont.I.pb.tt0.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.X_band.cont.I.alpha.error.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.X_band.cont.I.alpha.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.X_band.cont.I.tt0.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.C_band.cont.I.pb.tt0.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.C_band.cont.I.alpha.error.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.C_band.cont.I.pbcor.tt0.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.C_band.cont.I.tt0.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.C_band.cont.I.alpha.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.C_band.cont.I.tt1.fits",
"20B-377.MJD59909.70629903935.AT2019teq_sci.C_band.cont.I.mask.fits",
"ingestion_artifacts_2022_12_14T06_22_03.874.tar",
"weblog.tgz",
"oussid.SDSS_J1017-000_sci.C_band.cont.I.tt0.fits",
"oussid.SDSS_J1017-000_sci.C_band.cont.I.tt1.fits",
"oussid.SDSS_J0940-000_sci.C_band.cont.I.tt1.fits",
"oussid.SDSS_J0909-010_sci.C_band.cont.I.tt0.fits",
"oussid.SDSS_J0907+042_sci.C_band.cont.I.tt1.fits",
"oussid.SDSS_J0851+024_sci.C_band.cont.I.tt1.fits",
"oussid.SDSS_J0940-000_sci.C_band.cont.I.tt0.fits",
"oussid.SDSS_J0910+021_sci.C_band.cont.I.tt0.fits",
"oussid.SDSS_J0851+024_sci.C_band.cont.I.tt0.fits",
"ingestion_artifacts_2022_04_28T12_57_00.186.tar",
"pipeline_artifacts_2022_04_25T17_26_07.tar",
"oussid.SDSS_J0910+021_sci.C_band.cont.I.tt1.fits",
"oussid.SDSS_J0952-013_sci.C_band.cont.I.tt1.fits",
"oussid.SDSS_J0907+042_sci.C_band.cont.I.tt0.fits",
"oussid.SDSS_J0909-010_sci.C_band.cont.I.tt1.fits",
"pipeline_artifacts_2022_12_09T19_08_32.tar",
],
}
full_curation_image_files_list_solicitor = Solicitor(CuratorType.FULL, SOLICITOR_URLS, filename)
actual_parameters = full_curation_image_files_list_solicitor.solicit_parameters()
assert actual_parameters == expected_parameters
assert len(actual_parameters.keys()) == len(expected_parameters.keys())
assert set(actual_parameters.keys()) == set(expected_parameters.keys())
for key, value in expected_parameters.items():
if key != "file_list":
assert value == actual_parameters[key]
else:
assert len(value) == len(actual_parameters[key])
assert set(value) == set(actual_parameters[key])
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment