cloudpss 4.1.1b8__py3-none-any.whl → 4.5.0__py3-none-any.whl

cloudpss/ieslab/IESLabPlan.py

@@ -1,14 +1,14 @@
 import json
 
 from cloudpss.ieslab.DataManageModel import IESPlanDataManageModel
-from cloudpss.ieslab.EvaluationModel import IESLabEvaluationModel
+from cloudpss.ieslab.EvaluationModel import IESLabPlanEvaluationModel
 from cloudpss.ieslab.PlanModel import IESLabPlanModel
 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
+from cloudpss.runner.IESLabEvaluationResult import IESLabPlanEvaluationResult
 
 class IESLabPlan(object):
     def __init__(self, project={}):
@@ -23,9 +23,9 @@ class IESLabPlan(object):
             self.model = Model.fetch(self.__modelRid)
         self.dataManageModel = IESPlanDataManageModel(self.id)
         self.planModel = IESLabPlanModel(self.id)
-        self.evaluationModel = IESLabEvaluationModel(self.id)
+        self.evaluationModel = IESLabPlanEvaluationModel(self.id)
         self.currentPlanResult = IESLabPlanResult(self.id)
-        self.currentEvaluationResult = IESLabEvaluationResult(self.id)
+        self.currentEvaluationResult = IESLabPlanEvaluationResult(self.id)
 
     @staticmethod
     def fetch(simulationId):
@@ -130,3 +130,81 @@ class IESLabPlan(object):
             :return: Boolean
         '''
         return self.planModel.kill()
+
+    @staticmethod
+    def createProjectGroup(group_name, desc=None, createById=None):
+        '''
+            创建项目组
+
+            :params group_name: String 项目组名称 
+            :params desc: String 项目组描述 可选参数
+            :params createById Int 父项目组id  可选参数，如果是从已有项目组导入的项目组，必填此项
+
+            :return: Int 返回创建的项目组id
+        '''
+        try:
+            if createById is None: 
+                isImport = 0
+            else:
+                isImport = 1
+            payload = {
+                'group_name': group_name,
+                'desc': desc,
+                'isImport': isImport,
+                'createById': createById,
+            }
+            r = request(
+                'POST', 'api/ieslab-plan/rest/projectgroup/', data=json.dumps(payload))
+            project = json.loads(r.text)
+            return project.get('id', None)
+        except Exception as e:
+            raise Exception('创建项目组失败')
+
+    @staticmethod  
+    def createProject(name, project_group, start_date, end_date, construction_cycle, desc=None, createById=None):
+        '''
+            创建项目
+
+            :params name: String 项目名称 
+            :params project_group: Int 父项目组id
+            :param start_date: Int 项目开始年限，范围在[1500,3000]之间
+            :param end_date: Int 项目结束年限，范围在项目开始时间之后且不超过五十年
+            :param construction_cycle: Int 项目建设周期(年), 必须小于等于 项目结束年限 - 项目开始年限
+            :params desc: String 项目描述, 可选参数
+            :params createById Int 父项目id, 可选参数, 如果是从已有项目导入的项目，必填此项
+
+            :return: Int 返回创建的项目id
+        '''
+        try:
+            if start_date < 1500 or start_date > 3000:
+                raise Exception('项目开始年限错误，范围在[1500,3000]之间')
+            if end_date < start_date or end_date > start_date + 50:
+                raise Exception('项目结束年限错误，范围在项目开始时间之后且不超过五十年')
+            if construction_cycle > end_date - start_date:
+                raise Exception('项目建设周期错误，必须小于等于 项目结束年限 - 项目开始年限')
+            if createById is None: 
+                payload = {
+                    'name': name,
+                    'project_group': project_group,
+                    'start_date': start_date,
+                    'end_date': end_date,
+                    'construction_cycle': construction_cycle,
+                    'desc': desc
+                }
+            else:
+                payload = {
+                    'name': name,
+                    'project_group': project_group,
+                    'start_date': start_date,
+                    'end_date': end_date,
+                    'construction_cycle': construction_cycle,
+                    'desc': desc,
+                    'createById': createById
+                }
+            r = request(
+                'POST', 'api/ieslab-plan/rest/simu/', data=json.dumps(payload))
+            project = json.loads(r.text)
+            return project.get('id', None)
+        except Exception as e:
+            raise Exception('创建项目失败')
+

cloudpss/ieslab/IESLabSimulation.py

@@ -5,7 +5,7 @@ from .DataManageModel import IESSimulationDataManageModel
 
 
 class IESLabSimulation(object):
-    def __init__(self, project={},model=None):
+    def __init__(self, project={},model:Model=None):
         '''
             初始化
         '''
@@ -36,26 +36,7 @@ class IESLabSimulation(object):
             return IESLabSimulation(project,model)
         except:
             raise Exception('未查询到当前算例')
-    @staticmethod
-    async def fetchAsync(simulationId):
-        '''
-            获取算例信息
-
-            :params: simulationId string类型，代表数据项的算例id
-
-            :return: IESLabSimulation
-        '''
-        try:
-            r = request(
-                'GET', 'api/ieslab-simulation/rest/simu/{0}/'.format(simulationId))
-            project = json.loads(r.text)
-            modelRid = project.get('model', None)
-            model=None
-            if modelRid is not None:
-                model =await Model.fetchAsync(modelRid)
-            return IESLabSimulation(project,model)
-        except:
-            raise Exception('未查询到当前算例')
+   
     def run(self, job=None, name=None):
         '''
             调用仿真 
