bugfix simulateur et test

Etienne Pallier
1 parent 2ca198f4
Showing 6 changed files with 85 additions and 59 deletions Show diff stats
src/core/pyros_django/agent/Agent.py
src/core/pyros_django/agent/AgentDevice.py
src/device_controller/abstract_component/device_controller.py
src/device_controller/abstract_component/device_simulator.py
src/device_controller/channels/client_channel.py
src/device_controller/test/test_client_gemini.py
@@ -232,6 +232,9 @@ class Agent:
     WITH_SIMULATOR = False
     TEST_MODE = False
  
+    # Default LOG level is INFO
+    PYROS_DEFAULT_GLOBAL_LOG_LEVEL = LogPyros.LOG_LEVEL_INFO # INFO
+
     # To be overriden by subclasses (empty by default, no agent specific command)
     AGENT_SPECIFIC_COMMANDS = [
         #"do_eval",
@@ -404,13 +407,17 @@ class Agent:
         printd("*** ENVIRONMENT VARIABLE PYROS_DEBUG is:", os.environ.get('PYROS_DEBUG'), '***')
         ##self.DEBUG_MODE = DEBUG_MODE
         self.DEBUG_MODE = os.environ.get('PYROS_DEBUG', '0')=='1'
-        self._log = LogPyros(self.name, AgentLogs)
-        ##self._log.debug_level = DEBUG_MODE
+        self.log = LogPyros(self.name, AgentLogs)
+        ##self.log.debug_level = DEBUG_MODE
+        '''
         # Default LOG level is INFO
         log_level = LogPyros.LOG_LEVEL_INFO # INFO
-        self._log.set_global_log_level(LogPyros.LOG_LEVEL_DEBUG) if self.DEBUG_MODE else self._log.set_global_log_level(log_level)
-        ##self.printd("LOG LEVEL IS:", self._log.debug_level)
-        self.print("LOG LEVEL IS:", self._log.get_global_log_level())
+        self.log.set_global_log_level(LogPyros.LOG_LEVEL_DEBUG) if self.DEBUG_MODE else self.log.set_global_log_level(log_level)
+        '''
+        global_log_level = LogPyros.LOG_LEVEL_DEBUG if self.DEBUG_MODE else self.PYROS_DEFAULT_GLOBAL_LOG_LEVEL
+        self.log.set_global_log_level(global_log_level)
+        ##self.printd("LOG LEVEL IS:", self.log.debug_level)
+        self.print("LOG LEVEL IS:", self.log.get_global_log_level())
  
         # New way with PathLib
         my_parent_abs_dir = Path(__file__).resolve().parent
@@ -500,7 +507,7 @@ class Agent:
         #return "I am agent " + self.name
  
     # Normal print
-    def print(self, *args, **kwargs): self._log.print(*args, **kwargs)
+    def print(self, *args, **kwargs): self.log.print(*args, **kwargs)
     """
     if args:
         self.printd(f"({self.name}): ", *args, **kwargs)
@@ -508,11 +515,16 @@ class Agent:
         self.printd()
     """
     # DEBUG print shortcut
-    def printd(self, *args, **kwargs): self._log.printd(*args, **kwargs)
+    def printd(self, *args, **kwargs): self.log.printd(*args, **kwargs)
     """
     if DEBUG: self.printd(d(*args, **kwargs)
     """
-    def printdb(self, *args, **kwargs): self._log.db( *args, **kwargs)
+    def log_d(self, *args, **kwargs): self.log.log_d(*args, **kwargs)
+    def log_i(self, *args, **kwargs): self.log.log_i(*args, **kwargs)
+    def log_w(self, *args, **kwargs): self.log.log_w(*args, **kwargs)
+    def log_e(self, *args, **kwargs): self.log.log_e(*args, **kwargs)
+    def log_c(self, *args, **kwargs): self.log.log_c(*args, **kwargs)
+    def printdb(self, *args, **kwargs): self.log.db( *args, **kwargs)
  
     def sleep(self, nbsec:float=2.0):
         '''
@@ -565,9 +577,9 @@ class Agent:
             self.print_TEST_MODE()
  
             self.init()
-            self._log.log_w("WARNING", "watch your step !")
-            self._log.log_e("ERROR")
-            self._log.log_c("FATAL critical ERROR")
+            self.log_w("WARNING", "watch your step !")
+            self.log_e("ERROR")
+            self.log_c("FATAL critical ERROR")
  
             # Avoid blocking on false "running" commands
             # (old commands that stayed with "running" status when agent was killed)
@@ -701,8 +713,8 @@ class Agent:
                 try:
                     self._exec_agent_cmd(cmd)
                 except AttributeError as e:
-                    self.print(f"EXCEPTION: Agent level specific command '{cmd.name}' unknown (not implemented as a function) :", e)
-                    self.print("Thus => I ignore this command...")
+                    self.log_e(f"EXCEPTION: Agent level specific command '{cmd.name}' unknown (not implemented as a function) :", e)
+                    self.log_e("Thus => I ignore this command...")
                     cmd.set_result("ERROR: INVALID AGENT LEVEL SPECIFIC COMMAND")
                     cmd.set_as_pending()
                     cmd.set_as_skipped()
@@ -738,8 +750,8 @@ class Agent:
                 try:
                     self.exec_device_cmd_if_possible(cmd)
                 except (UnimplementedGenericCmdException, UnknownNativeCmdException) as e:
-                    self.print(f"EXCEPTION caught by {type(self).__name__} (from Agent mainloop) for command '{cmd.name}'", e)
-                    self.print("Thus ==> ignore this command")
+                    self.log_e(f"EXCEPTION caught by {type(self).__name__} (from Agent mainloop) for command '{cmd.name}'", e)
+                    self.log_e("Thus ==> ignore this command")
                     cmd.set_result(e)
                     #cmd.set_as_killed_by(type(self).__name__)
                     cmd.set_as_skipped()
@@ -988,11 +1000,11 @@ class Agent:
         self.printd("------------------------------------------")
  
         # --- update the log parameters
-        ##self._log.path_data = self._path_data
-        ##print("new self._log.path_data is", self._log.path_data)
-        self._log.set_global_path_data(self._path_data)
-        print("new self._log.global_path_data is", self._log.get_global_path_data())
-        self._log.home = home
+        ##self.log.path_data = self._path_data
+        ##print("new self.log.path_data is", self.log.path_data)
+        self.log.set_global_path_data(self._path_data)
+        print("new self.log.global_path_data is", self.log.get_global_path_data())
+        self.log.home = home
  
  
     #def update_survey(self):
@@ -1040,9 +1052,9 @@ class Agent:
         try:
             real_agent_name = self._get_real_agent_name(to_agent)
         except KeyError as e:
-            self.print("UNKNOWN AgentDevice ALIAS", to_agent)
-            self.print("Exception raised", e)
-            self.print(f"=> Thus, I do not send this command '{cmd_name}'")
+            self.log_e("UNKNOWN AgentDevice ALIAS", to_agent)
+            self.log_e("Exception raised", e)
+            self.log_e(f"=> Thus, I do not send this command '{cmd_name}'")
             return None
         return Command.create(self.name, real_agent_name, cmd_name, cmd_args)
         '''
@@ -327,7 +327,7 @@ class AgentDevice(Agent):
         try:
             self._device_ctrl.close()
         except AttributeError as e:
-            self.print("Error on closing the socket (TBC):", e)
+            self.log_e("Error on closing the socket (TBC):", e)
         '''
         # Stop device simulator (only if used)
         if self.is_using_simulator():
@@ -380,12 +380,12 @@ class AgentDevice(Agent):
             try:
                 res = self.exec_device_cmd(cmd)
             except (DCCNotFoundException, UnimplementedGenericCmdException, UnknownNativeCmdException) as e:
-                self.tprintd(f"EXCEPTION caught by {type(self).__name__} (from thread)", e)
+                self.log_e(f"THREAD EXCEPTION caught by {type(self).__name__} (from thread)", e)
                 #raise
                 cmd.set_result(e)
                 cmd.set_as_killed_by(type(self).__name__)
                 #time.sleep(2)
-                self.tprintd(">>>>> Thread: execution of command", cmd.name, "is now aborted")
+                self.log_e(">>>>> Thread: execution of command", cmd.name, "is now aborted")
                 self._current_device_cmd = None
                 self._current_device_cmd_thread.terminate()
                 # (EP) ...NOT SURE THAT BELOW THIS LINE, SOMETHING WILL BE EXECUTED, because THIS current thread is being killed...
@@ -554,7 +554,7 @@ class AgentDevice(Agent):
         try:
             res = self._device_ctrl.exec_cmd(cmd.full_name)
         except (DCCNotFoundException, UnimplementedGenericCmdException) as e:
-            self.tprintd(f"EXCEPTION caught by {type(self).__name__} (from AD)", e)
+            self.log_e(f"THREAD EXCEPTION caught by {type(self).__name__} (from AD)", e)
             raise
         self.tprintd("result is", str(res))
         if res.ok: self.tprintd("OK")
@@ -438,7 +438,7 @@ class DeviceController():
         ##self.Protoc.encap(self)
         ##return self._protoc.encap(self, data)
         return self._protoc.encap(data)
-        self._log.log_w("WARNING", "watch your step !!!")
+        self.log_w("WARNING", "watch your step !!!")
  
     ##def uncap(self, data:str):
     def uncap(self, stamp:str, data:str):
@@ -463,7 +463,7 @@ class DeviceController():
         self.DEBUG_MODE = os.environ.get('PYROS_DEBUG', '0') == '1'
         ##set_logger(self.DEBUG_MODE)
         ##log_d("Logger configured")
-        self._log = LogPyros(self.__class__.__name__)
+        self.log = LogPyros(self.__class__.__name__)
         self.print("coucou")
  
  
@@ -518,7 +518,7 @@ class DeviceController():
                 self._thread_device_simulator = threading.Thread(target=self.device_simulator_run)
                 self._thread_device_simulator.start()
  
-        self._log.log_w("WARNING", "watch your step !!")
+        self.log_w("WARNING", "watch your step !!")
  
  
  
@@ -540,15 +540,16 @@ class DeviceController():
         self._my_channel.set_logger(DEBUG)
     '''
  
-    def print(self, *args, **kwargs): self._log.print(*args, **kwargs)
-
-    # DEBUG print
+    def print(self, *args, **kwargs): self.log.print(*args, **kwargs)
     def printd(self, *args, **kwargs):
-        self._log.printd(*args, **kwargs)
-        #if self.DEBUG_MODE: printd(*args, **kwargs)
-
+        self.log.printd(*args, **kwargs)
     def tprintd(self, *args, **kwargs):
         self.printd('(THREAD):', *args, *kwargs)
+    def log_d(self, *args, **kwargs): self.log.log_d(*args, **kwargs)
+    def log_i(self, *args, **kwargs): self.log.log_i(*args, **kwargs)
+    def log_w(self, *args, **kwargs): self.log.log_w(*args, **kwargs)
+    def log_e(self, *args, **kwargs): self.log.log_e(*args, **kwargs)
+    def log_c(self, *args, **kwargs): self.log.log_c(*args, **kwargs)
  
     def device_simulator_run(self):
         #HOST, PORT = "localhost", 11110
@@ -911,7 +912,7 @@ class DeviceController():
             try:
                 res = self.exec_generic_cmd(cmd.name, cmd.args, cmd.devtype)
             except (UnimplementedGenericCmdException, DCCNotFoundException) as e:
-                self.tprintd(f"EXCEPTION caught by {type(self).__name__} (from DC)", e)
+                self.log_e(f"THREAD EXCEPTION caught by {type(self).__name__} (from DC)", e)
                 raise
             return res
  
@@ -934,7 +935,7 @@ class DeviceController():
         try:
             res_native = self.exec_native_cmd(cmd.name_and_args)
         except UnknownNativeCmdException as e:
-            self.tprintd(f"EXCEPTION caught by {type(self).__name__} (from DC)", e)
+            self.log_e(f"THREAD EXCEPTION caught by {type(self).__name__} (from DC)", e)
             raise
         return GenericResult(res_native)
  
@@ -1045,7 +1046,7 @@ class DeviceController():
                 dcc = self.get_dc_component_for_type(dcc_type)
                 self.tprintd("*** EXECUTÉ PAR COMPONENT", dcc)
             except DCCNotFoundException as e:
-                self.tprintd(f"EXCEPTION caught by {type(self).__name__} (from dcc)", e)
+                self.log_e(f"THREAD EXCEPTION caught by {type(self).__name__} (from dcc)", e)
                 raise
             #return (DCC)(self.exec_generic_cmd(generic_cmd, values_to_set, None))
  
@@ -1053,7 +1054,7 @@ class DeviceController():
             try:
                 return dcc.exec_generic_cmd(generic_cmd, values_to_set, None)
             except UnimplementedGenericCmdException as e:
-                self.tprintd(f"EXCEPTION caught by {type(self).__name__} (from dcc)", e)
+                self.log_e(f"THREAD EXCEPTION caught by {type(self).__name__} (from dcc)", e)
                 raise
                 # not executed ?
                 return None
@@ -198,6 +198,11 @@ class DeviceSimulator:
         # TYPE1
         if command not in (cls.protoc.COMMAND5, cls.protoc.COMMAND6):
             # TYPE2 or 3
+            '''
+            if len(command) < 3: raise UnknownCommandException()
+            if not (command[-1]=='#'): raise UnknownCommandException()
+            if not (command[0]==':') and command not in ('bC#','bW#','bR#'): raise UnknownCommandException()
+            '''        
             if (
                 (len(command) < 3)
                 or
@@ -208,22 +213,26 @@ class DeviceSimulator:
             ):
                 raise UnknownCommandException()
  
-        command_start = command[1:3]
  
-        # If "set_xxx" command, update related "get_xxx" command simulated answer in the commands dictionary
-        #if command_start in ('SC', 'SL', 'Sg', 'St'):
-        if command_start[0] == 'S':
-            #Memo.set(command_start[1],command[3:])
-            #related_get_cmd_name = 'G'+ command_start[1]
-            related_get_cmd_name = cls.my_dc.get_related_native_get_cmd_name_for_set_cmd(command_start)
-            #printd('(SIM) related_get_cmd_name:', related_get_cmd_name)
-            if related_get_cmd_name:
-                cls.my_dc.set_simulated_answer_for_native_get_cmd(related_get_cmd_name, command)
-
-        ##answer = cls.get_simulated_answer_for_native_cmd(command_start)
-        answer = cls.my_dc.get_simulated_answer_for_native_cmd(command_start)
-        if answer is None: answer='NO ANSWER IMPLEMENTED FOR COMMAND '+command
-        printd("****** (SIM) answer for native cmd", command_start, "is:", answer)
+        # TODO: GEMINI SPECIFIC => move from this default method
+        if command in (cls.protoc.COMMAND6, cls.protoc.COMMAND5):
+            if command == cls.protoc.COMMAND6: answer = "G"
+            elif command == cls.protoc.COMMAND5: answer = cls.protoc.COMMAND5
+        else:
+            command_start = command[1:3]
+            # If "set_xxx" command, update related "get_xxx" command simulated answer in the commands dictionary
+            #if command_start in ('SC', 'SL', 'Sg', 'St'):
+            if command_start[0] == 'S':
+                #Memo.set(command_start[1],command[3:])
+                #related_get_cmd_name = 'G'+ command_start[1]
+                related_get_cmd_name = cls.my_dc.get_related_native_get_cmd_name_for_set_cmd(command_start)
+                #printd('(SIM) related_get_cmd_name:', related_get_cmd_name)
+                if related_get_cmd_name:
+                    cls.my_dc.set_simulated_answer_for_native_get_cmd(related_get_cmd_name, command)
+            ##answer = cls.get_simulated_answer_for_native_cmd(command_start)
+            answer = cls.my_dc.get_simulated_answer_for_native_cmd(command_start)
+            if answer is None: answer='NO ANSWER IMPLEMENTED FOR COMMAND '+command
+            printd("****** (SIM) answer for native cmd", command_start, "is:", answer)
  
         '''
         if command == cls.protoc.COMMAND6: answer = "G"
@@ -42,7 +42,7 @@ class ClientChannel():
         self.PROTOCOL = PROTOCOL
         self.buf = buffer_size
  
-        self._log = LogPyros(self.__class__.__name__)
+        self.log = LogPyros(self.__class__.__name__)
  
         # Logger configuration
         #self.set_logger()
@@ -61,8 +61,8 @@ class ClientChannel():
         print("Client channel killed")
  
     # LOG methods
-    def print(self, *args, **kwargs): self._log.print(*args, **kwargs)
-    def printd(self, *args, **kwargs): self._log.printd(*args, **kwargs)
+    def print(self, *args, **kwargs): self.log.print(*args, **kwargs)
+    def printd(self, *args, **kwargs): self.log.printd(*args, **kwargs)
  
  
     def send_data(self, data:str):
@@ -36,9 +36,12 @@ class TestClient(unittest.TestCase):
     def test_run_unittests(self):
  
         q_a = [
-            (':toto#', 'TOTO'),
+            #(':toto#', 'TOTO'),
+            (':toto#', 'NO ANSWER IMPLEMENTED FOR COMMAND :toto#'),
+            #(':GD#', '+12:30'),
             (':GD#', '+12:29'),
             #(':GD#', '+12:28')
+            # Command SIX (6)
             ('6', 'G'),
         ]
  
@@ -72,6 +75,7 @@ class TestClient(unittest.TestCase):
             print("ra-dec is", radec)
             #self.assertEqual(radec,  ('15:01:48', '+12:28'))
             self.assertEqual(radec.txt, '15:01:49,+12:29')
+            #self.assertEqual(radec.txt, '15:01:50,+12:30')
  
             #tele_client.close()