ep-sdk-4pd 1.0.1__tar.gz → 1.0.3__tar.gz

{ep_sdk_4pd-1.0.1 → ep_sdk_4pd-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ep_sdk_4pd
-Version: 1.0.1
+Version: 1.0.3
 Summary: 4paradigm Electricity Platform Service SDK Library for Python
 Home-page: https://gitlab.4pd.io/electricityproject/electricity-platform-sdk
 Author: 4paradigm Electricity Platform SDK

ep_sdk_4pd-1.0.3/ep_sdk_4pd/__init__.py

@@ -0,0 +1 @@
+__version__ = '1.0.3'

{ep_sdk_4pd-1.0.1 → ep_sdk_4pd-1.0.3}/ep_sdk_4pd/ep_data.py

@@ -8,20 +8,23 @@ from ep_sdk_4pd.ep_system import EpSystem
 from ep_sdk_4pd.models import HistoryDataRequest, PredictDataRequest
 
 # test 地址
-# endpoint = 'http://172.27.88.56:6001'
-
+endpoint = 'http://172.27.88.56:6001'
 
 # prod 地址
-endpoint = 'http://172.27.88.56:6601'
+# endpoint = 'http://172.27.88.56:6601'
+
+# 外网 地址
+# endpoint = 'http://82.157.231.254:6001'
 
 Authorization = 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJlbGVjdHJpY2l0eS1wbGF0Zm9ybSIsInN1YiI6IjEyMyIsImlhdCI6MTc0NjYwNjQ4NSwianRpIjoiMTIzXzE3NDY1Nzc2ODUxNDYiLCJ0eXBlIjoiYWNjZXNzIn0.Clrz_8j3aJlXTWPX-4DS0NxXN9idTcUIc0AtXOMIjd8'
 
+
 class EpData:
 
     @staticmethod
     def get_history_data(
-            scope = None,
-            days = 0
+            scope=None,
+            days=0
     ):
         # 最晚时间为系统时间 D-2
         date_str = EpSystem.get_system_date(is_online=True)
@@ -83,7 +86,7 @@ class EpData:
 
         # 测试
         if is_test:
-            system_date=test_time
+            system_date = test_time
 
         request = PredictDataRequest(
             scope=scope,
@@ -124,4 +127,4 @@ class EpData:
             data=response.json().get('data', None),
             message=response.json().get('message', None),
         )
-        return ep_sdk_4pd_models.PredictDataResponse(response=base_resp)
+        return ep_sdk_4pd_models.PredictDataResponse(response=base_resp)

{ep_sdk_4pd-1.0.1 → ep_sdk_4pd-1.0.3}/ep_sdk_4pd/ep_system.py

@@ -1,23 +1,29 @@
 import json
 import logging
 import os
-
+import rsa
+import base64
 import requests
 
 from ep_sdk_4pd import models as ep_sdk_4pd_models
 from datetime import datetime
 
-from ep_sdk_4pd.models import ModelOutputDirRequest, RunStrategyRequest, CallTrainDoneRequest
+from ep_sdk_4pd.models import ModelOutputDirRequest, RunStrategyRequest, CallTrainDoneRequest, RsaKeyRequest
 
 # test 地址
-# endpoint = 'http://172.27.88.56:6001'
-
+endpoint = 'http://172.27.88.56:6001'
 
 # prod 地址
-endpoint = 'http://172.27.88.56:6601'
+# endpoint = 'http://172.27.88.56:6601'
+
+# 外网 地址
+# endpoint = 'http://82.157.231.254:6001'
 
 Authorization = 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJlbGVjdHJpY2l0eS1wbGF0Zm9ybSIsInN1YiI6IjEyMyIsImlhdCI6MTc0NjYwNjQ4NSwianRpIjoiMTIzXzE3NDY1Nzc2ODUxNDYiLCJ0eXBlIjoiYWNjZXNzIn0.Clrz_8j3aJlXTWPX-4DS0NxXN9idTcUIc0AtXOMIjd8'
 
+def rsa_decrypt(privkey, ciphertext):
+    decrypted = rsa.decrypt(base64.b64decode(ciphertext), privkey)
+    return decrypted.decode('utf-8')
 
 class EpSystem:
 
@@ -71,6 +77,16 @@ class EpSystem:
         if is_online:
             # 线上环境,随着真实调用运行时间变化
             system_date = datetime.now().strftime('%Y-%m-%d')
+
+            target_date = os.environ.get('TARGET_DATE')
+            # target_date = 'JgAgrcfaQBI0h5YtLGGCjH92snKB3pUBOQs8yy0/mxMBdur0jNvAz6LzpU+Vq3QXsf36jy79WCrgVFo+0RwfUN338VJ9Qe+HwPfe0eq29De6eLD3nOl8xORj339dtSEdXq4dwc2mTaIxQc+erpv4acgQ7YVSDX6AuprwfW7c7qxthziqCqHxVm/qZwUkMsQ1fgzVLeICdscbCJbCD5GFYSpohaP5hRebutoa5FqyhYURA/4kxus98lJsENhnOZAACFdnCWDklpkKZyyOq0aKMd8Vv9SWX1LAZVTRjQ1GGuUPyOYjvnhUyNeRo3D85ODGBFeEju8rjDEB8LFSvX5d3Q=='
+            if target_date is not None:
+                rsa_data = EpSystem.get_rsa_key()
+                if rsa_data:
+                    rsa_private_key = rsa_data['rsa_private_key']
+                    loaded_privkey = rsa.PrivateKey.load_pkcs1(rsa_private_key.encode('utf-8'))
+                    decrypted_data = rsa_decrypt(loaded_privkey, target_date)
+                    system_date = decrypted_data
         else:
             # 线下环境
             system_date = "2024-12-31"
@@ -165,3 +181,37 @@ class EpSystem:
             return True
         else:
             return False
+
+    @staticmethod
+    def get_rsa_key():
+        request = RsaKeyRequest()
+        response = EpSystem.rsa_key(request=request)
+
+        if response.code == 200:
+            return response.data
+        else:
+            return None
+
+    @staticmethod
+    def rsa_key(
+            request: ep_sdk_4pd_models.RsaKeyRequest = None,
+    ) -> ep_sdk_4pd_models.RsaKeyResponse:
+
+        full_url = f'{endpoint}{request.api}'
+        headers = {
+            'content-type': request.content_type,
+            'Authorization': Authorization
+        }
+
+        response = requests.request(
+            method=request.method,
+            url=full_url,
+            headers=headers,
+        )
+
+        base_resp = ep_sdk_4pd_models.BaseResponse(
+            code=response.json().get('code', None),
+            data=response.json().get('data', None),
+            message=response.json().get('message', None),
+        )
+        return ep_sdk_4pd_models.RsaKeyResponse(response=base_resp)

{ep_sdk_4pd-1.0.1 → ep_sdk_4pd-1.0.3}/ep_sdk_4pd/models.py

@@ -202,6 +202,34 @@ class CallTrainDoneResponse(BaseResponse):
     Model for CallTrainDoneResponse
     """
 
+    def __init__(self, response: BaseResponse = None, **kwargs):
+        super().__init__(
+            code=response.code if response else None,
+            data=response.data if response else None,
+            message=response.message if response else None,
+            **kwargs,
+        )
+
+class RsaKeyRequest(BaseRequest):
+    """
+    Model for RsaKeyRequest
+    """
+
+    def __init__(
+            self
+    ):
+
+        super().__init__()
+        self.api = f'/ep/api/sdk/get_rsa_key'
+        self.method = 'GET'
+        self.content_type = 'application/json'
+
+
+class RsaKeyResponse(BaseResponse):
+    """
+    Model for RsaKeyResponse
+    """
+
     def __init__(self, response: BaseResponse = None, **kwargs):
         super().__init__(
             code=response.code if response else None,

{ep_sdk_4pd-1.0.1 → ep_sdk_4pd-1.0.3}/ep_sdk_4pd.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ep_sdk_4pd
-Version: 1.0.1
+Version: 1.0.3
 Summary: 4paradigm Electricity Platform Service SDK Library for Python
 Home-page: https://gitlab.4pd.io/electricityproject/electricity-platform-sdk
 Author: 4paradigm Electricity Platform SDK

{ep_sdk_4pd-1.0.1 → ep_sdk_4pd-1.0.3}/setup.py

@@ -8,7 +8,7 @@ DESCRIPTION = '4paradigm Electricity Platform Service SDK Library for Python'
 AUTHOR = '4paradigm Electricity Platform SDK'
 AUTHOR_EMAIL = ''
 URL = 'https://gitlab.4pd.io/electricityproject/electricity-platform-sdk'
-VERSION = '1.0.1'
+VERSION = '1.0.3'
 REQUIRES = ['requests']
 
 LONG_DESCRIPTION = ''

{ep_sdk_4pd-1.0.1 → ep_sdk_4pd-1.0.3}/tests/test_predict_data.py

@@ -4,7 +4,7 @@ from ep_sdk_4pd.ep_data import EpData
 def test_predict_data():
     print('-------------test_predict_data-------------')
 
-    data = EpData.get_predict_data(scope="plant",is_test=True,test_time='2023-04-02')
+    data = EpData.get_predict_data(scope="plant")
     print(data)
     print('-------------------------------------')
 

ep_sdk_4pd-1.0.1/ep_sdk_4pd/__init__.py

@@ -1 +0,0 @@
-__version__ = '1.0.1'