last minute.com modif de Agent : nombreuses petites ameliorations et petits bugfixes

Etienne Pallier
1 parent 69be5e68
Showing 5 changed files with 173 additions and 108 deletions Show diff stats
privatedev/config/tnc/computer_XYZ_EP.yml
pyros.py
src/core/pyros_django/agent/Agent.py
src/core/pyros_django/agent/AgentBasic.py
src/core/pyros_django/common/models.py
@@ -14,7 +14,7 @@ COMPUTER:
         intensity: 5
         socket: "IEC 60130-10 Type A: 5.5 mm OD, 2.5 mm ID"
-    hostname: macp1219
+    hostname: macp1219.local
     #hostname: c32f49397c28
     virtual_machine: False
     os: Mac
@@ -56,31 +56,31 @@ _previous_dir = None
 # List of all agents that pyros can start, with this format :
 # agent-name : agent-folder-name
 AGENTS = {
-    "agentM": "monitoring",
-    "agentSP": "scientific_programs",
-    "agentScheduler": "scheduler",
-    "agentImagesProcessor": "observation_manager",
-    "agentSST": "agent",
-    "agent": "agent",
-    "agent2": "agent",
-    "agentX": "agent",
-    "agentA": "agent",
-    "agentB": "agent",
-    "agentC": "agent",
+    "AgentM": "monitoring",
+    "AgentSP": "scientific_programs",
+    "AgentScheduler": "scheduler",
+    "AgentImagesProcessor": "observation_manager",
+    "AgentSST": "agent",
+    "Agent": "agent",
+    "Agent2": "agent",
+    "AgentX": "agent",
+    "AgentA": "agent",
+    "AgentB": "agent",
+    "AgentC": "agent",
     # "agentDevice" : "AgentDevice",
     # "agentDeviceTelescopeGemini" : "AgentDeviceTelescopeGemini",
-    "agentDeviceGemini": "AgentDeviceGemini",
-    "agentDeviceSBIG": "AgentDeviceSBIG",
-    "agentTelescopeRequester": "AgentTelescopeRequester",
-    "agentMultiRequester": "AgentMultiRequester",
+    "AgentDeviceGemini": "AgentDeviceGemini",
+    "AgentDeviceSBIG": "AgentDeviceSBIG",
+    "AgentTelescopeRequester": "AgentTelescopeRequester",
+    "AgentMultiRequester": "AgentMultiRequester",
     "webserver": "webserver",
     "monitoring": "monitoring",
     "majordome": "majordome",
     #"scheduler": "scheduler",
     "alert_manager": "alert_manager",
-    "agentImagesProcessor_tnc_up1": "../../../privatedev/plugin/agent",
+    "AgentImagesProcessor_tnc_up1": "../../../privatedev/plugin/agent",
     "agentBasic": "agent",
-    "agentTriton": "agent",
+    "AgentTriton": "agent",
 }
 # AGENTS = ["agentX", "webserver", "monitoring", "majordome", "scheduler", "alert_manager"]
 # AGENTS = ["all", "webserver", "monitoring", "majordome", "scheduler", "alert"]
@@ -420,12 +420,12 @@ class Agent:
         # -------------------------------
         # This command has a validity of 0s and thus should be tagged as "expired"
-        ("self set_mode ATTENTIVE", 0, "MODE = ATTENTIVE", CMD_STATUS.CMD_EXPIRED),
+        ("self set_mode ATTENTIVE", 0, "MODE is ATTENTIVE", CMD_STATUS.CMD_EXPIRED),
         # Agent general command
-        ("self set_mode ATTENTIVE", 200, "MODE = ATTENTIVE", CMD_STATUS.CMD_EXECUTED),
+        ("self set_mode ATTENTIVE", 200, "MODE is ATTENTIVE", CMD_STATUS.CMD_EXECUTED),
         # => should get "ATTENTIVE"
-        ("self get_mode", 100, "MODE = ATTENTIVE", None),
+        ("self get_mode", 100, "MODE is ATTENTIVE", None),
         # => should get "7"
         ("self do_eval 3+5-1", 200, '7', None),
