solax-py-library 1.0.0.2501__py3-none-any.whl → 1.0.0.2503__py3-none-any.whl

solax_py_library/smart_scene/types/condition.py

@@ -1,8 +1,10 @@
+import operator
 from enum import IntEnum, Enum
 from typing import Optional, List, Union, Any
 
 from pydantic import BaseModel, validator, root_validator
 
+from solax_py_library.device.types.alarm import AlarmLevel
 from solax_py_library.smart_scene.constant.message_entry import MESSAGE_ENTRY
 
 
@@ -16,6 +18,13 @@ class ConditionFunc(IntEnum):
     LT = 101
     EQ = 102
 
+    def function(self):
+        return {
+            ConditionFunc.GT: operator.gt,
+            ConditionFunc.LT: operator.lt,
+            ConditionFunc.EQ: operator.eq,
+        }.get(self)
+
 
 class RepeatFunc(IntEnum):
     ONCE = 103
@@ -79,13 +88,13 @@ class PriceConditionItemData(BaseModel):
 
     @validator("childData", always=True)
     def _check_child_data(cls, value, values):
-        childType = values.get("childType")
-        if childType in {
+        child_type = values.get("childType")
+        if child_type in {
             PriceConditionType.lowerPrice,
             PriceConditionType.higherPrice,
         }:
             assert value.data[0] > 0, ValueError
-        elif childType in {
+        elif child_type in {
             PriceConditionType.expensiveHours,
             PriceConditionType.cheapestHours,
         }:
@@ -119,14 +128,14 @@ class SystemConditionItemData(BaseModel):
 
     @validator("childData", always=True)
     def _check_child_data(cls, value, values):
-        childType = values.get("childType")
-        if childType in {
+        child_type = values.get("childType")
+        if child_type in {
             SystemConditionType.systemExportPower,
             SystemConditionType.systemImportPower,
         }:
             assert 0 <= value.data[0] <= 100000, ValueError
             value.data[0] = round(value.data[0], 2)  # 功率保留两位小数
-        elif childType == SystemConditionType.systemSoc:
+        elif child_type == SystemConditionType.systemSoc:
             assert 5 <= value.data[0] <= 100, ValueError
         return value
 
@@ -152,14 +161,14 @@ class CabinetConditionItemData(BaseModel):
 
     @validator("childData", always=True)
     def _check_child_data(cls, value, values):
-        childType = values.get("childType")
-        # if childType == CabinetConditionType.cabinetAlarm:
-        #     assert value.data[0] in {
-        #         AlarmLevel.TIPS,
-        #         AlarmLevel.NORMAL,
-        #         AlarmLevel.EMERGENCY,
-        #     }, ValueError
-        if childType == CabinetConditionType.cabinetSoc:
+        child_type = values.get("childType")
+        if child_type == CabinetConditionType.cabinetAlarm:
+            assert value.data[0] in {
+                AlarmLevel.TIPS,
+                AlarmLevel.NORMAL,
+                AlarmLevel.EMERGENCY,
+            }, ValueError
+        if child_type == CabinetConditionType.cabinetSoc:
             assert 0 <= value.data[0] <= 100, ValueError
         return value
 
@@ -182,11 +191,11 @@ class DateConditionItemData(BaseModel):
 
     @validator("childData", always=True)
     def check_param(cls, value, values):
-        childType = values.get("childType")
+        child_type = values.get("childType")
         data = value.data
-        if childType == DateConditionType.time:
+        if child_type == DateConditionType.time:
             assert isinstance(data[0], str), ValueError
-        elif childType == DateConditionType.duration:
+        elif child_type == DateConditionType.duration:
             assert isinstance(data[0], int), ValueError
         return value
 
@@ -203,8 +212,8 @@ class WeatherConditionItemData(BaseModel):
 
     @validator("childData", always=True)
     def _check_child_data(cls, value, values):
-        childType = values.get("childType")
-        if childType == WeatherConditionType.irradiance:
+        child_type = values.get("childType")
+        if child_type == WeatherConditionType.irradiance:
             assert value.data[0] > 0, ValueError
             assert 0 <= value.data[1] <= 24, ValueError
         return value
@@ -247,7 +256,9 @@ class ConditionItem(BaseModel):
             return {self.type: [d.to_text(lang, unit) for d in self.data]}
         elif self.type == ConditionType.cabinet:
             cabinet_sns = ",".join(self.cabinet)
-            return {self.type: [d.to_text(lang, unit) for d in self.data] + [cabinet_sns]}
+            return {
+                self.type: [d.to_text(lang, unit) for d in self.data] + [cabinet_sns]
+            }
 
 
 class SmartSceneCondition(BaseModel):
@@ -273,13 +284,8 @@ class SmartSceneCondition(BaseModel):
         return values
 
     def to_text(self, lang, unit):
-        # ret = {
-        #     "operation": MESSAGE_ENTRY[self.operation.name][lang],
-        #     "value": {}
-        # }
-        ret = {}
+        ret = {"operation": [MESSAGE_ENTRY[self.operation.name][lang]]}
         for v in self.value:
-            # ret["value"].update(v.to_text(lang, unit))
             ret.update(v.to_text(lang, unit))
         return ret
 

solax_py_library/smart_scene/types/smart_scene_content.py

@@ -5,21 +5,21 @@ from typing import Optional, List
 from pydantic import Field
 from pydantic.main import BaseModel
 
-from domain.ems_enum.smart_scene.action import (
+from solax_py_library.device.constant.cabinet import TRENE_CABINET_ENUM
+from solax_py_library.smart_scene.constant.message_entry import MESSAGE_ENTRY
+from solax_py_library.smart_scene.types.action import (
+    SmartSceneAction,
     ActionType,
     SystemActionType,
-    SmartSceneAction,
 )
-from domain.ems_enum.smart_scene.base import MESSAGE_ENTRY
-from domain.ems_enum.smart_scene.condition import (
-    LogicFunc,
-    ConditionFunc,
+from solax_py_library.smart_scene.types.condition import (
     RepeatFunc,
+    SmartSceneCondition,
+    LogicFunc,
     ConditionType,
     PriceConditionType,
-    SmartSceneCondition,
+    ConditionFunc,
 )
-from settings.const import DeviceInfo
 
 
 class SmartSceneOtherInfo(BaseModel):
@@ -145,7 +145,7 @@ class SmartSceneContent(BaseModel):
             ],
             "elseThen": [],
         }
-        if cabinet_type in DeviceInfo.TRENE_CABINET_ENUM:
+        if cabinet_type in TRENE_CABINET_ENUM:
             return [scene_rec_2]
         else:
             return [scene_rec_1, scene_rec_2]

solax_py_library/test/test_utils/test_cloud_client.py

@@ -0,0 +1,14 @@
+from unittest import TestCase
+
+from solax_py_library.utils.cloud_client import CloudClient
+
+
+class TestCloudClient(TestCase):
+    def test_get_weather(self):
+        client = CloudClient()
+        ret = client.get_weather_data_from_cloud(
+            "https://aliyun-sit.solaxtech.net:5050",
+            "XMG11A011L",
+            "b080a22827484db6bd509d496f9df90b",
+        )
+        print(ret)

solax_py_library/utils/cloud_client.py

@@ -8,8 +8,11 @@ from solax_py_library.utils.time_util import trans_str_time_to_index
 
 
 class CloudClient:
-    def get_token(self, cloud_url, ems_sn, sn_secret):
-        token_url = cloud_url + "/device/token/getByRegistrationSn"
+    def __init__(self, base_url):
+        self.base_url = base_url
+
+    def get_token(self, ems_sn, sn_secret):
+        token_url = self.base_url + "/device/token/getByRegistrationSn"
         try:
             response = requests.post(
                 token_url,
@@ -17,7 +20,7 @@ class CloudClient:
                     "registrationSn": ems_sn,
                     "snSecret": sn_secret,
                 },
-                timeout=5
+                timeout=5,
             )
             if response.content:
                 response_data = json.loads(response.content)
@@ -28,13 +31,10 @@ class CloudClient:
         except Exception as e:
             print(f"访问token接口失败: {str(e)}")
 
-    def get_weather_data_from_cloud(self, cloud_url, ems_sn, sn_secret):
+    def get_weather_data_from_cloud(self, ems_sn, token):
         """获取未来24小时天气数据"""
         try:
-            token = self.get_token(cloud_url, ems_sn, sn_secret)
-            if not token:
-                return False
-            weather_url = cloud_url + "/ess/web/v1/powerStation/station/solcast/get"
+            weather_url = self.base_url + "/ess/web/v1/powerStation/station/solcast/get"
             headers = {"token": token, "Content-Type": "application/json"}
             post_dict = {"registerNo": ems_sn, "day": 1}
             response = requests.post(
@@ -137,17 +137,14 @@ class CloudClient:
             print(f"获取天气数据失败 异常 {traceback.format_exc()}")
             return False
 
-    def get_electrovalence_data_from_cloud(self, cloud_url, ems_sn, sn_secret):
+    def get_electrovalence_data_from_cloud(self, ems_sn, token):
         try:
-            token = self.get_token(cloud_url, ems_sn, sn_secret)
-            if not token:
-                return False
-            price_url = cloud_url + "/powerStation/station/getCurrentElectrovalence"
+            price_url = self.base_url + "/powerStation/station/getCurrentElectrovalence"
             response = requests.post(
                 url=price_url,
                 headers={"token": token, "Content-Type": "application/json"},
                 json={"registerNo": ems_sn},
-                timeout=5
+                timeout=5,
             )
             # 访问失败或获取数据失败，则重复插入最后一条数据
             if response.status_code != 200:

solax_py_library/utils/time_util.py

@@ -1,5 +1,38 @@
+from datetime import datetime, timedelta
+
+
 def trans_str_time_to_index(now_time, minute=15):
     """将时间按照minute切换为索引，时间格式为 %H-%M"""
     time_list = [int(i) for i in now_time.split(":")]
     time_int = time_list[0] * 4 + time_list[1] // minute
     return time_int
+
+
+def get_highest_or_lowest_value(start_time, end_time, hours, price_list, reverse=False):
+    start_index = trans_str_time_to_index(start_time)
+    end_index = trans_str_time_to_index(end_time)
+    arr = price_list[start_index:end_index]
+    if None in arr:
+        return False
+    indices = list(range(end_index - start_index))
+    sorted_indices = sorted(indices, key=lambda i: arr[i], reverse=reverse)
+    return sorted_indices[: int(hours * 4)], start_index
+
+
+def get_rounded_times():
+    """
+    返回距离当前时间最近的15min的整点时间以及后一整点5min时间（天气是预测未来15min的，也就是在00:00时，只能拿到00:15的数据）
+    """
+    now = datetime.now()
+    # 确定当前时间所属的15分钟区间
+    index_1 = now.minute // 15
+    index_2 = now.minute % 15
+    left_time = now.replace(minute=15 * index_1, second=0, microsecond=0)
+    right_time = left_time + timedelta(minutes=15)
+    if index_2 < 8:
+        nearest_time = left_time
+    else:
+        nearest_time = right_time
+    return datetime.strftime(nearest_time, "%Y-%m-%d %H:%M:%S"), datetime.strftime(
+        right_time, "%Y-%m-%d %H:%M:%S"
+    )

{solax_py_library-1.0.0.2501.dist-info → solax_py_library-1.0.0.2503.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: solax-py-library
-Version: 1.0.0.2501
+Version: 1.0.0.2503
 Summary: some common tool
 Author: shenlvyu
 Author-email: 13296718439@163.com
@@ -13,6 +13,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: pydantic (>=1.10.0,<2.0.0)
+Requires-Dist: requests (==2.32.3)
 Requires-Dist: typing-extensions (==4.7.1)
 Description-Content-Type: text/markdown
 

{solax_py_library-1.0.0.2501.dist-info → solax_py_library-1.0.0.2503.dist-info}/RECORD

@@ -1,34 +1,39 @@
 solax_py_library/__init__.py,sha256=4wrB7TuGOQaYHQvdn574G4JrcOnH6l8RNSR6AtKAiKc,34
 solax_py_library/device/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 solax_py_library/device/constant/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+solax_py_library/device/constant/cabinet.py,sha256=V76qP2JXjdjTnsIo8wXGXYhbUb4YNKANFY-r4CrTFD4,68
 solax_py_library/device/constant/inverter_model_info.py,sha256=Ujnwv79qycOTV_zqqr21wKXXj_lGLgrA56X_-Vjuxqw,18049
 solax_py_library/device/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 solax_py_library/device/core/interver/__init__.py,sha256=RKye2D6NawSGdL4YUp_H-LmKIjThBp9CWhb6zwyM97s,1153
 solax_py_library/device/core/interver/base.py,sha256=2TXHsjigMcIvGDLF3ZD4dw6UDrRRAk9Mq6sdBKRvydc,7191
 solax_py_library/device/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+solax_py_library/device/types/alarm.py,sha256=kartXs_iRSV9Y3weFSsh9wMXU1_FxHZa6inHThyQCOk,358
 solax_py_library/device/types/inverter_config.py,sha256=qCInNPbgsWf6yQjSw59kfQtJJWilMYUhvx_qo5qwRlU,912
 solax_py_library/device/types/modbus_point.py,sha256=YmXe92gWXL_voVXDJE5zzNzr6dpPs7Ff3ciOAW-LgPs,580
 solax_py_library/exception.py,sha256=ygAccdTqJctRrdt9bu6-vqZP5KadfKVS_1tjt4KcRn8,257
 solax_py_library/smart_scene/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 solax_py_library/smart_scene/constant/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-solax_py_library/smart_scene/constant/message_entry.py,sha256=wTd9_yBMesHhj-Ws5OncHq-JnU_W8XBoWCxhZYUhJ2U,9118
+solax_py_library/smart_scene/constant/message_entry.py,sha256=Ah2yDNpsf1W4HKD-tCzK6xtew0H5TLN7ko7kSsXgcng,8973
 solax_py_library/smart_scene/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 solax_py_library/smart_scene/core/action/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+solax_py_library/smart_scene/core/action/base.py,sha256=vSC3rL9qfPy41Nlds_0QcTLMbf4n-P18XUBJ3oYiNGk,237
+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=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-solax_py_library/smart_scene/core/condition/base.py,sha256=r3YRW5jsza0HWQtiisI_Pf9UROvTsG0CgTElpK9xbKg,339
-solax_py_library/smart_scene/core/condition/cabinet_condition.py,sha256=MoP8pi7O9vVDCoSXx4kQApIyk-vYlHP8JtszNqqzELg,4492
-solax_py_library/smart_scene/core/condition/date_condition.py,sha256=cuS2Pn6EO8IAJgenkn9FZy_Ml9SeyA_nG8HeAM28_Pg,894
-solax_py_library/smart_scene/core/condition/price_condition.py,sha256=REIDSxVkkWoAz9YV6QRlqwM01vGSCvE6Xn3zgmngUAc,3934
-solax_py_library/smart_scene/core/condition/system_condition.py,sha256=JdoWc8wHpP55AIR2srG8Bvm4VfPalnC-MmJKSJdE9fY,1546
-solax_py_library/smart_scene/core/condition/weather_condition.py,sha256=bhv4x3xcYn4-qcoNHCzj7y_yMqcreQllBUqIN5csclg,2583
+solax_py_library/smart_scene/core/condition/base.py,sha256=dQK5gRguOo7GmQkRSnae2kTv4wvZh7zJeyQCdX09OmE,177
+solax_py_library/smart_scene/core/condition/cabinet_condition.py,sha256=vbo5wHf_p1qoTgItcyh-DcxE4GOe-2mUK5tYCg5pRCM,879
+solax_py_library/smart_scene/core/condition/date_condition.py,sha256=NXDN2A7t6h8r_F9GNUD8YPAJLFedFDXlrQhs5vvyNyo,899
+solax_py_library/smart_scene/core/condition/price_condition.py,sha256=4k4oDKSiSFdAM5reRVdfBW25XNw0o1QKYm0PUB_Mnxw,4174
+solax_py_library/smart_scene/core/condition/system_condition.py,sha256=100lBBf_yhdPbzK000U1OSfanKtA2xH4PoM6RRc42x0,1522
+solax_py_library/smart_scene/core/condition/weather_condition.py,sha256=kQ-0pM07G9-mOqOGp6BNbEdP3HuZyOdBqTQD0cAl8Ck,2469
 solax_py_library/smart_scene/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 solax_py_library/smart_scene/exceptions/price.py,sha256=ztsM8leCsxbzx1TYS5GQAVbfvxlU49QymS1NUykqM_g,142
 solax_py_library/smart_scene/exceptions/smart_scene.py,sha256=VFjRe7fUg5JA13Wg8BFvxzlF-pBSNaGJJBpnphYdSbM,1774
 solax_py_library/smart_scene/exceptions/weather.py,sha256=bJl1VwiIXEpLQ9VjlVrDoTAIMFqVZdRCas7dtR7eAJc,133
 solax_py_library/smart_scene/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-solax_py_library/smart_scene/types/action.py,sha256=YP2BRd24BILn82Dj6xGzaa8zypuLyx5BS_YNx6SJjNQ,5565
-solax_py_library/smart_scene/types/condition.py,sha256=NlTKATka1mI0G94Fx1m4ouVUZ9ZeMPocfZooQyiKTPM,9381
-solax_py_library/smart_scene/types/smart_scene_content.py,sha256=-aehAnRz_dTZmiRYTUpMYvl63UOokRiS_l4cbGPz8IE,6005
+solax_py_library/smart_scene/types/action.py,sha256=zvMsy_SVLIvsV3kHSbI6xEJLOYThQ6_ucGpYn3TXCUs,5607
+solax_py_library/smart_scene/types/condition.py,sha256=xJGv4Xv-kRzMYzlj6y6Q3eeMSVLwoOY9V-denlyicik,9552
+solax_py_library/smart_scene/types/smart_scene_content.py,sha256=C8H17QEicmDBbxN-m550njwaZyUhAL2hUhlLg3Qj1zM,6061
 solax_py_library/snap_shot/__init__.py,sha256=Ex12q6BCkdU-3OP-f-ehGCetJJWnoZ7KxhEDd_lXh6M,81
 solax_py_library/snap_shot/constant/__init__.py,sha256=UNfjAlx1wovXc1oH74af9oIe2TljwCCiTzNXzWgtUms,65
 solax_py_library/snap_shot/constant/crc_table.py,sha256=D-pSxpf1XDzu7YR8LmbnzdLRvI8exDL2dyDh7RRc4Io,3566
@@ -41,6 +46,9 @@ solax_py_library/snap_shot/exceptions/snap_shot.py,sha256=-oxxh_lUhfZwtggJ4zfNBP
 solax_py_library/snap_shot/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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_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
 solax_py_library/upload/api/__init__.py,sha256=ASShe-YQxP0aA3B_I8EmpWKXIdXPWvaANifrzlYrFEk,84
 solax_py_library/upload/api/service.py,sha256=-APuz86t4loCkjzaxq02kuKrB6jxaPV-Tz1V__j6cY0,763
@@ -59,10 +67,10 @@ solax_py_library/upload/types/__init__.py,sha256=og9KBpYbcs36_S1izURj3vyHeuNOLJQ
 solax_py_library/upload/types/client.py,sha256=fG674_QEpOw3ibO171lcxJ0cz27yGR_sd3zgiyr4yuI,492
 solax_py_library/upload/types/ftp.py,sha256=9kCeLB0g5Je19v4ifz8YYEsGOhJL1lKBO2C6V2VBndc,679
 solax_py_library/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-solax_py_library/utils/cloud_client.py,sha256=QbINoIMAxMm3UHr-lSL_MuZUbMR2SKvgy1TefRxmZdg,9809
+solax_py_library/utils/cloud_client.py,sha256=5dZrc5fzrNFSXqTPZd7oHt-Y9Jj6RCigB7aXJQMJ8sQ,9610
 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=oVnC-NrPrVggvrhnDnUAeZOJmfgUXuY_P9jKKsgFweI,252
-solax_py_library-1.0.0.2501.dist-info/METADATA,sha256=zlm5HzCMmKvfd90-1KoAIcAW05ntKT3qIB7csMkOyRQ,1792
-solax_py_library-1.0.0.2501.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-solax_py_library-1.0.0.2501.dist-info/RECORD,,
+solax_py_library/utils/time_util.py,sha256=bY5kj9dmyOuLEQ6uYGQK7jU7y1RMiHZgevEKnkcQcSU,1461
+solax_py_library-1.0.0.2503.dist-info/METADATA,sha256=vk7Hfoh4mLBm6qpGLhpsqNgPN01FRrex8Cu24KqzNYg,1827
+solax_py_library-1.0.0.2503.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+solax_py_library-1.0.0.2503.dist-info/RECORD,,