Removed set_token()

Author: Juliana Mashon

main.py

@@ -9,11 +9,11 @@ def __init__(self):
         self.token = None
         self.error = None
         self.last_message = None
+        self.verbosity = 1
 
 class Farmbot():
     def __init__(self):
         self.state = State()
-        self.echo = True
 
         # Initialize other components without the token initially
         self.auth = Authentication(self.state)
@@ -28,16 +28,11 @@ def __init__(self):
         self.resources = Resources(self.state)
         self.tools = ToolControls(self.state)
 
-    def set_token(self, token):
-        self.state.token = token
+    def set_verbosity(self, value):
+        if value <= -1 or value >= 3:
+            return print("ERROR: verbosity must be between 0-2")
 
-    def set_echo(self, value):
-        if value is True:
-            self.echo = True
-        elif value is False:
-            self.echo = False
-        else:
-            return print("ERROR: `Echo` can only be True or False.")
+        self.state.verbosity = value
 
     # authentication.py
 

tests/tests_main.py

@@ -110,7 +110,7 @@ def test_get_info_endpoint_only(self, mock_request):
         mock_response.status_code = 200
         mock_request.return_value = mock_response
         fb = Farmbot()
-        fb.set_token(MOCK_TOKEN)
+        fb.state.token = MOCK_TOKEN
         # Call with endpoint only
         response = fb.get_info('device')
         mock_request.assert_called_once_with(
@@ -133,7 +133,7 @@ def test_get_info_with_id(self, mock_request):
         mock_response.status_code = 200
         mock_request.return_value = mock_response
         fb = Farmbot()
-        fb.set_token(MOCK_TOKEN)
+        fb.state.token = MOCK_TOKEN
         # Call with specific ID
         response = fb.get_info('peripherals', '12345')
         mock_request.assert_called_once_with(
@@ -155,7 +155,7 @@ def test_set_info(self, mock_request):
         mock_response.json.return_value = {'name': 'new name'}
         mock_request.return_value = mock_response
         fb = Farmbot()
-        fb.set_token(MOCK_TOKEN)
+        fb.state.token = MOCK_TOKEN
         device_info = fb.set_info('device', 'name', 'new name')
         mock_request.assert_has_calls([call(
             'PATCH',
@@ -188,7 +188,7 @@ def test_group(self, mock_request):
         mock_response.status_code = 200
         mock_request.return_value = mock_response
         fb = Farmbot()
-        fb.set_token(MOCK_TOKEN)
+        fb.state.token = MOCK_TOKEN
         group_info = fb.group(12345)
         mock_request.assert_called_once_with(
             'GET',
@@ -209,7 +209,7 @@ def test_curve(self, mock_request):
         mock_response.status_code = 200
         mock_request.return_value = mock_response
         fb = Farmbot()
-        fb.set_token(MOCK_TOKEN)
+        fb.state.token = MOCK_TOKEN
         curve_info = fb.curve(12345)
         mock_request.assert_called_once_with(
             'GET',
@@ -230,7 +230,7 @@ def test_safe_z(self, mock_request):
         mock_response.status_code = 200
         mock_request.return_value = mock_response
         fb = Farmbot()
-        fb.set_token(MOCK_TOKEN)
+        fb.state.token = MOCK_TOKEN
         safe_height = fb.safe_z()
         mock_request.assert_called_once_with(
             'GET',
@@ -256,7 +256,7 @@ def test_garden_size(self, mock_request):
         mock_response.status_code = 200
         mock_request.return_value = mock_response
         fb = Farmbot()
-        fb.set_token(MOCK_TOKEN)
+        fb.state.token = MOCK_TOKEN
         garden_size = fb.garden_size()
         mock_request.assert_called_once_with(
             'GET',
@@ -276,7 +276,7 @@ def test_log(self, mock_request):
         mock_response.status_code = 200
         mock_request.return_value = mock_response
         fb = Farmbot()
-        fb.set_token(MOCK_TOKEN)
+        fb.state.token = MOCK_TOKEN
         fb.log('test message', 'info', ['toast'])
         mock_request.assert_called_once_with(
             'POST',
@@ -298,7 +298,7 @@ def test_connect_broker(self, mock_mqtt):
         mock_client = Mock()
         mock_mqtt.return_value = mock_client
         fb = Farmbot()
-        fb.set_token(MOCK_TOKEN)
+        fb.state.token = MOCK_TOKEN
         fb.connect_broker()
         mock_client.username_pw_set.assert_called_once_with(
             username='device_0',
@@ -324,7 +324,7 @@ def test_start_listen(self, mock_mqtt):
         mock_client = Mock()
         mock_mqtt.return_value = mock_client
         fb = Farmbot()
-        fb.set_token(MOCK_TOKEN)
+        fb.state.token = MOCK_TOKEN
         fb.start_listen()
         mock_client.on_connect('', '', '', '')
 
@@ -360,7 +360,7 @@ def send_command_test_helper(self, *args, **kwargs):
         mock_response.status_code = 200
         mock_request.return_value = mock_response
         fb = Farmbot()
-        fb.set_token(MOCK_TOKEN)
+        fb.state.token = MOCK_TOKEN
         execute_command(fb)
         expected_payload = {
             'kind': 'rpc_request',
@@ -883,7 +883,7 @@ def test_get_seed_tray_cell(self, mock_request, _mock_client):
         mock_response.status_code = 200
         mock_request.return_value = mock_response
         fb = Farmbot()
-        fb.set_token(MOCK_TOKEN)
+        fb.state.token = MOCK_TOKEN
         cell = fb.get_seed_tray_cell(123, 'd4')
         mock_request.assert_called_once_with(
             'GET',