@@ -439,17 +439,17 @@ class Agent:
         ("self do_specific1 1 2 3.5 titi (3,'titi',5) [1,3,5,7,9]", 200, '15.5', None),
-        ("self set_mode ROUTINE", 200, "MODE = ROUTINE", None),
+        ("self set_mode ROUTINE", 200, "MODE is ROUTINE", None),
         # => should get "ROUTINE"
-        ("self get_mode", 200, "MODE = ROUTINE", None), 
+        ("self get_mode", 200, "MODE is ROUTINE", None), 
         # Agent specific command => should be skipped (because not ATTENTIVE)
         ("self do_specific1 1 2 3.5 titi (3,'titi',5) [1,3,5,7,9]", 200, "SKIPPED", None),
         # From now on, should not run anymore process_before/after
         # => and should skip next specific commands
-        ("self set_mode IDLE", 200, "MODE = IDLE", None),
+        ("self set_mode IDLE", 200, "MODE is IDLE", None),
         # => should get "IDLE"
-        ("self get_mode", 200, "MODE = IDLE", None),
+        ("self get_mode", 200, "MODE is IDLE", None),
         # Agent specific command => should be skipped (because not ATTENTIVE)
         ("self do_specific1 1 2 3.5 titi (3,'titi',5) [1,3,5,7,9]", 200, 'SKIPPED', None),
@@ -537,34 +537,38 @@ class Agent:
     #COMMANDS_PEREMPTION_HOURS = 48
     #COMMANDS_PEREMPTION_HOURS = 60/60
-    name = "Generic Agent"
-    status = None
-    mode = None
+    ##name = "Generic Agent"
+    ##status = None
+    ##mode = None
     config = None
+   # MODE
+    #MODES = AgentSurvey.MODE_IDLE
+    # (('IDLE', 'IDLE'), ('ROUTINE', 'ROUTINE'), ('ATTENTIVE', 'ATTENTIVE'))
+    '''
+    MODE_IDLE = "IDLE"
+    MODE_ROUTINE = "ROUTINE"
+    MODE_ATTENTIVE = "ATTENTIVE"
+    '''
+
     # STATUS
