solax-py-library 1.0.0.2501__tar.gz → 1.0.0.2502__tar.gz

{solax_py_library-1.0.0.2501 → solax_py_library-1.0.0.2502}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: solax-py-library
-Version: 1.0.0.2501
+Version: 1.0.0.2502
 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 → solax_py_library-1.0.0.2502}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "solax-py-library"
-version = "1.0.0.2501"
+version = "1.0.0.2502"
 description = "some common tool"
 authors = ["shenlvyu <13296718439@163.com>", "x5m8944pjl <371630856@qq.com>"]
 readme = "README.md"
@@ -9,6 +9,7 @@ readme = "README.md"
 python = "^3.8"
 pydantic = "^1.10.0"
 typing-extensions = "==4.7.1"
+requests = "==2.32.3"
 
 [build-system]
 requires = ["poetry-core"]

solax_py_library-1.0.0.2502/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-1.0.0.2501 → solax_py_library-1.0.0.2502}/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,
@@ -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,12 +137,9 @@ 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"},