Fixed SPH creation

Author: indykoning

docs/openapiv1.md

@@ -98,8 +98,8 @@ Convenience methods that wrap the core SPH methods above for common use cases.
 |:---|:---|:---|
 | `api.sph_write_ac_charge_times(...)` | device_sn, charge_power, charge_stop_soc, mains_enabled, periods | Helper: wraps `sph_write_parameter()` with type `mix_ac_charge_time_period`. see: [details](./openapiv1/sph_settings.md) |
 | `api.sph_write_ac_discharge_times(...)` | device_sn, discharge_power, discharge_stop_soc, periods | Helper: wraps `sph_write_parameter()` with type `mix_ac_discharge_time_period`. see: [details](./openapiv1/sph_settings.md) |
-| `api.sph_read_ac_charge_times(...)` | device_sn (optional), settings_data (optional) | Helper: parses charge config from `sph_detail()` response. see: [details](./openapiv1/sph_settings.md) |
-| `api.sph_read_ac_discharge_times(...)` | device_sn (optional), settings_data (optional) | Helper: parses discharge config from `sph_detail()` response. see: [details](./openapiv1/sph_settings.md) |
+| `api.sph_read_ac_charge_times(...)` | device_sn, settings_data (optional) | Helper: parses charge config from `sph_detail()` response. see: [details](./openapiv1/sph_settings.md) |
+| `api.sph_read_ac_discharge_times(...)` | device_sn, settings_data (optional) | Helper: parses discharge config from `sph_detail()` response. see: [details](./openapiv1/sph_settings.md) |
 
 #### Classic methods
 

docs/openapiv1/sph_settings.md

@@ -184,7 +184,7 @@ For SPH (hybrid inverter) systems, the public V1 API provides methods to read an
 ### Read: `api.sph_read_ac_charge_times`
 
 * parameters:
-  * `device_sn`: The device serial number (not used if settings_data is provided)
+  * `device_sn`: The device serial number
   * `settings_data`: Settings data from sph_detail() (not used if device_sn is provided)
 * note: Either `device_sn` or `settings_data` must be provided
 * returns: Dict with `charge_power`, `charge_stop_soc`, `mains_enabled`, and `periods` list

examples/sph_example.py

@@ -76,6 +76,7 @@
 
             # Read AC charge time periods using helper function and inverter_data to avoid rate limiting
             charge_config = api.sph_read_ac_charge_times(
+                device_sn=inverter_sn,
                 settings_data=inverter_data,
             )
             print("AC Charge Configuration:")
@@ -86,6 +87,7 @@
 
             # Read AC discharge time periods using helper function and inverter_data to avoid rate limiting
             discharge_config = api.sph_read_ac_discharge_times(
+                device_sn=inverter_sn,
                 settings_data=inverter_data,
             )
             print("AC Discharge Configuration:")

growattServer/open_api_v1/__init__.py

@@ -320,9 +320,9 @@ def get_device(self, device_sn: str, device_type: int) -> AbstractDevice|None:
         """Get the device class by serial number and device_type id."""
         match device_type:
             case Sph.DEVICE_TYPE_ID:
-                return Sph(device_sn)
+                return Sph(self, device_sn)
             case Min.DEVICE_TYPE_ID:
-                return Min(device_sn)
+                return Min(self, device_sn)
             case _:
                 warnings.warn(f"Device for type id: {device_type} has not been implemented yet.", stacklevel=2)
                 return None
@@ -524,7 +524,7 @@ def sph_detail(self, device_sn):
             requests.exceptions.RequestException: If there is an issue with the HTTP request.
 
         """
-        return Sph(device_sn).detail()
+        return Sph(self, device_sn).detail()
 
     def sph_energy(self, device_sn):
         """
@@ -541,7 +541,7 @@ def sph_energy(self, device_sn):
             requests.exceptions.RequestException: If there is an issue with the HTTP request.
 
         """
-        return Sph(device_sn).energy()
+        return Sph(self, device_sn).energy()
 
     def sph_energy_history(self, device_sn, start_date=None, end_date=None, timezone=None, page=None, limit=None):
         """
