Updated readme, Python 3.9, Clutter.Matrix support, only sync files on authentication success

Author: eliasbakken

.travis.yml

@@ -2,7 +2,7 @@ matrix:
   include:
     - language: python
       python:
-        - "3.6"
+        - "3.9"
       before_install:
         - sudo apt-get update
         - sudo apt install libdbus-1-dev

README.md

@@ -47,7 +47,7 @@ Install actual program
 ```
 git clone https://github.com/intelligent-agent/toggle
 cd toggle
-pip3 install -e . -r requirements.txt
+pip3 install -r requirements.txt
 python3 setup.py install_data
 ```
 
@@ -77,3 +77,14 @@ To Run toggle once it's installed:
 ```
 CLUTTER_BACKEND=<wayland|x11|eglnative> toggle
 ```
+
+## Contributing
+Make sure all tests pass before creating a pull-request
+To test locally, run:
+```
+pytest
+```
+and also make sure the formatting is correct
+```
+yapf3 --diff -e venv -e .git -e build -r .
+ ```

configs/default.cfg

@@ -43,6 +43,7 @@ port = 5000
 
 [OctoPrint]
 user = toggle
+password = REPLACE_ME
 authentication = REPLACE_ME
 apikey = REPLACE_ME
 timeout = 40

requirements.txt

@@ -1,4 +1,5 @@
 requests
 python-networkmanager
 tornado
-https://github.com/liamw9534/pyconnman/archive/master.tar.gz#egg=pyconnman
+https://github.com/liamw9534/pyconnman/archive/master.tar.gz#egg=pyconnman
+-e .

tests/conformance/test_graph_plot.py

@@ -9,7 +9,7 @@
 from toggle.ui.Graph import Graph, GraphPlot, GraphScale
 
 
-def test_graph_plot(mocker):
+def test_graph_plot():
   ctx = mock.Mock()
   plot = GraphPlot("H", (0, 1, 0))
   plot.add_point(0, 4)

toggle/Toggle.py

@@ -124,7 +124,7 @@ def __init__(self):
     config.loader = ModelLoader(config)
     config.model = Model(config)
     config.plate = Plate(config)
-    config.socks_client = WebSocksClient(config, self.on_connected_cb)
+    config.socks_client = WebSocksClient(config, self.on_auth_cb)
 
     # mouse
     use_mouse = int(config.get('Input', 'mouse'))
@@ -144,7 +144,7 @@ def __init__(self):
     self.config = config
     config.stage.show()
 
-  def on_connected_cb(self):
+  def on_auth_cb(self):
     self.config.loader.sync_models()
 
   def run(self):

toggle/core/Event.py

@@ -48,20 +48,25 @@ def timelapse(self):
   def plugin(self):
     plugin_type = self.payload["data"]["type"]
     plugin_name = self.payload["plugin"]
-    if plugin_type == "filament_sensor":
-      logging.warning("filament sensor has been disabled")
-    elif plugin_type == "alarm_filament_jam":
-      self.config.message.display("Alarm: Filament Jam!")
-    elif plugin_type == "display_message":
-      message = plugin_data["message"]
-      self.config.message.display(message)
-    elif plugin_type == "bed_probe_point":
-      point = json.loads(plugin_data["message"])
-      self.config.plate.add_probe_point(point)
-      self.config.loader.select_none()
-    elif plugin_type == "bed_probe_reset":
-      self.config.plate.remove_probe_points()
-      self.config.loader.model.show()
+    if plugin_name == "redeem":
+      if plugin_type == "filament_sensor":
+        logging.warning("filament sensor has been disabled")
+      elif plugin_type == "alarm_filament_jam":
+        self.config.message.display("Alarm: Filament Jam!")
+      elif plugin_type == "display_message":
+        message = plugin_data["message"]
+        self.config.message.display(message)
+      elif plugin_type == "bed_probe_point":
+        point = json.loads(plugin_data["message"])
+        self.config.plate.add_probe_point(point)
+        self.config.loader.select_none()
+      elif plugin_type == "bed_probe_reset":
+        self.config.plate.remove_probe_points()
+        self.config.loader.model.show()
+    elif plugin_name == "klipper":
+      if plugin_type == "status":
+        status = self.payload["data"]["title"]
+        logging.debug(f"Kipper status: {status}")
     else:
       logging.debug("Unknown plugin type: " + str(plugin_type))
 
@@ -129,6 +134,9 @@ def ClientOpened(self):
   def ClientClosed(self):
     logging.debug("Client Closed")
 
