Skip to content
Snippets Groups Projects

WS-795: laying groundwork for "final" std calib. ingestion manifest

Merged Andrew Kapuscinski requested to merge WS-795-ingest-mf-bldr-mods into main
All threads resolved!
4 files
+ 134
3
Compare changes
  • Side-by-side
  • Inline
Files
4
@@ -30,6 +30,7 @@ MANIFEST_FILENAME = "ingestion-manifest.json"
INGESTION_ARTIFACTS_NAME = "ingestion_artifacts_"
TARFILE_EXT = ".tar"
WEBLOG_FILENAME = "weblog.tgz"
INIT_WEBLOG_FILENAME = "initial_weblog.tgz"
SCIENCE_PRODUCT_PATTERN = re.compile("[a-zA-Z0-9._\\-+]*\\.tar")
JSON = Union[int, float, str, List["JSON"], Dict[str, "JSON"]]
@@ -197,7 +198,7 @@ class AncillaryProduct(ManifestComponentIF):
# make this an ancillary to a particular science product (assumes locator string)
if science_associate:
self.science_associate = science_associate # TODO, possibly: enum?
self.science_associate = science_associate
# make this an ancillary to the group of a science product (assumes locator string)
if group_with:
self.group_with = group_with
@@ -256,7 +257,7 @@ class OutputScienceProduct(ManifestComponentIF):
return False
def __str__(self):
return f"{Path(self.filename).name}: {self.type.value}, " f"{len(self.ancillary_products)} ancillary products"
return f"{Path(self.filename).name}: {self.type.value}, {len(self.ancillary_products)} ancillary products"
def to_json(self) -> JSON:
json_dict = {"type": self.type.value, "filename": self.filename}
Loading