Merge pull request #58 from eodms-sgdot/development

Development

Author: keballantyne

eodms_cli.py

@@ -17,7 +17,7 @@
 __license__ = 'MIT License'
 __description__ = 'Script used to search, order and download imagery from ' \
                   'the EODMS using the REST API (RAPI) service.'
-__version__ = '3.6.0'
+__version__ = '3.6.1'
 __maintainer__ = 'Kevin Ballantyne'
 __email__ = 'eodms-sgdot@nrcan-rncan.gc.ca'
 
@@ -911,8 +911,9 @@ def ask_record_ids(self, ids, single_coll=False):
                       f"RCMImageProducts:7625368|25654750" \
                       f",NAPL:3736869{self.eod.reset_colour})\n"
                 if single_coll:
-                    msg = "\nEnter a single or set of Record IDs with the " \
-                        f"(Ex: {self.eod.var_colour}" \
+                    msg = f"\nEnter a single or set of Record IDs with the " \
+                        f"Collection ID at the start of IDs separated by a " \
+                        f"pipe (Ex: {self.eod.var_colour}" \
                         f"RCMImageProducts:7625368|25654750" \
                         f"{self.eod.reset_colour})\n"
                 ids = self.get_input(msg, required=False)
@@ -928,7 +929,43 @@ def ask_record_ids(self, ids, single_coll=False):
 
         return ids
 
-    def ask_st(self, record_ids):
+    def ask_st_images(self, ids):
+
+        """
+        Asks the user for Record IDs or Order Keys for SAR Toolbox orders.
+        
+        :param ids: A single or set of Record IDs with their collections.
+        :type  ids: str
+        """
+
+        if ids is None or ids == '':
+
+            if not self.eod.silent:
+                self.print_header("Enter Record Id(s) or Order Key(s)")
+                
+                msg = f"\nEnter a single or set of Record IDs or enter a " \
+                    f"single or set of Order Keys separated by a pipe. " \
+                    f"Include the Collection Id at the beginning of the set." \
+                    f" (Ex: {self.eod.var_colour}" \
+                    f"RCMImageProducts:7625368|25654750" \
+                    f"{self.eod.reset_colour} or {self.eod.var_colour}" \
+                    f"RCMImageProducts:RCM2_OK1373330_PK1530425_1_16M12_" \
+                    f"20210326_111202_HH_HV_GRD|RCM2_OK1373330_PK1524695_1_" \
+                    f"16M17_20210321_225956_HH_HV_GRD{self.eod.reset_colour})\n"
+                ids = self.get_input(msg, required=False)
+
+                process = self.eod.validate_st_images(ids)
+
+                if not process:
+                    err_msg = "Invalid entry for the Record Ids or Order Keys."
+                    # self.eod.print_support(True, err_msg)
+                    self.eod.print_msg(err_msg, heading='error')
+                    self.logger.error(err_msg)
+                    self.eod.exit_cli(1)
+
+        return ids
+
+    def ask_st(self):
         """
         Ask user for all SAR Toolbox information
         """
@@ -960,7 +997,7 @@ def ask_param(param):
             if param.get_value():
                 sub_params = param.get_sub_param()
                 # print(f"param.get_value(): {param.get_value()}")
-                if param.data_type == bool and not param.get_value():
+                if param.data_type == 'bool' and param.get_value() == 'False':
                     return None
                 if sub_params:
                     for s_param in sub_params:
@@ -1025,7 +1062,7 @@ def ask_item(item_name, item_list, item_type='runner', multiple=False,
 
         self.print_header("Enter SAR Toolbox Information")
 
-        st = sar.SARToolbox(self.eod, record_ids)
+        st = sar.SARToolbox(self.eod)
 
         ###############################
         # Set the category
@@ -1698,10 +1735,11 @@ def prompt(self):
                 sar_tb = sar.SARToolbox(self.eod, out_fn=st_request)
                 sar_tb.ingest_request()
             else:
-                inputs = self.ask_record_ids(input_val, True)
+                inputs = self.ask_st_images(input_val)
                 self.params['input_val'] = inputs
 
-                sar_tb = self.ask_st(self.params['input_val'])
+                # sar_tb = self.ask_st(self.params['input_val'])
+                sar_tb = self.ask_st()
 
             self.params['st_request'] = sar_tb.out_fn
 
@@ -1713,7 +1751,7 @@ def prompt(self):
             self.print_syntax()
 
             # Run the order_csv process
-            self.eod.order_st(sar_tb, priority)
+            self.eod.order_st(sar_tb, self.params)
 
         else:
             # self.eod.print_support("That is not a valid process type.")

scripts/sar.py

@@ -703,9 +703,10 @@ def __init__(self, eod, record_ids=None, out_fn=None):
         with urllib.request.urlopen(schema_url) as response:
             self.schema_json = json.loads(response.read())
 
-        if record_ids:
-            self.coll_id, rec_ids = record_ids.split(':')
-            self.record_ids = rec_ids.split('|')
+        # if record_ids:
+        #     self.coll_id, rec_ids = record_ids.split(':')
+        #     self.record_ids = rec_ids.split('|')
+        self.record_ids = record_ids
 
         # self.constants = None
         self.out_fn = out_fn
@@ -726,6 +727,12 @@ def __init__(self, eod, record_ids=None, out_fn=None):
 
         self.logger = logging.getLogger('eodms')
 
+    def set_coll_id(self, coll_id):
+        self.coll_id = coll_id
+
+    def set_record_ids(self, record_ids):
+        self.record_ids = record_ids
+
     def ingest_request(self, json_fn=None):
         """
         Gets the VAP Request from a JSON file.

scripts/utils.py

@@ -1760,6 +1760,22 @@ def validate_dates(self, dates):
         except Exception:
             return False
 
+    def validate_st_images(self, in_vals):
+        """
+        Validates the user input for the Record Id search
+
+        :param in_vals: The input values from the user
+        :type  in_vals: str
+        """
+
+        try:
+            if in_vals.find(":") > -1:
+                coll, rec_ids = in_vals.split(':')
+            return in_vals
+        except Exception as e:
+            return False
+
+        
     def validate_record_ids(self, ids, single_coll=False):
         """
         Validates the user input for the Record Id search
@@ -1776,7 +1792,7 @@ def validate_record_ids(self, ids, single_coll=False):
                 for i in ids_lst:
                     coll, rec_ids = i.split(':')
             return ids
-        except Exceptionase:
+        except Exception as e:
             return False
 
     def validate_int(self, val, limit=None):
@@ -2580,11 +2596,37 @@ def download_results(self, params):
         self.cur_res = query_imgs
         self._finish_process(orders)
 
-    def order_st(self, sar_toolbox, priority):
+    def order_st(self, sar_toolbox, params): # sar_toolbox, priority):
         """
         Submit a SAR Toolbox order to the RAPI.
         """
 
+        in_vals = params.get('input_val')
+        priority = params.get('priority')
+
+        coll_id, ids = in_vals.split(':')
+
+        if ids.find("_") > -1:
+            ord_keys = ids.split('|')
+            for ok in ord_keys:
+                filters = {'Order Key': ('=', ok)}
+                self.eodms_rapi.search(coll_id, filters)
+
+            res = self.eodms_rapi.get_results()
+            if len(res) > 0:
+                record_ids = [r.get('recordId') for r in res]
+
+                # print(f"res: {res}")
+                # answer = input("Press enter...")
+        else:
+            record_ids = ids.split('|')
+
+        # print(f"record_ids: {record_ids}")
+        # answer = input("Press enter...")
+
+        sar_toolbox.set_coll_id(coll_id)
+        sar_toolbox.set_record_ids(record_ids)
+
         start_str = self._set_result_fn()
         self.logger.info(f"Process start time: {start_str}")