From c84ca326ec3d20f0cdb4b93ba74a0bff650d25e3 Mon Sep 17 00:00:00 2001 From: Etienne Pallier Date: Fri, 15 Mar 2019 18:11:50 +0100 Subject: [PATCH] Multi-agents (3 agents) : AgentA, AgentB, et AgentX s'envoient des commandes (en //) --- README.md | 4 ++-- pyros.py | 1 + src/agent/AgentA.py | 26 -------------------------- src/agent/AgentB.py | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 176 insertions(+), 28 deletions(-) create mode 100644 src/agent/AgentB.py diff --git a/README.md b/README.md index 3a3ba3a..cfa32b0 100644 --- a/README.md +++ b/README.md @@ -74,9 +74,9 @@ Author: E. Pallier VERSION: 0.20.19 Comment: - Multi-agents : AgentA et AgentX s'envoient mutuellement des commandes (en //) + Multi-agents (3 agents) : AgentA, AgentB, et AgentX s'envoient des commandes (en //) - - AgentA et AgentX ont chacun leur propre scenario + - AgentA, AgentB, et AgentX ont chacun leur propre scenario - GROSSE OPTIMISATION : plus besoin du script intermédiaire "start_agent.py" !!! - pyros.py lance directement "cd src/agent/ ; python AgentX.py" - Mode opératoire pour lancer un agent: diff --git a/pyros.py b/pyros.py index b36d78c..b65a7e5 100755 --- a/pyros.py +++ b/pyros.py @@ -27,6 +27,7 @@ AGENTS = { "agent" : "Agent", "agentX" : "AgentX", "agentA" : "AgentA", + "agentB" : "AgentB", "webserver" : "webserver", "monitoring" : "monitoring", "majordome" : "majordome", diff --git a/src/agent/AgentA.py b/src/agent/AgentA.py index b7d2614..9873bb0 100644 --- a/src/agent/AgentA.py +++ b/src/agent/AgentA.py @@ -33,32 +33,6 @@ class AgentA(Agent): "exit", ] - """ - How to run this agent thread_exec_specific_cmd() method ? - - True = inside a Thread (cannot be killed, must be asked to stop, and inadequate for computation) - - False = inside a Process - If thread, displays : - >>>>> Thread: starting execution of command specific1 - >>>>> Thread: PID: 2695, Process Name: MainProcess, Thread Name: Thread-1 - ... - >>>>> Thread: starting execution of command specific2 - >>>>> Thread: PID: 2695, Process Name: MainProcess, Thread Name: Thread-2 - ... - >>>>> Thread: starting execution of command specific3 - >>>>> Thread: PID: 2695, Process Name: MainProcess, Thread Name: Thread-3 - If process, displays : - >>>>> Thread: starting execution of command specific1 - >>>>> Thread: PID: 2687, Process Name: Process-1, Thread Name: MainThread - ... - >>>>> Thread: starting execution of command specific2 - >>>>> Thread: PID: 2689, Process Name: Process-2, Thread Name: MainThread - ... - >>>>> Thread: starting execution of command specific3 - >>>>> Thread: PID: 2690, Process Name: Process-3, Thread Name: MainThread - """ - RUN_IN_THREAD = True - #RUN_IN_THREAD = False - """ ================================================================= diff --git a/src/agent/AgentB.py b/src/agent/AgentB.py new file mode 100644 index 0000000..a392c2d --- /dev/null +++ b/src/agent/AgentB.py @@ -0,0 +1,173 @@ +#!/usr/bin/env python3 + + +import sys +##import utils.Logger as L + +##from .Agent import Agent +from Agent import Agent + + +##log = L.setupLogger("AgentXTaskLogger", "AgentX") + + + +class AgentB(Agent): + + # FOR TEST ONLY + # Run this agent in simulator mode + SIMULATOR_MODE = True + # Run the assertion tests at the end + SIMULATOR_WITH_TEST = False + # Who should I send commands to ? + #SIMULATOR_COMMANDS_DEST = "myself" + SIMULATOR_COMMANDS_DEST = "AgentX" + # Scenario to be executed + SIMULATOR_COMMANDS = [ + "go_active", + "go_idle", + "go_active", + "abort", + "abort", + "go_active", + "go_idle", + "exit", + ] + + + """ + ================================================================= + FUNCTIONS RUN INSIDE MAIN THREAD + ================================================================= + """ + + # @override + 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) + + # @override + def init(self): + super().init() + # --- Set the mode according the startmode value + ##agent_alias = self.__class__.__name__ + ##self.set_mode_from_config(agent_alias) + + ''' + # @override + def load_config(self): + super().load_config() + ''' + + ''' + # @override + def update_survey(self): + super().update_survey() + ''' + + ''' + # @override + def get_next_command(self): + return super().get_next_command() + ''' + + # @override + def do_log(self): + super().do_log() + + + + """ + ================================================================= + FUNCTIONS RUN INSIDE A SUB-THREAD (OR A PROCESS) (thread_*()) + ================================================================= + """ + + # Define your own command step(s) here + def cmd_step1(self, step:int): + cmd = self._current_specific_cmd + cmd.result = f"in step #{step}/{self._thread_total_steps_number}" + cmd.save() + """ + if self.RUN_IN_THREAD: + print("(save from thread)") + cmd.save() + else: + #@transaction.atomic + print("(save from process)") + with transaction.atomic(): + cmd.save() + #Command.objects.select_for_update() + """ + + def cmd_step2(self, step:int): + self.cmd_step1(step) + def cmd_step3(self, step:int): + self.cmd_step1(step) + def cmd_step4(self, step:int): + self.cmd_step1(step) + + """ + # @override + def thread_exec_specific_cmd_step(self, step:int, sleep_time:float=1.0): + self.thread_stop_if_asked() + cmd = self._current_specific_cmd + print(f">>>>> Thread (cmd {cmd.name}): step #{step}/5") + self.sleep(sleep_time) + """ + + ''' + # @override + def exec_specific_cmd_start(self, cmd:Command, from_thread=True): + super().exec_specific_cmd_start(cmd, from_thread) + ''' + + + # @override + def thread_exec_specific_cmd_main(self): + # This is optional + self.thread_set_total_steps_number(5) + + # HERE, write your own scenario + + # scenario OK + self.thread_exec_specific_cmd_step(1, self.cmd_step1, 1) + self.thread_exec_specific_cmd_step(2, self.cmd_step2, 3) + self.thread_exec_specific_cmd_step(3, self.cmd_step1, 5) + self.thread_exec_specific_cmd_step(4, self.cmd_step3, 10) + self.thread_exec_specific_cmd_step(5, self.cmd_step1, 4) + # ... as many as you need + + """ autre scenario + self.thread_exec_specific_cmd_step(1, self.cmd_step1, 1) + self.thread_exec_specific_cmd_step(2, self.cmd_step2, 2) + self.thread_exec_specific_cmd_step(3, self.cmd_step1, 2) + self.thread_exec_specific_cmd_step(4, self.cmd_step3, 2) + self.thread_exec_specific_cmd_step(5, self.cmd_step1, 3) + """ + + ''' + # @override + def exec_specific_cmd_end(self, cmd:Command, from_thread=True): + super().exec_specific_cmd_end(cmd, from_thread) + ''' + + + +if __name__ == "__main__": + + # with thread + #RUN_IN_THREAD=True + # with process + RUN_IN_THREAD=False + + configfile = None + + # arg 1 : config file + if len(sys.argv) == 2: + configfile = sys.argv[1] + + #agent = AgentX() + agent = AgentB("AgentB", configfile, RUN_IN_THREAD) + print(agent) + agent.run() -- libgit2 0.21.2