solax-py-library 1.0.0.2512__py3-none-any.whl → 1.0.0.2514__py3-none-any.whl

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/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/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/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/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)

{solax_py_library-1.0.0.2512.dist-info → solax_py_library-1.0.0.2514.dist-info}/METADATA

@@ -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.dist-info → solax_py_library-1.0.0.2514.dist-info}/RECORD

@@ -20,14 +20,14 @@ solax_py_library/smart_scene/core/action/base.py,sha256=vSC3rL9qfPy41Nlds_0QcTLM
 solax_py_library/smart_scene/core/action/ems_action.py,sha256=tasL7pUJbnmrEEokAa9Mug5eUFvHuFKGYZKNvNMdrBs,610
 solax_py_library/smart_scene/core/action/system_action.py,sha256=mVLTg9pZ7tDayLbr3I92a33snA2AGT3meUdm_XYDQEc,10839
 solax_py_library/smart_scene/core/condition/__init__.py,sha256=1nN-N52Oq7LKdn6ApKGtSZq5fB1qJzJq8BOKOumfQvY,475
-solax_py_library/smart_scene/core/condition/base.py,sha256=CMVHRuPrVpCjrc5WLHFU9nc-jrE9RLCbXfzBiNkURWE,456
+solax_py_library/smart_scene/core/condition/base.py,sha256=saj7dc0Su2Wi_Lx04cesHFgIPDyQUwvHuDElcaDOIHU,596
 solax_py_library/smart_scene/core/condition/cabinet_condition.py,sha256=HEVifO3rHk2ElfSCEB0MzVdfrFWlkwqjt6tFhtJ8CLY,1581
-solax_py_library/smart_scene/core/condition/date_condition.py,sha256=-mzTgahn1IphYBBhT5dc_VeVrmgoIUCjhzVqrDJUqLc,915
+solax_py_library/smart_scene/core/condition/date_condition.py,sha256=Xhca6VjoM8Bq-I-dFj1RPLTTzbBL81ORkBnR8D-YqUw,772
 solax_py_library/smart_scene/core/condition/price_condition.py,sha256=mzUnrMuG0DHCxaQQe7-rmE_vra9U6vd-1AYDKkbPPUw,3884
-solax_py_library/smart_scene/core/condition/system_condition.py,sha256=g-5LSUAnu7JESUlTRbJ3MKm9cEMzofDZzNNm7_RSy10,1380
+solax_py_library/smart_scene/core/condition/system_condition.py,sha256=oLz0MM47bj6K1saAap3YBteK9UeejSqu5CQVdLvGE1Q,1350
 solax_py_library/smart_scene/core/condition/weather_condition.py,sha256=OiKye007PZnocnmcrNQD6ObOEF7VyaYkdqz6D_2lNok,2236
 solax_py_library/smart_scene/core/service/__init__.py,sha256=wWzHSN2XaHnI-TNtCJWWRHnNC7s3-2GNQo9y0K_PC4Q,69
-solax_py_library/smart_scene/core/service/runner.py,sha256=wfpFQ_JDxarC_sLtv-_f0jJPO0CITGtTy5CczfKoPrw,6163
+solax_py_library/smart_scene/core/service/runner.py,sha256=SwQ6jb5yFPcyHyfU-THyGDjPEMcNFUOHkvVYA9wB1EE,6201
 solax_py_library/smart_scene/exceptions/__init__.py,sha256=0hDgr70fFLQB14uorVCwbBhl1yQmZ-uBYGH5XtGm_dg,147
 solax_py_library/smart_scene/exceptions/price.py,sha256=3bnY6JzeEskUoXVzEs8bpg6hQzgbinBKY4GP4hBITWU,152
 solax_py_library/smart_scene/exceptions/smart_scene.py,sha256=lIwzjdpvtrAub4lyTQRD3h2sM95vF6gpUy3Nmq1w1k0,1778
@@ -49,6 +49,8 @@ solax_py_library/snap_shot/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 solax_py_library/snap_shot/types/__init__.py,sha256=g9ybB88TntvAMGIhLgJ31Xxn26zluSfI496bg-apSTU,290
 solax_py_library/snap_shot/types/address.py,sha256=JhyB-t2OnKuE8akKk120sojCNXv4_OlLLuWsl5ChFZ8,1148
 solax_py_library/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+solax_py_library/test/test_smart_scene/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+solax_py_library/test/test_smart_scene/test_condition.py,sha256=w-REUzkaDrq9acye2qZeAbTQb8bpgAykLfylsLvNrx8,331
 solax_py_library/test/test_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 solax_py_library/test/test_utils/test_cloud_client.py,sha256=gOrHGXkFXpFV4kXTnjhmyJGem8VaGKw8OmXyW884oJ0,395
 solax_py_library/upload/__init__.py,sha256=XhZar7BKaRN0XcdPl4QffWr488L3UWvuq5syT8nX2OU,93
@@ -73,6 +75,6 @@ solax_py_library/utils/cloud_client.py,sha256=5dZrc5fzrNFSXqTPZd7oHt-Y9Jj6RCigB7
 solax_py_library/utils/common.py,sha256=bfnZcX9uM-PjJrYAFv1UMmZgt6bGR7MaOd7jRPNHGxw,1238
 solax_py_library/utils/struct_util.py,sha256=4SKx5IyAke88PGHPHDK3OEDtyGHdapGoQ1BnGR0F2ts,913
 solax_py_library/utils/time_util.py,sha256=bY5kj9dmyOuLEQ6uYGQK7jU7y1RMiHZgevEKnkcQcSU,1461
-solax_py_library-1.0.0.2512.dist-info/METADATA,sha256=Szd6YLH-pfHuKczXMwXwv_MX5DOJ_MuGsIhemOC1U7g,1827
-solax_py_library-1.0.0.2512.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-solax_py_library-1.0.0.2512.dist-info/RECORD,,
+solax_py_library-1.0.0.2514.dist-info/METADATA,sha256=2aiCh__xWlAwyUZxGCK5qlIlz3kRyGTEO8CHz__cLG8,1827
+solax_py_library-1.0.0.2514.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+solax_py_library-1.0.0.2514.dist-info/RECORD,,