Added verbosity configuration as state function

Author: Juliana Mashon

functions/basic_commands.py

@@ -19,12 +19,7 @@ def __init__(self, state):
     def wait(self, duration):
         """Pauses execution for a certain number of milliseconds."""
 
-        verbosity_level = {
-            1: lambda: print("`wait` called"),
-            2: lambda: print(f"Waiting for {duration} milliseconds...")
-        }
-
-        verbosity_level[self.broker.state.verbosity]()
+        self.broker.state.print_status("wait()", description=f"Waiting for {duration} milliseconds...")
 
         wait_message = {
             "kind": "rpc_request",
@@ -46,12 +41,7 @@ def wait(self, duration):
     def e_stop(self):
         """Emergency locks (E-stops) the Farmduino microcontroller."""
 
-        verbosity_level = {
-            1: lambda: print("`e_stop` called"),
-            2: lambda: print(f"Triggered device emergency stop at: {datetime.now()}")
-        }
-
-        verbosity_level[self.broker.state.verbosity]()
+        self.broker.state.print_status("e_stop()", description=f"Triggered device emergency stop at: {datetime.now()}")
 
         stop_message = {
             "kind": "rpc_request",
@@ -71,12 +61,7 @@ def e_stop(self):
     def unlock(self):
         """Unlocks a locked (E-stopped) device."""
 
-        verbosity_level = {
-            1: lambda: print("`unlock` called"),
-            2: lambda: print(f"Triggered device unlock at: {datetime.now()}")
-        }
-
-        verbosity_level[self.broker.state.verbosity]()
+        self.broker.state.print_status("unlock()", description=f"Triggered device unlock at: {datetime.now()}")
 
         unlock_message = {
             "kind": "rpc_request",
@@ -96,12 +81,7 @@ def unlock(self):
     def reboot(self):
         """Reboots the FarmBot OS and reinitializes the device."""
 
-        verbosity_level = {
-            1: lambda: print("`reboot` called"),
-            2: lambda: print(f"Triggered device reboot at: {datetime.now()}")
-        }
-
-        verbosity_level[self.broker.state.verbosity]()
+        self.broker.state.print_status("reboot()", description=f"Triggered device reboot at: {datetime.now()}")
 
         reboot_message = {
             **RPC_REQUEST,
@@ -119,12 +99,7 @@ def reboot(self):
     def shutdown(self):
         """Shuts down the FarmBot OS and turns the device off."""
 
-        verbosity_level = {
-            1: lambda: print("`shutdown` called"),
-            2: lambda: print(f"Triggered device shutdown at: {datetime.now()}")
-        }
-
-        verbosity_level[self.broker.state.verbosity]()
+        self.broker.state.print_status("shutdown()", description=f"Triggered device shutdown at: {datetime.now()}")
 
         shutdown_message = {
             **RPC_REQUEST,

functions/information.py

@@ -27,12 +27,7 @@ def get_info(self, endpoint, id=None):
 
         endpoint_data = self.auth.request('GET', endpoint, id)
 
-        verbosity_level = {
-            1: lambda: print("`get_info` called"),
-            2: lambda: print(json.dumps(endpoint_data, indent=4))
-        }
-
-        verbosity_level[self.auth.state.verbosity]()
+        self.broker.state.print_status("get_info()", endpoint_json=endpoint_data)
 
         return endpoint_data
 
@@ -44,7 +39,11 @@ def set_info(self, endpoint, field, value, id=None):
         }
 
         self.auth.request('PATCH', endpoint, id, new_value)
-        return self.get_info(endpoint, id)
+        endpoint_data = self.get_info(endpoint, id)
+
+        self.broker.state.print_status("set_info()", endpoint_json=endpoint_data)
+
+        return endpoint_data
 
     def safe_z(self):
         """Returns the highest safe point along the z-axis."""

main.py

@@ -11,6 +11,16 @@ def __init__(self):
         self.last_message = None
         self.verbosity = 2
 
+    def print_status(self, function, endpoint_json=None, description=None):
+        """Handle changes to output based on user-defined verbosity."""
+
+        if self.verbosity >= 1:
+            return print(f"`{function}` called")
+        if self.verbosity >= 2 and endpoint_json:
+            return print(json.dumps(endpoint_json, indent=4))
+        if self.verbosity >= 2 and description:
+            return print(description)
+
 class Farmbot():
     def __init__(self):
         self.state = State()