Skip to content

Commit 13c8cc0

Browse files
committed
Pass site coordinates to QC
1 parent ecbd7ff commit 13c8cc0

File tree

5 files changed

+14
-6
lines changed

5 files changed

+14
-6
lines changed

src/processing/instrument.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def process_instrument(processor: Processor, params: InstrumentParams, directory
7171
new_file, params.product.id, std_uuid.UUID(uuid.product), filename, directory
7272
)
7373
qc_result = processor.upload_quality_report(
74-
new_file, std_uuid.UUID(uuid.product), params.product.id
74+
new_file, std_uuid.UUID(uuid.product), params.site, params.product.id
7575
)
7676
processor.update_statuses(uuid.raw, "processed")
7777
utils.print_info(uuid, volatile, patch, upload, qc_result)

src/processing/jobs.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ def update_plots(processor: Processor, params: ProcessParams, directory: Path) -
3737
def update_qc(processor: Processor, params: ProcessParams, directory: Path) -> None:
3838
metadata, full_path = _fetch_data(processor, params, directory)
3939
file_uuid = uuid.UUID(metadata["uuid"])
40-
result = processor.upload_quality_report(full_path, file_uuid, params.product.id)
40+
result = processor.upload_quality_report(
41+
full_path, file_uuid, params.site, params.product.id
42+
)
4143
url = f"{utils.build_file_landing_page_url(str(file_uuid))}/quality"
4244
logging.info(f"Created quality report: {url} {result.upper()}")
4345

src/processing/model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def process_model(processor: Processor, params: ModelParams, directory: Path):
9393
processor.create_and_upload_images(
9494
new_file, "model", product_uuid, filename, directory
9595
)
96-
qc_result = processor.upload_quality_report(new_file, product_uuid)
96+
qc_result = processor.upload_quality_report(new_file, product_uuid, params.site)
9797
_print_info(product_uuid, qc_result)
9898
processor.update_statuses(raw_uuids, "processed")
9999
except MiscError as err:

src/processing/processor.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,13 +486,19 @@ def _upload_img(
486486
}
487487

488488
def upload_quality_report(
489-
self, full_path: Path, uuid: uuid.UUID, product: str | None = None
489+
self, full_path: Path, uuid: uuid.UUID, site: Site, product: str | None = None
490490
) -> str:
491491
try:
492492
# is_dev = self.config.get("PID_SERVICE_TEST_ENV", "").lower() == "true"
493493
# ignore_tests = ["TestInstrumentPid"] if is_dev else None
494+
site_meta: quality.SiteMeta = {
495+
"latitude": site.latitude,
496+
"longitude": site.longitude,
497+
"altitude": site.altitude,
498+
}
494499
quality_report = quality.run_tests(
495500
full_path,
501+
site_meta,
496502
product=product, # ignore_tests=ignore_tests
497503
)
498504
except ValueError:

src/processing/product.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def process_me(processor: Processor, params: ModelParams, directory: Path):
7777
directory,
7878
)
7979
qc_result = processor.upload_quality_report(
80-
new_file, std_uuid.UUID(uuid.product), params.product.id
80+
new_file, std_uuid.UUID(uuid.product), params.site, params.product.id
8181
)
8282
utils.print_info(uuid, volatile, patch, upload, qc_result)
8383

@@ -148,7 +148,7 @@ def process_product(processor: Processor, params: ProductParams, directory: Path
148148
directory,
149149
)
150150
qc_result = processor.upload_quality_report(
151-
new_file, std_uuid.UUID(uuid.product), params.product.id
151+
new_file, std_uuid.UUID(uuid.product), params.site, params.product.id
152152
)
153153
utils.print_info(uuid, volatile, patch, upload, qc_result)
154154
if processor.md_api.config.is_production:

0 commit comments

Comments
 (0)