PPS 2021 refactor

bin/pps_runner.py

@@ -24,6 +24,7 @@
 """Posttroll runner for the NWCSAF/PPS version >= v2018.
 """
 
+import argparse
 import logging
 import os
 import sys
@@ -125,7 +126,7 @@
         LOG.debug("...from config file = " + str(options['pps_outdir']))
 
         LOG.debug("Run command: " + str(cmd_str))
         try:
             pps_all_proc = Popen(cmd_str, shell=True, stderr=PIPE, stdout=PIPE)
         except PpsRunError:
             LOG.exception("Failed in PPS...")
@@ -149,7 +150,7 @@
             cmdl = create_pps_call_command(py_exec, pps_script, scene)
 
             LOG.debug("Run command: " + str(cmdl))
             try:
                 pps_cmaprob_proc = Popen(cmdl, shell=True, stderr=PIPE, stdout=PIPE)
             except PpsRunError:
                 LOG.exception("Failed when trying to run the PPS Cma-prob")
@@ -283,14 +284,34 @@
     listen_thread.stop()
 
 
+def get_arguments():
+    """Get command line arguments."""
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--test_with_l1c_file',
+                        type=str,
+                        help="To test for l1c file with patched subscriber",
+                        required=False)
+    parser.add_argument('-c', '--config_file',
+                        type=str,
+                        dest='config_file',
+                        default='l1c_config.yaml',
+                        help="The file containing " +
+                        "configuration parameters e.g. product_filter_config.yaml, \n" +
+                        "default = ./l1c_config.yaml",
+                        required=True)
+
+    args = parser.parse_args()
+    return args
+
+
 if __name__ == "__main__":
 
     from logging import handlers
-
-    CONFIG_PATH = os.environ.get('PPSRUNNER_CONFIG_DIR', './')
-    CONFIG_FILE = os.environ.get('PPSRUNNER_CONFIG_FILE', 'pps_config.yaml')
 
-    OPTIONS = get_config(os.path.join(CONFIG_PATH, CONFIG_FILE), add_defaults=True)
+    args = get_arguments()
+    config_file = args.config_file
+
+    OPTIONS = get_config(config_file, add_defaults=True)
 
     _PPS_LOG_FILE = OPTIONS.get('pps_log_file',
                                 os.environ.get('PPSRUNNER_LOG_FILE', False))
@@ -318,7 +339,17 @@
     logging.getLogger('posttroll').setLevel(logging.INFO)
 
     LOG = logging.getLogger('pps_runner')
-    LOG.debug("Path to PPS-runner config file = " + CONFIG_PATH)
-    LOG.debug("PPS-runner config file = " + CONFIG_FILE)
-
+    LOG.debug("Path to PPS-runner config file = {:s}".format(args.config_file))
+
+    if args.test_with_l1c_file:
+        from posttroll.message import Message
+        from posttroll.testing import patched_subscriber_recv
+        some_files = [args.test_with_l1c_file]
+        messages = [Message("some_topic", "file", data={"uri": f, "orbit_number": 00000, "sensor": "avhrr",
+                                                        'platform_name': "EOS-Aqua",
+                                                        "start_time": datetime(2024, 4, 9, 8, 3)})
+                    for f in some_files]
+        subscriber_settings = dict(nameserver=False, addresses=["ipc://bla"])
+        with patched_subscriber_recv(messages):
+            pps(OPTIONS)
     pps(OPTIONS)

bin/run_nwp_preparation.py

@@ -39,17 +39,19 @@
 
 # datetime.datetime.utcnow => datetime.datetime.now(datetime.UTC) ~python 3.12
 
+
 def prepare_and_publish(pub, options, flens):
     config_file_name = options.config_file
     starttime = datetime.utcnow() - timedelta(days=8)
     ok_files, publish_topic = update_nwp(starttime, flens, config_file_name)
-    if "publish_topic" is not None:
+    if publish_topic is not None:
         for filename in ok_files:
             publish_msg = prepare_nwp_message(filename, publish_topic)
             LOG.debug("Will publish")
             LOG.debug("publish_msg")
             publish_l1c(pub, publish_msg, publish_topic)
-
+
+
 def _run_subscribe_publisher(pub, options, flens):
     """Prepare NWP data for pps."""
     every_hour_minute = options.run_every_hour_at_minute
@@ -71,12 +73,14 @@ def _run_subscribe_publisher(pub, options, flens):
                 raise
             LOG.info("Ready with nwp preparation for pps, waiting 45 minutes")
             time.sleep(45 * 60)
-
+
+
 def prepare_nwp4pps_runner(options, flens):
     """Start runner for nwp data preparations."""
     with Publish("pps-nwp-preparation-runner", 0) as pub:
         _run_subscribe_publisher(pub, options, flens)
 
+
 def get_arguments():
     """Get command line arguments."""
     parser = argparse.ArgumentParser()

nwcsafpps_runner/publish_and_listen.py

@@ -51,7 +51,7 @@ def run(self):
         LOG.debug("Subscribe topics = %s", str(self.subscribe_topics))
         with posttroll.subscriber.Subscribe("", self.subscribe_topics, True) as subscr:
 
-            for msg in subscr.recv(timeout=90):
+            for msg in subscr.recv():
                 if not self.loop:
                     break