ep-sdk-4pd 3.0.5.dev0__tar.gz → 4.0.0__tar.gz

{ep_sdk_4pd-3.0.5.dev0 → ep_sdk_4pd-4.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ep_sdk_4pd
-Version: 3.0.5.dev0
+Version: 4.0.0
 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-4.0.0/ep_sdk_4pd/__init__.py

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

{ep_sdk_4pd-3.0.5.dev0 → ep_sdk_4pd-4.0.0}/ep_sdk_4pd/ep_data.py

@@ -1,5 +1,6 @@
 import json
 import os
+import time
 from datetime import timedelta, datetime
 
 import requests
@@ -9,13 +10,13 @@ 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://82.157.231.254'
+endpoint = 'http://82.157.231.254'
 
 Authorization = 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJlbGVjdHJpY2l0eS1wbGF0Zm9ybSIsInN1YiI6IjEyMyIsImlhdCI6MTc0NjYwNjQ4NSwianRpIjoiMTIzXzE3NDY1Nzc2ODUxNDYiLCJ0eXBlIjoiYWNjZXNzIn0.Clrz_8j3aJlXTWPX-4DS0NxXN9idTcUIc0AtXOMIjd8'
 
@@ -61,25 +62,103 @@ class EpData:
             'content-type': request.content_type,
             'Authorization': Authorization
         }
-
+        scopes = request.scope.split(",")
+        assert len(scopes) > 0 or "scope 参数错误"
+        gfs_resp = None
+        if 'gfs' in scopes:
+            gfs_resp = EpData.history_large_gfs_data(request=request)
+            if gfs_resp.code != 200:
+                return gfs_resp
+            scopes.remove('gfs')
+        if len(scopes) == 0:
+            return gfs_resp
         payload = {
-            'scope': request.scope,
+            'scope': ",".join(scopes),
             'system_date': request.system_date,
             'days': request.days,
             'strategy_id': request.strategy_id
         }
-
         response = requests.request(
             method=request.method,
             url=full_url,
             headers=headers,
             data=json.dumps(payload),
         )
+        code = response.json().get('code', None)
+        data = response.json().get('data', None)
+        message = response.json().get('message', None)
+        if code == 200 and gfs_resp:
+            data.update(gfs_resp.data)
+        return ep_sdk_4pd_models.HistoryDataResponse(response=ep_sdk_4pd_models.BaseResponse(**{
+            'code': code,
+            'data': data,
+            'message': message
+        }))
 
+    @staticmethod
+    def history_large_gfs_data(
+            request: ep_sdk_4pd_models.HistoryDataRequest = None,
+    ) -> ep_sdk_4pd_models.HistoryDataResponse:
+        """
+        由于 gfs 数据可能会比较长，这里处理一下 将长时间的数据进行切分 然后进行组装。
+        如果 request.days > 31 那么就将时间按照 31天的时间长度 进行切分
+        """
+        unit = 31
+        full_url = f'{endpoint}{request.api}'
+        headers = {
+            'content-type': request.content_type,
+            'Authorization': Authorization
+        }
+        ret = list()
+        code = 200
+        data = None
+        message = None
+        days = request.days
+        date = datetime.strptime(request.system_date, "%Y-%m-%d")
+        while True:
+            if days > unit:
+                days -= unit
+                d = unit
+            else:
+                d = days
+                days = 0
+
+            for _ in range(0, 3):
+                payload = {
+                    'scope': "gfs",
+                    'system_date': date.strftime("%Y-%m-%d"),
+                    'days': d,
+                    'strategy_id': request.strategy_id
+                }
+                response = requests.request(
+                    method=request.method,
+                    url=full_url,
+                    headers=headers,
+                    data=json.dumps(payload),
+                )
+                code = response.json().get('code', None)
+                data = response.json().get('data', None)
+                message = response.json().get('message', None)
+                if code == 200:
+                    date -= timedelta(days=unit)
+                    ret.extend(data['gfs'])
+                    break
+                else:
+                    time.sleep(0.1)
+            else:
+                return ep_sdk_4pd_models.HistoryDataResponse(response=ep_sdk_4pd_models.BaseResponse(
+                    code=code,
+                    data=data,
+                    message=message,
+                ))
+            if days == 0:
+                break
         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),
+            code=code,
+            data={
+                "gfs": ret
+            },
+            message=message,
         )
         return ep_sdk_4pd_models.HistoryDataResponse(response=base_resp)
 

{ep_sdk_4pd-3.0.5.dev0 → ep_sdk_4pd-4.0.0}/ep_sdk_4pd/ep_system.py

@@ -12,13 +12,13 @@ from ep_sdk_4pd import models as ep_sdk_4pd_models
 from ep_sdk_4pd.models import 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://82.157.231.254'
+endpoint = 'http://82.157.231.254'
 
 Authorization = 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJlbGVjdHJpY2l0eS1wbGF0Zm9ybSIsInN1YiI6IjEyMyIsImlhdCI6MTc0NjYwNjQ4NSwianRpIjoiMTIzXzE3NDY1Nzc2ODUxNDYiLCJ0eXBlIjoiYWNjZXNzIn0.Clrz_8j3aJlXTWPX-4DS0NxXN9idTcUIc0AtXOMIjd8'
 

{ep_sdk_4pd-3.0.5.dev0 → ep_sdk_4pd-4.0.0}/ep_sdk_4pd.egg-info/PKG-INFO

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

ep_sdk_4pd-3.0.5.dev0/ep_sdk_4pd/__init__.py

@@ -1 +0,0 @@
-__version__ = '3.0.5.dev0'