ep-sdk-4pd 1.1.1__tar.gz → 1.1.2__tar.gz

{ep_sdk_4pd-1.1.1 → ep_sdk_4pd-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ep_sdk_4pd
-Version: 1.1.1
+Version: 1.1.2
 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.1.2/ep_sdk_4pd/__init__.py

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

{ep_sdk_4pd-1.1.1 → ep_sdk_4pd-1.1.2}/ep_sdk_4pd/ep_system.py

@@ -1,14 +1,15 @@
+import base64
 import json
 import logging
 import os
-import rsa
-import base64
+from datetime import datetime
+from pathlib import Path
+
 import requests
+import rsa
 
 from ep_sdk_4pd import models as ep_sdk_4pd_models
-from datetime import datetime
-
-from ep_sdk_4pd.models import ModelOutputDirRequest, RunStrategyRequest, CallTrainDoneRequest, RsaKeyRequest
+from ep_sdk_4pd.models import RunStrategyRequest, CallTrainDoneRequest, RsaKeyRequest
 
 # test 地址
 # endpoint = 'http://172.27.88.56:6001'
@@ -29,45 +30,29 @@ class EpSystem:
 
     @staticmethod
     def model_output_dir(is_online: bool = True):
+        user_home = os.path.expanduser('~')
+        base_dir = os.path.join(user_home, "modelResult")
+
         if is_online:
             # 从环境变量中获取策略id
-            strategy_id = os.getenv('STRATEGY_ID')
+            # strategy_id = os.getenv('STRATEGY_ID')
+            strategy_id = 1
             logging.info(f'strategy_id: {strategy_id}')
 
             if strategy_id is None:
                 raise Exception('STRATEGY_ID is not set')
+
+            target_dir = os.path.join(base_dir, f"{strategy_id}")
         else:
-            # 线下环境，给固定的策略id
-            strategy_id = 63
-        request = ModelOutputDirRequest(strategy_id=strategy_id)
-        full_url = f'{endpoint}{request.api}'
-        headers = {
-            'content-type': request.content_type,
-            'Authorization': Authorization
-        }
+            # 线下环境
+            target_dir = os.path.join(base_dir, "test")
 
-        payload = {
-            'strategy_id': request.strategy_id
-        }
+        Path(target_dir).mkdir(parents=True, exist_ok=True)
 
-        response = requests.request(
-            method=request.method,
-            url=full_url,
-            headers=headers,
-            data=json.dumps(payload),
-        )
+        abs_path = os.path.abspath(target_dir)
 
-        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),
-        )
-        response = ep_sdk_4pd_models.ModelOutputDirResponse(response=base_resp)
+        return abs_path
 
-        if response.code == 200:
-            return response.data
-        else:
-            return None
 
     @staticmethod
     def get_system_date(is_online: bool = True):

{ep_sdk_4pd-1.1.1 → ep_sdk_4pd-1.1.2}/ep_sdk_4pd.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ep_sdk_4pd
-Version: 1.1.1
+Version: 1.1.2
 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.1.1 → ep_sdk_4pd-1.1.2}/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.1.1'
+VERSION = '1.1.2'
 REQUIRES = ['requests']
 
 LONG_DESCRIPTION = ''

ep_sdk_4pd-1.1.2/tests/test_history_data.py

@@ -0,0 +1,24 @@
+import datetime
+from turtle import pd
+
+from ep_sdk_4pd.ep_data import EpData
+from ep_sdk_4pd.ep_system import EpSystem
+
+
+def test_history_data():
+    print('-------------test_history_data-------------')
+
+    system_data = EpSystem.get_system_date()
+    dt1 = datetime.datetime.strptime("2024-01-01", "%Y-%m-%d")
+    dt2 = datetime.datetime.strptime(system_data, "%Y-%m-%d")
+    gaps = dt2 - dt1
+    gap_days = gaps.days
+    print("gap_days:", gap_days)
+
+    data = EpData.get_history_data(scope="market",days=gap_days)
+    print(data)
+    print('-------------------------------------')
+
+
+if __name__ == '__main__':
+    test_history_data()

{ep_sdk_4pd-1.1.1 → ep_sdk_4pd-1.1.2}/tests/test_predict_data.py

@@ -4,7 +4,9 @@ from ep_sdk_4pd.ep_data import EpData
 def test_predict_data():
     print('-------------test_predict_data-------------')
 
-    data = EpData.get_predict_data(scope="plant")
+    data = EpData.get_predict_data()
+    weather = data['weather']
+    plant = data['plant']
     print(data)
     print('-------------------------------------')
 

ep_sdk_4pd-1.1.1/ep_sdk_4pd/__init__.py

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

ep_sdk_4pd-1.1.1/tests/test_history_data.py

@@ -1,16 +0,0 @@
-from ep_sdk_4pd.ep_data import EpData
-
-
-def test_history_data():
-    print('-------------test_history_data-------------')
-
-    data = EpData.get_history_data(scope="market",days=1)
-    # print(data)
-    market = data.get("market")
-    for m in market:
-        print(m.get("day_ahead_tieline_power"))
-    print('-------------------------------------')
-
-
-if __name__ == '__main__':
-    test_history_data()