@@ -564,7 +564,7 @@ def sph_energy_history(self, device_sn, start_date=None, end_date=None, timezone
             requests.exceptions.RequestException: If there is an issue with the HTTP request.
 
         """
-        return Sph(device_sn).energy_history(start_date, end_date, timezone, page, limit)
+        return Sph(self, device_sn).energy_history(start_date, end_date, timezone, page, limit)
 
     def sph_read_parameter(self, device_sn, parameter_id=None, start_address=None, end_address=None):
         """
@@ -585,7 +585,7 @@ def sph_read_parameter(self, device_sn, parameter_id=None, start_address=None, e
             requests.exceptions.RequestException: If there is an issue with the HTTP request.
 
         """
-        return Sph(device_sn).read_parameter(parameter_id, start_address, end_address)
+        return Sph(self, device_sn).read_parameter(parameter_id, start_address, end_address)
 
     def sph_write_parameter(self, device_sn, parameter_id, parameter_values=None):
         """
@@ -607,7 +607,7 @@ def sph_write_parameter(self, device_sn, parameter_id, parameter_values=None):
             requests.exceptions.RequestException: If there is an issue with the HTTP request.
 
         """
-        return Sph(device_sn).write_parameter(parameter_id, parameter_values)
+        return Sph(self, device_sn).write_parameter(parameter_id, parameter_values)
 
     def sph_write_ac_charge_times(self, device_sn, charge_power, charge_stop_soc, mains_enabled, periods):
         """
@@ -647,7 +647,7 @@ def sph_write_ac_charge_times(self, device_sn, charge_power, charge_stop_soc, ma
             requests.exceptions.RequestException: If there is an issue with the HTTP request.
 
         """
-        return Sph(device_sn).write_ac_charge_times(charge_power, charge_stop_soc, mains_enabled, periods)
+        return Sph(self, device_sn).write_ac_charge_times(charge_power, charge_stop_soc, mains_enabled, periods)
 
     def sph_write_ac_discharge_times(self, device_sn, discharge_power, discharge_stop_soc, periods):
         """
@@ -685,7 +685,7 @@ def sph_write_ac_discharge_times(self, device_sn, discharge_power, discharge_sto
             requests.exceptions.RequestException: If there is an issue with the HTTP request.
 
         """
-        return Sph(device_sn).write_ac_discharge_times(discharge_power, discharge_stop_soc, periods)
+        return Sph(self, device_sn).write_ac_discharge_times(discharge_power, discharge_stop_soc, periods)
 
     def sph_read_ac_charge_times(self, device_sn, settings_data=None):
         """
@@ -729,7 +729,7 @@ def sph_read_ac_charge_times(self, device_sn, settings_data=None):
             requests.exceptions.RequestException: If there is an issue with the HTTP request.
 
         """
-        return Sph(device_sn).read_ac_charge_times(settings_data)
+        return Sph(self, device_sn).read_ac_charge_times(settings_data)
 
     def sph_read_ac_discharge_times(self, device_sn, settings_data=None):
         """
@@ -772,4 +772,4 @@ def sph_read_ac_discharge_times(self, device_sn, settings_data=None):
             requests.exceptions.RequestException: If there is an issue with the HTTP request.
 
         """
-        return Sph(device_sn).read_ac_discharge_times(device_sn, settings_data)
+        return Sph(self, device_sn).read_ac_discharge_times(device_sn, settings_data)

growattServer/open_api_v1/devices/min.py

@@ -1,5 +1,5 @@
 """Min/TLX device file."""
-from datetime import datetime, timedelta
+from datetime import UTC, datetime, timedelta
 from typing import Any
 
 from growattServer.exceptions import GrowattParameterError
@@ -84,8 +84,8 @@ def energy_history(self, start_date=None, end_date=None, timezone=None, page=Non
 
         """
         if start_date is None and end_date is None:
-            start_date = datetime.now(datetime.UTC).date()
-            end_date = datetime.now(datetime.UTC).date()
+            start_date = datetime.now(UTC).date()
+            end_date = datetime.now(UTC).date()
         elif start_date is None:
             start_date = end_date
         elif end_date is None:

growattServer/open_api_v1/devices/sph.py

@@ -1,5 +1,5 @@
 """SPH/MIX device file."""
-from datetime import datetime, timedelta
+from datetime import UTC, datetime, timedelta
 
 from growattServer.exceptions import GrowattParameterError
 
@@ -27,7 +27,7 @@ def detail(self):
 
         """
         # API: https://www.showdoc.com.cn/262556420217021/6129763571291058
-        response = self.session.get(
+        response = self.api.session.get(
             self.get_url("device/mix/mix_data_info"),
             params={
                 "device_sn": self.device_sn
@@ -52,7 +52,7 @@ def energy(self):
 
         """
         # API: https://www.showdoc.com.cn/262556420217021/6129764475556048
-        response = self.session.post(
+        response = self.api.session.post(
             url=self.get_url("device/mix/mix_last_data"),
             data={
                 "mix_sn": self.device_sn,
@@ -83,8 +83,8 @@ def energy_history(self, start_date=None, end_date=None, timezone=None, page=Non
 
         """
         if start_date is None and end_date is None:
-            start_date = datetime.now(datetime.UTC).date()
-            end_date = datetime.now(datetime.UTC).date()
+            start_date = datetime.now(UTC).date()
+            end_date = datetime.now(UTC).date()
         elif start_date is None:
             start_date = end_date
         elif end_date is None:
@@ -95,7 +95,7 @@ def energy_history(self, start_date=None, end_date=None, timezone=None, page=Non
             raise GrowattParameterError("date interval must not exceed 7 days")
 
         # API: https://www.showdoc.com.cn/262556420217021/6129765461123058
-        response = self.session.post(
+        response = self.api.session.post(
             url=self.get_url("device/mix/mix_data"),
             data={
                 "mix_sn": self.device_sn,
@@ -144,7 +144,7 @@ def read_parameter(self, parameter_id=None, start_address=None, end_address=None
             parameter_id = "set_any_reg"
 
         # API: https://www.showdoc.com.cn/262556420217021/6129766954561259
-        response = self.session.post(
+        response = self.api.session.post(
             self.get_url("readMixParam"),
             data={
                 "device_sn": self.device_sn,
@@ -208,7 +208,7 @@ def write_parameter(self, parameter_id, parameter_values=None):
             request_data[f"param{i}"] = str(parameters[i])
 
         # API: https://www.showdoc.com.cn/262556420217021/6129761750718760
-        response = self.session.post(
+        response = self.api.session.post(
             self.get_url("mixSet"),
             data=request_data
         )
@@ -281,7 +281,7 @@ def write_ac_charge_times(self, charge_power, charge_stop_soc, mains_enabled, pe
             request_data[f"param{base + 4}"] = "1" if period["enabled"] else "0"
 
         # API: https://www.showdoc.com.cn/262556420217021/6129761750718760
-        response = self.session.post(
+        response = self.api.session.post(
             self.get_url("mixSet"),
             data=request_data
         )
@@ -351,7 +351,7 @@ def write_ac_discharge_times(self, discharge_power, discharge_stop_soc, periods)
             request_data[f"param{base + 4}"] = "1" if period["enabled"] else "0"
 
         # API: https://www.showdoc.com.cn/262556420217021/6129761750718760
-        response = self.session.post(
+        response = self.api.session.post(
             self.get_url("mixSet"),
             data=request_data
         )