Provide data model

cli.py

@@ -5,12 +5,14 @@
 import aiohttp
 
 from cli_ac_menu import show_aircon_menu
+from cli_dryer_menu import show_dryer_menu
 from cli_oven_menu import show_oven_menu
 from cli_refrigerator_menu import show_refrigerator_menu
-from cli_washerdryer_menu import show_washerdryer_menu
+from cli_washer_menu import show_washer_menu
 from whirlpool.appliancesmanager import AppliancesManager
 from whirlpool.auth import Auth
-from whirlpool.backendselector import BackendSelector, Brand, Region
+from whirlpool.backendselector import BackendSelector
+from whirlpool.types import ApplianceKind, Brand, Region
 
 logging.basicConfig(format="%(asctime)s [%(name)s %(levelname)s]: %(message)s")
 logger = logging.getLogger("whirlpool")
@@ -35,9 +37,6 @@
 
 
 async def start():
-    def attr_upd():
-        logger.info("Attributes updated")
-
     if args.brand == "whirlpool":
         selected_brand = Brand.Whirlpool
     elif args.brand == "maytag":
@@ -70,34 +69,35 @@ def attr_upd():
 
         if args.list:
             print(appliance_manager.aircons)
-            print(appliance_manager.washer_dryers)
+            print(appliance_manager.dryer)
             print(appliance_manager.ovens)
             print(appliance_manager.refrigerators)
+            print(appliance_manager.washers)
             return
 
         if not args.said:
             logger.error("No appliance specified")
             return
 
-        for ac_data in appliance_manager.aircons:
-            if ac_data["SAID"] == args.said:
-                await show_aircon_menu(backend_selector, auth, args.said, session)
-                return
-
-        for wd_data in appliance_manager.washer_dryers:
-            if wd_data["SAID"] == args.said:
-                await show_washerdryer_menu(backend_selector, auth, args.said, session)
-                return
-
-        for mo_data in appliance_manager.ovens:
-            if mo_data["SAID"] == args.said:
-                await show_oven_menu(backend_selector, auth, args.said, session)
-                return
-
-        for rf_data in appliance_manager.refrigerators:
-            if rf_data["SAID"] == args.said:
-                await show_refrigerator_menu(backend_selector, auth, args.said, session)
-                return
+        app = appliance_manager.get_appliance(args.said)
+        if not app:
+            logger.error(f"{args.said} wasn't found")
+            return
 
+        await appliance_manager.connect()
+
+        match app.Kind:
+            case ApplianceKind.AirCon:
+                await show_aircon_menu(app)
+            case ApplianceKind.Dryer:
+                await show_dryer_menu(app)
+            case ApplianceKind.Oven:
+                await show_oven_menu(app)
+            case ApplianceKind.Refrigerator:
+                await show_refrigerator_menu(app)
+            case ApplianceKind.Washer:
+                await show_washer_menu(app)
+
+        await appliance_manager.disconnect()
 
 asyncio.run(start())

cli_ac_menu.py

@@ -3,7 +3,7 @@
 from whirlpool.aircon import Aircon, Mode
 
 
-async def show_aircon_menu(backend_selector, auth, said, session):
+async def show_aircon_menu(ac: Aircon) -> None:
     def print_menu():
         print("\n")
         print(30 * "-", "MENU", 30 * "-")
@@ -46,9 +46,7 @@ def print_status(ac: Aircon):
     def attr_upd():
         print("Attributes updated")
 
-    ac = Aircon(backend_selector, auth, said, session)
     ac.register_attr_callback(attr_upd)
-    await ac.connect()
 
     loop = True
     while loop:
@@ -95,7 +93,6 @@ def attr_upd():
             val = await aioconsole.ainput("Value: ")
             await ac.send_attributes({cmd: val})
         elif choice == "q":
-            await ac.disconnect()
             print("Bye")
             loop = False
         else:

cli_dryer_menu.py

@@ -0,0 +1,76 @@
+import aioconsole
+
+from whirlpool.dryer import Dryer
+
+
+async def show_dryer_menu(dr: Dryer) -> None:
+    def print_menu() -> None:
+        print("\n")
+        print(30 * "-", "MENU", 30 * "-")
+        print("u. Update status from server")
+        print("p. Print status")
+        print("v. Print raw status")
+        print("c. Custom command")
+        print("q. Exit")
+        print(67 * "-")
+
+    def print_status(dr: Dryer) -> None:
+        print(f"online: {dr.get_online()}")
+        print(f"state: {dr.get_machine_state_value()}")
+        print(f"door open: {dr.get_op_status_dooropen()}")
+        print(f"est time remaining: {dr.get_time_status_est_time_remaining()}")
+        print(f"extra power changeable: {dr.get_change_status_extrapowerchangeable()}")
+        print(f"steam changeable: {dr.get_change_status_steamchangeable()}")
+        print(f"cycle select: {dr.get_change_status_cycleselect()}")
+        print(f"dryness: {dr.get_change_status_dryness()}")
+        print(f"manual dry time: {dr.get_change_status_manualdrytime()}")
+        print(f"static guard: {dr.get_change_status_staticguard()}")
+        print(f"temperature: {dr.get_change_status_temperature()}")
+        print(f"wrinkle shield: {dr.get_change_status_wrinkleshield()}")
+        print(f"airflow status: {dr.get_cycle_status_airflow_status()}")
+        print(f"cool down: {dr.get_cycle_status_cool_down()}")
+        print(f"damp: {dr.get_cycle_status_damp()}")
+        print(f"drying: {dr.get_cycle_status_drying()}")
+        print(f"limited cycle: {dr.get_cycle_status_limited_cycle()}")
+        print(f"sensing: {dr.get_cycle_status_sensing()}")
+        print(f"static reduce: {dr.get_cycle_status_static_reduce()}")
+        print(f"steaming: {dr.get_cycle_status_steaming()}")
+        print(f"wet: {dr.get_cycle_status_wet()}")
+        print(f"cycle count: {dr.get_odometer_status_cycle_count()}")
+        print(f"running hours: {dr.get_odometer_status_running_hours()}")
+        print(f"total hours: {dr.get_odometer_status_total_hours()}")
+        print(f"isp check: {dr.get_wifi_status_isp_check()}")
+        print(f"rssi antenna diversity: {dr.get_wifi_status_rssi_antenna_diversity()}")
+
+        print(f"set dryness: {dr.get_dryness()}")
+        print(f"set manual dry time: {dr.get_manual_dry_time()}")
+        print(f"set cycle select: {dr.get_cycle_select()}")
+
+    def attr_upd() -> None:
+        print("Attributes updated")
+
+    dr.register_attr_callback(attr_upd)
+
+    loop = True
+    while loop:
+        print_menu()
+        choice = await aioconsole.ainput("Enter your choice: ")
+
+        if choice == "p":
+            print_status(dr)
+        elif choice == "u":
+            await dr.fetch_data()
+            print_status(dr)
+        elif choice == "v":
+            print(dr._data_dict)
+        elif choice == "c":
+            cmd = await aioconsole.ainput("Command: ")
+            val = await aioconsole.ainput("Value: ")
+            await dr.send_attributes({cmd: val})
+        elif choice == "q":
+            print("Bye")
+            loop = False
+        else:
+            print("Wrong option selection. Enter any key to try again..")
+
+    dr.unregister_attr_callback(attr_upd)

