foxesscloud 2.7.2__tar.gz → 2.7.4__tar.gz

{foxesscloud-2.7.2/src/foxesscloud.egg-info → foxesscloud-2.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foxesscloud
-Version: 2.7.2
+Version: 2.7.4
 Summary: library for accessing Fox ESS cloud data using Open API
 Author-email: Tony Matthews <tony@quasair.co.uk>
 Project-URL: Homepage, https://github.com/TonyM1958/FoxESS-Cloud
@@ -807,6 +807,12 @@ This setting can be:
 
 # Version Info
 
+2.7.4<br>
+Update to support T series inverters.
+
+2.7.3<br>
+Fix divide by zero error if get_report() returns no data.
+
 2.7.2<br>
 Fix to get_battery() to return error and flag status=0 in f.battery when the cloud is not returning valid data.
 Fix exception calculating SoH if ratedCapacity is returned as 0 when cloud is not returning valid data.

{foxesscloud-2.7.2 → foxesscloud-2.7.4}/README.md

@@ -793,6 +793,12 @@ This setting can be:
 
 # Version Info
 
+2.7.4<br>
+Update to support T series inverters.
+
+2.7.3<br>
+Fix divide by zero error if get_report() returns no data.
+
 2.7.2<br>
 Fix to get_battery() to return error and flag status=0 in f.battery when the cloud is not returning valid data.
 Fix exception calculating SoH if ratedCapacity is returned as 0 when cloud is not returning valid data.

{foxesscloud-2.7.2 → foxesscloud-2.7.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "foxesscloud"
-version = "2.7.2"
+version = "2.7.4"
 authors = [
   {name="Tony Matthews", email="tony@quasair.co.uk"},
 ]

{foxesscloud-2.7.2 → foxesscloud-2.7.4}/src/foxesscloud/foxesscloud.py

@@ -1,7 +1,7 @@
 ##################################################################################################
 """
 Module:   Fox ESS Cloud
-Updated:  23 November 2024
+Updated:  13 December 2024
 By:       Tony Matthews
 """
 ##################################################################################################
@@ -10,7 +10,7 @@ By:       Tony Matthews
 # ALL RIGHTS ARE RESERVED © Tony Matthews 2023
 ##################################################################################################
 
-version = "1.8.3"
+version = "1.8.5"
 print(f"FoxESS-Cloud version {version}")
 
 debug_setting = 1
@@ -491,15 +491,16 @@ def get_device(sn=None):
     remote_settings = get_ui()
     # parse the model code to work out attributes
     model_code = device['deviceType'].upper()
-    # first 2 letters / numbers e.g. H1, H3, KH
-    if model_code[:2] == 'KH':
+    if model_code[:1] == 'T':
+        model_code = 'T3-' + model_code[1:]
+    elif model_code[:2] == 'KH':
         model_code = 'KH-' + model_code[2:]
     elif model_code[:4] == 'AIO-':
         model_code = 'AIO' + model_code[4:]
     device['eps'] = 'E' in model_code
     parts = model_code.split('-')
     model = parts[0]
-    if model not in ['KH', 'H1', 'AC1', 'H3', 'AC3', 'AIOH1', 'AIOH3']:
+    if model not in ['T3', 'KH', 'H1', 'AC1', 'H3', 'AC3', 'AIOH1', 'AIOH3']:
         output(f"** device model not recognised for deviceType: {device['deviceType']}")
         return device
     device['model'] = model
@@ -507,13 +508,15 @@ def get_device(sn=None):
     for p in parts[1:]:
         if p.replace('.','').isnumeric():
             power = float(p)
-            if power >= 1.0 and power < 20.0:
+            if power >= 1.0 and power < 50.0:
                 device['power'] = float(p)
             break
     if device.get('power') is None:
         output(f"** device power not found for deviceType: {device['deviceType']}")
     # set max charge current
-    if model in ['KH']:
+    if model in ['T3']:
+        device['max_charge_current'] = None
+    elif model in ['KH']:
         device['max_charge_current'] = 50
     elif model in ['H1', 'AC1']:
         device['max_charge_current'] = 35
@@ -809,7 +812,7 @@ def time_period(t):
     return result
 
 def set_charge(ch1=True, st1=0, en1=0, ch2=True, st2=0, en2=0, force=0, enable=1):
-    global device_sn, battery_settings, debug_setting, messages, schedule
+    global device_sn, battery_settings, debug_setting, messages
     if get_device() is None:
         return None
     if battery_settings is None:
@@ -818,9 +821,8 @@ def set_charge(ch1=True, st1=0, en1=0, ch2=True, st2=0, en2=0, force=0, enable=1
         battery_settings['times'] = []
         battery_settings['times'].append({'tip': '', 'enableCharge': True, 'enableGrid': False, 'startTime': {'hour': 0, 'minute': 0}, 'endTime': {'hour': 0, 'minute': 0}})
         battery_settings['times'].append({'tip': '', 'enableCharge': True, 'enableGrid': False, 'startTime': {'hour': 0, 'minute': 0}, 'endTime': {'hour': 0, 'minute': 0}})
-    if get_flag() is None:
-        return None
-    if schedule.get('enable') == True:
+    flag = get_flag()
+    if flag is not None and flag.get('enable') == True:
         if force == 0:
             output(f"** set_charge(): cannot set charge when a schedule is enabled")
             return None
@@ -1250,8 +1252,6 @@ def get_flag():
         errno = response.json().get('errno')
         if errno == 40256:
             output(f"** get_flag(), not suported on this device")
-        else:
-            output(f"** get_flag()), no result data, {errno_message(errno)}")
         return None
     if schedule is None:
         schedule = {'enable': None, 'support': None, 'pollcy': None}
@@ -1781,7 +1781,7 @@ def report_value_profile(result):
     current_total = sum(by_hour)
     result = []
     for t in range(0, 24):
-        result.append(by_hour[t] * daily_average / current_total)
+        result.append(by_hour[t] * daily_average / current_total if current_total != 0.0 else 0.0)
     return (daily_average, result)
 
 # forwards compatibility
@@ -1840,7 +1840,7 @@ def get_report(report_type='day', d=None, v=None, summary=1, save=None, load=Non
         return None
     id_name = 'deviceID' if station == 0 else 'stationID'
     id_code = device_id if station == 0 else station_id
-    query_path = '/c/v0/device/history/report' if station == 0 else '/c/v0/plant/history/report'
+    query_path = '/generic/w/v0/device/history/report' if station == 0 else '/generic/w/v0/plant/history/report'
     # process list of days
     if d is not None and type(d) is list:
         result_list = []
@@ -3067,7 +3067,7 @@ def charge_needed(forecast=None, update_settings=0, timed_mode=None, show_data=N
         output(f"full_charge = {full_charge}")
     if test_soc is not None:
         current_soc = test_soc
-        capacity = 14.43
+        capacity = 14.40
         residual = test_soc * capacity / 100
         bat_volt = 317.4
         bat_power = 0.0

{foxesscloud-2.7.2 → foxesscloud-2.7.4}/src/foxesscloud/openapi.py

@@ -1,7 +1,7 @@
 ##################################################################################################
 """
 Module:   Fox ESS Cloud using Open API
-Updated:  23 November 2024
+Updated:  13 December 2024
 By:       Tony Matthews
 """
 ##################################################################################################
@@ -10,7 +10,7 @@ By:       Tony Matthews
 # ALL RIGHTS ARE RESERVED © Tony Matthews 2024
 ##################################################################################################
 
-version = "2.7.2"
+version = "2.7.4"
 print(f"FoxESS-Cloud Open API version {version}")
 
 debug_setting = 1
@@ -481,7 +481,8 @@ def get_device(sn=None):
 #    remote_settings = get_ui()
     # parse the model code to work out attributes
     model_code = device['deviceType'].upper()
-    # first 2 letters / numbers e.g. H1, H3, KH
+    if model_code[:1] == 'T':
+        model_code = 'T3-' + model_code[1:]
     if model_code[:2] == 'KH':
         model_code = 'KH-' + model_code[2:]
     elif model_code[:4] == 'AIO-':
@@ -489,7 +490,7 @@ def get_device(sn=None):
     device['eps'] = 'E' in model_code
     parts = model_code.split('-')
     model = parts[0]
-    if model not in ['KH', 'H1', 'AC1', 'H3', 'AC3', 'AIOH1', 'AIOH3']:
+    if model not in ['T3', 'KH', 'H1', 'AC1', 'H3', 'AC3', 'AIOH1', 'AIOH3']:
         output(f"** device model not recognised for deviceType: {device['deviceType']}")
         return device
     device['model'] = model
@@ -497,13 +498,15 @@ def get_device(sn=None):
     for p in parts[1:]:
         if p.replace('.','').isnumeric():
             power = float(p)
-            if power >= 1.0 and power < 20.0:
+            if power >= 1.0 and power < 50.0:
                 device['power'] = float(p)
             break
     if device.get('power') is None:
         output(f"** device power not found for deviceType: {device['deviceType']}")
     # set max charge current
-    if model in ['KH']:
+    if model in ['T3']:
+        device['max_charge_current'] = None
+    elif model in ['KH']:
         device['max_charge_current'] = 50
     elif model in ['H1', 'AC1']:
         device['max_charge_current'] = 35
@@ -693,7 +696,8 @@ def set_charge(ch1=True, st1=0, en1=0, ch2=True, st2=0, en2=0, force = 0, enable
         battery_settings['times']['enable2']    = False
         battery_settings['times']['startTime2'] = {'hour': 0, 'minute': 0}
         battery_settings['times']['endTime2']   = {'hour': 0, 'minute': 0}
-    if get_flag().get('enable') == 1:
+    flag = get_flag()
+    if flag is not None and flag.get('enable') == 1:
         if force == 0:
             output(f"** set_charge(): cannot set charge when a schedule is enabled")
             return None
@@ -1002,7 +1006,8 @@ def get_flag():
         return None
     result = response.json().get('result')
     if result is None:
-        output(f"** get_flag(), no result data, {errno_message(response)}")
+        if errno == 40256:
+            output(f"** get_flag(), not suported on this device")
         return None
     if schedule is None:
         schedule = {'enable': None, 'support': None, 'periods': None}
@@ -1477,7 +1482,7 @@ def report_value_profile(result):
     current_total = sum(by_hour)
     result = []
     for t in range(0, 24):
-        result.append(by_hour[t] * daily_average / current_total)
+        result.append(by_hour[t] * daily_average / current_total if current_total != 0.0 else 0.0)
     return (daily_average, result)
 
 # rescale history data based on time and steps
@@ -2727,7 +2732,7 @@ def charge_needed(forecast=None, update_settings=0, timed_mode=None, show_data=N
         output(f"full_charge = {full_charge}")
     if test_soc is not None:
         current_soc = test_soc
-        capacity = 14.43
+        capacity = 14.40
         residual = test_soc * capacity / 100
         bat_volt = 317.4
         bat_power = 0.0

{foxesscloud-2.7.2 → foxesscloud-2.7.4/src/foxesscloud.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foxesscloud
-Version: 2.7.2
+Version: 2.7.4
 Summary: library for accessing Fox ESS cloud data using Open API
 Author-email: Tony Matthews <tony@quasair.co.uk>
 Project-URL: Homepage, https://github.com/TonyM1958/FoxESS-Cloud
@@ -807,6 +807,12 @@ This setting can be:
 
 # Version Info
 
+2.7.4<br>
+Update to support T series inverters.
+
+2.7.3<br>
+Fix divide by zero error if get_report() returns no data.
+
 2.7.2<br>
 Fix to get_battery() to return error and flag status=0 in f.battery when the cloud is not returning valid data.
 Fix exception calculating SoH if ratedCapacity is returned as 0 when cloud is not returning valid data.