Merge branch 'dev' of https://gitlab.irap.omp.eu/pyros-irap/pyros into dev

Etienne Pallier
2 parents a56e6e0e 683fc05b
Showing 5 changed files with 110 additions and 55 deletions Show diff stats
src/core/pyros_django/bdf_process/A_BDFProcessor.py
src/core/pyros_django/img_process/A_ImgProcessor.py
src/core/pyros_django/majordome/agent/Agent.py
src/core/pyros_django/scheduling/A_Scheduler.py
src/core/pyros_django/scp_mgmt/A_SCP_Manager.py
 #!/usr/bin/env python3
 #
 # To launch this agent from the root of Pyros:
-# cd /srv/develop/pyros
-# .\PYROS -t start AgentImagesCalibrator -o tnc -fg
 #
-# Edit the file pyros/pyros.py,
-# Add a new entry in the dict AGENT:
-#     "AgentImagesCalibrator": "observation_manager",
+# Linux console:
+# cd /srv/develop/pyros/docker
+# ./PYROS_DOCKER_START.sh
+#
+# Launch from Power Shell:
+# To go from docker to Powershell: pyros_user@ORION:~/app$ exit (or Ctrl+d)
+# Prompt is now PS ...>
+# cd \srv\develop\pyros
+# .\PYROS -t new-start -o tnc -fg -a A_BDFProcessor_tnc_up1_akz
+#
+# Launch from docker:
+# To go from Powershell to docker: PS ...> .\PYROS_DOCKER_SHELL
+# Prompt is now pyros_user@ORION:~/app$
+# ./PYROS -t new-start -o tnc -fg -a A_BDFProcessor_tnc_up1_akz
+#
+# To use debug
+# ./PYROS -d -t new-start -o tnc -fg -a A_BDFProcessor
+#
+# ./PYROS -d -t start -o tnc -fg A_BDFProcessor
 # ---------------------------------------------------
 import sys
 import time
-
+import argparse
 import os
+import pickle
+import socket
 pwd = os.environ['PROJECT_ROOT_PATH']
 if pwd not in sys.path:
     sys.path.append(pwd)
@@ -23,8 +39,8 @@ for short_path in short_paths:
     if path not in sys.path:
         sys.path.insert(0, path)
-from src.core.pyros_django.majordome.agent.Agent import Agent, build_agent, log
-
+from src.core.pyros_django.majordome.agent.Agent import Agent, build_agent, log, parse_args
+from seq_submit.models import Sequence, Album, Plan, Image
 # = Specials
 import glob
 import shutil
@@ -40,74 +56,88 @@ class A_BDFProcessor(Agent):
     # TODO: Redefine valid timeout
     _AGENT_SPECIFIC_COMMANDS = {
         # Format : “cmd_name” : (timeout, exec_mode)
-        
+
         "do_create_test_images_1" : (60, Agent.EXEC_MODE.SEQUENTIAL, ''),
         "do_create_test_images_2" : (60, Agent.EXEC_MODE.SEQUENTIAL, ''),
         "do_stop_current_processing" : (60, Agent.EXEC_MODE.SEQUENTIAL, ''),
     }
-
-    
-
-    # Scenario to be executed
+    # Test scenario to be executed (option -t)
     # "self do_stop_current_processing"
     # AgentCmd.CMD_STATUS_CODE.CMD_EXECUTED
     _TEST_COMMANDS_LIST = [
         # Format : ("self cmd_name cmd_args", timeout, "expected_result", expected_status),
-        (True, "self do_create_test_images_1", 200, '', Agent.CMD_STATUS.CMD_EXECUTED),
-        (True, "self do_exit", 500, "STOPPING", Agent.CMD_STATUS.CMD_EXECUTED),
+        (True, "self do_create_test_images_1", 500, "", Agent.CMD_STATUS.CMD_EXECUTED),
+        (True, "self do_stop asap", 500, "STOPPING", Agent.CMD_STATUS.CMD_EXECUTED),
     ]
