Merge pull request #100 from GeoscienceAustralia/update/timestamp_in_path

update filepath with timestamp

Author: abradley60

sar_pipeline/aws/metadata/odc.py

@@ -1,3 +1,6 @@
+import datetime
+
+
 def get_odc_product_name(product, collection_number, polarisations):
     """get the odc product name. WARNING this must align with
     the DEA product name at indexing into the datacube.
@@ -31,9 +34,7 @@ def make_rtc_s1_s3_subpath(
     collection_number: int,
     burst_polarisations: list,
     burst_id: str,
-    year: str,
-    month: str,
-    day: str,
+    burst_st: datetime.datetime,
 ):
     """Structure for the RTC_S1 product sub-folders. These include
     information about when the burst was acquired.
@@ -48,24 +49,24 @@ def make_rtc_s1_s3_subpath(
         list of burst polarisations
     burst_id : str
         burst_id. e.g. t028_059507_iw2
-    year : str
-        year of burst acquisition
-    month : str
-        month of burst acquisition
-    day : str
-        day of burst acquisition
+    burst_st : datetime.datetime
+        The starting datetime for the the burst acquisition
 
     Returns
     -------
     str
         path to the s3 bucket subfolder
         e.g. s3_project_folder/ga_s1_nrb_iw_vv_c1/t028_059507_iw2/2022/01/01
     """
+
     # get the odc product name which includes the collection number
+    burst_st_fmt = burst_st.strftime(
+        "%Y%m%dT%H%M%S"
+    )  # formatted timestamp without UTC 'Z'
     odc_product_name = get_odc_product_name(
         "RTC_S1", collection_number, burst_polarisations
     )
-    return f"{s3_project_folder}/{odc_product_name}/{burst_id}/{year}/{month:02d}/{day:02d}"
+    return f"{s3_project_folder}/{odc_product_name}/{burst_id}/{burst_st.year}/{burst_st.month:02d}/{burst_st.day:02d}/{burst_st_fmt}"
 
 
 def make_rtc_s1_static_s3_subpath(

sar_pipeline/aws/metadata/stac.py

@@ -170,9 +170,7 @@ def _make_s3_subfolder(self):
                 collection_number=self.collection_number,
                 burst_polarisations=self.polarisations,
                 burst_id=self.burst_id,
-                year=self.start_dt.year,
-                month=self.start_dt.month,
-                day=self.start_dt.day,
+                burst_st=self.start_dt,
             )
 
         elif self.product == "RTC_S1_STATIC":

sar_pipeline/aws/preparation/burst_utils.py

@@ -226,9 +226,7 @@ def check_burst_product_h5_exists_in_s3(
                 collection_number=collection_number,
                 burst_polarisations=burst_polarisations,
                 burst_id=burst_id,
-                year=burst_st.year,
-                month=burst_st.month,
-                day=burst_st.day,
+                burst_st=burst_st,
             )
         # assume the product exists if there is a .h5 file
         logging.info(f"searching s3 folder : {s3_product_subpath}")