cloudpss 4.5.13__py3-none-any.whl → 4.5.14__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

@@ -202,7 +202,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)
             self.__receiver.connect(**kwargs)
         return self.__receiver
 
@@ -216,7 +216,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)
         self.__sender.connect_legacy(**kwargs)
         return self.__sender
     
@@ -259,7 +259,9 @@ 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
 
     
 

cloudpss/job/messageStreamReceiver.py

@@ -1,5 +1,9 @@
+import datetime
 import logging
 import sys
+
+from cloudpss.job.TemplateManager import TemplateManager
+
 from .jobReceiver import JobReceiver
 import os
 from urllib.parse import urlparse
@@ -7,7 +11,6 @@ import websocket
 import pytz
 import threading
 import time
-
 utc_tz = pytz.timezone("UTC")
 
 from ..utils.IO import IO
@@ -18,15 +21,31 @@ class Message(object):
         self.id = id
         self.token = token
 
-
+    
+    
 class MessageStreamReceiver(JobReceiver):
-    def __init__(self, job):
+    def __init__(self, output):
         super().__init__()
-        self.job = job
-        self.id =self.job.output
+        self.id = output
         self.origin = os.environ.get("CLOUDPSS_API_URL", "https://cloudpss.net/")
         self.__hasOpen = False
-
+        self.templates=TemplateManager()
+        self.timeOffset=0
+        self.lastMessageTime=0
+    
+    
+    def updateTime(self,timestamp):
+        self.lastMessageTime = timestamp
+        
+    ## 判断是否到达当前时间点的数据或者消息流结束
+    def isEnd(self,current_time=None):
+        
+        if self.status == 1:
+            return True
+        logging.debug('lastMessageTime',self.lastMessageTime)
+        current_time = current_time if current_time is not None else time.time()
+        return (self.lastMessageTime/1000)>=current_time-self.timeOffset
+        
     def __path(self, from_=None):
         if self.id is None:
             raise Exception("id is None")
@@ -39,22 +58,36 @@ class MessageStreamReceiver(JobReceiver):
   
     ###下面是兼容Receiver部分功能实现
     def __on_message_legacy(self,  *args, **kwargs):
-        
         if type(args[0]) != websocket.WebSocketApp:
             message = args[0]
         else:
             message = args[1]
         return self.__on_message(message)
-
     def __on_message(self, message):
-        
-        data = IO.deserialize(message, "ubjson")
-        self.ws.url = self.__path(data["id"])
-        msg = IO.deserialize(data["data"], "ubjson")
-        self.messages.append(msg)
-        if(msg['type']=='terminate'):
-            self.close(self.ws)
-        return msg
+        try:
+            data = IO.deserialize(message, "ubjson")
+            self.updateTime(data["timestamp"])
+            self.ws.url = self.__path(data["id"])
+            msg = IO.deserialize(data["data"], "ubjson")
+            if type(msg) is list:
+                if len(msg) == 3:
+                    pass
+                    
+                    templateMessage = self.templates.invoke(msg)
+                    # print(templateMessage)
+                    for m in templateMessage:
+                        self.messages.append(m)
+                    return
+                else:
+                    self.templates.create(msg)
+                    return
+            
+            self.messages.append(msg)
+            return msg
+        except Exception as e:
+            print(msg)
+            self.ws.close()
+            return None
 
 
     def __on_error(self,  *args, **kwargs):
@@ -101,6 +134,10 @@ class MessageStreamReceiver(JobReceiver):
     
     def __on_open(self,ws, *args, **kwargs):
         self.ws = ws
+        gmt_format = '%a, %d %b %Y %H:%M:%S GMT'
+        serverTime = datetime.datetime.strptime(ws.sock.headers['date'],gmt_format)
+        self.timeOffset = time.time()+time.timezone-serverTime.timestamp()
+        
         logging.debug(f"MessageStreamReceiver on_open")
         self._status = 0
         self.__hasOpen = True
@@ -128,7 +165,7 @@ class MessageStreamReceiver(JobReceiver):
        
 
     def connect(self):
