cloudpss 4.5.13__py3-none-any.whl → 4.5.15__py3-none-any.whl

cloudpss/__init__.py

@@ -9,10 +9,11 @@ from . import function
 from .job import Job
 from .function import FunctionExecution
 from .version import __version__
+from .dslab import DSLab
 __all__ = [
     'setToken', 'Model', 'ModelRevision', 'ModelTopology', 'Runner', 'Result',
     'PowerFlowResult', 'EMTResult', 'MatlabDataEncoder', 'DateTimeEncode',
-    'function', 'Project', 'currentJob', 'IESLabSimulation', 'IESLabPlan','IESLabOpt','__version__','Job'
+    'function', 'Project', 'currentJob', 'IESLabSimulation', 'IESLabPlan','IESLabOpt','__version__','Job','DSLab'
 ]
 
 

cloudpss/ieslab/DataManageModel.py

@@ -125,7 +125,6 @@ class DataManageModel(object):
         assert (dataType in self._kindNameMap
                 or dataType in self._kindUrlMap), "数据类型不存在"
         kind = self._kindNameMap.get(dataType, dataType)
-        print(kind)
         return copy.deepcopy(self._kindItemDataMap[kind])
 
     def AddDataItem(self, dataType, data):
@@ -496,6 +495,7 @@ class IESOptDataManageModel(DataManageModel):
         "储氨罐": "AmmoniaStoTank",
         "制氮设备": "NitrogenProduction",
         "氨负荷": "ammoniaLoad",
+        "氨": "Ammonia",
     }
     _kindUrlMap = {
         "PhotovoltaicSys": "api/ieslab-opt/rest/dpcs/",
@@ -546,5 +546,6 @@ class IESOptDataManageModel(DataManageModel):
         "AmmoniaStoTank": "api/ieslab-opt/rest/escs/",
         "NitrogenProduction": "api/ieslab-opt/rest/asec/",
         "ammoniaLoad": "api/ieslab-opt/rest/ammoniaLoad/",
+        "Ammonia": "api/ieslab-opt/rest/ammonia/",
     }
     pass

cloudpss/ieslab/IESLabOpt.py

