From 04774aaa48b1c72e63ff20e74a7d4c1961c05f24 Mon Sep 17 00:00:00 2001 From: Rick Ross Date: Tue, 12 Mar 2024 17:44:54 -0700 Subject: [PATCH] Added 'optout' code back into universe_map_file.py --- lib_afc_mosaic/universe_map_file.py | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib_afc_mosaic/universe_map_file.py b/lib_afc_mosaic/universe_map_file.py index 598a9c7..2a49062 100644 --- a/lib_afc_mosaic/universe_map_file.py +++ b/lib_afc_mosaic/universe_map_file.py @@ -204,6 +204,15 @@ class AFCMUniverseMapFile: except Exception as ex: raise Exception(f"universe_map_file.generate_mapped_file: Failed to get {self.optout_s3_bucket}/{errors_filename_s3_key}: {ex}") from ex + if "optout_s3_key" in self.metadata and self.metadata["optout_s3_key"] != None: + try: + file_data_stream = self.optout_s3_connection.get_object(self.optout_s3_bucket, + self.metadata["optout_s3_key"]) + optout_numbers = json.load(codecs.getreader("utf-8")(file_data_stream)) + self.error_numbers.update(optout_numbers) + except Exception as ex: + raise Exception(f"universe_map_file.generate_mapped_file: Failed to get {self.optout_s3_bucket}/{self.metadata['optout_s3_key']}: {ex}") from ex + # Loop the files from the map for ufilename in self.mosaic_file_list: self.process_file(ufilename) diff --git a/setup.py b/setup.py index 054afc9..258d8a7 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ with open('README.md', 'r') as f: setup( name='lib_afc_mosaic', - version='0.1.11', + version='0.1.12', author='', author_email='', description='',