solax-py-library 1.0.0.2519__tar.gz → 1.0.0.2521__tar.gz

{solax_py_library-1.0.0.2519 → solax_py_library-1.0.0.2521}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: solax-py-library
-Version: 1.0.0.2519
+Version: 1.0.0.2521
 Summary: some common tool
 Author: shenlvyu
 Author-email: 13296718439@163.com

{solax_py_library-1.0.0.2519 → solax_py_library-1.0.0.2521}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "solax-py-library"
-version = "1.0.0.2519"
+version = "1.0.0.2521"
 description = "some common tool"
 authors = ["shenlvyu <13296718439@163.com>", "x5m8944pjl <371630856@qq.com>"]
 readme = "README.md"

{solax_py_library-1.0.0.2519 → solax_py_library-1.0.0.2521}/solax_py_library/smart_scene/constant/message_entry.py

@@ -173,4 +173,7 @@ MESSAGE_ENTRY = {
     "cabinetAlarm": {"zh_CN": "机柜发生{}", "en_US": "cabinet occurs {}"},
     "OR": {"zh_CN": "满足任一条件", "en_US": "Meet any of the conditions"},
     "AND": {"zh_CN": "满足所有条件", "en_US": "Meet all conditions"},
+    "tips_alarm": {"zh_CN": "状态提醒", "en_US": "Alarm tips"},
+    "normal_alarm": {"zh_CN": "普通告警", "en_US": "Normal alarm"},
+    "emergency_alarm": {"zh_CN": "紧急告警", "en_US": "Emergency alarm"},
 }

{solax_py_library-1.0.0.2519 → solax_py_library-1.0.0.2521}/solax_py_library/smart_scene/exceptions/smart_scene.py

@@ -1,81 +1,82 @@
 from solax_py_library.exception import SolaxBaseError
 
 
-class OnlyPositive(SolaxBaseError):
+class MissParam(SolaxBaseError):
+    code = 0x2001
+    message = "smart_scene__miss_param"
+
+
+class OnlyPositive(MissParam):
     message = "smart_scene__only_positive"
 
 
-class TimeRange(SolaxBaseError):
+class TimeRange(MissParam):
     message = "smart_scene__time_range"
 
 
-class IrradianceOnlyPositive(SolaxBaseError):
+class IrradianceOnlyPositive(MissParam):
     message = "smart_scene__irradiance_only_positive"
 
 
-class ExportLimitNum(SolaxBaseError):
+class ExportLimitNum(MissParam):
     message = "smart_scene__export_limit_num"
 
 
-class ExportLimitPercent(SolaxBaseError):
+class ExportLimitPercent(MissParam):
     message = "smart_scene__export_limit_percent"
 
 
-class ImportLimitNum(SolaxBaseError):
+class ImportLimitNum(MissParam):
     message = "smart_scene__import_limit_num"
 
 
-class ImportOnlyPositive(SolaxBaseError):
+class ImportOnlyPositive(MissParam):
     message = "smart_scene__import_only_positive"
 
 
-class SocLimit(SolaxBaseError):
+class SocLimit(MissParam):
     message = "smart_scene__soc_limit"
 
 
-class ActivePowerLimitNum(SolaxBaseError):
+class ActivePowerLimitNum(MissParam):
     message = "smart_scene__active_power_limit_num"
 
 
-class ReactivePowerLimitNum(SolaxBaseError):
+class ReactivePowerLimitNum(MissParam):
     message = "smart_scene__reactive_power_limit_num"
 
 
-class EnergyLimit(SolaxBaseError):
+class EnergyLimit(MissParam):
     message = "smart_scene__energy_limit"
 
 
-class PowerLimitNum(SolaxBaseError):
+class PowerLimitNum(MissParam):
     message = "smart_scene__power_limit_num"
 
 
-class BatteryPowerLimitNum(SolaxBaseError):
+class BatteryPowerLimitNum(MissParam):
     message = "smart_scene__battery_power_limit_num"
 
 
-class PvOnlyGe0(SolaxBaseError):
+class PvOnlyGe0(MissParam):
     message = "smart_scene__pv_only_ge_0"
 
 
-class MissParam(SolaxBaseError):
-    message = "smart_scene__miss_param"
-
-
-class CountLimit(SolaxBaseError):
+class CountLimit(MissParam):
     message = "smart_scene__count_limit"
 
 
-class NameLengthLimit(SolaxBaseError):
+class NameLengthLimit(MissParam):
     message = "smart_scene__name_length_limit"
 
 
-class UniqueLimit(SolaxBaseError):
+class UniqueLimit(MissParam):
     message = "smart_scene__unique_limit"
 
 
-class ElectricityPriceFailure(SolaxBaseError):
+class ElectricityPriceFailure(MissParam):
     message = "cloud__electricity_price_failure"
 
 
-class WeatherFailure(SolaxBaseError):
+class WeatherFailure(MissParam):
     message = "cloud__weather_failure"

{solax_py_library-1.0.0.2519 → solax_py_library-1.0.0.2521}/solax_py_library/smart_scene/types/action.py

@@ -38,7 +38,7 @@ class SystemActionChildData(ActionChildData):
 
 class SystemActionItemData(BaseModel):
     childType: SystemActionType
-    childData: ActionChildData
+    childData: SystemActionChildData
 
     def to_text(self, lang, cabinet_type):
         if self.childType == SystemActionType.systemSwitch:

{solax_py_library-1.0.0.2519 → solax_py_library-1.0.0.2521}/solax_py_library/smart_scene/types/condition.py

@@ -181,7 +181,7 @@ class CabinetConditionItemData(BaseModel):
             )
         elif self.childType == CabinetConditionType.cabinetAlarm:
             return MESSAGE_ENTRY[self.childType][lang].format(
-                MESSAGE_ENTRY[str(data[0])][lang], lang
+                MESSAGE_ENTRY[str(AlarmLevel(data[0]))][lang], lang
             )