Skip to content

Commit 6604c5f

Browse files
committed
rework some upstream changex to work with ruff
1 parent 8a192f5 commit 6604c5f

2 files changed

Lines changed: 24 additions & 30 deletions

File tree

examples/settings_example_classic.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
device_type = device["deviceType"]
4242

4343
# Turn inverter on
44-
print("Turning on inverter: %s" % (device_sn))
44+
print(f"Turning on inverter: {device_sn}") # noqa: T201
4545

4646
# Set up the default parameters
4747
default_parameters = {
@@ -55,4 +55,4 @@
5555
"command_2": "", # Empty string for command_2 as not used
5656
}
5757
response = api.update_classic_inverter_setting(default_parameters, parameters)
58-
print(response)
58+
print(response) # noqa: T201

growattServer/base_api.py

Lines changed: 22 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -761,15 +761,18 @@ def mix_detail( # noqa: D417
761761
"""
762762
date_str = self.__get_date_string(timespan, date)
763763

764-
response = self.session.post(self.get_url('newMixApi.do'), params={
765-
'op': 'getEnergyProdAndCons_KW',
766-
'plantId': plant_id,
767-
'mixId': mix_id,
768-
'type': timespan.value,
769-
'date': date_str
770-
})
764+
response = self.session.post(
765+
self.get_url("newMixApi.do"),
766+
params={
767+
"op": "getEnergyProdAndCons_KW",
768+
"plantId": plant_id,
769+
"mixId": mix_id,
770+
"type": timespan.value,
771+
"date": date_str,
772+
},
773+
)
771774

772-
return response.json().get('obj', {})
775+
return response.json().get("obj", {})
773776

774777
def get_mix_inverter_settings(self, serial_number):
775778
"""
@@ -779,26 +782,15 @@ def get_mix_inverter_settings(self, serial_number):
779782
Returns:
780783
A dictionary of settings
781784
"""
782-
783785
default_params = {
784-
'op': 'getMixSetParams',
785-
'serialNum': serial_number,
786-
'kind': 0
786+
"op": "getMixSetParams",
787+
"serialNum": serial_number,
788+
"kind": 0,
787789
}
788-
response = self.session.get(self.get_url('newMixApi.do'), params=default_params)
789-
data = json.loads(response.content.decode('utf-8'))
790+
response = self.session.get(self.get_url("newMixApi.do"), params=default_params)
791+
data = json.loads(response.content.decode("utf-8"))
790792
return data
791793

792-
def dashboard_data(self, plant_id, timespan=Timespan.hour, date=None):
793-
"""
794-
Get 'dashboard' data for specified timespan
795-
NOTE - All numerical values returned by this api call include units e.g. kWh or %
796-
- Many of the 'total' values that are returned for a Mix system are inaccurate on the system this was tested against.
797-
However, the statistics that are correct are not available on any other interface, plus these values may be accurate for
798-
non-mix types of system. Where the values have been proven to be inaccurate they are commented below.
799-
800-
return response.json().get("obj", {})
801-
802794
def dashboard_data( # noqa: D417
803795
self,
804796
plant_id: str,
@@ -1407,18 +1399,20 @@ def update_classic_inverter_setting(self, default_parameters, parameters):
14071399
14081400
Returns:
14091401
JSON response from the server whether the configuration was successful
1402+
14101403
"""
14111404
settings_parameters = parameters
14121405

14131406
# If we've been passed an array then convert it into a dictionary
14141407
if isinstance(parameters, list):
14151408
settings_parameters = {}
14161409
for index, param in enumerate(parameters, start=1):
1417-
settings_parameters['param' + str(index)] = param
1410+
settings_parameters["param" + str(index)] = param
14181411

14191412
settings_parameters = {**default_parameters, **settings_parameters}
14201413

1421-
response = self.session.post(self.get_url('tcpSet.do'),
1422-
params=settings_parameters)
1414+
response = self.session.post(
1415+
self.get_url("tcpSet.do"), params=settings_parameters
1416+
)
14231417

1424-
return response.json()
1418+
return response.json()

0 commit comments

Comments
 (0)