solax-py-library 1.0.0.23__py3-none-any.whl → 1.0.0.26__py3-none-any.whl

solax_py_library/snap_shot/types/address.py

@@ -1,39 +1,39 @@
-from enum import IntEnum
-
-
-class SnapshotMCUSource(IntEnum):
-    MCU_SOURCE_MDSP = 0
-    MCU_SOURCE_SDSP = 1
-
-
-class SnapshotExportDevice(IntEnum):
-    EXPORT_DEVICE_UART = 0
-    EXPORT_DEVICE_USB = 1
-
-
-class SnapshotStartResult(IntEnum):
-    SNAPSHOT_START_START = 0xAAAA
-    SNAPSHOT_START_SUCCESS = 0xA5A5
-    SNAPSHOT_START_FAILED = 0x5A5A
-    SNAPSHOT_START_STOP = 0xBBBB
-
-
-class SnapshotRegisterAddress(IntEnum):
-    SNAPSHOT_REGISTERADDRESS_MCUSOURCE = 0x4011
-    SNAPSHOT_REGISTERADDRESS_EXPORTDEVICE = 0x4012
-    SNAPSHOT_REGISTERADDRESS_START = 0x4013
-    SNAPSHOT_REGISTERADDRESS_TOTALNUMBER = 0x4070
-    SNAPSHOT_REGISTERADDRESS_SNAPSHOTINDEX = 0x4071
-    SNAPSHOT_REGISTERADDRESS_PACKDATASTATUS = 0x4072
-    SNAPSHOT_REGISTERADDRESS_DATASIZE = 0x4073
-    SNAPSHOT_REGISTERADDRESS_CHANNELNUMBER = 0x4074
-    SNAPSHOT_REGISTERADDRESS_CHANNELDATASIZE = 0x4075
-    SNAPSHOT_REGISTERADDRESS_PACKINDEX = 0x407F
-    SNAPSHOT_REGISTERADDRESS_PACKDATA = 0x4080
-
-
-class CommandType(IntEnum):
-    ACK = 0x80  # 接收应答
-    TOTAL_PACKETS = 0x81  # 上报总包数
-    DATA_PACKET = 0x82  # 具体分包数据
-    ERROR = 0x83  # 报错应答
+from enum import IntEnum
+
+
+class SnapshotMCUSource(IntEnum):
+    MCU_SOURCE_MDSP = 0
+    MCU_SOURCE_SDSP = 1
+
+
+class SnapshotExportDevice(IntEnum):
+    EXPORT_DEVICE_UART = 0
+    EXPORT_DEVICE_USB = 1
+
+
+class SnapshotStartResult(IntEnum):
+    SNAPSHOT_START_START = 0xAAAA
+    SNAPSHOT_START_SUCCESS = 0xA5A5
+    SNAPSHOT_START_FAILED = 0x5A5A
+    SNAPSHOT_START_STOP = 0xBBBB
+
+
+class SnapshotRegisterAddress(IntEnum):
+    SNAPSHOT_REGISTERADDRESS_MCUSOURCE = 0x4011
+    SNAPSHOT_REGISTERADDRESS_EXPORTDEVICE = 0x4012
+    SNAPSHOT_REGISTERADDRESS_START = 0x4013
+    SNAPSHOT_REGISTERADDRESS_TOTALNUMBER = 0x4070
+    SNAPSHOT_REGISTERADDRESS_SNAPSHOTINDEX = 0x4071
+    SNAPSHOT_REGISTERADDRESS_PACKDATASTATUS = 0x4072
+    SNAPSHOT_REGISTERADDRESS_DATASIZE = 0x4073
+    SNAPSHOT_REGISTERADDRESS_CHANNELNUMBER = 0x4074
+    SNAPSHOT_REGISTERADDRESS_CHANNELDATASIZE = 0x4075
+    SNAPSHOT_REGISTERADDRESS_PACKINDEX = 0x407F
+    SNAPSHOT_REGISTERADDRESS_PACKDATA = 0x4080
+
+
+class CommandType(IntEnum):
+    ACK = 0x80  # 接收应答
+    TOTAL_PACKETS = 0x81  # 上报总包数
+    DATA_PACKET = 0x82  # 具体分包数据
+    ERROR = 0x83  # 报错应答

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/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/upload/__init__.py

@@ -1,3 +1,3 @@
-from . import api, types, core, exceptions
-
-__all__ = ["api", "core", "exceptions", "types"]
+from . import api, types, core, exceptions
+
+__all__ = ["api", "core", "exceptions", "types"]

solax_py_library/upload/api/service.py