@@ -1,235 +1,236 @@
-import json
-
-from cloudpss.ieslab.DataManageModel import IESOptDataManageModel
-from cloudpss.ieslab.EvaluationModel import IESLabOptEvaluationModel
-from cloudpss.ieslab.PlanModel import IESLabOptModel
-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 IESLabOptResult
-from cloudpss.runner.IESLabEvaluationResult import IESLabOptEvaluationResult
-
-class IESLabOpt(object):
-    def __init__(self, project={}):
-        '''
-            初始化
-        '''
-        self.id = project.get('id', None)
-        self.name = project.get('name', None)
-        self.__modelRid = project.get('model', None)
-        self.project_group = project.get('project_group', None)
-        self.start_date = project.get('start_date', None)
-        self.end_date = project.get('end_date', None)
-        if self.__modelRid is not None:
-            self.model = Model.fetch(self.__modelRid)
-        self.dataManageModel = IESOptDataManageModel(self.id)
-        self.planModel = IESLabOptModel(self.id, self.model.rid)
-        self.evaluationModel = IESLabOptEvaluationModel(self.id)
-        self.currentPlanResult = IESLabOptResult(self.id)
-        self.currentEvaluationResult = IESLabOptEvaluationResult(self.id)
-
-    @staticmethod
-    def fetch(simulationId):
-        '''
-            获取算例信息
-
-            :params: simulationId string类型，代表数据项的算例id
-
-            :return: IESLabOpt
-        '''
-        try:
-            r = request('GET',
-                        'api/ieslab-opt/rest/simu/{0}/'.format(simulationId))
-            project = json.loads(r.text)
-            return IESLabOpt(project)
-        except:
-            raise Exception('未查询到当前算例')
-
-    def __run(self, job=None, name=None):
-        '''
-            调用仿真 
-
-            :params job:  调用仿真时使用的计算方案，不指定将使用算例保存时选中的计算方案
-            :params name:  任务名称，为空时使用项目的参数方案名称和计算方案名称
-
-            :return: 返回一个运行实例
-        '''
-        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)
-
-    def iesLabTypicalDayRun(self, job=None, name=None, **kwargs)->Runner[IESLabTypicalDayResult]:
-        '''
-            运行典型日计算 
-
-            :params job:  调用仿真时使用的计算方案，不指定将使用算例保存时选中的计算方案
-            :params name:  任务名称，为空时使用项目的参数方案名称和计算方案名称
-
-            :return: Runner[IESLabTypicalDayResult]
-        '''
-        if job is None:
-            currentJob = self.model.context['currentJob']
-            job = self.model.jobs[currentJob]
-            if job['rid'] != 'function/CloudPSS/ieslab-gmm-opt':
-                for j in self.model.jobs:
-                    if j['rid'] == 'job-definition/ies/ies-gmm-opt' or j['rid'] == 'job-definition/cloudpss/ieslab-gmm-opt':
-                        j['rid'] = 'function/CloudPSS/ieslab-gmm-opt'
-                        job = j
-        if job is None:
-            raise Exception("找不到默认的综合能源系统规划典型日生成算法的计算方案")
-        if job['rid'] != 'function/CloudPSS/ieslab-gmm-opt':
-            raise Exception("不是综合能源系统规划典型日生成算法的计算方案")
-        return self.__run(job=job, name=name)
-
-    def iesLabEvaluationRun(self, planId, type=None):
-        '''
-            运行方案评估
-
-            :param planID int类型，表示优化方案的ID，数值位于0~优化方案数量之间
-            :param type string类型，表示评估类型，可选值为：能效评价、环保评价
-
-            :return: 方案评估运行实例
-
-        '''
-        return self.evaluationModel.run(planId, type)
-
-    def iesLabEnergyEvaluationRun(self, planId):
-        '''
-            运行能效评价
-
-            :param planID int类型，表示优化方案的ID，数值位于0~优化方案数量之间
-
-            :return: 能效评价运行实例
-
-        '''
-        return self.evaluationModel.EnergyEvaluationRun(planId)
-
-    def iesLabEnvironmentalEvaluationRun(self, planId):
-        '''
-            运行环保评价
-
-            :param planID int类型，表示优化方案的ID，数值位于0~优化方案数量之间
-
-            :return: 环保评价运行实例
-        '''
-        return self.evaluationModel.EnvironmentalEvaluationRun(planId)
-
-    def iesLabOptRun(self):
-        '''
-            生成方案优选算例
-
-            :return: 方案优选运行实例
-        '''
-        return self.planModel.run()
-    
-    def iesLabOptKill(self):
-        '''
-            停止并删除方案优选算例
-
-            :return: Boolean
-        '''
-        return self.planModel.kill()
-    
-    def createProjectGroup(self, name):
-        '''
-            创建项目组
-
-            :params name: 项目组名称
-
-            :return: 返回一个创建的项目组
-        '''
-
-    @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-opt/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-opt/rest/simu/', data=json.dumps(payload))
-            project = json.loads(r.text)
-            return project.get('id', None)
-        except Exception as e:
-            raise Exception('创建项目失败')
-
-
-    @staticmethod
-    def getProjectList():
-        '''
-            获取项目组列表
-
-            :return: 返回项目组列表
-        '''
-        try:
-            r = request('GET', 'api/ieslab-opt/rest/projectgroup/?mode=simu')
-            project = json.loads(r.text)
-            return project
-        except Exception as e:
+import json
+
+from cloudpss.ieslab.DataManageModel import IESOptDataManageModel
+from cloudpss.ieslab.EvaluationModel import IESLabOptEvaluationModel
+from cloudpss.ieslab.PlanModel import IESLabOptModel
+# 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 IESLabOptResult
+from cloudpss.runner.IESLabEvaluationResult import IESLabOptEvaluationResult
+from cloudpss.job.result.IESLabTypicalDayResult import IESLabTypicalDayResult
+
+class IESLabOpt(object):
+    def __init__(self, project={}):
+        '''
+            初始化
+        '''
+        self.id = project.get('id', None)
+        self.name = project.get('name', None)
+        self.__modelRid = project.get('model', None)
+        self.project_group = project.get('project_group', None)
+        self.start_date = project.get('start_date', None)
+        self.end_date = project.get('end_date', None)
+        if self.__modelRid is not None:
+            self.model = Model.fetch(self.__modelRid)
+        self.dataManageModel = IESOptDataManageModel(self.id)
+        self.planModel = IESLabOptModel(self.id, self.model.rid)
+        self.evaluationModel = IESLabOptEvaluationModel(self.id)
+        self.currentPlanResult = IESLabOptResult(self.id)
+        self.currentEvaluationResult = IESLabOptEvaluationResult(self.id)
+
+    @staticmethod
+    def fetch(simulationId):
+        '''
+            获取算例信息
+
+            :params: simulationId string类型，代表数据项的算例id
+
+            :return: IESLabOpt
+        '''
+        try:
+            r = request('GET',
+                        'api/ieslab-opt/rest/simu/{0}/'.format(simulationId))
+            project = json.loads(r.text)
+            return IESLabOpt(project)
+        except:
+            raise Exception('未查询到当前算例')
+
+    def __run(self, job=None, name=None):
+        '''
+            调用仿真 
+
+            :params job:  调用仿真时使用的计算方案，不指定将使用算例保存时选中的计算方案
+            :params name:  任务名称，为空时使用项目的参数方案名称和计算方案名称
+
+            :return: 返回一个运行实例
+        '''
+        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)
+
+    def iesLabTypicalDayRun(self, job=None, name=None, **kwargs)-> Runner[IESLabTypicalDayResult]:
+        '''
+            运行典型日计算 
+
+            :params job:  调用仿真时使用的计算方案，不指定将使用算例保存时选中的计算方案
+            :params name:  任务名称，为空时使用项目的参数方案名称和计算方案名称
+
+            :return: Runner[IESLabTypicalDayResult]
+        '''
+        if job is None:
+            currentJob = self.model.context['currentJob']
+            job = self.model.jobs[currentJob]
+            if job['rid'] != 'function/CloudPSS/ieslab-gmm-opt':
+                for j in self.model.jobs:
+                    if j['rid'] == 'job-definition/ies/ies-gmm-opt' or j['rid'] == 'job-definition/cloudpss/ieslab-gmm-opt':
+                        j['rid'] = 'function/CloudPSS/ieslab-gmm-opt'
+                        job = j
+        if job is None:
+            raise Exception("找不到默认的综合能源系统规划典型日生成算法的计算方案")
+        if job['rid'] != 'function/CloudPSS/ieslab-gmm-opt':
+            raise Exception("不是综合能源系统规划典型日生成算法的计算方案")
+        return self.__run(job=job, name=name)
+
+    def iesLabEvaluationRun(self, planId, type=None):
+        '''
+            运行方案评估
+
+            :param planID int类型，表示优化方案的ID，数值位于0~优化方案数量之间
+            :param type string类型，表示评估类型，可选值为：能效评价、环保评价
+
+            :return: 方案评估运行实例
+
+        '''
+        return self.evaluationModel.run(planId, type)
+
+    def iesLabEnergyEvaluationRun(self, planId):
+        '''
+            运行能效评价
+
+            :param planID int类型，表示优化方案的ID，数值位于0~优化方案数量之间
+
+            :return: 能效评价运行实例
+
+        '''
+        return self.evaluationModel.EnergyEvaluationRun(planId)
+
+    def iesLabEnvironmentalEvaluationRun(self, planId):
+        '''
+            运行环保评价
+
+            :param planID int类型，表示优化方案的ID，数值位于0~优化方案数量之间
+
+            :return: 环保评价运行实例
+        '''
+        return self.evaluationModel.EnvironmentalEvaluationRun(planId)
+
+    def iesLabOptRun(self):
+        '''
+            生成方案优选算例
+
+            :return: 方案优选运行实例
+        '''
+        return self.planModel.run()
+    
+    def iesLabOptKill(self):
+        '''
+            停止并删除方案优选算例
+
+            :return: Boolean
+        '''
+        return self.planModel.kill()
+    
+    def createProjectGroup(self, name):
+        '''
+            创建项目组
+
+            :params name: 项目组名称
+
+            :return: 返回一个创建的项目组
+        '''
+
+    @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-opt/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-opt/rest/simu/', data=json.dumps(payload))
+            project = json.loads(r.text)
+            return project.get('id', None)
+        except Exception as e:
+            raise Exception('创建项目失败')
+
+
+    @staticmethod
+    def getProjectList():
+        '''
+            获取项目组列表
+
+            :return: 返回项目组列表
+        '''
+        try:
+            r = request('GET', 'api/ieslab-opt/rest/projectgroup/?mode=simu')
+            project = json.loads(r.text)
+            return project
+        except Exception as e:
             raise Exception('获取项目组列表失败')