-
+    
     """
     =================================================================
         Methods running inside main thread
     =================================================================
     """
-    def __init__(self, name:str=None):
+    def __init__(self, name:str=None,simulated_computer=None):
         if name is None:
             name = self.__class__.__name__
-        super().__init__()
+        super().__init__(simulated_computer=simulated_computer)
     def _init(self):
         super()._init()
-        log.debug("end super init()")
-        log.info(f"self.TEST_MODE = {self.TEST_MODE}")
+        log.debug("End super init()")
+        log.info(f"self.TEST_MODE = {self.TEST_MODE}") # is_in_test_mode()
+        log.info(f"self.is_in_test_mode() = {self.is_in_test_mode()}") # is_in_test_mode()
-        # === Get config infos
-        agent_alias = self.name
-        log.info(f"agent_alias = {agent_alias}")
         # === Get the config object
         self.config = self._oc['config']
-        # === Get self._path_data_root
-        self._path_data_root = self.config.get_agent_path_data_root(agent_alias)
-        # === Get self._home of current unit
+        self.pconfig = self._oc['pyros_config']
+
+        # === Get agent_alias
+        hostname = socket.gethostname()
+        log.info(f"{hostname=}")
+        log.info(f"{self.name=}")
+        agent_alias = self.config.get_agent_real_name(self.name, hostname)
+        log.info(f"{agent_alias=}")
+
+        # === Get self._home (str) of current unit
         self._home = self.config.getHome()
-        # === Get self._paths the directories for all data (images). See obsconfig_class.py to know keys
-        self._paths = self.config.get_agent_path_data_tree(agent_alias, True)
-        # === Get bias strategies
-        unit_name = "TNC"
-        channel_name = "OpticalChannel_up1"
-        category = "BI"
-        self_strategy_bias = self.config.get_image_calibrations(unit_name, channel_name, category)
-        log.debug(f"self_strategy_bias={self_strategy_bias}")
-        # === Instanciate an object Ima to make image processing
-        self._ima = guitastro.Ima()
+        # === Get home (Home object) of current unit
         home = guitastro.Home(self._home)
-        # === Instanciate an object Filenames to manage file names
-        self._filename_manager = guitastro.FileNames()
-        self._filename_manager.naming("PyROS.1")
+        # === Get the channel of agent
+        channel = self.config.get_channel_of_agent(agent_alias)
+        if channel == None:
+            raise Exception(f"{agent_alias} has no channel file contexts {channel=}")
+        #log.info(f"{channel=}")
+        self._channel = channel
-        # === Set longitude to ima object to generate the night yyyymmdd and subdirectories yyyy/mm/dd
-        longitude = home.longitude
-        log.info(f"Longitude={longitude}")
-        self._ima.longitude(longitude)
-        log.info("Init done with success")
+        # === Get all file contexts from the channel config
+        self._fn = channel['fn_contexts']
+
+        # === Get all file contexts from pyros config
+        # Shouldn't be used in channel's agent (self.config.fn are general fcontext)
+        #self._fn = self.config.fn
+        log.info(f"=== List of file name contexts available for the unit")
+        self.check_contexts(False)
+        log.info(f"{self._fn.longitude=}")
+
+        # === Instanciate an object Ima to make image processing
+        self._ima = guitastro.Ima()
+        # === Set longitude to ima object to generate the night yyyymmdd and subdirectories yyyy/mm/dd
+        self._ima.longitude = self._fn.longitude
+
+        # === Copy and update the channel file contexts into the Ima object
+        self._ima.fcontext_replace(channel['fn_contexts'])
+        log.info(f"=== List of file name contexts available for the channel {channel['name']} ({channel['symbol']})")
+        for fcname in self._ima.fcontexts:
+            self._ima.fcontext = fcname
+            log.info(f"{fcname} : {self._ima.fdescription} {self._ima.rootdir}/[{self._ima.pathing()}]/[{self._ima.naming()}]{self._ima.extension}")
+        
         # === Status of routine processing
         self._routine_running = self.RUNNING_NOTHING
