bugfix get_all_cmds

Etienne Pallier
1 parent dbe1a54d
Showing 5 changed files with 21 additions and 12 deletions Show diff stats
CHANGELOG
VERSION
privatedev/plugin/agent/AgentBasic.py
src/core/pyros_django/agent/Agent.py
src/core/pyros_django/agent/AgentBasic.py
-18-11-2022 (EP): v0.6.10.2
+18-11-2022 (EP): v0.6.10.3
 	- bugfix CC_PREV
 	- bugfix TEST_MAX_DURATION_SEC
+	- bugfix get_all_cmds()
 	- cleanup
  
 15-11-2022 (EP): v0.6.10.1
-0.6.10.2
 \ No newline at end of file
+0.6.10.3
 \ No newline at end of file
@@ -28,7 +28,7 @@ class AgentBasic(Agent):
     # Run the assertion tests at the end
     TEST_WITH_FINAL_TEST = False
     #TEST_MAX_DURATION_SEC = None
-    TEST_MAX_DURATION_SEC = 400
+    TEST_MAX_DURATION_SEC = 100
     # Who should I send commands to ?
     TEST_COMMANDS_DEST = "myself"
     #TEST_COMMANDS_DEST = "AgentB"
@@ -588,11 +588,11 @@ class Agent:
         self.__ROUTINE_ITER_END_IS_RUNNING:bool = False
         self.__test_cmd_received_num:int = 0  # only for tests
         # Current Command running
-        self.__CC :Optional(AgentCmd) = None
+        self.__CC :Optional[AgentCmd] = None
         # Previous Command running
-        self.__CC_prev :Optional(AgentCmd) = None
+        self.__CC_prev :Optional[AgentCmd] = None
         # Current Command exception (if occurs)
-        self.__CCE :Optional(Exception) = None
+        self.__CCE :Optional[Exception] = None
         self.name = "Generic Agent"
         self.__status :str = None
         self.__mode :str = None
@@ -1209,7 +1209,7 @@ class Agent:
             self.__start_cmd(cmd)
         except Exception as e: 
             self.__CCE=e
-            pass
+            #pass
         log.info("*"*10 + " NEXT CMD RECEIVED PROCESSING (END) " + "*"*10 + "\n")
  
  
@@ -1383,6 +1383,7 @@ class Agent:
         # (Test only)
         # EXIT because max duration reached ?
         if self.TEST_MODE and self.TEST_MAX_DURATION_SEC and (time.time()-self.start_time > self.TEST_MAX_DURATION_SEC):
+            print("Exit because of max duration set to " + str(self.TEST_MAX_DURATION_SEC) + "s")
             log.info("Exit because of max duration set to " + str(self.TEST_MAX_DURATION_SEC) + "s")
             #self._kill_running_device_cmd_if_exists(self.name)
             self.__cleanup_before_exit(self.name)
@@ -1477,7 +1478,8 @@ class Agent:
  
  
         # Misnamed command => CMD_INVALID
-        if not AgentCmd.is_generic_name(cmd.name) and not self.is_native_device_command(cmd.name):
+        #if not AgentCmd.is_generic_name(cmd.name) and not self.is_native_device_command(cmd.name):
+        if not cmd.is_generic() and not self.is_native_device_command(cmd.name):
             cmd.set_as_invalid("Command misnamed, must start with do_, get_, or set_")
             return #cmd
  
@@ -2032,7 +2034,8 @@ class Agent:
             # misnamed ?
             #FIXME:
             #elif not cmd.is_generic():
-            elif not AgentCmd.is_generic(cmd.name):
+            #elif not AgentCmd.is_generic(cmd.name):
+            elif not cmd.is_generic():
                 cmd.set_as_invalid()
             # unknown ?
             elif self.is_agent_specific_cmd(cmd):
@@ -2383,10 +2386,13 @@ class Agent:
  
         # Replace low level exception with high level one (CmdExceptionBadArgs)
         except (TypeError, AttributeError, ValueError, CmdExceptionBadArgs, AssertionError) as e:
+            print("EXCEPTION !!!")
+            print(type(e))
+            print(e)
             # set back to PENDING because this command should never has been RUNNING
             cmd.set_as_pending()
             raise CmdExceptionBadArgs(cmd) from None
-        
+
         # Replace any other exception raised during execution with high level one (CmdExceptionExecError)
         except Exception as e:
             #cmd.set_as_exec_error()
@@ -2398,6 +2404,8 @@ class Agent:
             ##tb = sys.exc_info()[2]
             ##raise AgentCmdUnimplementedException(cmd).with_traceback(tb)
             ##raise AgentCmdUnimplementedException(cmd).with_traceback(None)
+    print("YESSS")
+
  
  
     def is_agent_level_cmd(self, cmd:AgentCmd):
@@ -2483,7 +2491,7 @@ class Agent:
             cmds += cmd_name
  
             # 1) Error case 1 - Misnamed (Invalid syntax) command (not get, set, do) (implemented or not)
-            if not AgentCmd.is_generic(cmd_name):
+            if not AgentCmd.is_generic_name(cmd_name):
                 cmds += '(I);'
                 continue
  
@@ -28,7 +28,7 @@ class AgentBasic(Agent):
     # Run the assertion tests at the end
     TEST_WITH_FINAL_TEST = False
     #TEST_MAX_DURATION_SEC = None
-    TEST_MAX_DURATION_SEC = 400
+    TEST_MAX_DURATION_SEC = 100
     # Who should I send commands to ?
     TEST_COMMANDS_DEST = "myself"
     #TEST_COMMANDS_DEST = "AgentB"