cloudpss/job/job.py

@@ -65,6 +65,7 @@ class Job(Generic[T]):
         input,
         output,
         position,
+        **kwargs
     ):
         super(Job, self).__init__()
         self.id = id
@@ -84,9 +85,10 @@ class Job(Generic[T]):
         self.__receiver = None
         self.__sender = None
         self._result = None
+        self.baseUrl = kwargs.get("baseUrl", None)
 
     @staticmethod
-    def fetch(id):
+    def fetch(id, **kwargs):
         """
         获取job信息
         """
@@ -94,11 +96,10 @@ class Job(Generic[T]):
             raise Exception("id is None")
        
         variables = {"_a": {"id": id}}
-
-        r =  graphql_request(Job.__jobQuery, variables)
+        r =  graphql_request(Job.__jobQuery, variables,**kwargs)
         if "errors" in r:
             raise Exception(r["errors"])
-        return Job(**r["data"]["job"])
+        return Job(**r["data"]["job"],**kwargs)
         
     
     # @staticmethod
@@ -162,7 +163,7 @@ class Job(Generic[T]):
         }
         return variables
     @staticmethod
-    def create(revisionHash, job, config, name=None, rid=None, policy=None, **kwargs):
+    def create(revisionHash, job, config, name=None, rid=None, policy=None,  **kwargs):
         """
         创建一个运行任务
 
@@ -177,11 +178,11 @@ class Job(Generic[T]):
         >>> runner = Runner.runRevision(revision,job,config,'')
         """
         variables=Job.__createJobVariables(job, config, revisionHash, rid=rid, policy=policy, **kwargs)