+  def ClientAuthed(self):
+    logging.debug("Client Authenticated")
+
   def SlicingStarted(self):
     self.config.message.display("Starting slicing!")
 

toggle/core/RestClient.py

@@ -16,7 +16,7 @@ def __init__(self, config):
     self._headers = {'Content-Type': 'application/json', 'X-Api-Key': self._api_key}
 
   def login(self):
-    logging.debug("Login")
+    logging.debug("Rest login")
     url = "http://" + self._host + ":" + str(self._port) + "/api/login"
     user = self.config.get("OctoPrint", "user")
     password = self.config.get("OctoPrint", "password")
@@ -25,6 +25,7 @@ def login(self):
     if r.status_code == 200:
       return r.json()["session"]
     else:
+      logging.warning("Authentication failed! Check username and password + CORS")
       return "INVALID-SESSION"
 
   def start_job(self):
@@ -61,7 +62,8 @@ def send_gcode(self, cmd):
         str(self._port) + "/api/printer/command"
     data = json.dumps({'command': cmd})
     r = requests.post(url, data=data, headers=self._headers)
-    print(r.json)
+    if r.status_code != 204:
+      logging.warning(f"send_gcode returned satus code: {r.status_code}")
 
   def start_preheat(self):
     logging.debug("Starting preheat")
@@ -134,12 +136,12 @@ def get_list_of_files(self):
       r = requests.get(self._build_url("/api/files"), headers=self._headers)
     except requests.ConnectionError as e:
       logging.warning("Connection error")
-      return {}
+      return {'files': []}
     if r.status_code in [200, 204]:
       return r.json()
     logging.warning("Unable to contact OctoPrint by REST. "
                     "Check your API key (currently '" + self._api_key + "'")
-    return {}
+    return {'files': []}
 
   def download_model(self, url):
     try:

toggle/core/WebSocksClient.py

@@ -34,11 +34,12 @@ class WebSocksClient():
   CLOSED = 0
   CONNECTING = 1
   CONNECTED = 2
-  FAILED = 3
+  AUTHENTICATED = 3
+  FAILED = 4
 
-  def __init__(self, config=None, on_connected_cb=None):
+  def __init__(self, config=None, on_auth_cb=None):
     self.config = config
-    self.on_connected_cb = on_connected_cb
+    self.on_auth_cb = on_auth_cb
     host = config.get("Server", "host")
     port = str(config.get("Server", "port"))
     self.connect_timeout = DEFAULT_CONNECT_TIMEOUT
@@ -59,10 +60,12 @@ def connect(self):
   def authenticate(self):
     user = self.config.get("OctoPrint", "user")
     session = self.config.rest_client.login()
+    if session != "INVALID-SESSION":
+      self.on_auth_cb()
     logging.debug("Authenticating with " + user + ":" + session)
     msg = '{ "auth" : "' + str(user) + ':' + str(session) + '" }'
     logging.info("Sending message " + msg)
-    self._ws_connection.write_message(msg)
+    ret = self._ws_connection.write_message(msg)
 
   def send(self, data):
     """
@@ -103,6 +106,7 @@ def _on_message(self, msg):
       :param str msg: server message.
     """
     data = json.loads(msg)
+    #logging.debug(msg)
     if 'connected' in data:
       logging.debug("SockJS: Socket connected")
       self.authenticate()
@@ -114,8 +118,6 @@ def _on_connection_success(self):
     """
     self.state = WebSocksClient.CONNECTED
     logging.debug('Websocket connected!')
-    if self.on_connected_cb:
-      self.on_connected_cb()
 
   def _on_connection_close(self):
     """

toggle/ui/Model.py

@@ -45,8 +45,12 @@ def __init__(self, config):
     vp.add_child(self.light_directional)
     vp.add_child(self.light_point)
 
-    cm = Cogl.Matrix()
-    m = Clutter.matrix_init_from_array(cm, [1, 0, 0, 0, 0, -1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1])
+    if hasattr(Clutter, 'Matrix'):
+      m = Clutter.Matrix.alloc()
+      m.init_from_array([1, 0, 0, 0, 0, -1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1])
+    else:
+      cm = Cogl.Matrix()
+      m = Clutter.matrix_init_from_array(cm, [1, 0, 0, 0, 0, -1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1])
     config.ui.get_object("model-flipper").set_transform(m)
 
     self.model.connect("show", self.model_loaded)