cli_oven_menu.py

@@ -3,7 +3,7 @@
 from whirlpool.oven import Cavity, CookMode, KitchenTimerState, Oven
 
 
-async def show_oven_menu(backend_selector, auth, said, session):
+async def show_oven_menu(ov: Oven) -> None:
     def print_menu():
         print("\n")
         print(30 * "-", "MENU", 30 * "-")
@@ -65,9 +65,7 @@ def print_status(ov: Oven):
     def attr_upd():
         print("Attributes updated")
 
-    ov = Oven(backend_selector, auth, said, session)
     ov.register_attr_callback(attr_upd)
-    await ov.connect()
 
     loop = True
     while loop:
@@ -130,8 +128,9 @@ def attr_upd():
             val = await aioconsole.ainput("Value: ")
             await ov.send_attributes({cmd: val})
         elif choice == "q":
-            await ov.disconnect()
             print("Bye")
             loop = False
         else:
             print("Wrong option selection. Enter any key to try again..")
+
+    ov.unregister_attr_callback(attr_upd)

cli_refrigerator_menu.py

@@ -3,7 +3,7 @@
 from whirlpool.refrigerator import Refrigerator
 
 
-async def show_refrigerator_menu(backend_selector, auth, said, session):
+async def show_refrigerator_menu(rf: Refrigerator) -> None:
     def print_menu():
         print("\n")
         print(30 * "-", "MENU", 30 * "-")
@@ -31,9 +31,7 @@ def print_status(bc: Refrigerator):
     def attr_upd():
         print("Attributes updated")
 
-    rf = Refrigerator(backend_selector, auth, said, session)
     rf.register_attr_callback(attr_upd)
-    await rf.connect()
 
     loop = True
     while loop:
@@ -65,8 +63,9 @@ def attr_upd():
             val = await aioconsole.ainput("Value: ")
             await rf.send_attributes({cmd: val})
         elif choice == "q":
-            await rf.disconnect()
             print("Bye")
             loop = False
         else:
             print("Wrong option selection. Enter any key to try again..")
+
+    rf.unregister_attr_callback(attr_upd)

cli_washer_menu.py

@@ -0,0 +1,54 @@
+import aioconsole
+
+from whirlpool.washer import Washer
+
+
+async def show_washer_menu(wr: Washer) -> None:
+    def print_menu():
+        print("\n")
+        print(30 * "-", "MENU", 30 * "-")
+        print("u. Update status from server")
+        print("p. Print status")
+        print("v. Print raw status")
+        print("c. Custom command")
+        print("q. Exit")
+        print(67 * "-")
+
+    def print_status(wr: Washer):
+        print("online: " + str(wr.get_online()))
+        print("state: " + str(wr.get_machine_state()))
+        print("sensing: " + str(wr.get_cycle_status_sensing()))
+        print("filling: " + str(wr.get_cycle_status_filling()))
+        print("soaking: " + str(wr.get_cycle_status_soaking()))
+        print("washing: " + str(wr.get_cycle_status_washing()))
+        print("rinsing: " + str(wr.get_cycle_status_rinsing()))
+        print("spinning: " + str(wr.get_cycle_status_spinning()))
+
+    def attr_upd():
+        print("Attributes updated")
+
+    wr.register_attr_callback(attr_upd)
+
+    loop = True
+    while loop:
+        print_menu()
+        choice = await aioconsole.ainput("Enter your choice: ")
+
+        if choice == "p":
+            print_status(wr)
+        elif choice == "u":
+            await wr.fetch_data()
+            print_status(wr)
+        elif choice == "v":
+            print(wr._data_dict)
+        elif choice == "c":
+            cmd = await aioconsole.ainput("Command: ")
+            val = await aioconsole.ainput("Value: ")
+            await wr.send_attributes({cmd: val})
+        elif choice == "q":
+            print("Bye")
+            loop = False
+        else:
+            print("Wrong option selection. Enter any key to try again..")
+
+    wr.unregister_attr_callback(attr_upd)