add default parameters to each behaviour class

Ctri-The-Third · Jan 19, 2024 · 2180a4f · 2180a4f
1 parent b8e3db5
commit 2180a4f
Show file tree

Hide file tree

Showing 29 changed files with 419 additions and 83 deletions.
diff --git a/behaviours/_empty_behaviour.py b/behaviours/_empty_behaviour.py
@@ -53,6 +53,9 @@ def run(self):
         self._run()
         self.end()
 
+    def default_params_obj(self):
+        return_obj = super().default_params_obj()
+
     def _run(self):
         st = self.st
         ship = self.ship  # = st.ships_view_one(self.ship_name, True)
@@ -78,7 +81,7 @@ def _run(self):
 
     bhvr = NewBehaviour(agent, ship, behaviour_params or {})
 
-    lock_ship(ship, "MANUAL", bhvr.st.db_client.connection, 60 * 24)
+    lock_ship(ship, "MANUAL", 60 * 24)
 
     bhvr.run()
-    lock_ship(ship, "MANUAL", bhvr.st.db_client.connection, 0)
+    lock_ship(ship, "MANUAL", 0)
diff --git a/behaviours/buy_and_deliver_or_sell.py b/behaviours/buy_and_deliver_or_sell.py
@@ -50,6 +50,22 @@ def __init__(
 
     def run(self):
         super().run()
+        self.ship = self.st.ships_view_one(self.ship_name)
+        self.sleep_until_ready()
+        self.st.logging_client.log_beginning(
+            BEHAVIOUR_NAME,
+            self.ship.name,
+            self.agent.credits,
+            behaviour_params=self.behaviour_params,
+        )
+        self._run()
+        self.end()
+
+    def default_params_obj(self):
+        return_obj = super().default_params_obj()
+        return return_obj
+
+    def _run(self):
         st = self.st
         ship = self.ship
         agent = self.agent

diff --git a/behaviours/buy_and_sell_dripfeed.py b/behaviours/buy_and_sell_dripfeed.py
@@ -55,12 +55,25 @@ def __init__(
 
     def run(self):
         super().run()
+        self.ship = self.st.ships_view_one(self.ship_name)
+        self.sleep_until_ready()
+        self.st.logging_client.log_beginning(
+            BEHAVIOUR_NAME,
+            self.ship.name,
+            self.agent.credits,
+            behaviour_params=self.behaviour_params,
+        )
+        self._run()
+        self.end()
+
+    def default_params_obj(self):
+        return_obj = super().default_params_obj()
+        return return_obj
+
+    def _run(self):
         st = self.st
         ship = self.ship = self.st.ships_view_one(self.ship.name, True)
         agent = self.agent
-        st.logging_client.log_beginning(
-            BEHAVIOUR_NAME, ship.name, agent.credits, self.behaviour_params
-        )
 
         #
         # setup initial parameters and preflight checks
@@ -178,7 +191,7 @@ def sell_half(self):
             amount_to_sell = min(ship.cargo_units_used, tradegood.trade_volume)
             self.sell_cargo(self.target_tradegood, amount_to_sell, sell_market_mkt)
 
-    def end(self, error):
+    def end(self, error=None):
         super().end()
         self.st.logging_client.log_ending(
             BEHAVIOUR_NAME, self.ship.name, self.agent.credits

diff --git a/behaviours/chill_and_survey.py b/behaviours/chill_and_survey.py
@@ -34,14 +34,28 @@ def __init__(
         )
         self.target_wp_s = behaviour_params["asteroid_wp"]
 
+    def default_params_obj(self):
+        return_obj = super().default_params_obj()
+        return_obj["asteroid_wp"] = "X1-TEST-AB12"
+
+        return return_obj
+
     def run(self):
+        self.ship = self.st.ships_view_one(self.ship_name)
+        self.sleep_until_ready()
+        self.st.logging_client.log_beginning(
+            BEHAVIOUR_NAME,
+            self.ship.name,
+            self.agent.credits,
+            behaviour_params=self.behaviour_params,
+        )
+        self._run()
+        self.end()
+
+    def _run(self):
         st = self.st
         ship = self.ship
         agent = st.view_my_self()
-        st.logging_client.log_beginning(
-            BEHAVIOUR_NAME, ship.name, agent.credits, self.behaviour_params
-        )
-
         target_wp = st.waypoints_view_one(self.target_wp_s)
         if not target_wp:
             self.st.sleep(SAFETY_PADDING)
@@ -67,6 +81,6 @@ def run(self):
     ship = f"{agent}-{ship_number}"
     behaviour_params = {"asteroid_wp": "X1-RV57-69965Z"}
     bhvr = ChillAndSurvey(agent, ship, behaviour_params or {})
-    lock_ship(ship_number, "MANUAL", bhvr.st.db_client.connection, 60 * 24)
+    lock_ship(ship_number, "MANUAL", 60 * 24)
     bhvr.run()
-    lock_ship(ship_number, "MANUAL", bhvr.st.db_client.connection, 0)
+    lock_ship(ship_number, "MANUAL", 0)
diff --git a/behaviours/construct_a_jumpgate.py b/behaviours/construct_a_jumpgate.py
@@ -61,6 +61,12 @@ def run(self):
         self._run()
         self.end()
 
+    def default_params_obj(self):
+        return_obj = super().default_params_obj()
+        return_obj["asteroid_wp"] = "X1-TEST-AB12"
+
+        return return_obj
+
     def _run(self):
         st = self.st
         ship = self.ship

diff --git a/behaviours/emergency_reboot.py b/behaviours/emergency_reboot.py
@@ -51,6 +51,7 @@ def __init__(
 
     def run(self):
         super().run()
+        self.sleep_until_ready()
         self.st.logging_client.log_beginning(
             BEHAVIOUR_NAME,
             self.ship.name,
@@ -60,6 +61,13 @@ def run(self):
         self._run()
         self.end()
 
+    def default_params_obj(self):
+        return_obj = super().default_params_obj()
+        return_obj["asteroid_wp"] = "X1-TEST-GAS1"
+        return_obj["sell_wp"] = "X1-TEST-KMKT"
+
+        return return_obj
+
     def _run(self):
         st = self.st
         ship = self.ship  # = st.ships_view_one(self.ship_name, True)

diff --git a/behaviours/evolve_supply_chain.py b/behaviours/evolve_supply_chain.py
@@ -63,7 +63,15 @@ def __init__(
         self.markets = {}
         self.tg_s_markets = {}
 
+    def default_params_obj(self):
+        return_obj = super().default_params_obj()
+        return_obj["target_tradegoods"] = ["CLOTHING", "FOOD"]
+        return_obj["max_tv"] = 180
+
+        return return_obj
+
     def run(self):
+        super().run()
         self.ship = self.st.ships_view_one(self.ship_name)
         self.sleep_until_ready()
         self.st.logging_client.log_beginning(

diff --git a/behaviours/explore_system.py b/behaviours/explore_system.py
@@ -44,18 +44,27 @@ def __init__(
 
     def run(self):
         super().run()
-        ship = self.ship
-        st = self.st
-        agent = st.view_my_self()
-        # check all markets in the system
-        st.logging_client.log_beginning(
+        self.sleep_until_ready()
+        self.st.logging_client.log_beginning(
             BEHAVIOUR_NAME,
-            ship.name,
-            agent.credits,
+            self.ship.name,
+            self.agent.credits,
             behaviour_params=self.behaviour_params,
         )
+        self._run()
+        self.end()
+
+    def default_params_obj(self):
+        return_obj = super().default_params_obj()
+        return_obj["target_sys"] = "X1-BC28"
 
-        self.sleep_until_arrived()
+        return return_obj
+
+    def _run(self):
+        ship = self.ship
+        st = self.st
+        agent = st.view_my_self()
+        # check all markets in the system
         o_sys = st.systems_view_one(ship.nav.system_symbol)
 
         path = None
@@ -141,8 +150,8 @@ def find_unexplored_jumpgate(self):
     behaviour_params = {"priority": 3.5, "target_sys": "X1-BC28"}  # X1-TF72 X1-YF83
     bhvr = ExploreSystem(agent, ship, behaviour_params or {})
 
-    lock_ship(ship, "MANUAL", bhvr.connection, duration=120)
+    lock_ship(ship, "MANUAL", duration=120)
     set_logging(logging.DEBUG)
 
     bhvr.run()
-    lock_ship(ship, "", bhvr.connection, duration=0)
+    lock_ship(ship, "", duration=0)
diff --git a/behaviours/extract_and_chill.py b/behaviours/extract_and_chill.py
@@ -37,8 +37,28 @@ def __init__(
         self.cargo_to_target = self.behaviour_params.get("cargo_to_transfer", None)
         self.cargo_to_jettison = self.behaviour_params.get("cargo_to_jettison", [])
 
+    def default_params_obj(self):
+        return_obj = super().default_params_obj()
+        return_obj["cargo_to_transfer"] = ["*"]
+        return_obj["cargo_to_jettison"] = []
+
+        return return_obj
+
     def run(self):
         super().run()
+        self.ship = self.st.ships_view_one(self.ship_name)
+        self.sleep_until_ready()
+        self.st.logging_client.log_beginning(
+            BEHAVIOUR_NAME,
+            self.ship.name,
+            self.agent.credits,
+            behaviour_params=self.behaviour_params,
+        )
+
+        self._run()
+        self.end()
+
+    def _run(self):
         # all  threads should have this.
 
         starting_credts = self.agent.credits
@@ -121,7 +141,7 @@ def run(self):
     set_logging(logging.DEBUG)
     behaviour_params = {"asteroid_wp": "X1-YG29-C39", "cargo_to_transfer": ["*"]}
     bhvr = ExtractAndChill(agent, ship, behaviour_params)
-    lock_ship(ship, "MANUAL", bhvr.connection, duration=120)
+    lock_ship(ship, "MANUAL", duration=120)
     set_logging(logging.DEBUG)
     bhvr.run()
-    lock_ship(ship, "", bhvr.connection, duration=0)
+    lock_ship(ship, "", duration=0)
diff --git a/behaviours/extract_and_fulfill.py b/behaviours/extract_and_fulfill.py
@@ -37,8 +37,29 @@ def __init__(
         )
         self.logger = logging.getLogger("bhvr_extract_and_transfer")
 
+    def default_params_obj(self):
+        return_obj = super().default_params_obj()
+        return_obj["asteroid_wp"] = "X1-TEST-AB12"
+        return_obj["cargo_to_transfer"] = ["*"]
+        return_obj["fulfil_wp"] = "X1-TEST-AB12"
+
+        return return_obj
+
     def run(self):
         super().run()
+        self.ship = self.st.ships_view_one(self.ship_name)
+        self.sleep_until_ready()
+        self.st.logging_client.log_beginning(
+            BEHAVIOUR_NAME,
+            self.ship.name,
+            self.agent.credits,
+            behaviour_params=self.behaviour_params,
+        )
+
+        self._run()
+        self.end()
+
+    def _run(self):
         starting_credts = self.st.view_my_self().credits
 
         st = self.st

diff --git a/behaviours/extract_and_transfer.py b/behaviours/extract_and_transfer.py
@@ -37,9 +37,28 @@ def __init__(
         )
         self.logger = logging.getLogger("bhvr_extract_and_transfer")
 
+    def default_params_obj(self):
+        return_obj = super().default_params_obj()
+        return_obj["asteroid_wp"] = "X1-TEST-AB12"
+        return_obj["cargo_to_transfer"] = ["*"]
+
+        return return_obj
+
     def run(self):
         super().run()
+        self.ship = self.st.ships_view_one(self.ship_name)
+        self.sleep_until_ready()
+        self.st.logging_client.log_beginning(
+            BEHAVIOUR_NAME,
+            self.ship.name,
+            self.agent.credits,
+            behaviour_params=self.behaviour_params,
+        )
+
+        self._run()
+        self.end()
 
+    def _run(self):
         starting_credts = self.st.view_my_self().credits
         # self.logger.info("NEEDLESS REQUEST - get inventory into DB")
 

diff --git a/behaviours/generic_behaviour.py b/behaviours/generic_behaviour.py
@@ -100,6 +100,9 @@ def run(self):
 
         pass
 
+    def default_params_obj(self):
+        return {"priority": 5, "delay_start": 0}
+
     def find_nearest_systems_by_waypoint_trait(
         self,
         source_system: System,

diff --git a/behaviours/go_and_buy_a_ship.py b/behaviours/go_and_buy_a_ship.py
@@ -33,20 +33,38 @@ def __init__(
             connection,
         )
 
+        self.target_ship_type = self.behaviour_params.get("ship_type", None)
+        self.target_wp = self.behaviour_params.get("target_wp", None)
+
+    def default_params_obj(self):
+        return_obj = super().default_params_obj()
+        return_obj["ship_type"] = "SHIP_PROBE"
+        return_obj["target_wp"] = "X1-TEST-A2"
+
+        return return_obj
+
     def run(self):
         super().run()
-        st = self.st
-        ship = self.ship
-        agent = st.view_my_self()
-        st.logging_client.log_beginning(
+        self.ship = self.st.ships_view_one(self.ship_name)
+        self.sleep_until_ready()
+        self.st.logging_client.log_beginning(
             BEHAVIOUR_NAME,
-            ship.name,
-            agent.credits,
+            self.ship.name,
+            self.agent.credits,
             behaviour_params=self.behaviour_params,
         )
 
-        target_ship_type = self.behaviour_params.get("ship_type", None)
-        target_wp = self.behaviour_params.get("target_wp", None)
+        self._run()
+        self.end()
+
+    def _run(self):
+        st = self.st
+        ship = self.ship
+        agent = st.view_my_self()
+
+        target_ship_type = self.target_ship_type
+        target_wp = self.target_wp
+
         if target_wp:
             target_wp = st.waypoints_view_one(target_wp)
         elif not target_wp:
@@ -112,6 +130,6 @@ def find_shipyards(self, ship_symbol):
     ship = f"{agent}-{ship_number}"
     behaviour_params = {"ship_type": "SHIP_PROBE", "target_wp": "X1-GU20-C37"}
     bhvr = GoAndBuyShip(agent, ship, behaviour_params or {})
-    lock_ship(ship, "MANUAL", bhvr.st.db_client.connection, 60 * 24)
+    lock_ship(ship, "MANUAL", 60 * 24)
     bhvr.run()
-    lock_ship(ship, "MANUAL", bhvr.st.db_client.connection, 0)
+    lock_ship(ship, "MANUAL", 0)
diff --git a/behaviours/manage_specific_export.py b/behaviours/manage_specific_export.py
@@ -57,6 +57,13 @@ def __init__(
             self.starting_market_wp = None
         self.markets = {}
 
+    def default_params_obj(self):
+        return_obj = super().default_params_obj()
+        return_obj["target_tradegood"] = "FUEL"
+        return_obj["market_wp"] = "X1-TEST-A1"
+
+        return return_obj
+
     def run(self):
         super().run()
         self.st.logging_client.log_beginning(