@@ -1,24 +1,24 @@
-from typing import Dict, Any
-
-from solax_py_library.upload.core.upload_service import upload_service_map
-from solax_py_library.exception import SolaxBaseError
-from solax_py_library.upload.types.client import UploadType, UploadData
-
-
-def upload_service(upload_type: UploadType, configuration: Dict[str, Any]):
-    """
-    upload_type: 上传类型。
-    configuration: 配置信息
-    """
-    upload_class = upload_service_map.get(upload_type)
-    if not upload_class:
-        raise SolaxBaseError
-    return upload_class(**configuration)
-
-
-async def upload(
-    upload_type: UploadType, configuration: Dict[str, Any], upload_data: UploadData
-):
-    service = upload_service(upload_type, configuration)
-    with service as s:
-        await s.upload(upload_data)
+from typing import Dict, Any
+
+from solax_py_library.upload.core.upload_service import upload_service_map
+from solax_py_library.exception import SolaxBaseError
+from solax_py_library.upload.types.client import UploadType, UploadData
+
+
+def upload_service(upload_type: UploadType, configuration: Dict[str, Any]):
+    """
+    upload_type: 上传类型。
+    configuration: 配置信息
+    """
+    upload_class = upload_service_map.get(upload_type)
+    if not upload_class:
+        raise SolaxBaseError
+    return upload_class(**configuration)
+
+
+async def upload(
+    upload_type: UploadType, configuration: Dict[str, Any], upload_data: UploadData
+):
+    service = upload_service(upload_type, configuration)
+    with service as s:
+        await s.upload(upload_data)

solax_py_library/upload/core/upload_service/ftp.py

@@ -79,6 +79,7 @@ class FTPUploadService(BaseUploadService):
         try:
             if not self._is_connect:
                 raise ConnectError(message="not connect yet")
+            # self._client.set_pasv(False)
             self._cwd_folder()
             with open(data.file_path, "rb") as f:
                 self._client.storbinary(f"STOR {data.file_name}", f)

solax_py_library/upload/exceptions/__init__.py

@@ -1,8 +1,8 @@
-from .upload_error import ConfigurationError, ConnectError, LoginError, SendDataError
-
-__all__ = [
-    "ConnectError",
-    "LoginError",
-    "SendDataError",
-    "ConfigurationError",
-]
+from .upload_error import ConfigurationError, ConnectError, LoginError, SendDataError
+
+__all__ = [
+    "ConnectError",
+    "LoginError",
+    "SendDataError",
+    "ConfigurationError",
+]

solax_py_library/upload/exceptions/upload_error.py

@@ -1,21 +1,21 @@
-from solax_py_library.exception import SolaxBaseError
-
-
-class ConnectError(SolaxBaseError):
-    code = 0x1001
-    message = "connect error"
-
-
-class LoginError(SolaxBaseError):
-    code = 0x1002
-    message = "authentication error"
-
-
-class SendDataError(SolaxBaseError):
-    code = 0x1003
-    message = "send data error"
-
-
-class ConfigurationError(SolaxBaseError):
-    code = 0x1004
-    message = "server configuration error"
+from solax_py_library.exception import SolaxBaseError
+
+
+class ConnectError(SolaxBaseError):
+    code = 0x1001
+    message = "connect error"
+
+
+class LoginError(SolaxBaseError):
+    code = 0x1002
+    message = "authentication error"
+
+
+class SendDataError(SolaxBaseError):
+    code = 0x1003
+    message = "send data error"
+
+
+class ConfigurationError(SolaxBaseError):
+    code = 0x1004
+    message = "server configuration error"

solax_py_library/utils/cloud_client.py