@@ -71,19 +52,65 @@ class IESLabSimulation(object):
 
         job['args']['simulationId'] = self.id
         return self.model.run(job, name=name)
-
-    async def runAsync(self, job=None, name=None):
+    
+    @staticmethod
+    def createProjectGroup(group_name, desc=None, createById=None):
         '''
-            调用仿真 
+            创建项目组
 
-            :params job:  调用仿真时使用的计算方案，不指定将使用算例保存时选中的计算方案
-            :params name:  任务名称，为空时使用项目的参数方案名称和计算方案名称
+            :params group_name: String 项目组名称 
+            :params desc: String 项目组描述 可选参数
+            :params createById Int 父项目组id  可选参数，如果是从已有项目组导入的项目组，必填此项
 
-            :return: 返回一个运行实例
+            :return: Int 返回创建的项目组id
         '''
-        if job is None:
-            currentJob = self.model.context['currentJob']
-            job = self.model.jobs[currentJob]
+        try:
+            if createById is None: 
+                isImport = 0
+            else:
+                isImport = 1
+            payload = {
+                'group_name': group_name,
+                'desc': desc,
+                'isImport': isImport,
+                'createById': createById,
+            }
+            r = request(
+                'POST', 'api/ieslab-simulation/rest/projectgroup/', data=json.dumps(payload))
+            project = json.loads(r.text)
+            return project.get('id', None)
+        except Exception as e:
+            raise Exception('创建项目组失败')
 
-        job['args']['simulationId'] = self.id
-        return await self.model.runAsync(job, name=name)
+    @staticmethod 
+    def createProject(name, project_group, desc=None, createById=None):
+        '''
+            创建项目
+
+            :params name: String 项目名称 
+            :params project_group: Int 父项目组id,
+            :params desc: String 项目描述, 可选参数
+            :params createById Int 父项目id, 可选参数, 如果是从已有项目导入的项目，必填此项
+
+            :return: Int 返回创建的项目id
+        '''
+        try:
+            if createById is None: 
+                payload = {
+                    'name': name,
+                    'project_group': project_group,
+                    'desc': desc
+                }
+            else:
+                payload = {
+                    'name': name,
+                    'project_group': project_group,
+                    'desc': desc,
+                    'createById': createById
+                }
+            r = request(
+                'POST', 'api/ieslab-simulation/rest/simu/', data=json.dumps(payload))
+            project = json.loads(r.text)
+            return project.get('id', None)
+        except Exception as e:
+            raise Exception('创建项目失败')

cloudpss/ieslab/PlanModel.py

@@ -1,12 +1,15 @@
-from cloudpss.runner.IESLabPlanResult import IESLabPlanResult
-from cloudpss.runner.runner import HttpRunner, Runner
+from cloudpss.runner.IESLabPlanResult import IESLabPlanResult, IESLabOptResult
+from cloudpss.runner.runner import HttpRunner, HttpOPTRunner
+from cloudpss.model import Model
+from cloudpss.model.revision import ModelRevision
 from ..utils import request, fileLoad
 import json
 from enum import IntEnum, unique
 
 
 class IESLabPlanModel(object):
-    _baseUri = 'api/ieslab-plan/taskmanager/getSimuLastTasks'
+    _baseUri = 'api/ieslab-plan/rest'
+    _runUri = 'api/ieslab-plan/taskmanager'
 
     def __init__(self, simulationId):
         '''
@@ -14,44 +17,83 @@ class IESLabPlanModel(object):
         '''
         self.simulationId = simulationId
         self.optimizationInfo = self.GetOptimizationInfo()
-        self.OptimizationMode = OptimizationMode
+        # self.OptimizationMode = OptimizationMode
 
-    def _fetchItemData(self, url):
+    def _fetchItemData(self, url, params):
         '''
             获取当前算例的优化目标设置信息
 
-            :return: enum 类型，代表经济性优化和环保性优化的类型
+            :return: List 类型，包括优化目标和全局参数储能动作灵敏度，若没有设置则返回 []
         '''
-        r = request('GET', url, params={"simuid": self.simulationId})
+        r = request('GET', url, params=params)
         data = json.loads(r.text)
-        return data
+        return data['results']
 
     def GetOptimizationInfo(self):
         '''
             获取当前算例的优化目标设置信息
 
-            :return: enum 类型，代表经济性优化和环保性优化的类型
+            :return: Dict 类型，例如：{'OptimizationMode': <OptimizationMode.经济性: 0>, 'StoSen': 0.1}
         '''
         try:
-            data = self._fetchItemData(self._baseUri)
-            for e in OptimizationMode:
-                if (e.value == data['data']['optimizationpara']
-                    ['OptimizationMode']):
-                    return e
+            url = f'{self._baseUri}/simuOpt/'
+            params = {"simu_id": self.simulationId}
+            r = self._fetchItemData(url, params)
+            if (len(r) == 0): 
+                return {
+                    "OptimizationMode": OptimizationMode['经济性'],
+                    "StoSen": 0.1
+                }
+            else:
+                value = json.loads(r[0]['opt_params'])
+                return {
+                    "OptimizationMode": OptimizationMode(value['OptimizationMode']),
+                    "StoSen": value['StoSen']
+                }
         except:
-            return OptimizationMode['经济性']
+            raise Exception('获得优化目标设置失败')
 
-    def SetOptimizationInfo(self, optType):
+    def SetOptimizationInfo(self, data: dict):
         '''
-            无对应接口
             设置当前算例的优化目标
 
-            :param optType: enum 类型，代表经济性优化和环保性优化的类型
-        '''
-        self.optimizationInfo = optType
-        return True
+            :param data: dict 类型，例如：{'OptimizationMode': <OptimizationMode.经济性: 0>, 'StoSen': 0.1}
 
-    def run(self) -> Runner[IESLabPlanResult]:
+            :return: boolean 类型，为 True 则设置成功
+        '''
+        try:
+            url = f'{self._baseUri}/simuOpt/'
+            params = {"simu_id": self.simulationId}
+            r = self._fetchItemData(url, params)
+            opt_params = {
+                "OptimizationMode": data.get('OptimizationMode', '').value,
+                "StoSen": data.get('StoSen', ''),
+                "ProjectPeriod": "20"
+            }
+            if(len(r) == 0):
+                payload = {
+                    "simu_id": self.simulationId,
+                    "opt_params": json.dumps(opt_params)
+                }
+                r = request('POST',
+                            url,
+                            data=json.dumps(payload))
+                return True
+            else:
+                url2 = f'{self._baseUri}/simuOpt/{r[0]["id"]}/'
+                payload = {
+                    "simu_id": self.simulationId,
+                    "opt_params": json.dumps(opt_params),
+                    "id": r[0]["id"]
+                }
+                r = request('PUT',
+                            url2,
+                            data=json.dumps(payload))
+                return True
+        except:
+            return False
+    
+    def run(self) -> HttpRunner[IESLabPlanResult]:
         '''
             生成方案优选算例
 
@@ -61,10 +103,12 @@ class IESLabPlanModel(object):
         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
+            url = f'api/{self._runUri}/runOptimization'
+            opt = {
+                "OptimizationMode": self.optimizationInfo.get('OptimizationMode', 0).value,
+                "ProjectPeriod": "20",
+                "StoSen": self.optimizationInfo.get('StoSen', 0.1)
+            }
             try:
                 r = request('GET',
                             url,
@@ -72,17 +116,14 @@ class IESLabPlanModel(object):
                                 "simuid":
                                 self.simulationId,
                                 "optPara":
-                                json.dumps({
-                                    "OptimizationMode": optType,
-                                    "ProjectPeriod": "20"
-                                })
+                                json.dumps(opt)
                             })
                 data = json.loads(r.text)
                 return HttpRunner({}, self.simulationId)
             except:
                 raise Exception('生成方案优选算例失败')
 
-    def GetRunner(self) -> Runner[IESLabPlanResult]:
+    def GetRunner(self) -> HttpRunner[IESLabPlanResult]:
         '''
             获得运行实例
 
@@ -100,7 +141,7 @@ class IESLabPlanModel(object):
             data = res.get('data', {})
             if data is not None:
                 taskID = data.get('task_id', '')
-        url = f'api/ieslab-plan/taskmanager/removeOptimizationTask'
+        url = f'{self._runUri}/removeOptimizationTask'
         try:
             r = request('GET',
                         url,
@@ -128,7 +169,208 @@ class IESLabPlanModel(object):
                 status = data.get('status', '')
                 if status == 'stop':
                     isRunning = False
-        logs = IESLabPlanResult(self.simulationId).GetLogs()
+        try:
+            
+            logs = IESLabPlanResult(self.simulationId).GetLogs()
+            if logs is not None:
+                for log in logs:
+                    if(log.get('data', '') == 'run ends'):
+                        isRunning = False
+                        break
+        except:
+            return False
+        return isRunning
+
+
+  
+class IESLabOptModel(object):
+    _baseUri = 'api/ieslab-opt/rest'
+    _runUri = 'api/ieslab-opt/taskmanager'
+
+
+    def __init__(self, simulationId, rid):
+        '''
+            初始化
+        '''
+        self.simulationId = simulationId
+        self.rid = rid
+        self.optimizationInfo = self.GetOptimizationInfo()
+
+    def _fetchItemData(self, url, params):
+        '''
+            获取当前算例的优化目标设置信息
+
+            :return: List 类型，包括优化目标和全局参数储能动作灵敏度，若没有设置则返回 []
+        '''
+        r = request('GET', url, params=params)
+        data = json.loads(r.text)
+        return data['results']
+
+    def GetOptimizationInfo(self):
+        '''
+            获取当前算例的优化目标设置信息
+
+            :return: Dict 类型，例如：{'OptGoal': <OptimizationMode.经济性: 0>, 'StoSen': "10", '@debug': '', 'clustering_algorithm': '0', 'num_method': '0', 'PowUnPrice': '1000', 'HeatAbandonPrice': '1000'}
+        '''
+        try:
+            url = f'{self._baseUri}/simuOpt/'
+            params = {"simu_id": self.simulationId}
+            r = self._fetchItemData(url, params)
+            if (len(r) == 0): 
+                return {
+                    "OptGoal": OptimizationMode['经济性'],
+                    "StoSen": "10",
+                    "@debug": "",
+                    "clustering_algorithm": "0",
+                    "num_method": "0",
+                    "PowUnPrice": "1000",
+                    "HeatAbandonPrice": "1000"
+                }
+            else:
+                value = json.loads(r[0]['opt_params'])
+                return {
+                    "OptGoal": OptimizationMode(int(value['OptGoal'])),
+                    "StoSen": value['StoSen'],
+                    "@debug": value["@debug"],
+                    "clustering_algorithm": value["clustering_algorithm"],
+                    "num_method": value["num_method"],
+                    "PowUnPrice": value["PowUnPrice"],
+                    "HeatAbandonPrice": value["HeatAbandonPrice"]
+                }
+        except:
+            raise Exception('获得优化目标设置失败')
+
+    def SetOptimizationInfo(self, data: dict):
+        '''
+            设置当前算例的优化目标
+
+            :param data: dict 类型，例如：{'OptGoal': <OptimizationMode.经济性: 0>, 'StoSen': "10", '@debug': '', 'clustering_algorithm': '0', 'num_method': '0', 'PowUnPrice': '1000', 'HeatAbandonPrice': '1000'}
+
+            :return: boolean 类型，为 True 则设置成功
+        '''
+        try:
+            url = f'{self._baseUri}/simuOpt/'
+            params = {"simu_id": self.simulationId}
+            r = self._fetchItemData(url, params)
+            opt_params = {
+                "OptGoal": data.get('OptGoal', ''),
+                "StoSen": data.get('StoSen', ''),
+                "@debug": data.get('@debug', ''),
+                "clustering_algorithm": data.get('clustering_algorithm', ''),
+                "num_method": data.get('num_method', ''),
+                "PowUnPrice": data.get('PowUnPrice', ''),
+                "HeatAbandonPrice": data.get('HeatAbandonPrice', '')
+            }
+            if(len(r) == 0):
+                payload = {
+                    "simu_id": self.simulationId,
+                    "opt_params": json.dumps(opt_params)
+                }
+                r = request('POST',
+                            url,
+                            data=json.dumps(payload))
+                return True
+            else:
+                url2 = f'{self._baseUri}/simuOpt/{r[0]["id"]}/'
+                payload = {
+                    "simu_id": self.simulationId,
+                    "opt_params": json.dumps(opt_params),
+                    "id": r[0]["id"]
+                }
+                r = request('PUT',
+                            url2,
+                            data=json.dumps(payload))
+                return True
+        except:
+            return False
+    
+    def run(self) -> HttpOPTRunner[IESLabOptResult]:
+        '''
+            生成方案优选算例
+
+            :return: Runner[IESLabOptResult]
+        '''
+        isRunning = self.GetLastTaskResult()
+        if isRunning:
+            raise Exception('该算例正在运行！请从浏览器算例页面点击结束运行或者调用IESPlan对象的kill接口终止计算后重试！')
+        else:
+            # 通过 rid 获取 model
+            model = Model.fetch(self.rid)
+            # 通过 model 获取 revision
+            revision = ModelRevision.create(model.revision, model.revision.hash)
+            hash = revision.get('hash', '')
+            url = f'{self._runUri}/runOptimization'
+            opt = {
+                "OptGoal": self.optimizationInfo.get('OptGoal', 0).value,
+                "StoSen": self.optimizationInfo.get('StoSen', 10),
+                "@debug": self.optimizationInfo.get('@debug', ''),
+                "clustering_algorithm": self.optimizationInfo.get('clustering_algorithm', '0'),
+                "num_method": self.optimizationInfo.get('num_method', '0'),
+                "PowUnPrice": self.optimizationInfo.get('PowUnPrice', '1000'),
+                "HeatAbandonPrice": self.optimizationInfo.get('HeatAbandonPrice', '1000'),
+            }
+            try:
+                r = request('GET',
+                            url,
+                            params={
+                                "simuid":
+                                self.simulationId,
+                                "optPara":
+                                json.dumps(opt),
+                                "revision": hash
+                            })
+                data = json.loads(r.text)
+                return HttpOPTRunner({}, self.simulationId)
+            except:
+                raise Exception('生成方案优选算例失败')
+
+    def GetRunner(self) -> HttpOPTRunner[IESLabOptResult]:
+        '''
+            获得运行实例
+
+            :return: Runner[IESLabOptResult]
+        '''
+        return HttpOPTRunner({}, self.simulationId)
+    
+    def kill(self) -> bool:
+        '''
+            停止并删除当前运行的优化算例
+        '''
+        res = IESLabOptResult(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'{self._runUri}/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 = IESLabOptResult(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 = IESLabOptResult(self.simulationId).GetLogs()
         if logs is not None:
             for log in logs:
                 if(log.get('data', '') == 'run ends'):
@@ -137,6 +379,7 @@ class IESLabPlanModel(object):
         return isRunning
 
 
+
 # @unique
 class OptimizationMode(IntEnum):
     经济性 = 0

cloudpss/ieslab/__init__.py

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