solax-py-library 1.0.0.2512__tar.gz → 1.0.0.2514__tar.gz

{solax_py_library-1.0.0.2512 → solax_py_library-1.0.0.2514}/PKG-INFO

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

{solax_py_library-1.0.0.2512 → solax_py_library-1.0.0.2514}/pyproject.toml

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

{solax_py_library-1.0.0.2512 → solax_py_library-1.0.0.2514}/solax_py_library/smart_scene/core/condition/base.py

@@ -8,8 +8,10 @@ class BaseCondition(object):
         self.update_value_function = update_value_function
 
     def update_value(self):
-        self.update_value_function()
-        print(self.value)
+        new_value = self.update_value_function()
+        if not isinstance(new_value, dict):
+            raise ValueError("update_value_function must return a dict")
+        self.value.update(new_value)
 
     def meet_func(self, data, ctx):
         ...

{solax_py_library-1.0.0.2512 → solax_py_library-1.0.0.2514}/solax_py_library/smart_scene/core/condition/date_condition.py

@@ -1,5 +1,3 @@
-from datetime import datetime
-
 from solax_py_library.smart_scene.core.condition.base import BaseCondition
 from solax_py_library.smart_scene.types.condition import (
     DateConditionItemData,
@@ -14,16 +12,12 @@ class DateCondition(BaseCondition):
     def __init__(self, update_value_function, **kwargs):
         super().__init__(update_value_function, **kwargs)
 
-    def _update_value(self):
-        """获取time 类型需要的数据"""
-        now = datetime.now()
-        self.hour = now.hour
-        self.minute = now.minute
-
     def meet_func(self, data: DateConditionItemData, ctx):
         if data.childType == DateConditionType.time:
             date = data.childData.data[0]
             hour, minute = date.split(":")
-            if int(hour) == self.hour and int(minute) == self.minute:
+            if int(hour) == self.value.get("hour") and int(minute) == self.value.get(
+                "minute"
+            ):
                 return True
         return False

{solax_py_library-1.0.0.2512 → solax_py_library-1.0.0.2514}/solax_py_library/smart_scene/core/condition/system_condition.py

@@ -11,8 +11,6 @@ class SystemCondition(BaseCondition):
 
     def __init__(self, update_value_function, **kwargs):
         super().__init__(update_value_function, **kwargs)
-        self.grid_active_power = None
-        self.system_soc = None
 
     def meet_system_condition(self, data: SystemConditionItemData, ctx):
         if not self.value:
@@ -21,15 +19,15 @@ class SystemCondition(BaseCondition):
         function_value = child_data.function
         compare_value = None
         if data.childType == SystemConditionType.systemExportPower:
-            compare_value = self.grid_active_power
+            compare_value = self.value.get("grid_active_power")
             if compare_value < 0:
                 return False
         elif data.childType == SystemConditionType.systemImportPower:
-            compare_value = self.grid_active_power
+            compare_value = self.value.get("grid_active_power")
             if compare_value > 0:
                 return False
         elif data.childType == SystemConditionType.systemSoc:
-            compare_value = self.system_soc
+            compare_value = self.value.get("system_soc")
         if compare_value is None:
             return False
         return function_value.function()(

{solax_py_library-1.0.0.2512 → solax_py_library-1.0.0.2514}/solax_py_library/smart_scene/core/service/runner.py

@@ -28,8 +28,10 @@ class SmartSceneRunner:
         self.action_class_map = {}
 
         for condition_class in condition_classes:
-            if not issubclass(BaseCondition, condition_class):
-                raise ValueError(f"condition({condition_class}) is not derived from BaseCondition")
+            if not isinstance(condition_class, BaseCondition):
+                raise ValueError(
+                    f"condition({condition_class}) is not derived from BaseCondition"
+                )
             self.condition_class_map[condition_class.condition_type] = condition_class
 
         for action_class in action_classes:

solax_py_library-1.0.0.2514/solax_py_library/test/test_smart_scene/test_condition.py

@@ -0,0 +1,11 @@
+from unittest import TestCase
+
+from solax_py_library.smart_scene.core.condition import DateCondition, BaseCondition
+
+
+class TestCondition(TestCase):
+    def test_condition(self):
+        date_condition = DateCondition(
+            update_value_function=lambda: 1,
+        )
+        assert isinstance(date_condition, BaseCondition)