+    #STATUSES = AgentSurvey.STATUS_CHOICES
+    # (('LAUNCHED', 'LAUNCHED'), ('INITIALIZING', 'INITIALIZING'), ('IN_MAIN_LOOP', 'IN_MAIN_LOOP'), 
+    # ('IN_ROUTINE_BEFORE_PROCESS', 'IN_ROUTINE_BEFORE_PROCESS'), ('IN_GET_NEXT_COMMAND', 'IN_GET_NEXT_COMMAND'), 
+    # ('IN_ROUTINE_AFTER_PROCESS', 'IN_ROUTINE_AFTER_PROCESS'), ('EXITING', 'EXITING')
+    '''
     STATUS_LAUNCH = "LAUNCHED"
     STATUS_INIT = "INITIALIZING"
     STATUS_MAIN_LOOP = "IN_MAIN_LOOP"
+    STATUS_ROUTINE_BEFORE_PROCESS = "IN_ROUTINE_BEFORE_PROCESS"
     STATUS_GET_NEXT_COMMAND = "IN_GET_NEXT_COMMAND"
-    STATUS_GENERAL_PROCESS = "IN_GENERAL_PROCESS"
-    STATUS_ROUTINE_PROCESS = "IN_ROUTINE_PROCESS"
+    #STATUS_GENERAL_PROCESS = "IN_GENERAL_PROCESS"
+    STATUS_ROUTINE_AFTER_PROCESS = "IN_ROUTINE_AFTER_PROCESS"
     ###STATUS_SPECIFIC_PROCESS = "IN_SPECIFIC_PROCESS"
     STATUS_EXIT = "EXITING"
+    '''
-    # MODE
-    #
-    # In all modes, the Agent listens to commands sent to him and executes Agent level GENERAL ones.
-    # - MODE_IDLE : "idle" mode, does nothing, only executes Agent level GENERAL commands (DO_RESTART, DO_EXIT, DO_ABORT, DO_FLUSH, SET_ACTIVE, ...)
-    # - MODE_ROUTINE : idem IDLE + executes routine process (before & after)
-    # - MODE_ATTENTIVE : idem ROUTINE + executes Agent level SPECIFIC commands (commands specific to this agent, that only this agent understands and can execute)
-    #
-    # Default mode is MODE_ATTENTIVE (most active mode)
-    MODE_IDLE = "IDLE"
-    MODE_ROUTINE = "ROUTINE"
-    MODE_ATTENTIVE = "ATTENTIVE"
-
     ''' Moved to more central file : config.config_base
     PYROS_DJANGO_BASE_DIR = Path("src/core/pyros_django") # pathlib
     DEFAULT_CONFIG_FILE_NAME = "config_unit_simulunit1.xml"
@@ -608,8 +612,22 @@ class Agent:
     # new obsconfig init for agent:
     ##def __init__(self, RUN_IN_THREAD=True):
     def __init__(self):
+
+        # Declaration of Instance attributes, default values
+        self.name = "Generic Agent"
+        self.status = None
+        self.mode = None
+        self.unit = None
+        self.TEST_COMMANDS = None
+
+        #print(AgentSurvey.MODE_IDLE)
+        #sys.exit()
+
         # Agent is by default in mode ATTENTIVE (most active mode)
-        self.mode = self.MODE_ATTENTIVE
+        #self.mode = self.MODE_ATTENTIVE
+        self._set_mode_attentive()
+        #self._set_mode(MODES.)
+
         log.addHandler(handler_filebyagent(logging.INFO, self.__class__.__name__))
         log.debug("start Agent init")
         obs_config_file_path = os.environ["PATH_TO_OBSCONF_FILE"]
@@ -637,7 +655,7 @@ class Agent:
         self.TEST_COMMANDS = iter(self.TEST_COMMANDS_LIST)
         ##self.RUN_IN_THREAD = RUN_IN_THREAD
-        self._set_status(self.STATUS_LAUNCH)
+        self._set_status(AgentSurvey.STATUS_LAUNCH)
         ####self._set_idle()
         # Create 1st survey if none
@@ -651,8 +669,10 @@ class Agent:
             self._agent_survey = AgentSurvey.objects.create(
                 name=self.name, 
                 validity_duration=60, 
-                mode=self.mode, 
-                status=self.status, 
+                #mode=self.mode,
+                mode = self.get_mode(),
+                #status=self.status, 
+                status=self.get_status(),
                 iteration=-1
             )
         log.debug("Agent survey is" + str(self._agent_survey))
@@ -1105,9 +1125,9 @@ class Agent:
         for i in range(3): print()
         #self.printd("-"*80)
-        log.info("*"*73)
-        log.info("*"*20 + f" MAIN LOOP ITERATION {self._iter_num} (START) " + "*"*20)
-        log.info("*"*73 + '\n')
+        log.info("*"*90)
+        log.info("*"*20 + f" {self.name} : MAIN LOOP ITERATION {self._iter_num} (START) " + "*"*20)
+        log.info("*"*90 + '\n')
         #self.print(f"Iteration {self._iter_num}")
         # EXIT because of nb of iterations ?
@@ -1137,7 +1157,7 @@ class Agent:
             self.DO_MAIN_LOOP = False
             return
-        self._set_status(self.STATUS_MAIN_LOOP)
+        self._set_status(AgentSurvey.STATUS_MAIN_LOOP)
         self.show_mode_and_status()
         self.main_loop_start()
@@ -1236,6 +1256,7 @@ class Agent:
             # cmd.args => ['arg1','arg2',...]
             #print("nom", cmd.name)
             if cmd.name=="do_stop":
+                # by default = "asap"
                 if cmd.args is None: cmd.full_name = "do_exit"
                 else:
                     arg = cmd.args[0]
@@ -1246,12 +1267,18 @@ class Agent:
             #print(self.get_specific_cmds())
             #exit(0)
             if cmd.name in ('do_restart_loop','do_exit','do_abort') :
+                #print(cmd)
                 self.DO_MAIN_LOOP = False
                 if cmd.name == 'do_abort':
                     self._abort_current_running_cmd_if_exists()
                 self._cleanup_before_exit()
                 if cmd.name != 'do_restart_loop':
                     self.DO_RESTART_LOOP = False
+                self._set_status(AgentSurvey.STATUS_EXIT)
+                # log last agent mode & status
+                self._log_agent_state()
+                #cmd.set_result('EXITING')
+
             return cmd
         # CASE 2 - AGENT SPECIFIC command
@@ -1308,7 +1335,7 @@ class Agent:
     def _cleanup_before_exit(self, stopper_agent_name:str=None):
         if not stopper_agent_name: stopper_agent_name = self.name
-        self._set_status(self.STATUS_EXIT)
+        #self._set_status(self.STATUS_EXIT)
         self._log_agent_state()
         log.info("Trying to stop cleanly")
@@ -1355,7 +1382,7 @@ class Agent:
         print()
         log.info("*"*10+ " ROUTINE PROCESSING BEFORE (START) "+ "*"*10+ '\n')
-        self._set_status(self.STATUS_ROUTINE_PROCESS)
+        self._set_status(AgentSurvey.STATUS_ROUTINE_BEFORE_PROCESS)
         self.routine_process_before_body()
         print()
         log.info("*"*10 + " ROUTINE PROCESSING BEFORE (END) "+ "*"*10)
@@ -1376,7 +1403,7 @@ class Agent:
         print()
         log.info("*"*10+ " ROUTINE PROCESSING AFTER (START) "+ "*"*10+ '\n')
-        self._set_status(self.STATUS_ROUTINE_PROCESS)
+        self._set_status(AgentSurvey.STATUS_ROUTINE_AFTER_PROCESS)
         self.routine_process_after_body()
         print()
         log.info("*"*10 + " ROUTINE PROCESSING AFTER (END) "+ "*"*10)
@@ -1470,7 +1497,8 @@ class Agent:
     #
     def show_current_mode_and_status(self):
-        log.info(f"CURRENT MODE is {self.mode} (status is {self.status})")
+        #log.info(f"CURRENT MODE is {self.mode} (status is {self.status})")
+        log.info(f"CURRENT MODE is {self.get_mode()} (status is {self.get_status()})")
     # @deprecated
     def show_mode_and_status(self):
         self.show_current_mode_and_status()
@@ -1479,36 +1507,30 @@ class Agent:
     # - STATUS MANAGEMENT
     #
-    def get_current_status(self):
+    def get_status(self):
         return self.status
     # @deprecated
     def get_state(self):
-        return self.get_current_status()
+        return self.get_status()
-    def _set_current_status(self, status:str):
+    def _set_status(self, status:str):
         #self.printd(f"[{status}] (switching from status {self.status})")
         log.debug(f"[{status}]")
         self.status = status
         return False
-    # @deprecated
-    def _set_status(self, status:str):
-        self._set_current_status(status)
     #
     # - MODE MANAGEMENT
     #
-    def get_current_mode(self):
-        return self.mode
-    # @deprecated
     def get_mode(self):
-        return self.get_current_mode()
+        return self.mode
     # Test mode
-    def IS_MODE_IDLE(self): return self.mode == self.MODE_IDLE
-    def IS_MODE_ROUTINE(self): return self.mode == self.MODE_ROUTINE
-    def IS_MODE_ATTENTIVE(self): return self.mode == self.MODE_ATTENTIVE
+    def IS_MODE_IDLE(self): return self.get_mode() == AgentSurvey.MODE_IDLE
+    def IS_MODE_ROUTINE(self): return self.get_mode() == AgentSurvey.MODE_ROUTINE
+    def IS_MODE_ATTENTIVE(self): return self.get_mode() == AgentSurvey.MODE_ATTENTIVE
     # @deprecated
     def IS_IDLE(self): return self.IS_MODE_IDLE()
     # @deprecated
@@ -1516,35 +1538,33 @@ class Agent:
     # @deprecated
     def IS_ATTENTIVE(self): return self.IS_MODE_ATTENTIVE()
-    def _set_current_mode(self, mode:str):
+    def _set_mode(self, mode:str):
         #self.printd(f"Switching from mode {self.mode} to mode {mode}")
         log.info(f"[NEW MODE {mode}]")
         self.mode = mode
-    # @deprecated
-    def _set_mode(self, mode:str):
-        self._set_current_mode(mode)
     def _set_mode_idle(self):
-        self._set_mode(self.MODE_IDLE)
+        self._set_mode(AgentSurvey.MODE_IDLE)
     # @deprecated
     def set_idle(self):
         self._set_mode_idle()
     def _set_mode_routine(self):
-        self._set_current_mode(self.MODE_ROUTINE)
+        self._set_mode(AgentSurvey.MODE_ROUTINE)
     # @deprecated
     def set_routine(self):
         self._set_mode_routine()
     def _set_mode_attentive(self):
-        self._set_current_mode(self.MODE_ATTENTIVE)
+        self._set_mode(AgentSurvey.MODE_ATTENTIVE)
     # @deprecated
     def set_attentive(self):
-        self._set_mode_attentive
-
+        self._set_mode_attentive()
+    '''
     def die(self):
