cloudpss 3.5.0a1__tar.gz → 4.0.0a3__tar.gz

{cloudpss-3.5.0a1 → cloudpss-4.0.0a3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudpss
-Version: 3.5.0a1
+Version: 4.0.0a3
 Summary: cloudpss sdk
 Home-page: https://www.cloudpss.net
 Author: cloudpss

{cloudpss-3.5.0a1 → cloudpss-4.0.0a3}/cloudpss/__init__.py

@@ -6,18 +6,19 @@ from .model import Model, ModelRevision, ModelTopology
 from .project import Project
 from .utils import MatlabDataEncoder, DateTimeEncode
 from . import function
-from .function import FunctionExecution
 
+from .function import FunctionExecution
+from .version import __version__
 __all__ = [
     'setToken', 'Model', 'ModelRevision', 'ModelTopology', 'Runner', 'Result',
     'PowerFlowResult', 'EMTResult', 'MatlabDataEncoder', 'DateTimeEncode',
-    'function', 'Project', 'currentJob', 'IESLabSimulation', 'IESLabPlan'
+    'function', 'Project', 'currentJob', 'IESLabSimulation', 'IESLabPlan','__version__'
 ]
-__version__ = '3.5.0-alpha.1'
+
 
 
 def currentJob():
     """
         获取当前的 currentExecution 实例
     """
-    return FunctionExecution.current()
+    return FunctionExecution.current()

{cloudpss-3.5.0a1 → cloudpss-4.0.0a3}/cloudpss/ieslab/DataManageModel.py

@@ -146,19 +146,19 @@ class DataManageModel(object):
         if r['timeid'] is not None:
             del r['timeid']
         try:
-            ret = self._saveItemData(self._kindUrlMap[kind], r)
+            self._saveItemData(self._kindUrlMap[kind], r)
             self._kindIdMap[str(data['timeid'])]=kind
             self._kindIdMap[str(data['id'])]=kind
             self._itemDataMap[str(data['timeid'])]=data
             self._itemDataMap[str(data['id'])]=data
             if kind in ['thermalLoads', 'electricLoads', 'fuels']:
                 dataList = self._fetchItemData(self._kindUrlMap[kind], None)
-                self._kindItemDataMap[kind].append(dataList)
-                return dataList[len(dataList) - 1]['id']
+                self._kindItemDataMap[kind] = dataList
+                return dataList[-1]['id']
             else:
                 dataList = self._fetchItemData(self._kindUrlMap[kind], kind)
-                self._kindItemDataMap[kind].append(dataList)
-                return dataList[len(dataList) - 1]['id']
+                self._kindItemDataMap[kind] = dataList
+                return dataList[-1]['id']
         except Exception as e:
             raise Exception(str(e))
 

{cloudpss-3.5.0a1 → cloudpss-4.0.0a3}/cloudpss/ieslab/EvaluationModel.py

@@ -5,7 +5,6 @@ from ..utils import request
 import json
 from enum import IntEnum, unique
 
-
 class IESLabEvaluationModel(object):
     _baseUri = 'api/ieslab-plan/rest/'
     _taskUri = 'api/ieslab-plan/taskmanager/getSimuLastTasks'
@@ -58,6 +57,12 @@ class IESLabEvaluationModel(object):
         }
     }
 
+    # 评价基础参数接口默认值
+    _evaluationType = {
+        "环保评价": "environmentalEvaluation",
+        "能效评价": "energyEvaluation"
+    }
+
     def __init__(self, simulationId):
         '''
             初始化
@@ -91,7 +96,7 @@ class IESLabEvaluationModel(object):
         data = json.loads(r.text)
         return data
 
-    def GetFinancialParas(self, planID):
+    def GetFinancialParams(self, planID):
         '''
             获取planID对应的优化方案下财务评估模块的基础信息
             :param planID int类型，表示优化方案的ID，数值位于0~优化方案数量之间
@@ -128,6 +133,7 @@ class IESLabEvaluationModel(object):
             :return: Runner[IESLabEvaluationResult]
         '''
         url = 'api/ieslab-plan/taskmanager/saveDataToclickhouse'
+        CMD_TYPE = type if type is None else self._evaluationType[type]
         try:
             timeId = int(time.time() * 1000)
             r = request('GET',
@@ -135,20 +141,20 @@ class IESLabEvaluationModel(object):
                         params={
                             "simuid": self.simulationId,
                             "planId": planID,
-                            "CMD_TYPE": type
+                            "CMD_TYPE": CMD_TYPE
                         })
             data = json.loads(r.text)
             return HttpRunner({'rid': 'function/ieslab/evaluation'},
                 self.simulationId,
                 timeId=timeId,
                 planId=planID,
-                cmdType=type)
+                cmdType=CMD_TYPE)
         except:
             raise Exception('方案评估开始计算失败')
 
     def EnvironmentalEvaluationRun(self, planID):
         '''
-            运行方案评估
+            运行环保评价方案评估
 
             :param planID int类型，表示优化方案的ID，数值位于0~优化方案数量之间
 
@@ -158,7 +164,7 @@ class IESLabEvaluationModel(object):
 
     def EnergyEvaluationRun(self, planID):
         '''
-            运行方案评估
+            运行能效评价方案评估
 
             :param planID int类型，表示优化方案的ID，数值位于0~优化方案数量之间
 

{cloudpss-3.5.0a1 → cloudpss-4.0.0a3}/cloudpss/ieslab/IESLabPlan.py

@@ -7,6 +7,8 @@ from cloudpss.runner.IESLabTypicalDayResult import IESLabTypicalDayResult
 from ..utils import request
 from ..model.model import Model
 from cloudpss.runner.runner import  Runner
+from cloudpss.runner.IESLabPlanResult import IESLabPlanResult
+from cloudpss.runner.IESLabEvaluationResult import IESLabEvaluationResult
 
 class IESLabPlan(object):
     def __init__(self, project={}):
@@ -22,6 +24,8 @@ class IESLabPlan(object):
         self.dataManageModel = IESPlanDataManageModel(self.id)
         self.planModel = IESLabPlanModel(self.id)
         self.evaluationModel = IESLabEvaluationModel(self.id)
+        self.currentPlanResult = IESLabPlanResult(self.id)
+        self.currentEvaluationResult = IESLabEvaluationResult(self.id)
 
     @staticmethod
     def fetch(simulationId):
@@ -52,7 +56,6 @@ class IESLabPlan(object):
         if job is None:
             currentJob = self.model.context['currentJob']
             job = self.model.jobs[currentJob]
-
         job['args']['simulationId'] = self.id
         return self.model.run(job, name=name)
 
@@ -68,26 +71,28 @@ class IESLabPlan(object):
         if job is None:
             currentJob = self.model.context['currentJob']
             job = self.model.jobs[currentJob]
-            if job['rid'] != 'job-definition/ies/ies-gmm' or job['rid'] != 'job-definition/cloudpss/ieslab-gmm':
+            if job['rid'] != 'function/CloudPSS/ieslab-gmm':
                 for j in self.model.jobs:
-                    if j['rid'] == 'job-definition/ies/ies-gmm' or job['rid'] == 'job-definition/cloudpss/ieslab-gmm':
+                    if j['rid'] == 'job-definition/ies/ies-gmm' or j['rid'] == 'job-definition/cloudpss/ieslab-gmm':
+                        j['rid'] = 'function/CloudPSS/ieslab-gmm'
                         job = j
         if job is None:
             raise Exception("找不到默认的综合能源系统规划典型日生成算法的计算方案")
-        if job['rid'] != 'job-definition/ies/ies-gmm'or job['rid'] != 'job-definition/cloudpss/ieslab-gmm':
+        if job['rid'] != 'function/CloudPSS/ieslab-gmm':
             raise Exception("不是综合能源系统规划典型日生成算法的计算方案")
         return self.__run(job=job, name=name)
 
-    def iesLabEvaluationRun(self, planId):
+    def iesLabEvaluationRun(self, planId, type=None):
         '''
             运行方案评估
 
             :param planID int类型，表示优化方案的ID，数值位于0~优化方案数量之间
+            :param type string类型，表示评估类型，可选值为：能效评价、环保评价
 
             :return: 方案评估运行实例
 
         '''
-        return self.evaluationModel.run(planId)
+        return self.evaluationModel.run(planId, type)
 
     def iesLabEnergyEvaluationRun(self, planId):
         '''
@@ -117,3 +122,11 @@ class IESLabPlan(object):
             :return: 方案优选运行实例
         '''
         return self.planModel.run()
+    
+    def iesLabPlanKill(self):
+        '''
+            停止并删除方案优选算例
+
+            :return: Boolean
+        '''
+        return self.planModel.kill()

{cloudpss-3.5.0a1 → cloudpss-4.0.0a3}/cloudpss/ieslab/IESLabSimulation.py

@@ -30,6 +30,7 @@ class IESLabSimulation(object):
             r = request(
                 'GET', 'api/ieslab-simulation/rest/simu/{0}/'.format(simulationId))
             project = json.loads(r.text)
+            print(project)
             return IESLabSimulation(project)
         except:
             raise Exception('未查询到当前算例')
@@ -48,5 +49,6 @@ class IESLabSimulation(object):
             job = self.model.jobs[currentJob]
 
         job['args']['simulationId'] = self.id
+        print(job)
         return self.model.run(job, name=name)
 

cloudpss-4.0.0a3/cloudpss/ieslab/PlanModel.py

@@ -0,0 +1,143 @@
+from cloudpss.runner.IESLabPlanResult import IESLabPlanResult
+from cloudpss.runner.runner import HttpRunner, Runner
+from ..utils import request, fileLoad
+import json
+from enum import IntEnum, unique
+
+
+class IESLabPlanModel(object):
+    _baseUri = 'api/ieslab-plan/taskmanager/getSimuLastTasks'
+
+    def __init__(self, simulationId):
+        '''
+            初始化
+        '''
+        self.simulationId = simulationId
+        self.optimizationInfo = self.GetOptimizationInfo()
+        self.OptimizationMode = OptimizationMode
+
+    def _fetchItemData(self, url):
+        '''
+            获取当前算例的优化目标设置信息
+
+            :return: enum 类型，代表经济性优化和环保性优化的类型
+        '''
+        r = request('GET', url, params={"simuid": self.simulationId})
+        data = json.loads(r.text)
+        return data
+
+    def GetOptimizationInfo(self):
+        '''
+            获取当前算例的优化目标设置信息
+
+            :return: enum 类型，代表经济性优化和环保性优化的类型
+        '''
+        try:
+            data = self._fetchItemData(self._baseUri)
+            for e in OptimizationMode:
+                if (e.value == data['data']['optimizationpara']
+                    ['OptimizationMode']):
+                    return e
+        except:
+            return OptimizationMode['经济性']
+
+    def SetOptimizationInfo(self, optType):
+        '''
+            无对应接口
+            设置当前算例的优化目标
+
+            :param optType: enum 类型，代表经济性优化和环保性优化的类型
+        '''
+        self.optimizationInfo = optType
+        return True
+
+    def run(self) -> Runner[IESLabPlanResult]:
+        '''
+            生成方案优选算例
+
+            :return: Runner[IESLabPlanResult]
+        '''
+        isRunning = self.GetLastTaskResult()
+        if isRunning:
+            raise Exception('该算例正在运行！请从浏览器算例页面点击结束运行或者调用IESPlan对象的kill接口终止计算后重试！')
+        else:
+            url = 'api/ieslab-plan/taskmanager/runOptimization'
+            if self.optimizationInfo is None:
+                self.optimizationInfo = OptimizationMode['经济性']
+            optType = self.optimizationInfo.value or 0
+            try:
+                r = request('GET',
+                            url,
+                            params={
+                                "simuid":
+                                self.simulationId,
+                                "optPara":
+                                json.dumps({
+                                    "OptimizationMode": optType,
+                                    "ProjectPeriod": "20"
+                                })
+                            })
+                data = json.loads(r.text)
+                return HttpRunner({}, self.simulationId)
+            except:
+                raise Exception('生成方案优选算例失败')
+
+    def GetRunner(self) -> Runner[IESLabPlanResult]:
+        '''
+            获得运行实例
+
+            :return: Runner[IESLabPlanResult]
+        '''
+        return HttpRunner({}, self.simulationId)
+    
+    def kill(self) -> bool:
+        '''
+            停止并删除当前运行的优化算例
+        '''
+        res = IESLabPlanResult(self.simulationId).getLastTaskResult()
+        error = res.get('error', 0)
+        if error == 0:
+            data = res.get('data', {})
+            if data is not None:
+                taskID = data.get('task_id', '')
+        url = f'api/ieslab-plan/taskmanager/removeOptimizationTask'
+        try:
+            r = request('GET',
+                        url,
+                        params={
+                            "taskid": taskID,
+                            "stopFlag": '2'
+                        })
+            json.loads(r.text)
+            return True
+        except:
+            return False
+
+    def GetLastTaskResult(self)-> bool:
+        '''
+            获取最后一次运行的taskID的运行结果与日志
+
+            :return: boolean 类型
+        '''
+        isRunning = True
+        res = IESLabPlanResult(self.simulationId).getLastTaskResult()
+        error = res.get('error', 0)
+        if error == 0:
+            data = res.get('data', {})
+            if data is not None:
+                status = data.get('status', '')
+                if status == 'stop':
+                    isRunning = False
+        logs = IESLabPlanResult(self.simulationId).GetLogs()
+        if logs is not None:
+            for log in logs:
+                if(log.get('data', '') == 'run ends'):
+                    isRunning = False
+                    break
+        return isRunning
+
+
+# @unique
+class OptimizationMode(IntEnum):
+    经济性 = 0
+    环保性 = 1

cloudpss-4.0.0a3/cloudpss/ieslab/__init__.py

@@ -0,0 +1,4 @@
+from .IESLabSimulation import IESLabSimulation
+from .IESLabPlan import IESLabPlan
+from .PlanModel import OptimizationMode
+__all__ = ['IESLabSimulation','IESLabPlan', 'OptimizationMode']

{cloudpss-3.5.0a1 → cloudpss-4.0.0a3}/cloudpss/model/jobDefinitions.py

@@ -112,5 +112,39 @@ JOB_DEFINITIONS = {
             "SkipPF": "0",
             "MaxIteration": "30"
         }
+    },
+    "iesLoadPrediction": {
+        "name": "负荷预测方案 1",
+        "rid": "job-definition/ies/ies-load-prediction",
+        "arcs": {
+            "startTime": "2022 -01-01 00:00:00",
+            "endTime": "2022 -12-31 23:00:00",
+            "layer_forcast": "0",
+            "forcast_algorithm": "0",
+            "ratio_sub": [],
+            "ratio_feeder": [],
+            "ratio_trans": []
+        }
+    },
+    "iesPowerFlow": {
+        "name": "时序潮流方案 1",
+        "rid": "job-definition/ies/ies-power-flow",
+        "arcs": {
+            "startTime": "2022 -01-01 00:00:00",
+            "endTime": "2022 -12-31 23:00:00",
+            "solveMethod": "0",
+            "maxIteration": "30"
+        }
+    },
+    "iesEnergyStoragePlan": {
+        "name": "储能规划方案 1",
+        "rid": "job-definition/ies/ies-energy-storage-plan",
+        "arcs": {
+            "Planyear": "15",
+            "NetConfig": [],
+            "SourceConfig": [],
+            "LoadConfig": []
+        }
     }
+
 }

{cloudpss-3.5.0a1 → cloudpss-4.0.0a3}/cloudpss/model/model.py

@@ -11,8 +11,8 @@ from .jobDefinitions import JOB_DEFINITIONS
 from ..utils import request, fileLoad, graphql_request
 from ..verify import userName
 
-from cloudpss.runner.result import PowerFlowResult, EMTResult, Result, IESResult
-from cloudpss.runner.runner import Runner
+from cloudpss.runner.result import  PowerFlowResult, EMTResult, Result, IESResult
+from cloudpss.runner.runner import  Runner
 
 
 class Model(object):
@@ -46,12 +46,7 @@ class Model(object):
         """
         for k, v in model.items():
             if k == 'revision':
-                if 'version' in v and v['version'] == 3:
-                    self.revision = ModelRevision(v)
-                else:
-                    raise Exception(
-                        '当前SDK版本（ver 3.X.X）不兼容该项目文件，请先升级项目文件。具体方法：将该项目文件导入至XStudio 3.X.X平台后重新保存至本地后即可。'
-                    )
+                self.revision = ModelRevision(v)
 
             else:
                 self.__dict__[k] = v
@@ -297,7 +292,7 @@ class Model(object):
             raise Exception(data['errors'][0]['message'])
         return Model(data['data']['model'])
 
-    def run(self, job=None, config=None, name=None, policy=None, **kwargs):
+    def run(self, job=None, config=None, name=None, **kwargs):
         """
 
             调用仿真 
@@ -318,7 +313,7 @@ class Model(object):
         if config is None:
             currentConfig = self.context['currentConfig']
             config = self.configs[currentConfig]
-        return self.revision.run(job, config, name, self.rid, policy, **kwargs)
+        return self.revision.run(job, config, name, self.rid, **kwargs)
 
     def iesSimulationRun(self, job=None, config=None, name=None, **kwargs):
         return self.run(job=job, config=config, name=name, kwargs=kwargs)
@@ -490,6 +485,13 @@ class Model(object):
         auth = (65539 if publicRead else 65537) if isPublic else 0
         revision = ModelRevision.create(model.revision, model.revision.hash)
 
+        xVersion = int(os.environ.get('X_CLOUDPSS_VERSION', 4))
+        tags= {
+            "replace":model.tags
+        }
+        if xVersion==3:
+            tags=model.tags
+        
         return graphql_request(
             modelQuery, {
                 'a': {
@@ -500,7 +502,7 @@ class Model(object):
                     'jobs': model.jobs,
                     'name': model.name,
                     'description': model.description,
-                    'tags': model.tags,
+                    'tags': tags,
                     "permissions": {
                         "moderator": 1,
                         "member": 1,
@@ -536,10 +538,10 @@ class Model(object):
                 currentConfig = self.context['currentConfig']
                 config = self.configs[currentConfig]
             return self.revision.fetchTopology(implementType, config,
-                                               maximumDepth)
+                maximumDepth)
         return None
 
-    def runEMT(self, job=None, config=None) -> Runner[EMTResult]:
+    def runEMT(self,job=None,config=None)->Runner[EMTResult]:
         '''
             运行 emtp 内核，如果当前 model 没有创建  Job 时报错，默认使用第一个计算方案，进行仿真。
 