+        log.info("Init done with success")
         log.debug("end init()")
     # Note : called by _routine_process() in Agent
@@ -142,10 +172,20 @@ class A_BDFProcessor(Agent):
         pass
     def do_create_test_images_1(self):
-        self._create_test_images_1()
+        """Create images to make tests.
+        """
+        try:
+            self._create_test_images_1()
+        except Exception as e:
+            self.dprint(f"ERROR {e}")
     def do_create_test_images_2(self):
-        self._create_test_images_2()
+        """Create images to make tests.
+        """
+        try:
+            self._create_test_images_2()
+        except Exception as e:
+            self.dprint(f"ERROR {e}")
     """
     =================================================================
@@ -17,6 +17,10 @@
 # Prompt is now pyros_user@ORION:~/app$
 # ./PYROS -t new-start -o tnc -fg -a A_ImgProcessor_tnc_up1_akz
 #
+# To use debug
+# ./PYROS -d -t new-start -o tnc -fg -a A_ImgProcessor
+#
+# ./PYROS -d -t start -o tnc -fg A_ImgProcessor
 # ---------------------------------------------------
 import sys
@@ -3572,6 +3572,10 @@ class Agent:
         targets = ['sun', 'moon']
         jd = jd1 + 0.1
         total1 = 0
+
+        d_prev = 0
+        d_cur = 0
+        d_total = 0
         night_info = {}
         while jd < jd2:
             night = self._oc['config'].fn.date2night(jd)
@@ -3580,16 +3584,18 @@ class Agent:
                 ephem = self.ephem_target2night(target, jd)
                 if target == "sun":
                     ks = np.where(ephem['alt'] < self._duskelev)
-                    total_night = len(ks[0])
-                    total2 = total1 + total_night
-                    sec1 = ks[0][0]
-                    sec2 = ks[0][-1]
-                    night_info[night] = [int(total1), int(total2), int(total_night), sec1, sec2]
-                    total1 = total2
+                    d_prev = d_prev + d_cur
+                    d_cur = len(ks[0])
+                    night_info[night] = [0, d_prev, d_cur, 0]
             jd += 1
-        night_info['total'] = [0, int(total2), int(total2), -1, -1]
-        self.dprint(f"Write {filename=}")
-        pickle.dump(night_info, open(filename, "wb"))
+        d_total = d_prev + d_cur
+        for key, val in night_info.items():
+            val[0] = d_total
+            val[-1] = d_total - val[-2]
+            # --- update db TODO
+            
+        #log.info(f"Write {filename=}")
+        #pickle.dump(night_info, open(filename, "wb"))
         return night_info
 """
@@ -159,6 +159,8 @@ class A_Scheduler(Agent):
     def do_create_seq_1(self, nb_seq:int):
         """Create sequences to debug
+        :raises ExceptionType: Some multi-line
+            exception description.
         """
         try:
             self._create_seq_1(nb_seq)
@@ -335,6 +337,8 @@ class A_Scheduler(Agent):
                 self.dprint(f"  {scientific_program_id=} range to start={len(kobss)}")
                 if scientific_program_id not in scientific_program_ids:
                     scientific_program_ids.append(scientific_program_id)
+                # --- TODO
+                # update_db_quota_sequence( id_period, night_id, d_total=sequence_info['duration'] )                
             else:
                 sequence_info['error'] = f"File {ephfile} not exists"
             sequence_infos.append(sequence_info)
@@ -244,6 +244,7 @@ class A_SCP_Manager(Agent):
             yield start_date + timedelta(n)
     def do_generate_ephem_moon_and_sun_for_period(self, period_id:int):
+        # Obsolete TODO
         period = Period.objects.get(id=period_id)
         period_start_date = period.start_date
         period_end_date = period.end_date