Extra bail removed

OSError raised anyways

pytec/pytec/gui/model/thermostat.py

@@ -8,9 +8,9 @@ from pytec.aioclient import AsyncioClient
 
 
 class ThermostatConnectionState(Enum):
-    DISCONNECTED = False
+    DISCONNECTED = "disconnected"
     CONNECTING = "connecting"
-    CONNECTED = True
+    CONNECTED = "connected"
 
 
 class Thermostat(QObject, metaclass=PropertyMeta):
@@ -31,20 +31,22 @@ class Thermostat(QObject, metaclass=PropertyMeta):
         self._watch_task = None
         self._report_mode_task = None
         self._poll_for_report = True
+        self._update_params_task = None
         self.connection_errored = False
-        self.task = None
         super().__init__(parent)
 
     async def start_session(self, host, port):
         await self._client.connect(host, port)
+        hw_rev_data = await self.get_hw_rev()
         self.start_watching()
+        return hw_rev_data
 
     async def run(self):
-        self.task = asyncio.create_task(self.update_params())
+        self._update_params_task = asyncio.create_task(self.update_params())
         while True:
-            if self.task.done():
+            if self._update_params_task.done():
                 try:
-                    self.task.result()
+                    self._update_params_task.result()
                 except OSError:
                     logging.error(
                         "Encountered an error while polling for information from Thermostat.",
@@ -52,7 +54,7 @@ class Thermostat(QObject, metaclass=PropertyMeta):
                     )
                     self.connection_error.emit()
                     return
-                self.task = asyncio.create_task(self.update_params())
+                self._update_params_task = asyncio.create_task(self.update_params())
             await asyncio.sleep(self._update_s)
 
     @pyqtSlot()
@@ -64,16 +66,23 @@ class Thermostat(QObject, metaclass=PropertyMeta):
         return self.hw_rev
 
     async def update_params(self):
-        self.fan = await self._client.get_fan()
+        fan_task = asyncio.create_task(self._client.get_fan())
-        self.pwm = await self._client.get_pwm()
+        pwm_task = asyncio.create_task(self._client.get_pwm())
+        pid_task = asyncio.create_task(self._client.get_pid())
+        report_task = asyncio.create_task(self._client.report())
+        thermistor_task = asyncio.create_task(self._client.get_steinhart_hart())
+        postfilter_task = asyncio.create_task(self._client.get_postfilter())
+
+        self.fan = await fan_task
+        self.pwm = await pwm_task
         if self._poll_for_report:
-            self.report = await self._client.report()
+            self.report = await report_task
             self.interval = [
                 self.report[i]["interval"] for i in range(len(self.report))
             ]
-        self.pid = await self._client.get_pid()
+        self.pid = await pid_task
-        self.thermistor = await self._client.get_steinhart_hart()
+        self.thermistor = await thermistor_task
-        self.postfilter = await self._client.get_postfilter()
+        self.postfilter = await postfilter_task
 
     def connected(self):
         return self._client.connected()
@@ -87,8 +96,8 @@ class Thermostat(QObject, metaclass=PropertyMeta):
             await self.set_report_mode(False)
             self._watch_task.cancel()
             self._watch_task = None
-            self.task.cancel()
+            self._update_params_task.cancel()
-            self.task = None
+            self._update_params_task = None
 
     async def set_report_mode(self, enabled: bool):
         self._poll_for_report = not enabled

pytec/tec_qt.py

@@ -29,9 +29,9 @@ def get_argparser():
         "--connect",
         default=None,
         action="store_true",
-        help="Automatically connect to the specified Thermostat in IP:port format",
+        help="Automatically connect to the specified Thermostat in host:port format",
     )
-    parser.add_argument("IP", metavar="ip", default=None, nargs="?")
+    parser.add_argument("HOST", metavar="host", default=None, nargs="?")
     parser.add_argument("PORT", metavar="port", default=None, nargs="?")
     parser.add_argument(
         "-l",
@@ -72,8 +72,6 @@ class MainWindow(QtWidgets.QMainWindow):
                 "Connection Error", "Thermostat connection lost. Is it unplugged?"
             )
 
-            self.bail()
-
         self.thermostat.connection_error.connect(handle_connection_error)
 
         self.thermostat.connection_error.connect(self.thermostat.timed_out)
@@ -82,7 +80,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.autotuners = PIDAutoTuner(self, self.thermostat, 2)
 
         def get_ctrl_panel_config(args):
-            with open(args.param_tree, "r") as f:
+            with open(args.param_tree, "r", encoding="utf-8") as f:
                 return json.load(f)["ctrl_panel"]
 
         param_tree_sigActivated_handles = [
@@ -186,9 +184,6 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.conn_menu.port_set_spin.setEnabled(False)
                 self.connect_btn.setText("Disconnect")
 
-                self.hw_rev_data = await self.thermostat.get_hw_rev()
-                logging.debug(self.hw_rev_data)
-
                 self._status(self.hw_rev_data)
 
             case ThermostatConnectionState.CONNECTING:
@@ -223,7 +218,6 @@ class MainWindow(QtWidgets.QMainWindow):
                             await self.autotuners.stop_pid_from_running(ch)
 
     def _status(self, hw_rev_d: dict):
-        logging.debug(hw_rev_d)
         self.status_lbl.setText(
             f"Connected to Thermostat v{hw_rev_d['rev']['major']}.{hw_rev_d['rev']['minor']}"
         )
@@ -247,7 +241,7 @@ class MainWindow(QtWidgets.QMainWindow):
         await self.thermostat.set_report_mode(enabled)
 
     @asyncClose
-    async def closeEvent(self, event):
+    async def closeEvent(self, _event):
         try:
             await self.bail()
         except:
@@ -256,15 +250,16 @@ class MainWindow(QtWidgets.QMainWindow):
     @asyncSlot()
     async def on_connect_btn_clicked(self):
         if (self._connecting_task is None) and (not self.thermostat.connected()):
-            host = self.conn_menu.host_set_line.text()
-            port = self.conn_menu.port_set_spin.value()
-
             await self._on_connection_changed(ThermostatConnectionState.CONNECTING)
+
             self._connecting_task = asyncio.create_task(
-                self.thermostat.start_session(host=host, port=port)
+                self.thermostat.start_session(
+                    host=self.conn_menu.host_set_line.text(),
+                    port=self.conn_menu.port_set_spin.value(),
+                )
             )
             try:
-                await self._connecting_task
+                self.hw_rev_data = await self._connecting_task
             except (OSError, asyncio.CancelledError) as exc:
                 await self.bail()
                 if isinstance(exc, asyncio.CancelledError):
@@ -447,8 +442,7 @@ class MainWindow(QtWidgets.QMainWindow):
         assert self.thermostat.connected()
 
         await self.thermostat.set_ipv4(ipv4_settings)
-        await self.thermostat.end_session()
+        await self.bail()
-        await self._on_connection_changed(ThermostatConnectionState.DISCONNECTED)
 
 
 async def coro_main():