-        self._set_status(self.STATUS_EXIT)
+        self._set_status(AgentSurvey.STATUS_EXIT)
+    '''
     """
     suspend/resume
@@ -1582,8 +1602,8 @@ class Agent:
         # all agent are active ? 
         #mode = self.MODE_ACTIVE
-        mode = self.MODE_ATTENTIVE
-        self._set_mode(mode)
+        #mode = self.MODE_ATTENTIVE
+        self._set_mode_attentive()
         return True
     # old config
     # def _set_mode_from_config(self, agent_name):
@@ -1614,7 +1634,7 @@ class Agent:
     def init(self):
         #log.debug("*** Initializing... ***")
         log.info("*** INITIALIZING... ***")
-        self._set_status(self.STATUS_INIT)
+        self._set_status(AgentSurvey.STATUS_INIT)
         if self.TEST_MODE: self.set_delay(2)
@@ -1732,8 +1752,8 @@ class Agent:
         # only necessary when using process (not necessary with threads)
         #with transaction.atomic():
         #self._agent_survey = AgentSurvey.objects.get(name=self.name)
-        self._agent_survey.mode = self.mode
-        self._agent_survey.status = self.status
+        self._agent_survey.mode = self.get_mode()
+        self._agent_survey.status = self.get_status()
         self._agent_survey.iteration = self._iter_num
         self._agent_survey.save()
         #self._agent_survey.save(update_fields=["mode", "status"])
@@ -1795,7 +1815,7 @@ class Agent:
         which is relevant to this agent.
         Commands are read in chronological order
         """
-        self._set_status(self.STATUS_GET_NEXT_COMMAND)
+        self._set_status(AgentSurvey.STATUS_GET_NEXT_COMMAND)
         log.info("Looking for a new command to process (sent by another agent):")
         # 1) Get all pending commands for me (return if None)
@@ -1998,7 +2018,7 @@ class Agent:
         result = None
         #if cmd_name in ("do_abort", "do_exit", "do_restart_init"):
-        if cmd_name in ("do_abort", "do_exit", "do_restart_loop"):
+        if cmd_name in ("do_stop", "do_abort", "do_exit", "do_restart_loop"):
             #self.printd("Current pending commands are:")
             #Command.show_commands(self._pending_commands)
             log.info("Stopping/Aborting current executing command if exists:")
@@ -2018,7 +2038,7 @@ class Agent:
             result = "I am now " + self.get_state()
         elif cmd_name == "get_mode":
-            result = "MODE = " + self.get_mode()
+            result = "MODE is " + self.get_mode()
         elif cmd_name == "set_mode":
             #if not cmd_args: raise ValueError()
@@ -2029,7 +2049,7 @@ class Agent:
             elif mode == "ATTENTIVE": self.set_attentive()
             else: raise AgentCmdBadArgsException(cmd)
             #cmd.set_result("I am now " + state)
-            result = "MODE = " + mode
+            result = "MODE is " + mode
             #time.sleep(1)
             #self.waitfor(1)
@@ -2271,9 +2291,9 @@ class Agent:
     def do_stop(self, when:str):
         # PRIO
         if when == "asap":
-            pass
+            self.do_exit()
         if when == "now":
-            pass
+            self.do_abort()
         # NOT PRIO
         if when == "noprio":
             pass
@@ -2439,7 +2459,7 @@ class Agent:
             #assert(cmd.state == self._cmdts.expected_status) 
             actual=cmd.state
             expected=self._cmdts.expected_status
-            assert actual==expected, f"Cmd result (='{actual}') is not as expected (='{expected}')"
+            assert actual==expected, f"Cmd status (='{actual}') is not as expected (='{expected}')"
     def _TEST_test_routine_process(self):
@@ -5,9 +5,10 @@ import sys
 ##import utils.Logger as L
 ##from .Agent import Agent
-sys.path.append("..")
-from agent.Agent import Agent, build_agent
-
+##sys.path.append("..")
+###from agent.Agent import Agent, build_agent
+sys.path.append("../../../..")
+from src.core.pyros_django.agent.Agent import Agent, build_agent
 ##log = L.setupLogger("AgentXTaskLogger", "AgentX")
@@ -31,7 +32,7 @@ class AgentBasic(Agent):
     TEST_COMMANDS_LIST = [
         # Format : ("self cmd_name cmd_args", timeout, "expected_result", expected_status),
-        ("self do_stop now", 200, '', Agent.CMD_STATUS.CMD_EXECUTED),
+        #("self do_stop now", 200, '', Agent.CMD_STATUS.CMD_EXECUTED),
         ("self do_specific1 2 2 3.5 titi (3,'titi',5) [1,3,5,7,9]", 200, '16.5', None),
@@ -57,11 +58,17 @@ class AgentBasic(Agent):
         # -------------------------------
         # This command has a validity of 0s and thus should be tagged as "expired"
-        ("self set_mode ATTENTIVE", 0, "MODE = ATTENTIVE", Agent.CMD_STATUS.CMD_EXPIRED),
+        ("self set_mode ATTENTIVE", 0, "MODE is ATTENTIVE", Agent.CMD_STATUS.CMD_EXPIRED),
        # ("self set_mode ATTENTIVE", 0, "MODE = ATTENTIVE", AgentCmd.CMD_STATUS_CODES),
         # Agent general command
-        ("self set_mode ATTENTIVE", 200, "MODE = ATTENTIVE", Agent.CMD_STATUS.CMD_EXECUTED),
+        ("self set_mode ROUTINE", 200, "MODE is ROUTINE", Agent.CMD_STATUS.CMD_EXECUTED),
+        ("self get_mode", 200, "MODE is ROUTINE", Agent.CMD_STATUS.CMD_EXECUTED),
+        ("self set_mode ATTENTIVE", 200, "MODE is ATTENTIVE", Agent.CMD_STATUS.CMD_EXECUTED),
+        ("self get_mode", 200, "MODE is ATTENTIVE", Agent.CMD_STATUS.CMD_EXECUTED),
+        
+        # End test
+        ("self do_stop asap", 200, "STOPPING", Agent.CMD_STATUS.CMD_EXECUTED),
     ]
@@ -320,32 +320,69 @@ class AgentSurvey(models.Model):
     | id | name | created | updated | validity_duration (default=1mn) | mode (active/idle) | status (launch/init/loop/exit/...) |
     """
-    # Statuses
+    # --- MODES ---
+    '''
+    In all modes, the Agent listens to commands sent to him and executes Agent level GENERAL ones.
+    - MODE_IDLE : "idle" mode, does nothing, only executes Agent level GENERAL commands (DO_RESTART, DO_EXIT, DO_ABORT, DO_FLUSH, SET_ACTIVE, ...)
+    - MODE_ROUTINE : idem IDLE + executes routine process (before & after)
+    - MODE_ATTENTIVE : idem ROUTINE + executes Agent level SPECIFIC commands (commands specific to this agent, that only this agent understands and can execute)
+    Default mode is MODE_ATTENTIVE (most active mode)
+    '''
+    #MODE_ACTIVE = "ACTIVE"
+    MODE_IDLE = "IDLE"
+    MODE_ROUTINE = "ROUTINE"
+    MODE_ATTENTIVE = "ATTENTIVE"    
+    '''
+    (MODE_ACTIVE, 'Active mode'),
+    (MODE_IDLE, 'Idle mode'),
+    '''
+    '''
+    (MODE_IDLE, 'IDLE'),
+    (MODE_ROUTINE, 'ROUTINE'),
+    (MODE_ATTENTIVE, 'ATTENTIVE'),
+    '''
+    MODE_CHOICES = (
+        (MODE_IDLE, MODE_IDLE),
+        (MODE_ROUTINE, MODE_ROUTINE),
+        (MODE_ATTENTIVE, MODE_ATTENTIVE),
+    )
+
+
+    # --- STATUSES ---
+
     #STATUSES = Choices('new', 'verified', 'published')
     STATUS_LAUNCH = "LAUNCHED"
     STATUS_INIT = "INITIALIZING"
     STATUS_MAIN_LOOP = "IN_MAIN_LOOP"
-    STATUS_PROCESS_LOOP = "IN_PROCESS_LOOP"
+    STATUS_ROUTINE_BEFORE_PROCESS = "IN_ROUTINE_BEF"
+    STATUS_GET_NEXT_COMMAND = "IN_GET_NEXT_CMD"
+    STATUS_ROUTINE_AFTER_PROCESS = "IN_ROUTINE_AFT"
     STATUS_EXIT = "EXITING"
     # NEW
     ##STATUS_RESTART = "RESTARTING"
-
-    # Modes
-    MODE_ACTIVE = "ACTIVE"
-    MODE_IDLE = "IDLE"
-
-    MODE_CHOICES = (
-        (MODE_ACTIVE, 'Active mode'),
-        (MODE_IDLE, 'Idle mode'),
-    )
-
+    #STATUS_GENERAL_PROCESS = "IN_GENERAL_PROCESS"
+    ###STATUS_SPECIFIC_PROCESS = "IN_SPECIFIC_PROCESS"
+    '''
     STATUS_CHOICES = (
         (STATUS_LAUNCH, "LAUNCHED"),
         (STATUS_INIT, "INITIALIZING"),
         (STATUS_MAIN_LOOP, "IN_MAIN_LOOP"),
-        (STATUS_PROCESS_LOOP, "IN_PROCESS_LOOP"),
+        (STATUS_ROUTINE_BEFORE_PROCESS, "IN_ROUTINE_BEF"),
+        (STATUS_GET_NEXT_COMMAND, "IN_GET_NEXT_CMD"),
+        (STATUS_ROUTINE_AFTER_PROCESS, "IN_ROUTINE_AFT"),
         (STATUS_EXIT, "EXITING"),
     )
+    '''
+    STATUS_CHOICES = (
+        #(STATUS_LAUNCH, "LAUNCHED"),
+        (STATUS_LAUNCH, STATUS_LAUNCH),
+        (STATUS_INIT, STATUS_INIT),
+        (STATUS_MAIN_LOOP, STATUS_MAIN_LOOP),
+        (STATUS_ROUTINE_BEFORE_PROCESS, STATUS_ROUTINE_BEFORE_PROCESS),
+        (STATUS_GET_NEXT_COMMAND, STATUS_GET_NEXT_COMMAND),
+        (STATUS_ROUTINE_AFTER_PROCESS, STATUS_ROUTINE_AFTER_PROCESS),
+        (STATUS_EXIT, STATUS_EXIT),
+    )
     name = models.CharField(max_length=50, unique=True)
     #name = models.CharField(max_length=50, blank=True, null=True, unique=True)
@@ -369,6 +406,7 @@ class AgentSurvey(models.Model):
     def __str__(self):
         return (f"Agent {self.name} at {self.updated} in mode {self.mode} and status {self.status}")
+    
 class Album(models.Model):