@@ -0,0 +1,210 @@
+import json
+import traceback
+from datetime import datetime
+
+import requests
+
+from solax_py_library.utils.time_util import trans_str_time_to_index
+
+
+class CloudClient:
+    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,
+                json={
+                    "registrationSn": ems_sn,
+                    "snSecret": sn_secret,
+                },
+                timeout=5,
+            )
+            if response.content:
+                response_data = json.loads(response.content)
+                print(f"获取token结果 {response_data}")
+                if response_data.get("code") == 0 and response_data.get("result"):
+                    token = response_data["result"]
+                    return token
+        except Exception as e:
+            print(f"访问token接口失败: {str(e)}")
+
+    def get_weather_data_from_cloud(self, ems_sn, token):
+        """获取未来24小时天气数据"""
+        try:
+            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(
+                url=weather_url, data=json.dumps(post_dict), headers=headers, timeout=5
+            )
+            # 访问失败或获取数据失败，则重复插入最后一条数据
+            if response.status_code != 200:
+                print(f"获取天气数据失败 状态码 {response.status_code}")
+                return False
+            response_data = response.json()
+            if response_data.get("result") is None:
+                print(f"获取天气数据失败 返回数据 {response_data}")
+                return False
+            weather_info = {
+                "timeList": [],
+                "irradiance": {"valueList": []},
+                "temperature": {"valueList": []},
+                "humidity": {"valueList": []},
+                "wind": {"valueList": []},
+                "barometricPressure": {"valueList": []},
+                "rain": {"valueList": []},
+            }
+            for info in response_data["result"]:
+                weather_info["timeList"].append(info["localTime"])
+                weather_info["irradiance"]["valueList"].append(float(info["ghi"]))
+                weather_info["temperature"]["valueList"].append(float(info["air_temp"]))
+                weather_info["humidity"]["valueList"].append(
+                    float(info["relative_humidity"])
+                )
+                weather_info["wind"]["valueList"].append(float(info["wind_speed_10m"]))
+                weather_info["barometricPressure"]["valueList"].append(
+                    float(info.get("surface_pressure", 0))
+                )
+                rain = 1 if float(info["precipitation_rate"]) > 2.5 else 0
+                weather_info["rain"]["valueList"].append(rain)
+            data_length = len(weather_info["irradiance"]["valueList"])
+            if weather_info["timeList"] == []:
+                weather_info = {}
+            else:
+                weather_info["irradiance"]["maxValue"] = max(
+                    weather_info["irradiance"]["valueList"]
+                )
+                weather_info["irradiance"]["avgValue"] = round(
+                    sum(weather_info["irradiance"]["valueList"]) / data_length, 3
+                )
+                weather_info["irradiance"]["minValue"] = min(
+                    weather_info["irradiance"]["valueList"]
+                )
+
+                weather_info["temperature"]["maxValue"] = max(
+                    weather_info["temperature"]["valueList"]
+                )
+                weather_info["temperature"]["avgValue"] = round(
+                    sum(weather_info["temperature"]["valueList"]) / data_length, 3
+                )
+                weather_info["temperature"]["minValue"] = min(
+                    weather_info["temperature"]["valueList"]
+                )
+
+                weather_info["humidity"]["maxValue"] = max(
+                    weather_info["humidity"]["valueList"]
+                )
+                weather_info["humidity"]["avgValue"] = round(
+                    sum(weather_info["humidity"]["valueList"]) / data_length, 3
+                )
+                weather_info["humidity"]["minValue"] = min(
+                    weather_info["humidity"]["valueList"]
+                )
+
+                weather_info["wind"]["maxValue"] = max(
+                    weather_info["wind"]["valueList"]
+                )
+                weather_info["wind"]["avgValue"] = round(
+                    sum(weather_info["wind"]["valueList"]) / data_length, 3
+                )
+                weather_info["wind"]["minValue"] = min(
+                    weather_info["wind"]["valueList"]
+                )
+
+                weather_info["barometricPressure"]["maxValue"] = max(
+                    weather_info["barometricPressure"]["valueList"]
+                )
+                weather_info["barometricPressure"]["avgValue"] = round(
+                    sum(weather_info["barometricPressure"]["valueList"]) / data_length,
+                    3,
+                )
+                weather_info["barometricPressure"]["minValue"] = min(
+                    weather_info["barometricPressure"]["valueList"]
+                )
+
+                weather_info["rain"]["maxValue"] = max(
+                    weather_info["rain"]["valueList"]
+                )
+                weather_info["rain"]["minValue"] = min(
+                    weather_info["rain"]["valueList"]
+                )
+            return weather_info
+            print("获取天气数据成功")
+        except Exception:
+            print(f"获取天气数据失败 异常 {traceback.format_exc()}")
+            return False
+
+    def get_electrovalence_data_from_cloud(self, ems_sn, token):
+        try:
+            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,
+            )
+            # 访问失败或获取数据失败，则重复插入最后一条数据
+            if response.status_code != 200:
+                print(f"获取电价数据失败 状态码 {response.status_code}")
+                return False
+            response_data = response.json()
+            if response_data.get("result") is None:
+                print(f"获取电价数据失败 返回数据 {response_data}")
+                return False
+            today = datetime.strftime(datetime.now(), "%Y-%m-%d %H:%M:%S")
+            ele_price_info = {
+                "buy": [None] * 192,
+                "sell": [None] * 192,
+                "date": today,
+            }
+            ele_price_info["ele_unit"] = response_data["result"]["unit"]
+            if ele_price_info["ele_unit"] == "¥":
+                rate = 1
+                ele_price_info["ele_unit"] = "¥/kWh"
+            else:
+                rate = 100
+                ele_price_info["ele_unit"] = "Cents €/kWh"
+            for detail_info in response_data["result"]["list"]:
+                start_index = trans_str_time_to_index(detail_info["startTime"])
+                end_index = trans_str_time_to_index(detail_info["endTime"])
+                # 处理欧分的情况
+                if detail_info["buyPrice"] is not None:
+                    buy_price = round(detail_info["buyPrice"] * rate, 5)
+                else:
+                    buy_price = detail_info["buyPrice"]
+                if detail_info["salePrice"] is not None:
+                    sale_price = round(detail_info["salePrice"] * rate, 5)
+                else:
+                    sale_price = detail_info["salePrice"]
+                ele_price_info["buy"][start_index:end_index] = [buy_price] * (
+                    end_index - start_index
+                )
+                ele_price_info["sell"][start_index:end_index] = [sale_price] * (
+                    end_index - start_index
+                )
+            if response_data["result"].get("tomorrow") is not None:
+                for detail_info in response_data["result"]["tomorrow"]:
+                    start_index = trans_str_time_to_index(detail_info["startTime"]) + 96
+                    end_index = trans_str_time_to_index(detail_info["endTime"]) + 96
+                    if detail_info["buyPrice"] is not None:
+                        buy_price = round(detail_info["buyPrice"] * rate, 5)
+                    else:
+                        buy_price = detail_info["buyPrice"]
+                    if detail_info["salePrice"] is not None:
+                        sale_price = round(detail_info["salePrice"] * rate, 5)
+                    else:
+                        sale_price = detail_info["salePrice"]
+                    ele_price_info["buy"][start_index:end_index] = [buy_price] * (
+                        end_index - start_index
+                    )
+                    ele_price_info["sell"][start_index:end_index] = [sale_price] * (
+                        end_index - start_index
+                    )
+            print("获取电价数据成功")
+            return ele_price_info
+        except Exception:
+            print(f"获取电价数据失败 异常 {traceback.format_exc()}")
+            return False