-        self._status = 1
+        self._status = 0
         path = self.__path()
         logging.info(f"receive data from websocket: {path}")
         self.ws = websocket.WebSocketApp(

cloudpss/job/messageStreamSender.py

@@ -12,9 +12,9 @@ import logging
 
 
 class MessageStreamSender:
-    def __init__(self, job):
+    def __init__(self, input):
         super().__init__()
-        self.job = job
+        self.input = input
         self.origin = os.environ.get("CLOUDPSS_API_URL", "https://cloudpss.net/")
         self.__hasOpen = False
 
@@ -60,14 +60,14 @@ class MessageStreamSender:
         同步方法连接ws
         """
         self._status = 0
-        if self.job.input is None:
+        if self.input is None:
             raise Exception("id is None")
-        if self.job.input == "00000000-0000-0000-0000-000000000000":
+        if self.input == "00000000-0000-0000-0000-000000000000":
             return
         u = list(urlparse(self.origin))
         head = "wss" if u[0] == "https" else "ws"
 
-        path = head + "://" + str(u[1]) + "/api/streams/token/" + self.job.input
+        path = head + "://" + str(u[1]) + "/api/streams/token/" + self.input
         logging.debug(f"MessageStreamSender data from websocket: {path}")
 
         self.ws = websocket.WebSocketApp(

cloudpss/job/result/EMTResult.py

@@ -38,6 +38,11 @@ class EMTResult(Result):
         该类只提供 EMT 仿真使用
 
     """
+    
+    def __init__(self, receiver, sender = None):
+        super().__init__(receiver, sender)
+        self.virtualInput=VirtualInput()
+    
     __messageIndex = 0
     def getPlots(self):
         '''

cloudpss/job/result/IESLabTypicalDayResult.py

@@ -1,6 +1,44 @@
 from .IESResult import IESResult
 import re
 import copy
+from cloudpss.job.messageStreamReceiver import MessageStreamReceiver, Message
+import asyncio
+from concurrent.futures import ThreadPoolExecutor
+import threading
+import time
+from queue import Queue
+
+class IESLabTypicalDaySubMessageResult():
+    def __init__(self, output) -> None:
+        self.receiver = MessageStreamReceiver(output)
+        # self.result={}
+    
+    def connect(self):
+        self.receiver.connect()
+    
+    def status(self):
+        return self.receiver.status()
+    
+    def wait(self,timeout=10,current_time=None):
+        start = time.time()
+        while True:
+            time.sleep(0.1)
+            if self.receiver.isEnd(current_time):
+                break
+            if time.time()-start>timeout:
+                break
+                # raise Exception("获取数据超时")
+    
+    def getMessages(self,timeout=10,current_time=None):
+        result={}
+        self.wait(timeout,current_time)
+        
+        for val in self.receiver:
+            if val.get('type',None) !='plot':
+                continue
+            result[val['key']] = val['data']
+        return result
+
 class IESLabTypicalDayResult(IESResult):
     
     def __init__(self, *args, **kwargs):
@@ -12,27 +50,36 @@ class IESLabTypicalDayResult(IESResult):
         self.__typicalIndex = 0
         self.__type_list =['总辐射','散射辐射', '直射辐射','天顶角', '环境温度', '湿球温度','土壤温度', '10m风速', '50m风速','电负荷', '热负荷','冷负荷','氢负荷']
         self.__map_load = { 'maxElectricalLoad':'电负荷', 'maxHeatLoad':'热负荷','maxCoolLoad':'冷负荷','maxHydrogenLoad':'氢负荷' }
+        self.token = ''
         
         self.result = {'TypicalMonth': [{'月份': int,'持续天数': [],**{key: [] for key in self.__type_list}} for i in range(12)],'TypicalDay': []}
+        self.messagemap={}
+
     def __readPlotResult(self):
+
         length = self.getMessageLength()
+
+        print(length)
         if (length > self.__plotIndex):
-            for num in range(self.__plotIndex, length):# update TypicalMonth
-                val = self.getMessage(num)
-                if val['type'] == 'plot':# 每个月各类型数据的各个典型日的数据，由于部分月份可能没有电冷热负荷，某月的某个典型日可能缺少冷热负荷
-                    key_re = re.split('-month',val['key'])#格式为：散射辐射-month1，re后分别为类型和月份
-                    typical_month_m = self.result['TypicalMonth'][int(key_re[1])-1]
-                    typical_month_m['月份'] = int(key_re[1])
-                    val_data_traces = val['data']['traces']
-                    #val['data']['traces'][i]['name']格式为：典型日1-共31天，re正则后[0]为典型日顺序，[1]为持续天数
-                    typicalNum = int(re.findall('\d+',val_data_traces[-1]['name'])[0])
-                    for i in range(typicalNum):#取该类型的最后一个典型日顺序，当该类型缺少后排典型日时，小于实际典型日数量
-                        typical_month_m[key_re[0]].append([])
-                        if key_re[0]  == '环境温度':#各类版本气象数据均有环境温度数据，其典型日数量为实际数量
-                            typical_month_m['持续天数'].append(int(re.findall('\d+',val_data_traces[i]['name'])[1]))
-                    # 当前排典型日缺少数据时，该类型数据为空list[]；当后排典型日缺少数据时，该类型数据为空
-                    for i in range(len(val_data_traces)):
-                        typical_month_m[key_re[0]][int(re.findall('\d+',val_data_traces[i]['name'])[0])-1] = copy.deepcopy(val_data_traces[i]['y']) 
+            
+
+                # stream_id = "fce32578-75c2-4aca-8323-1ce60941e57b"
+
+                # if val['type'] == 'plot':# 每个月各类型数据的各个典型日的数据，由于部分月份可能没有电冷热负荷，某月的某个典型日可能缺少冷热负荷
+                #     key_re = re.split('-month',val['key'])#格式为：散射辐射-month1，re后分别为类型和月份
+                #     typical_month_m = self.result['TypicalMonth'][int(key_re[1])-1]
+                #     typical_month_m['月份'] = int(key_re[1])
+                #     val_data_traces = val['data']['traces']
+                #     #val['data']['traces'][i]['name']格式为：典型日1-共31天，re正则后[0]为典型日顺序，[1]为持续天数
+                #     typicalNum = int(re.findall('\d+',val_data_traces[-1]['name'])[0])
+                #     for i in range(typicalNum):#取该类型的最后一个典型日顺序，当该类型缺少后排典型日时，小于实际典型日数量
+                #         typical_month_m[key_re[0]].append([])
+                #         if key_re[0]  == '环境温度':#各类版本气象数据均有环境温度数据，其典型日数量为实际数量
+                #             typical_month_m['持续天数'].append(int(re.findall('\d+',val_data_traces[i]['name'])[1]))
+                #     # 当前排典型日缺少数据时，该类型数据为空list[]；当后排典型日缺少数据时，该类型数据为空
+                #     for i in range(len(val_data_traces)):
+                #         typical_month_m[key_re[0]][int(re.findall('\d+',val_data_traces[i]['name'])[0])-1] = copy.deepcopy(val_data_traces[i]['y']) 
+
             self.__plotIndex = length
             # update TypicalDay based on TypicalMonth
             for m in range(12):
@@ -54,6 +101,36 @@ class IESLabTypicalDayResult(IESResult):
                         if typical_month_m[type_i] and i < len(typical_month_m[type_i]):
                             typical_day_index['data'][type_i] = typical_month_m[type_i][i]
                     self.__typicalIndex += 1
+    def __init_message_map(self):      
+        
+        message = self.getMessagesByKey("message_map")
+        if message is None or len(message) == 0:
+            return
+        
+        self.messagemap = {}
+        for m in message:
+            dataMap = m['data']['map']
+            for item in dataMap:
+                messages = item['messages']
+                for val in messages:
+                    self.messagemap[val] = item['id']
+                    
+    def __init_result(self):
+        self.__init_message_map()
+        # print(self.messagemap)
+        current_time = time.time()
+        
+        for key,val in self.messagemap.items():
+            
+            sub=IESLabTypicalDaySubMessageResult(val)
+            sub.connect()
+            message = sub.getMessages(current_time=current_time,timeout=10)
+            print("key",key,'message', message)
+        
+        
+        pass
+        
+    
     def GetTypical(self):
         '''
             获取所有的 GetTypical 典型日数据
@@ -61,7 +138,7 @@ class IESLabTypicalDayResult(IESResult):
             >>> result.GetTypical()
             {...}
         '''
-        self.__readPlotResult()
+        self.__init_result()
         return self.result['TypicalDay']
     def GetTypicalDayNum(self):
         '''
@@ -131,4 +208,10 @@ class IESLabTypicalDayResult(IESResult):
             :return: list<list>类型，代表以1h为时间间隔的该参数的典型日内时序曲线
         '''
         self.__readPlotResult()
-        return self.result['TypicalMonth'][monthID-1].get(dataType,'没有该类型数据')
+        return self.result['TypicalMonth'][monthID-1].get(dataType,'没有该类型数据')
+    
+
+    
+ 
+
+

cloudpss/job/result/result.py

@@ -83,7 +83,6 @@ class Result(object):
 
             >>> message= db.getMessagesByType('log')
         """
-
         result = []
         for val in self._receiver:
             if val['type'] == type:

cloudpss/model/implements/diagram.py

@@ -126,8 +126,10 @@ class DiagramImplement(object):
         component = self.cells.get(key)
         if not component:
             return False
-        position = component.position.copy()
         del self.cells[key]
+        position=getattr(component, "position", None)
+        if position is None:
+            return True
         for edge in self.cells.values():
             if edge.shape == "diagram-edge":
                 if edge.source.get("cell") == key:

cloudpss/runner/IESLabTypicalDayResult.py

@@ -151,4 +151,5 @@ class IESLabTypicalDayResult(Result):
         try:
             return self.result['TypicalMonth'][monthID-1][dataType]
         except:
-            raise Exception('未查询到该数据')        
+            raise Exception('未查询到该数据')        
+

cloudpss/runner/result.py

@@ -116,7 +116,6 @@ class Result(object):
 
             >>> message= result.getMessagesByType('log')
         """
-
         return self.db.getMessagesByType(type)
 
 

cloudpss/runner/runner.py

@@ -12,10 +12,12 @@ from .MessageStreamReceiver import MessageStreamReceiver
 from .result import IESLabSimulationResult, PowerFlowResult, EMTResult, Result, IESResult
 from .IESLabPlanResult import IESLabPlanResult, IESLabOptResult
 from .IESLabEvaluationResult import IESLabEvaluationResult, IESLabPlanEvaluationResult, IESLabOptEvaluationResult
-from .IESLabTypicalDayResult import IESLabTypicalDayResult
+# from .IESLabTypicalDayResult import IESLabTypicalDayResult
+from ..job.result.IESLabTypicalDayResult import IESLabTypicalDayResult
 from .storage import Storage
 from ..utils import request
 from typing import  TypeVar,  Generic
+from .DSLabResult import DSLabResult
 import re
 
 RECEIVER = {
@@ -35,7 +37,9 @@ IES_LAB_OPT_RESULT = {
     'function/ieslab/evaluation': IESLabOptEvaluationResult,
 }
 
-
+DS_LAB_RESULT = {
+    'function/ieslab/evaluation': DSLabResult
+}
 
 RESULT_DB = {
     'function/CloudPSS/emtp': EMTResult,
@@ -256,6 +260,15 @@ class HttpRunner(Runner[T]):
             return False
         return self.result.status()  # type: ignore
     
+class DSLabRunner(Runner[T]):
+    def __init__(self, job, simulationId, **kwargs):
+        self.simulationId = simulationId
+        self.job = job
+        result = DS_LAB_RESULT.get(job.get('rid', ''), DSLabResult)
+        self.result: T = result(self.simulationId, **kwargs)
+
+    def status(self):
+        return self.result.status()
 
 class HttpOPTRunner(Runner[T]):
 

cloudpss/utils/httprequests.py

@@ -29,7 +29,7 @@ def request(method, uri, baseUrl=None, params={}, token=None, **kwargs):
         del kwargs['xToken']
     
     r = requests.request(method, url, params=params, headers=headers, **kwargs)
-
+    
     if (uri.startswith('graphql')):
         if 'X-Cloudpss-Version' not in r.headers:
             raise Exception(

cloudpss/version.py

@@ -1 +1 @@
-__version__ = '4.5.13'
+__version__ = '4.5.14'

{cloudpss-4.5.13.dist-info → cloudpss-4.5.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudpss
-Version: 4.5.13
+Version: 4.5.14
 Summary: cloudpss sdk
 Home-page: https://www.cloudpss.net
 Author: cloudpss

{cloudpss-4.5.13.dist-info → cloudpss-4.5.14.dist-info}/RECORD

@@ -1,6 +1,6 @@
-cloudpss/__init__.py,sha256=1RNmUBhoxYUutZiTS-XJ9yBoNGGh8Mpt1uY6ETlSBDc,825
+cloudpss/__init__.py,sha256=xnA-UjehYOzH6KV7vOXHwdbGEiw6g_OPKzrbZA9Fuc8,858
 cloudpss/verify.py,sha256=KF4Gd59DGvCyIEkRD7rNnekWw22XxJpi3DW6keb6j4c,1498
-cloudpss/version.py,sha256=aVYdQoUnTLZ8UhUcBQDLp0bUQ49RHfnX1Rb_9E58kn0,23
+cloudpss/version.py,sha256=_rcYfia10t15TUgPkQvxNv7NkZu1MKRhIBYRWbJufEA,23
 cloudpss/asyncio/__init__.py,sha256=CJGopQl_vz3z3fJsK7NjMX5uzkzfrJrbqKVhyYqlYWc,198
 cloudpss/asyncio/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
 cloudpss/asyncio/job/job.py,sha256=Bn2BEERw1J8YarFauTzVrGJK7nmaoMsdlrFUqiHRth4,3897
@@ -24,9 +24,9 @@ cloudpss/function/__init__.py,sha256=TNzChB-gQF6oB62F423evpUlgcp6s03D4pKKs89Lz4Q
 cloudpss/function/function.py,sha256=llomkfnTmKMiFJYJ2mKnmAEoIjTNVCnjCUUyiJMOV1s,29
 cloudpss/function/functionExecution.py,sha256=YM2hS0Ao3jhMJodqFfxk0JAK7ZR00MPh-U2foBWshT0,16897
 cloudpss/function/job.py,sha256=LdzaTyjvBcMZIyLstSZnt79d2eREljx2HnNoilDp03A,13162
-cloudpss/ieslab/DataManageModel.py,sha256=94kdnhVc4X97xYjk2U0ByG3CBjVOf70BtuudjcskbOY,25967
+cloudpss/ieslab/DataManageModel.py,sha256=k0ZLToBuIKl2Kj8LDvMUUaGc3wLE1CgZ8BmRKNDm7tk,26024
 cloudpss/ieslab/EvaluationModel.py,sha256=hGZmuaB8lL9LVti_TCG-qCfK_bA-HJgdxYt7oMmVrXY,9399
-cloudpss/ieslab/IESLabOpt.py,sha256=KMswh-q_RpM_HU8HtKLj05p-AKBwnNrc37zy7pq6cf8,9063
+cloudpss/ieslab/IESLabOpt.py,sha256=D2iDbi80ohvU7wKelb-Uk6FP_S0rbZyHfWwlBbQYYPc,9379
 cloudpss/ieslab/IESLabPlan.py,sha256=rEf1W2pT_J3C8-TFFHVm8Llli9ySSXbBeRpd6Yz9Glk,8345
 cloudpss/ieslab/IESLabSimulation.py,sha256=-EJFkhklN9ao-nbfk7Lz6JCHboFCSDcn5R2jr3_Z7_A,4046
 cloudpss/ieslab/PlanModel.py,sha256=fLWzVnRiyYRHchG2xsfUH-oCUmnF1uwbDuWNC750dWw,12612
@@ -34,17 +34,17 @@ cloudpss/ieslab/__init__.py,sha256=gr1rXYw9vIAGOe60eg7LyMHP7QDXvNf4dJ5GTR_kj1Y,2
 cloudpss/job/TemplateCompiler.py,sha256=MuJDTQ54wRo5bGSvBJBJjXJ7u463dwpRkaLwIwm_hLE,9936
 cloudpss/job/TemplateManager.py,sha256=uOvctmE3P17aGWt_26d940FbRUSEs6iovFBb8T5xjd4,1115
 cloudpss/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
-cloudpss/job/job.py,sha256=ciphBMfRkIK1bvZ1zrbuISojXiixoNwQRlCzfEVWOa8,8240
+cloudpss/job/job.py,sha256=pV-J0VBnyExIabzt2hMnIvLFdowWz-QT0DuR80Gv9AE,8297
 cloudpss/job/jobReceiver.py,sha256=PNYxcN33LiXZVyc4tzhPlpWxKnyWO_ElKjJ9wsxsroI,925
-cloudpss/job/messageStreamReceiver.py,sha256=VvrDewFjiZxMHZJUoMh2_CYC1bmcztY1TrNx0WSsQIU,4133
-cloudpss/job/messageStreamSender.py,sha256=MCgMP6Epgu2md_rhZhHeGv8q8sObF_wHfL3WpANoreM,2371
-cloudpss/job/result/EMTResult.py,sha256=0PVmGSkXSllkwIbGBxqPTmWNk7uGvT5FvqvphiIY38Y,8008
+cloudpss/job/messageStreamReceiver.py,sha256=-U9rmGRvU-qFZQNIuHAizsPf9EbrcH66mA8EVGwpIpU,5546
+cloudpss/job/messageStreamSender.py,sha256=QQO6XtoZNLiUJXeSZmim-XFDBrb9i-JAjMPHKXcscZA,2365
+cloudpss/job/result/EMTResult.py,sha256=GHgpdDO7-C4M-HFb91h4ZSLWEAm1ZuOm3zOeFCdkmYc,8151
 cloudpss/job/result/IESLabSimulationResult.py,sha256=a47Ic1vvfHTK_vEokOZxJBnQReqYOWux_aePPic_Hrs,84
-cloudpss/job/result/IESLabTypicalDayResult.py,sha256=YugatJHMqLGhSHXFhoorVzcGgEk8dH3dUyGLRsCIhqk,7452
+cloudpss/job/result/IESLabTypicalDayResult.py,sha256=tpWfN3G34l3qSXaTDDdPRSTXR4p7jY3AlP7o9e-A3VI,9554
 cloudpss/job/result/IESResult.py,sha256=sLTdwZLE2HyZZNvJATgibsOPm3lqYquvLyOJjEgfog0,4027
 cloudpss/job/result/PowerFlowResult.py,sha256=KoImlmsEEZyMriuoE_MSHBQu4k9MSDUuZ8E2SRLndWE,2097
 cloudpss/job/result/__init__.py,sha256=dRWZNoX33cukgrNl6sMkQM3hdQrGHCpwIktoayrpP_4,1594
-cloudpss/job/result/result.py,sha256=uHR-6b_UeVsH7h6roiVz9mCdLta8oqeeTsedR3rI6Tk,4292
+cloudpss/job/result/result.py,sha256=UvtHWNPhVq1NsmuE4m-iy9BywacgLCYRfQMEBusFdpc,4290
 cloudpss/model/__init__.py,sha256=SNq-bfwcQtDHtTNBYppfUEs8wkjfrQfGeywx7igmvOs,151
 cloudpss/model/jobDefinitions.py,sha256=uuTwpqStlg3YDmfxbU2PVi_Tf18opa0kYLCMGaOP-qA,3749
 cloudpss/model/model.py,sha256=UOtHdqS6ARPSWoMKllryqJ4PZg_mJefu6FB2wWZlOWo,26782
@@ -52,29 +52,29 @@ cloudpss/model/revision.py,sha256=IFznBKirwpfqadyCNJWPGL7lTpQxbCmU1fxdI5AvoA4,40
 cloudpss/model/topology.py,sha256=MJF3rQBLWus4RVO6L3Zwih7SWYjRWsLMcrcIBxCmIwM,2617
 cloudpss/model/implements/__init__.py,sha256=88L_wF9SSzxsbtqwStWIPH4LxaKq7TVcssHQ62YBnls,67
 cloudpss/model/implements/component.py,sha256=uNSpkZKChdXLiO40Ev4P3oQ1di2Hu4YjcBOb0I8Bf0c,734
-cloudpss/model/implements/diagram.py,sha256=ILBq7oZVb2ZThmm_HdwGmGX0sZPwetoT4SSVN0xFqzo,6053
+cloudpss/model/implements/diagram.py,sha256=-r9tTAIT_ET8ClPjcefAlBsMf2f1BytUi2F0L8pfdVc,6115
 cloudpss/model/implements/implement.py,sha256=Uld96tjXVDbVUNV8xscyy_nZWLHr3iP2DqA6S3p-XJE,954
 cloudpss/project/__init__.py,sha256=fpskY-cJGmMcTg1naVzNPtJaRG1xmSc2CFjDTin64Cw,51
 cloudpss/project/project.py,sha256=uFhOnM8ngo1_ZYz2uArtORKZquYNdOIVLXU_q1MDFI4,17698
 cloudpss/runner/DSLabResult.py,sha256=xJqKA3e1KSXQmLDe9_T6fG1exdE9j7EjfIfvBMmqiJ8,3422
 cloudpss/runner/IESLabEvaluationResult.py,sha256=rsKbSJ9zsgyMYP-oIWsJlSXGxs7Y-44rj45Fn6NJXMA,5998
 cloudpss/runner/IESLabPlanResult.py,sha256=pbUq2YCPBE01Sy9e9X5Wp8OZ4PJhUkUb-28b5CEzqxc,8874
-cloudpss/runner/IESLabTypicalDayResult.py,sha256=-9D0TRsXEYJIgGKYFPZHjR7URyPypN7jfPc1lohFJ0c,8175
+cloudpss/runner/IESLabTypicalDayResult.py,sha256=lr8ID_Wk4zJagirReFoBJdedXoxUYt4CSQH9uZD6kKo,8179
 cloudpss/runner/MessageStreamReceiver.py,sha256=dT-rKslQbRt3bMTGXupa1YrocHl2zTWOCHlsXcbgfhs,2812
 cloudpss/runner/__init__.py,sha256=FxiYYmssbZgRjieySzi43yPiWEF6eNos2UsoFQeD2H8,341
 cloudpss/runner/receiver.py,sha256=QU0RsbCt0EK7sCLHzfj8_QQsuPNfqXxpZi5JKm6roxA,4162
-cloudpss/runner/result.py,sha256=GFpd7848gsLRuzhVcWbCwmAjR84Lhik_3pNCjOV8VOY,13291
-cloudpss/runner/runner.py,sha256=SJkEjDnrmRPmq1t8sbZtIbYaq-wQblv6Yx9RnyWz4c8,9583
+cloudpss/runner/result.py,sha256=Q8RcfUnvilxPo6yvtjH6dXePaCqrBjQCljur3rem2pU,13290
+cloudpss/runner/runner.py,sha256=oCK1PdDNArk25v9S7xvE5r6xfQu0EKHKuxKQN0CLUHE,10093
 cloudpss/runner/storage.py,sha256=zFET_zwPIOF2Cnh9sgFiS0HFxV1OmVsU34bGUQ6PpkA,4162
 cloudpss/runner/transform.py,sha256=krOgTZiJSJAb5QSwerAqlbC4Ma0PKi__0WOZlAxw4O8,11613
 cloudpss/utils/IO.py,sha256=FsFp3V8I1-P0YiBGmjKwbMalBrVKMHUxTjFZFOtv0CQ,5357
 cloudpss/utils/__init__.py,sha256=jWVHSOqJQWU0fpg2UbWSEQoLCb2Uys-vH5Uqkb0ihNA,326
 cloudpss/utils/dataEncoder.py,sha256=5PUPb844eOGgFnYrMM8bdjdKH_MZz0lk-67uo8TvwEo,885
 cloudpss/utils/graphqlUtil.py,sha256=zGEhRZvy5JMipFKFxjDmbc-HQP3aPZ5noDwi-RTXWSk,280
-cloudpss/utils/httprequests.py,sha256=cXCBwciwvGtRByCi5pYcg1eXsvBXqUmtrB4FO9_pUeg,1877
+cloudpss/utils/httprequests.py,sha256=Ewxc3AWarQp46-kDTasUC18TfIRpuuBSh5I9wvK0aCI,1881
 cloudpss/utils/matlab.py,sha256=SLwVt790BjklJK2XNELt9R2n_1ej9Y8QsTIdFkKXLWE,795
 cloudpss/utils/yamlLoader.py,sha256=bv_vPDK_e0n_vZ5FwpDJ_NJWqMAwfU3AbhkvQIxPCy4,2677
-cloudpss-4.5.13.dist-info/METADATA,sha256=zl-52PfP7KkvAgxIWb_zPpWayCl9UP3sJCMc3HDIUbM,2402
-cloudpss-4.5.13.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cloudpss-4.5.13.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
-cloudpss-4.5.13.dist-info/RECORD,,
+cloudpss-4.5.14.dist-info/METADATA,sha256=bu2kZXqqINjgJYYmZSTf3LZrZ_0PYkouWlXzO1oBB9I,2402
+cloudpss-4.5.14.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cloudpss-4.5.14.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
+cloudpss-4.5.14.dist-info/RECORD,,