Optimisation log_agent_status() (ex update_survey())

+ bugfix import celme + activity diag

Optimisation log_agent_status() (ex update_survey())
+ bugfix import celme + activity diag
Etienne Pallier
1 parent 4ba41afb
Showing 5 changed files with 101 additions and 37 deletions Show diff stats
README.md
src/agent/Agent.py
src/agent/AgentA.py
src/agent/Agent_run_activitydiag.png
src/agent/logpyros.py
@@ -73,9 +73,7 @@ Author: E. Pallier
  
 VERSION: 0.20.31
  
-Comment: AgentM 
-
-	- routine_process() : envoi commande n'est plus bloquant
+Comment: Optimisation log_agent_status() (ex update_survey())
  
 	- Scenario de test :
 		- lancer agents A et B en mode simu (option -t): ./pyros.py -t start agentA,agentB
@@ -89,7 +87,9 @@ Comment: AgentM
 		(ou encore: activer l'environnement virtuel, puis lancer "cd src/agent/ ; ./AgentA.py configfile")
 		- pour utiliser thread ou processus : il suffit de mettre la constante RUN_IN_THREAD de AgentA (ou AgentB ou AgentX) à False ou True
  
-	- Autres remarques:
+	- Historique des nouveautés :
+		- AgentM (début) pour remplacer progressivement l'agent monitoring
+		- routine_process() : envoi commande n'est plus bloquant
 		- pyros.py peut lancer plusieurs agents (A et B) en même temps
 		- run(N) : run only N iterations
 		- send_command() implemented
@@ -72,12 +72,12 @@ print()
  
 # --- GENERAL PURPOSE IMPORT ---
 #from __future__ import absolute_import
+import utils.Logger as L
 import platform
 import random
 from threading import Thread
 import threading, multiprocessing
 import time
-import utils.Logger as L
 import socket
 #import ctypes
 #import copy
@@ -185,19 +185,82 @@ class StoppableThreadEvenWhenSleeping(threading.Thread):
 class Agent:
     """
     Behavior of an agent:
+    - If idle :
+        - still does routine_process() and general_process()
+        - does not do specific_process()
     - Once a command has been sent to another agent :
-        - It waits for the end of execution of the command and get its result
-        - If command is timed out or has been skipped or killed, then same command will be re-executed at next iteration
-        - Then only, it goes to next iteration
+        - It waits (non blocking) for the end of execution of the command and get its result
+        - If command is timed out or has been skipped or killed, then it is NOT re-executed at next iteration (except if needed explicitely)
     """
  
+    """
+    PLANTUML ACTIVITY DIAGRAM
+    # (http://plantuml.com/fr/activity-diagram-legacy)
+    """
+
+    """
+    @startuml
+    version
+    @enduml
+    """
+
+    """
+    @startuml
+
+    title
+    __** Agent.run() function activity diagram **__
+    end title
+
+    skinparam activity {
+      StartColor red
+      EndColor Silver
+      BackgroundColor Peru
+      BackgroundColor<< Begin >> Olive
+      BorderColor Peru
+      FontName Impact
+    }
+
+    (*) --> load_config()
+
+    --> init()
+
+    partition infinite_loop {
+            ---> "reload_config()"
+            note right
+                only if changed
+            end note
+
+            --> log_agent_status()
+            note right
+                Log this agent status in DB
+            end note
+
+            --> routine_process()
+
+            --> cmd = get_next_valid_command()
+            --> cmd = command_process(cmd)
+            note right
+                only if there is a command
+            end note
+    }
+
+    If "NEW ITERATION ?" then
+        --> [Yes] "reload_config()"        
+    else
+        --> (*)
+    Endif
+
+    @enduml
+    """
+
+
  
     # Maximum duration of this agent (only for SIMULATION mode)
     # If set to None, it will never exit except if asked (or CTRL-C)
     # If set to 20, it will exit after 20s
     SIMULATOR_MAX_DURATION_SEC = None
     #SIMULATOR_MAX_DURATION_SEC = 30
-    
+
     # FOR TEST ONLY
     # Run this agent in simulator mode
     SIMULATOR_MODE = True
@@ -345,10 +408,10 @@ class Agent:
         self.RUN_IN_THREAD = RUN_IN_THREAD
         self.set_status(self.STATUS_LAUNCH)
         self.set_idle()
-        
+
         self._log = LogPyros()
         self._log.set_agent_alias(self.name)
-       
+
         #self.set_mode(self.MODE_IDLE)
         if not config_filename:
             config_filename = self.DEFAULT_CONFIG_FILE_NAME
@@ -379,11 +442,11 @@ class Agent:
         #if len(tmp) == 0:
         #nb_agents = AgentSurvey.objects.filter(name=self.name).count()
         #if nb_agents == 0:
-        if not AgentSurvey.objects.filter(name=self.name).exists():
+        if AgentSurvey.objects.filter(name=self.name).exists():
+            self._agent_survey = AgentSurvey.objects.get(name=self.name)
+        else:
             self._agent_survey = AgentSurvey.objects.create(name=self.name, validity_duration_sec=60, mode=self.mode, status=self.status)
-            self.printd("Agent survey is", self._agent_survey)
-            #self._agent_survey = AgentSurvey(name=self.name, validity_duration_sec=60, mode=self.mode, status=self.status)
-            #self._agent_survey.save()
+        self.printd("Agent survey is", self._agent_survey)
  
     def __repr__(self):
         return "I am agent " + self.name
@@ -417,7 +480,7 @@ class Agent:
         """
  
         self.load_config()
-        
+
         if self.SIMULATOR_MODE:
             self._log.print("[IN SIMULATOR MODE]")
         else:
@@ -440,11 +503,6 @@ class Agent:
             Command.delete_pending_commands_for_agent(self.name)
  
         '''
-        self.printd()
-        self.printd(self)
-        self.printd("FOR REAL ?", self.FOR_REAL)
-        self.printd("DB3 used is:", djangosettings.DATABASES["default"]["NAME"])
-
         # SETUP
         try:
             self.config = get_object_or_404(Config, id=1)
@@ -467,7 +525,7 @@ class Agent:
  
                 # Bad number of iterations, so exit
                 if nb_iter is not None:
-                    if nb_iter <= 0: break 
+                    if nb_iter <= 0: break
                     # Number of iterations asked is reached, so exit
                     if self._iter_num > nb_iter:
                         print(f"Exit because number of iterations asked ({nb_iter}) has been reached") 
@@ -488,8 +546,8 @@ class Agent:
  
                 self.load_config() # only if changed
  
-                # Update my current mode and status in DB
-                self.update_survey()
+                # Log this agent status (update my current mode and status in DB)
+                self.log_agent_status()
  
                 self.printd("------START COMMMAND PROCESSING------")
  
@@ -500,18 +558,17 @@ class Agent:
                     #Command.purge_old_commands_for_agent(self.name)
                     self.purge_old_commands_sent_to_me()
  
+                # ROUTINE process
+                #if self.is_active(): 
+                self.routine_process()
+                #self.printd("I am IDLE, so I bypass the routine_process (do not send any new command)")
+
                 # Get next command to execute
                 cmd = self.get_next_valid_command()
                 #if cmd: cmd = self.general_process(cmd)
-
                 # Process this (next) command (if exists)
                 if cmd: cmd = self.command_process(cmd)
  
-                # ROUTINE process
-                #if self.is_active(): 
-                self.routine_process()
-                #self.printd("I am IDLE, so I bypass the routine_process (do not send any new command)")
-
                 self.printd("------END COMMMAND PROCESSING------")
  
                 #self.waitfor(self.mainloop_waittime)
@@ -519,7 +576,7 @@ class Agent:
                 self.print("-"*20, "MAIN LOOP ITERATION (END)", "-"*20)
                 #self.do_log(LOG_DEBUG, "Ending main loop iteration")
  
-                # Exit if max duration is reached
+                # (simulator only) Exit if max duration is reached
                 if self.SIMULATOR_MAX_DURATION_SEC and (time.time()-start_time > self.SIMULATOR_MAX_DURATION_SEC):
                     self.print("Exit because of max duration set to ", self.SIMULATOR_MAX_DURATION_SEC, "s")
                     self.kill_running_specific_cmd_if_exists()
@@ -782,15 +839,21 @@ class Agent:
         self._log.set_home(home)
  
  
-    def update_survey(self):
-        self.printd("Updating the survey database table...")
+    #def update_survey(self):
+    def log_agent_status(self):
+        """
+        Save (update) this agent current mode and status in DB
+        """
+        self.printd("Updating the agent survey database table...")
         #self.printd("- fetching table line for agent", self.name)
         # only necessary when using process (not necessary with threads)
         #with transaction.atomic():
-        self._agent_survey = AgentSurvey.objects.get(name=self.name)
+        #self._agent_survey = AgentSurvey.objects.get(name=self.name)
         self._agent_survey.mode = self.mode
         self._agent_survey.status = self.status
-        self._agent_survey.save()
+        #self._agent_survey.save()
+        self._agent_survey.save(update_fields=["mode", "status"])
+
  
     """
     def send_command(self, cmd_name):
@@ -69,6 +69,7 @@ class AgentA(Agent):
     def __init__(self, name:str=None, config_filename=None, RUN_IN_THREAD=True):
         if name is None: name = self.__class__.__name__
         super().__init__(name, config_filename, RUN_IN_THREAD)
+        self._log.print(f"init done for {name}")
  
     # @override
     def init(self):
@@ -9,8 +9,8 @@ py_pwd = os.getcwd() + &quot;/../utils&quot;
 if (py_pwd not in py_path):
     (os.sys.path).append(py_pwd)
  
-#import utils.celme as celme
-import celme
+import utils.celme as celme
+#import celme
  
 class LogPyros: