From 13fe8d650592c12cae6375fa2b23af29b38d4d9a Mon Sep 17 00:00:00 2001 From: Peter Shipley Date: Fri, 14 Mar 2014 15:54:17 -0700 Subject: [PATCH] making pylint happy --- RainEagle/EagleClass.py | 97 ++++++++++++++++++++++------------------- bin/meter_status.py | 6 ++- bin/plot_power.py | 13 +++--- 3 files changed, 62 insertions(+), 54 deletions(-) diff --git a/RainEagle/EagleClass.py b/RainEagle/EagleClass.py index c313607..0a35fdc 100644 --- a/RainEagle/EagleClass.py +++ b/RainEagle/EagleClass.py @@ -195,13 +195,13 @@ class Eagle(object) : # socket commands as class functions - def list_devices(self): + def list_devices(self, macid=None): """ Send the LIST_DEVICES command returns information about the EAGLE device """ - comm_responce = self._send_soc_comm("list_devices") + comm_responce = self._send_soc_comm("list_devices", MacId=macid) if self.debug : print "comm_responce =", comm_responce if comm_responce is None: @@ -359,16 +359,16 @@ class Eagle(object) : # http commands as class functions - def get_device_list(self) : + def get_device_list(self, macid=None) : """ Send the LIST_DEVICES command returns information about the EAGLE device """ - comm_responce = self._send_http_comm("get_device_list") + comm_responce = self._send_http_comm("get_device_list", MacId=macid) return json.loads(comm_responce) - def get_uploaders(self) : + def get_uploaders(self, macid=None) : """ gets list of uploaders for Web UI @@ -379,10 +379,10 @@ class Eagle(object) : 'uploader_name[1]': 'Bidgely Inc.' """ - comm_responce = self._send_http_comm("get_uploaders") + comm_responce = self._send_http_comm("get_uploaders", MacId=macid) return json.loads(comm_responce) - def get_uploader(self) : + def get_uploader(self, macid=None) : """ gets current uploaders config @@ -401,27 +401,28 @@ class Eagle(object) : See also set_cloud() to set current uploader cloud config """ - comm_responce = self._send_http_comm("get_uploader") + comm_responce = self._send_http_comm("get_uploader", MacId=macid) return json.loads(comm_responce) - def set_message_read(self) : + def set_message_read(self, macid=None) : """ On Success returns dict with the values : 'remote_management_status' : 'success' """ - comm_responce = self._send_http_comm("set_message_read") + comm_responce = self._send_http_comm("set_message_read", MacId=macid) return json.loads(comm_responce) - def confirm_message(self, id) : + def confirm_message(self, macid=None, id=None) : """ """ id = _tohex(id) - comm_responce = self._send_http_comm("confirm_message", Id=id) + comm_responce = self._send_http_comm("confirm_message", + MacId=macid, Id=id) return json.loads(comm_responce) - def get_message(self) : + def get_message(self, macid=None) : """ On Success returns dict with the values (example): "meter_status" : "Connected" @@ -435,10 +436,10 @@ class Eagle(object) : "message_read" : "Y" """ - comm_responce = self._send_http_comm("get_message") + comm_responce = self._send_http_comm("get_message", MacId=macid) return json.loads(comm_responce) - def get_usage_data(self) : + def get_usage_data(self, macid=None) : """ Get current demand usage summation @@ -464,11 +465,11 @@ class Eagle(object) : 'usage_timestamp' : '1394505386' """ - comm_responce = self._send_http_comm("get_usage_data") + comm_responce = self._send_http_comm("get_usage_data", MacId=macid) return json.loads(comm_responce) - def get_historical_data(self, period="day") : + def get_historical_data(self, macid=None, period="day") : """ get a series of summation values over an interval of time ( http command api ) @@ -510,11 +511,11 @@ class Eagle(object) : """ if period not in ['day', 'week', 'month', 'year'] : raise ValueError("get_historical_data : period must be one of day|week|month|year") - comm_responce = self._send_http_comm("get_historical_data", Period=period) + comm_responce = self._send_http_comm("get_historical_data", macid=macid, Period=period) return json.loads(comm_responce) - def get_setting_data(self) : + def get_setting_data(self, macid=None) : """ get settings data @@ -522,10 +523,10 @@ class Eagle(object) : relating to price, uploader, network & device """ - comm_responce = self._send_http_comm("get_setting_data") + comm_responce = self._send_http_comm("get_setting_data", MacId=macid) return json.loads(comm_responce) - def get_device_config(self) : + def get_device_config(self, macid=None) : """ get remote management status @@ -534,10 +535,10 @@ class Eagle(object) : 'config_vpn_enabled': 'Y' """ - comm_responce = self._send_http_comm("get_device_config") + comm_responce = self._send_http_comm("get_device_config", MacId=macid) return json.loads(comm_responce) - def get_gateway_info(self) : + def get_gateway_info(self, macid=None) : """ gets network status @@ -548,10 +549,10 @@ class Eagle(object) : 'gateway_mac_id': 'D8:D5:B9:00:90:24' """ - comm_responce = self._send_http_comm("get_gateway_info") + comm_responce = self._send_http_comm("get_gateway_info", MacId=macid) return json.loads(comm_responce) - def get_timezone(self) : + def get_timezone(self, macid=None) : """ get current timezone configuration @@ -564,7 +565,7 @@ class Eagle(object) : 'timezone_status': 'success' """ - comm_responce = self._send_http_comm("get_timezone") + comm_responce = self._send_http_comm("get_timezone", MacId=macid) return json.loads(comm_responce) def get_time_source(self, macid=None) : @@ -574,11 +575,11 @@ class Eagle(object) : On Success returns dict with value 'internet' or 'meter' : 'time_source': 'internet' """ - comm_responce = self._send_http_comm("get_time_source") + comm_responce = self._send_http_comm("get_time_source", MacId=macid) return json.loads(comm_responce) - def get_remote_management(self) : - return self.get_device_config(self) + def get_remote_management(self, macid=None) : + return self.get_device_config(self, MacId=macid) def set_remote_management(self, macid=None, status="on") : """ set_remote_management @@ -593,7 +594,8 @@ class Eagle(object) : """ if status not in ['on', 'off'] : raise ValueError("set_remote_management status must be 'on' or 'off'") - comm_responce = self._send_http_comm("set_remote_management", Status=status) + comm_responce = self._send_http_comm("set_remote_management", + MacId=macid, Status=status) return json.loads(comm_responce) @@ -612,10 +614,11 @@ class Eagle(object) : """ if source not in ['meter', 'internet'] : raise ValueError("set_time_source Source must be 'meter' or 'internet'") - comm_responce = self._send_http_comm("set_time_source", Source=source) + comm_responce = self._send_http_comm("set_time_source", + MacId=macid, Source=source) return json.loads(comm_responce) - def get_price(self) : + def get_price(self, macid=None) : """ get price for kWh @@ -627,10 +630,10 @@ class Eagle(object) : returns empty dict on Error """ - comm_responce = self._send_http_comm("get_price") + comm_responce = self._send_http_comm("get_price", MacId=macid) return json.loads(comm_responce) - def set_price(self, price) : + def set_price(self, macid=None, price=None) : """ Set price manualy @@ -658,12 +661,12 @@ class Eagle(object) : price_adj = "{:#x}".format(int(price * multiplier)) tdigits = "{:#x}".format(trailing_digits) - comm_responce = self._send_http_comm("set_price", + comm_responce = self._send_http_comm("set_price", MacId=macid, Price=price_adj, TrailingDigits=tdigits) return json.loads(comm_responce) - def set_price_auto(self) : + def set_price_auto(self, macid=None) : """ Set Price from Meter @@ -671,6 +674,7 @@ class Eagle(object) : 'set_price_status': 'success' """ comm_responce = self._send_http_comm("set_price", + MacId=macid, Price="0xFFFFFFFF", TrailingDigits="0x00") return json.loads(comm_responce) @@ -681,35 +685,35 @@ class Eagle(object) : # """ # multiplier = _tohex(multiplier, 8) # divisor = _tohex(divisor, 8) -# comm_responce = self._send_http_comm("set_multiplier_divisor", Multiplier=multiplier, Divisor=divisor) +# comm_responce = self._send_http_comm("set_multiplier_divisor", MacId=macid, Multiplier=multiplier, Divisor=divisor) # return json.loads(comm_responce) - def factory_reset(self) : + def factory_reset(self, macid=None) : """ Factory Reset """ - comm_responce = self._send_http_comm("factory_reset") + comm_responce = self._send_http_comm("factory_reset", MacId=macid) return json.loads(comm_responce) -# def disconnect_meter(self) : +# def disconnect_meter(self, macid=None) : # """ # disconnect from Smart Meter # """ -# comm_responce = self._send_http_comm("disconnect_meter") +# comm_responce = self._send_http_comm("disconnect_meter", MacId=macid) # return json.loads(comm_responce) - def cloud_reset(self) : + def cloud_reset(self, macid=None) : """ cloud_reset : Clear Cloud Configuration """ - comm_responce = self._send_http_comm("cloud_reset") + comm_responce = self._send_http_comm("cloud_reset", MacId=macid) return json.loads(comm_responce) - def set_cloud(self, url, authcode="", email="") : + def set_cloud(self, macid=None, url=None, authcode="", email="") : """ set cloud Url @@ -720,6 +724,9 @@ class Eagle(object) : See also get_uploader() to retrieve current uploader cloud config """ + if url is None : + raise ValueError("invalid url.\n") + if url.__len__() > 200 : raise ValueError("Max URL length is 200 characters long.\n") @@ -749,7 +756,7 @@ class Eagle(object) : else : password = "" - comm_responce = self._send_http_comm("set_cloud", + comm_responce = self._send_http_comm("set_cloud", MacId=macid, Provider="manual", Protocol=protocol, HostName=hostname, Url=url, Port=port, diff --git a/bin/meter_status.py b/bin/meter_status.py index 3db31f4..42b78f3 100755 --- a/bin/meter_status.py +++ b/bin/meter_status.py @@ -48,7 +48,11 @@ def create_parser(): def main() : parser = create_parser() - args = parser.parse_args() + args, unknown = parser.parse_known_args() + + print "Args = ", args, vars(args) + print "unknown = ", unknown + exit(0) eg = Eagle(**vars(args)) # timeout=45, diff --git a/bin/plot_power.py b/bin/plot_power.py index 2e464de..7c48979 100755 --- a/bin/plot_power.py +++ b/bin/plot_power.py @@ -35,13 +35,11 @@ def print_data(eg) : for dat in rh['HistoryData']['CurrentSummation'] : print_currentsummation(dat) - print "# day_delta_received={0:0.4f}\t" \ - + " day_delta_delivered={1:0.4f} : {2:0.4f}".format( + print "# day_delta_received={0:0.4f}\tday_delta_delivered={1:0.4f} : {2:0.4f}".format( day_delta_received, day_delta_delivered, (day_delta_delivered - day_delta_received)) - print "# max_delta_received={0:0.4f}\t" \ - + " max_delta_delivered={1:0.4f}".format( + print "# max_delta_received={0:0.4f}\tmax_delta_delivered={1:0.4f}".format( max_delta_received, max_delta_delivered) @@ -87,10 +85,9 @@ def print_currentsummation(cs) : time_struct = time.localtime(time_stamp) if curr_day != time_struct.tm_mday : curr_day = time_struct.tm_mday - print "# day_delta_received={0:0.4f}\tday_delta_delivered={1:0.4f}" \ - + ": {2:0.4f}".format(day_delta_received, - day_delta_delivered, - (day_delta_delivered - day_delta_received)) + print "# day_delta_received={0:0.4f}".format(day_delta_received) \ + + "\tday_delta_delivered={0:0.4f}".format(day_delta_delivered) \ + + " : {0:0.4f}".format((day_delta_delivered - day_delta_received)) day_delta_received = 0 day_delta_delivered = 0