ep-sdk-4pd 1.1.3.dev0__tar.gz → 1.2.0__tar.gz

{ep_sdk_4pd-1.1.3.dev0 → ep_sdk_4pd-1.2.0}/PKG-INFO

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

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

{ep_sdk_4pd-1.1.3.dev0 → ep_sdk_4pd-1.2.0}/ep_sdk_4pd/ep_data.py

@@ -8,13 +8,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:6001'
+endpoint = 'http://82.157.231.254:6001'
 
 Authorization = 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJlbGVjdHJpY2l0eS1wbGF0Zm9ybSIsInN1YiI6IjEyMyIsImlhdCI6MTc0NjYwNjQ4NSwianRpIjoiMTIzXzE3NDY1Nzc2ODUxNDYiLCJ0eXBlIjoiYWNjZXNzIn0.Clrz_8j3aJlXTWPX-4DS0NxXN9idTcUIc0AtXOMIjd8'
 

{ep_sdk_4pd-1.1.3.dev0 → ep_sdk_4pd-1.2.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:6001'
+endpoint = 'http://82.157.231.254:6001'
 
 Authorization = 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJlbGVjdHJpY2l0eS1wbGF0Zm9ybSIsInN1YiI6IjEyMyIsImlhdCI6MTc0NjYwNjQ4NSwianRpIjoiMTIzXzE3NDY1Nzc2ODUxNDYiLCJ0eXBlIjoiYWNjZXNzIn0.Clrz_8j3aJlXTWPX-4DS0NxXN9idTcUIc0AtXOMIjd8'
 
@@ -29,24 +29,34 @@ def rsa_decrypt(privkey, ciphertext):
 class EpSystem:
 
     @staticmethod
-    def model_output_dir(is_online: bool = True):
-        user_home = os.path.expanduser('~')
+    def model_output_dir(
+            # is_online: bool = True
+    ):
+        user_home = os.path.expanduser('root')
         base_dir = os.path.join(user_home, "modelResult")
 
-        if is_online:
-            # 从环境变量中获取策略id
-            strategy_id = os.getenv('STRATEGY_ID')
-            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:
-            # 线下环境
-            target_dir = os.path.join(base_dir, "test")
-
-        Path(target_dir).mkdir(parents=True, exist_ok=True)
+        # 从环境变量中获取策略id
+        strategy_id = os.getenv('STRATEGY_ID')
+        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}")
+        # if is_online:
+        #     # 从环境变量中获取策略id
+        #     strategy_id = os.getenv('STRATEGY_ID')
+        #     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:
+        #     # 线下环境
+        #     target_dir = os.path.join(base_dir, "test")
+        #
+        # Path(target_dir).mkdir(parents=True, exist_ok=True)
 
         abs_path = os.path.abspath(target_dir)
 

{ep_sdk_4pd-1.1.3.dev0 → ep_sdk_4pd-1.2.0}/ep_sdk_4pd.egg-info/PKG-INFO

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

ep_sdk_4pd-1.1.3.dev0/ep_sdk_4pd/__init__.py

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