@@ -564,7 +566,7 @@ class Model(object):
             config = self.configs[currentConfig]
         return self.run(job=job, config=config)
 
-    def runSFEMT(self, job=None, config=None) -> Runner[EMTResult]:
+    def runSFEMT(self,job=None,config=None)->Runner[EMTResult]:
         '''
             运行 移频电磁暂态 内核，如果当前 model 没有创建  Job 时报错，默认使用第一个计算方案，进行仿真。
 
@@ -589,7 +591,7 @@ class Model(object):
             config = self.configs[currentConfig]
         return self.run(job=job, config=config)
 
-    def runPowerFlow(self, job=None, config=None) -> Runner[PowerFlowResult]:
+    def runPowerFlow(self,job=None,config=None)->Runner[PowerFlowResult]:
         '''
             运行 潮流 内核，如果当前 model 没有创建  Job 时报错，默认使用第一个计算方案，进行仿真。
 
@@ -614,9 +616,7 @@ class Model(object):
             config = self.configs[currentConfig]
         return self.run(job=job, config=config)
 
-    def runThreePhasePowerFlow(self,
-                               job=None,
-                               config=None) -> Runner[PowerFlowResult]:
+    def runThreePhasePowerFlow(self,job=None,config=None)->Runner[PowerFlowResult]:
         '''
             运行 三相不平衡潮流 内核，如果当前 model 没有创建  Job 时报错，默认使用第一个计算方案，进行仿真。
             
@@ -640,3 +640,79 @@ class Model(object):
             currentConfig = self.context['currentConfig']
             config = self.configs[currentConfig]
         return self.run(job=job, config=config)
+    
+    def runIESLoadPrediction(self,job=None,config=None)->Runner[IESResult]:
+        '''
+            运行 负荷预测方案 内核，如果当前 model 没有创建  Job 时报错，默认使用第一个计算方案，进行仿真。
+            
+            :param: job 计算方案名称，可选，字符串类型或者字典类型,默认使用第一个计算方案，如果同名使用最靠前一个
+            :param: config 参数方案，可选，字符串类型或者字典类型,默认使用保存时选中的参数方案
+
+            :return: runner Runner[IESResult]
+        '''
+        if job is None:
+            currentJob = self.context['currentJob']
+            job = self.jobs[currentJob]
+            if job['rid'] != 'job-definition/ies/ies-load-prediction':
+                for j in self.jobs:
+                    if j['rid'] == 'job-definition/ies/ies-load-prediction':
+                        job = j
+        if job is None:
+            raise Exception("找不到负荷预测方案内核运行的计算方案")
+        if job['rid'] != 'job-definition/ies/ies-load-prediction':
+            raise Exception("不是负荷预测方案内核运行生成算法的计算方案")
+        if config is None:
+            currentConfig = self.context['currentConfig']
+            config = self.configs[currentConfig]
+        return self.run(job=job, config=config)
+    
+    def runIESPowerFlow(self,job=None,config=None)->Runner[IESResult]:
+        '''
+            运行 时序潮流方案 内核，如果当前 model 没有创建  Job 时报错，默认使用第一个计算方案，进行仿真。
+            
+            :param: job 计算方案名称，可选，字符串类型或者字典类型,默认使用第一个计算方案，如果同名使用最靠前一个
+            :param: config 参数方案，可选，字符串类型或者字典类型,默认使用保存时选中的参数方案
+
+            :return: runner Runner[IESResult]
+        '''
+        if job is None:
+            currentJob = self.context['currentJob']
+            job = self.jobs[currentJob]
+            if job['rid'] != 'job-definition/ies/ies-power-flow':
+                for j in self.jobs:
+                    if j['rid'] == 'job-definition/ies/ies-power-flow':
+                        job = j
+        if job is None:
+            raise Exception("找不到时序潮流方案内核运行的计算方案")
+        if job['rid'] != 'job-definition/ies/ies-power-flow':
+            raise Exception("不是时序潮流方案内核运行生成算法的计算方案")
+        if config is None:
+            currentConfig = self.context['currentConfig']
+            config = self.configs[currentConfig]
+        return self.run(job=job, config=config)
+
+    def runIESEnergyStoragePlan(self,job=None,config=None)->Runner[IESResult]:
+        '''
+            运行 储能规划方案 内核，如果当前 model 没有创建  Job 时报错，默认使用第一个计算方案，进行仿真。
+            
+            :param: job 计算方案名称，可选，字符串类型或者字典类型,默认使用第一个计算方案，如果同名使用最靠前一个
+            :param: config 参数方案，可选，字符串类型或者字典类型,默认使用保存时选中的参数方案
+
+            :return: runner Runner[IESResult]
+        '''
+        if job is None:
+            currentJob = self.context['currentJob']
+            job = self.jobs[currentJob]
+            if job['rid'] != 'job-definition/ies/ies-energy-storage-plan':
+                for j in self.jobs:
+                    if j['rid'] == 'job-definition/ies/ies-energy-storage-plan':
+                        job = j
+        if job is None:
+            raise Exception("找不到储能规划方案内核运行的计算方案")
+        if job['rid'] != 'job-definition/ies/ies-energy-storage-plan':
+            raise Exception("不是储能规划方案内核运行生成算法的计算方案")
+        if config is None:
+            currentConfig = self.context['currentConfig']
+            config = self.configs[currentConfig]
+        return self.run(job=job, config=config)
+

{cloudpss-3.5.0a1 → cloudpss-4.0.0a3}/cloudpss/model/revision.py

@@ -21,7 +21,6 @@ class ModelRevision(object):
 
 
     """
-
     def __init__(self, revision: dict = {}):
         """
             初始化
@@ -55,7 +54,7 @@ class ModelRevision(object):
 
         return self.implements
 
-    def run(self, job, config, name=None, rid='', policy=None, **kwargs):
+    def run(self, job, config, name=None, rid='', **kwargs):
         """
             运行某个指定版本的项目
 
@@ -69,7 +68,7 @@ class ModelRevision(object):
             >>> revision.run(revision,job,config,'')
         """
         revision = ModelRevision.create(self)
-        return Runner.create(revision['hash'], job, config, name, rid, policy,
+        return Runner.create(revision['hash'], job, config, name, rid,
                              **kwargs)
 
     @staticmethod