Skip to content

release/3.8.0 #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
May 15, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: update code for stac lambda
  • Loading branch information
wphyojpl committed Apr 25, 2023
commit c9d3c322f8ed610a3ce8444fb59a746fdc835970
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import json
import os
from copy import deepcopy

Expand All @@ -9,6 +10,7 @@
from cumulus_lambda_functions.lib.metadata_extraction.echo_metadata import EchoMetadata
from cumulus_lambda_functions.lib.time_utils import TimeUtils
from cumulus_lambda_functions.metadata_s4pa_generate_cmr.pds_metadata import PdsMetadata
from cumulus_lambda_functions.metadata_stac_generate_cmr.stac_input_metadata import StacInputMetadata

LOGGER = LambdaLoggerGenerator.get_logger(__name__, LambdaLoggerGenerator.get_level_from_env())

Expand Down Expand Up @@ -97,7 +99,7 @@ def __init__(self, event):
self.__event = event
self.__s3 = AwsS3()
self._pds_file_dict = None
self.__file_postfixes = os.getenv('FILE_POSTFIX', '1.PDS.XML, NC.XML')
self.__file_postfixes = os.getenv('FILE_POSTFIX', 'STAC.JSON')
self.__file_postfixes = [k.upper().strip() for k in self.__file_postfixes.split(',')]
self.__input_file_list = []

Expand Down Expand Up @@ -128,10 +130,10 @@ def __read_pds_metadata_file(self):
def start(self):
self.__validate_input()
LOGGER.error(f'input: {self.__event}')
pds_metadata = PdsMetadata(xmltodict.parse(self.__read_pds_metadata_file())).load()
echo_metadata = EchoMetadata(pds_metadata).load().echo_metadata
granules_metadata_props = StacInputMetadata(json.loads(self.__read_pds_metadata_file())).start()
echo_metadata = EchoMetadata(granules_metadata_props).load().echo_metadata
echo_metadata_xml_str = xmltodict.unparse(echo_metadata, pretty=True)
self.__s3.target_key = os.path.join(os.path.dirname(self.__s3.target_key), f'{pds_metadata.granule_id}.cmr.xml')
self.__s3.target_key = os.path.join(os.path.dirname(self.__s3.target_key), f'{granules_metadata_props.granule_id}.cmr.xml')
self.__s3.upload_bytes(echo_metadata_xml_str.encode())

# put payload
Expand Down Expand Up @@ -190,8 +192,8 @@ def start(self):
"granules": [
{
"granuleId": self.__event['cma']['event']['meta']['input_granules'][0]['granuleId'],
"dataType": pds_metadata.collection_name,
"version": f'{pds_metadata.collection_version}',
"dataType": granules_metadata_props.collection_name,
"version": f'{granules_metadata_props.collection_version}',
"files": self.__input_file_list + [{
"key": self.__s3.target_key,
"fileName": os.path.basename(self.__s3.target_key),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import json

from cumulus_lambda_functions.lib.lambda_logger_generator import LambdaLoggerGenerator
from cumulus_lambda_functions.metadata_s4pa_generate_cmr.generate_cmr import GenerateCmr
from cumulus_lambda_functions.metadata_stac_generate_cmr.generate_cmr import GenerateCmr


def lambda_handler(event, context):
Expand Down