X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=smart_home%2Foutlets.py;h=d4a4886dd38d1a932494e90f060f4ce884de744d;hb=6ba90a1f30f1c0cf4df12fcd0c62181f29bc3668;hp=c079cfd09d9cbbfbb8595379770ebc1c8d7497ae;hpb=55a3172e37855f388b9ba0dfc91641a6c9ad1376;p=python_utils.git diff --git a/smart_home/outlets.py b/smart_home/outlets.py index c079cfd..d4a4886 100644 --- a/smart_home/outlets.py +++ b/smart_home/outlets.py @@ -2,7 +2,6 @@ """Utilities for dealing with the smart outlets.""" -from abc import abstractmethod import asyncio import atexit import datetime @@ -12,10 +11,12 @@ import os import re import subprocess import sys +from abc import abstractmethod from typing import Any, Dict, List, Optional from meross_iot.http_api import MerossHttpClient from meross_iot.manager import MerossManager +from overrides import overrides import argparse_utils import config @@ -23,8 +24,8 @@ import decorator_utils import logging_utils import scott_secrets import smart_home.device as dev -from google_assistant import ask_google, GoogleResponse -from decorator_utils import timeout, memoized +from decorator_utils import memoized, timeout +from google_assistant import GoogleResponse, ask_google logger = logging.getLogger(__name__) @@ -41,9 +42,7 @@ parser.add_argument( ) -@timeout( - 5.0, use_signals=False, error_message="Timed out waiting for tplink.py" -) +@timeout(5.0, use_signals=False, error_message="Timed out waiting for tplink.py") def tplink_outlet_command(command: str) -> bool: result = os.system(command) signal = result & 0xFF @@ -66,7 +65,6 @@ def tplink_outlet_command(command: str) -> bool: class BaseOutlet(dev.Device): def __init__(self, name: str, mac: str, keywords: str = "") -> None: super().__init__(name.strip(), mac.strip(), keywords) - self.info = None @abstractmethod def turn_on(self) -> bool: @@ -105,27 +103,29 @@ class TPLinkOutlet(BaseOutlet): ) return cmd - def command(self, cmd: str, extra_args: str = None) -> bool: + def command(self, cmd: str, extra_args: str = None, **kwargs) -> bool: cmd = self.get_cmdline() + f"-c {cmd}" if extra_args is not None: cmd += f" {extra_args}" return tplink_outlet_command(cmd) + @overrides def turn_on(self) -> bool: return self.command('on') + @overrides def turn_off(self) -> bool: return self.command('off') + @overrides def is_on(self) -> bool: return self.get_on_duration_seconds() > 0 + @overrides def is_off(self) -> bool: return not self.is_on() - @timeout( - 10.0, use_signals=False, error_message="Timed out waiting for tplink.py" - ) + @timeout(10.0, use_signals=False, error_message="Timed out waiting for tplink.py") def get_info(self) -> Optional[Dict]: cmd = self.get_cmdline() + "-c info" out = subprocess.getoutput(cmd) @@ -161,7 +161,7 @@ class TPLinkOutletWithChildren(TPLinkOutlet): for child in self.info["children"]: self.children.append(child["id"]) - # override + @overrides def get_cmdline(self, child: Optional[str] = None) -> str: cmd = ( f"{config.config['smart_outlets_tplink_location']} -m {self.mac} " @@ -171,10 +171,9 @@ class TPLinkOutletWithChildren(TPLinkOutlet): cmd += f"-x {child} " return cmd - # override - def command( - self, cmd: str, child: str = None, extra_args: str = None - ) -> bool: + @overrides + def command(self, cmd: str, extra_args: str = None, **kwargs) -> bool: + child: Optional[str] = kwargs.get('child', None) cmd = self.get_cmdline(child) + f"-c {cmd}" if extra_args is not None: cmd += f" {extra_args}" @@ -184,9 +183,11 @@ class TPLinkOutletWithChildren(TPLinkOutlet): def get_children(self) -> List[str]: return self.children + @overrides def turn_on(self, child: str = None) -> bool: return self.command("on", child) + @overrides def turn_off(self, child: str = None) -> bool: return self.command("off", child) @@ -218,22 +219,28 @@ class GoogleOutlet(BaseOutlet): def parse_google_response(response: GoogleResponse) -> bool: return response.success + @overrides def turn_on(self) -> bool: return GoogleOutlet.parse_google_response( - ask_google('turn {self.goog_name()} on') + ask_google(f'turn {self.goog_name()} on') ) + @overrides def turn_off(self) -> bool: return GoogleOutlet.parse_google_response( - ask_google('turn {self.goog_name()} off') + ask_google(f'turn {self.goog_name()} off') ) + @overrides def is_on(self) -> bool: r = ask_google(f'is {self.goog_name()} on?') if not r.success: return False - return 'is on' in r.audio_transcription + if r.audio_transcription is not None: + return 'is on' in r.audio_transcription + raise Exception('Can\'t talk to Google right now!?') + @overrides def is_off(self) -> bool: return not self.is_on() @@ -247,10 +254,13 @@ class MerossWrapper(object): this class. """ + def __init__(self): self.loop = asyncio.get_event_loop() self.email = os.environ.get('MEROSS_EMAIL') or scott_secrets.MEROSS_EMAIL - self.password = os.environ.get('MEROSS_PASSWORD') or scott_secrets.MEROSS_PASSWORD + self.password = ( + os.environ.get('MEROSS_PASSWORD') or scott_secrets.MEROSS_PASSWORD + ) self.devices = self.loop.run_until_complete(self.find_meross_devices()) atexit.register(self.loop.close) @@ -282,8 +292,8 @@ class MerossWrapper(object): class MerossOutlet(BaseOutlet): def __init__(self, name: str, mac: str, keywords: str = '') -> None: super().__init__(name, mac, keywords) - self.meross_wrapper = None - self.device = None + self.meross_wrapper: Optional[MerossWrapper] = None + self.device: Optional[Any] = None def lazy_initialize_device(self): """If we make too many calls to Meross they will block us; only talk @@ -294,23 +304,28 @@ class MerossOutlet(BaseOutlet): if self.device is None: raise Exception(f'{self.name} is not a known Meross device?!') + @overrides def turn_on(self) -> bool: self.lazy_initialize_device() - self.meross_wrapper.loop.run_until_complete( - self.device.async_turn_on() - ) + assert self.meross_wrapper + assert self.device + self.meross_wrapper.loop.run_until_complete(self.device.async_turn_on()) return True + @overrides def turn_off(self) -> bool: self.lazy_initialize_device() - self.meross_wrapper.loop.run_until_complete( - self.device.async_turn_off() - ) + assert self.meross_wrapper + assert self.device + self.meross_wrapper.loop.run_until_complete(self.device.async_turn_off()) return True + @overrides def is_on(self) -> bool: self.lazy_initialize_device() + assert self.device return self.device.is_on() + @overrides def is_off(self) -> bool: return not self.is_on()