solax_py_library/utils/struct_util.py

@@ -1,30 +1,42 @@
-import copy
-import struct
-from typing import List
-
-
-def unpack(data: List, data_format, reversed=False):
-    """
-    :param data: 数据字节, 入参均是由modbus读取到的list[uint16]进行转换
-    :param data_format:  数据格式
-    :param reversed:  是否翻转大小端
-    """
-    cur_data = copy.deepcopy(data)
-    data_format = data_format.lower()
-    format_map = {
-        "int8": "bb",
-        "uint8": "BB",
-        "int16": "h",
-        "uint16": "H",
-        "int32": "i",
-        "uint32": "I",
-        "int64": "q",
-        "uint64": "Q",
-        "float": "f",
-    }
-    if data_format not in format_map:
-        raise Exception("暂不支持")
-    pack_str = ("<" if reversed else ">") + "H" * len(cur_data)
-    to_pack_data = struct.pack(pack_str, *cur_data)
-    struct_format = ("<" if reversed else ">") + format_map[data_format]
-    return struct.unpack(struct_format, to_pack_data)
+import copy
+import struct
+from typing import List
+
+format_map = {
+    "int8": {"format_str": "bb", "length": 1},
+    "uint8": {"format_str": "BB", "length": 1},
+    "int16": {"format_str": "h", "length": 1},
+    "uint16": {"format_str": "H", "length": 1},
+    "int32": {"format_str": "i", "length": 2},
+    "uint32": {"format_str": "I", "length": 2},
+    "int64": {"format_str": "q", "length": 4},
+    "uint64": {"format_str": "Q", "length": 4},
+    "float": {"format_str": "f", "length": 1},
+}
+
+
+def unpack(data: List, data_format, reversed=False):
+    """
+    :param data: 数据字节, 入参均是由modbus读取到的list[uint16]进行转换
+    :param data_format:  数据格式
+    :param reversed:  是否翻转大小端
+    """
+    cur_data = copy.deepcopy(data)
+    data_format = data_format.lower()
+    if data_format not in format_map:
+        raise Exception("暂不支持")
+    pack_str = ("<" if reversed else ">") + "H" * len(cur_data)
+    to_pack_data = struct.pack(pack_str, *cur_data)
+    struct_format = ("<" if reversed else ">") + format_map[data_format]["format_str"]
+    return struct.unpack(struct_format, to_pack_data)
+
+
+def pack(value, fmt, order="big"):
+    """将10进制的原始值转换为modbus协议需要的精度与类型的值"""
+    opt = "<" if order == "little" else ">"
+    if fmt not in format_map:
+        raise Exception("暂不支持")
+    value = int(value)
+    ret = struct.pack(f'{opt}{format_map[fmt]["format_str"]}', value)
+    ret_list = struct.unpack(f'{opt}{"H" * format_map[fmt]["length"]}', ret)
+    return list(ret_list)

solax_py_library/utils/time_util.py

@@ -0,0 +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.23.dist-info → solax_py_library-1.0.0.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: solax-py-library
-Version: 1.0.0.23
+Version: 1.0.0.26
 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