From 17c1dba65292a439e462b9eef6cecac6d9040513 Mon Sep 17 00:00:00 2001 From: Matt Daily Date: Mon, 10 Jul 2023 15:29:23 -0700 Subject: [PATCH 1/3] Update to use in-cluser url rabbitmq.lco.gtn is a separate LB that we're retiring --- helm-chart/banzai-nres/values-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-chart/banzai-nres/values-prod.yaml b/helm-chart/banzai-nres/values-prod.yaml index 124439fe..56a66c4e 100644 --- a/helm-chart/banzai-nres/values-prod.yaml +++ b/helm-chart/banzai-nres/values-prod.yaml @@ -34,7 +34,7 @@ banzaiNres: calibrateProposalId: calibrate banzaiWorkerLogLevel: info rawDataApiRoot: http://archiveapi-internal.prod/ - fitsBroker: rabbitmq.lco.gtn + fitsBroker: rabbitmq-ha.prod.svc.cluster.local. fitsExchange: archived_fits queueName: banzai_nres_pipeline phoenixFileLocation: s3://banzai-nres-phoenix-models-lco-global From 2fdb74a6ea1479aaeb28426541bb6830f0f97e4f Mon Sep 17 00:00:00 2001 From: Matt Daily Date: Tue, 25 Jul 2023 12:26:48 -0700 Subject: [PATCH 2/3] Add UNKNOWN to list of empty coordinates FITS keywords changed after Java17 upgrade and we needed to handle UNKNOWN as an empty coordinate keyword, as well. --- banzai_nres/frames.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/banzai_nres/frames.py b/banzai_nres/frames.py index 7f481a06..b38a2d8f 100644 --- a/banzai_nres/frames.py +++ b/banzai_nres/frames.py @@ -367,7 +367,7 @@ def calibration_frame_class(self): @staticmethod def is_empty_coordinate(coordinate): - return 'nan' in str(coordinate).lower() or 'n/a' in str(coordinate).lower() + return any(coordinate.lower() in value for value in ['nan', 'n/a', 'unknown']) def open(self, path, runtime_context) -> Optional[ObservationFrame]: image = super().open(path, runtime_context) From 22911a2414552f81b3edecd76d3f15901bf60e74 Mon Sep 17 00:00:00 2001 From: Matt Daily Date: Tue, 25 Jul 2023 12:31:17 -0700 Subject: [PATCH 3/3] Update changelog --- CHANGES.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 962129a8..7d840d58 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,7 @@ +1.1.2 (2023-07-25) +------------------ +- Update NRES Frame Factory to handle UNKNOWN as a valid empty coordinate + 1.1.0 (2023-04-04) ------------------ - Added calibration frame comparison to reject them if they deviate too much from previous stacks