-        r =  graphql_request(Job.__createJobQuery, variables)
+        r =  graphql_request(Job.__createJobQuery, variables,**kwargs)
         if "errors" in r:
             raise Exception(r["errors"])
         id = r["data"]["job"]["id"]
-        return  Job.fetch(id)
+        return  Job.fetch(id,**kwargs)
         
     
 
@@ -202,7 +203,7 @@ class Job(Generic[T]):
         if receiver is not None:
             self.__receiver = receiver
         if self.__receiver is None:
-            self.__receiver = MessageStreamReceiver(self)
+            self.__receiver = MessageStreamReceiver(self.output,baseUrl=self.baseUrl)
             self.__receiver.connect(**kwargs)
         return self.__receiver
 
@@ -216,7 +217,7 @@ class Job(Generic[T]):
         if sender is not None:
             self.__sender = sender
         if self.__sender is None:
-            self.__sender = MessageStreamSender(self)
+            self.__sender = MessageStreamSender(self.input,baseUrl=self.baseUrl)
         self.__sender.connect_legacy(**kwargs)
         return self.__sender
     
@@ -259,11 +260,13 @@ class Job(Generic[T]):
         sender =  self.write()
         if resultType is None:
             resultType = getResultClass(self.context[0])
-        return resultType(receiver, sender)
+        self._result= resultType(receiver, sender)
+        
+        return self._result
 
     
 
-    def abort(self,timeout=3):
+    def abort(self,timeout=3,**kwargs):
         """
         中断当前运行实例
         """
@@ -276,8 +279,8 @@ class Job(Generic[T]):
         '''
         variables = {
             'input': {
-                'id': self.taskId,
+                'id': self.id,
                 'timeout': timeout
             }
         }
-        graphql_request(query, variables)
+        graphql_request(query, variables,**kwargs)