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

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,**kwargs):
         super().__init__()
-        self.job = job
-        self.id =self.job.output
-        self.origin = os.environ.get("CLOUDPSS_API_URL", "https://cloudpss.net/")
+        self.id = output
+        self.origin = kwargs.get("baseUrl",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,34 @@ 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)
+                    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:
+            self.ws.close()
+            return None
 
 
     def __on_error(self,  *args, **kwargs):
@@ -101,6 +132,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 +163,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,10 +12,10 @@ import logging
 
 
 class MessageStreamSender:
-    def __init__(self, job):
+    def __init__(self, input,**kwargs):
         super().__init__()
-        self.job = job
-        self.origin = os.environ.get("CLOUDPSS_API_URL", "https://cloudpss.net/")
+        self.input = input
+        self.origin = kwargs.get("baseUrl",os.environ.get("CLOUDPSS_API_URL", "https://cloudpss.net/"))
         self.__hasOpen = False
 
     def __on_message(self, ws, message):
@@ -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):
         '''
@@ -140,15 +145,21 @@ class EMTResult(Result):
         else:
             raise Exception('transmitter is None')
         
-    def send(self,message):
+    def send(self,message=None):
         """
             发送消息
         """
         if self._sender is not None:
-            val =message
+            val ={
+                "type": 'virtual_input',
+                "data": message,
+            } 
             if type(message) is VirtualInput:
                 val = message.toJson()
             
+            if message is  None:
+                val = self.virtualInput.toJson()
+            
             self._sender.write(val)
         else:
             raise Exception('transmitter is None')

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/model/model.py

@@ -298,7 +298,7 @@ class Model(object):
         return config
 
     @staticmethod
-    def fetchMany(name=None, cursor=[], pageSize=10,owner=None):
+    def fetchMany(name=None, cursor=[], pageSize=10,owner=None,**kwargs):
         """
         获取用户可以运行的项目列表
 
@@ -332,13 +332,13 @@ class Model(object):
         if name is not None:
             variables["_search"] = name
 
-        data = graphql_request(Model.__models_query, {"input": variables})
+        data = graphql_request(Model.__models_query, {"input": variables},**kwargs)
         if "errors" in data:
             raise Exception(data["errors"][0]["message"])
         return data["data"]["models"]['items']
 
     @staticmethod
-    def fetch(rid):
+    def fetch(rid,**kwargs):
         """
         获取项目
 
@@ -349,7 +349,7 @@ class Model(object):
         >>> model=Model.fetch('model/Demo/test')
 
         """
-        data = graphql_request(Model.__model_query, {"rid": rid})
+        data = graphql_request(Model.__model_query, {"rid": rid},**kwargs)
         if "errors" in data:
             raise Exception(data["errors"][0]["message"])
         return Model(data["data"]["model"])
@@ -464,7 +464,7 @@ class Model(object):
 
 
     @staticmethod
-    def create(model):
+    def create(model,**kwargs):
         """
         新建项目
 
@@ -506,12 +506,13 @@ class Model(object):
                     },
                 }
             },
+            **kwargs
         )
 
     
 
     @staticmethod
-    def update(model):
+    def update(model,**kwargs):
         """
         更新项目
 
@@ -555,7 +556,7 @@ class Model(object):
                     'tags': tags,
                     "permissions": permissions,
                 }
-            })
+            },**kwargs)
         if "errors" in r:
             raise Exception(r["errors"][0]["message"])
         return r

cloudpss/model/revision.py

@@ -75,7 +75,8 @@ class ModelRevision(object):
 
             >>> revision.run(revision,job,config,'')
         """
-        revision= ModelRevision.create(self)
+        
+        revision= ModelRevision.create(self,**kwargs)
         if stop_on_entry is not None:
             job['args']['stop_on_entry'] = stop_on_entry
         return Job.create(
@@ -84,7 +85,7 @@ class ModelRevision(object):
     
 
     @staticmethod
-    def create(revision, parentHash=None):
+    def create(revision, parentHash=None, **kwargs):
         """
             创建一个新版本
 
@@ -95,12 +96,11 @@ class ModelRevision(object):
             >>> ModelRevision.create(model.revision)
             {hash:'4043acbddb9ce0c6174be65573c0380415bc48186c74a459f88865313743230c'}
         """
-
         r = revision.toJSON()
         if 'hash' in r:
             del r['hash']
         variables = {'a': {**r, 'parent': parentHash}}
-        r = graphql_request(ModelRevision.__createModelRevisionQuery, variables)
+        r = graphql_request(ModelRevision.__createModelRevisionQuery, variables,**kwargs)
         if 'errors' in r:
             raise Exception(r['errors'])
         

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/graphqlUtil.py

@@ -3,9 +3,9 @@ import json
 from cloudpss.utils import request
 
 
-def graphql_request(query, variables=None, **kwargs):
+def graphql_request(query, variables=None, baseUrl=None,token=None,**kwargs):
     payload = {'query': query, 'variables': variables}
     
-    r = request('POST', 'graphql', data=json.dumps(payload), **kwargs)
+    r = request('POST', 'graphql', data=json.dumps(payload),baseUrl=baseUrl,token=token, **kwargs)
 
     return json.loads(r.text)

cloudpss/utils/httprequests.py

@@ -12,7 +12,8 @@ def request(method, uri, baseUrl=None, params={}, token=None, **kwargs):
     if baseUrl == None:
         baseUrl = os.environ.get('CLOUDPSS_API_URL', 'https://cloudpss.net/')
     url = requests.compat.urljoin(baseUrl,uri)
-    token = os.environ.get('CLOUDPSS_TOKEN', None)
+    if token is None:
+        token = os.environ.get('CLOUDPSS_TOKEN', None)
     
     if token:
         headers = {
@@ -29,7 +30,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.15'

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

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

{cloudpss-4.5.13.dist-info → cloudpss-4.5.15.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=tSsepOcbNt8DX4JgJ-Dlwbcts2PAeUK69aReQTlWCkM,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,47 +34,47 @@ 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=vLJ7mIbrVfTWgQsUlk5bjM995wzu1q_Mee2AoW_MViM,8467
 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=Yjrg8_dIq4MoqbNoQHX8LbCe916od8C1NxHa0xpWJmg,5509
+cloudpss/job/messageStreamSender.py,sha256=8I3h-y2zQQnI8zgS4NKVV2E9YmPPApX-kAzpauy0uOs,2396
+cloudpss/job/result/EMTResult.py,sha256=T4LQdFMQoA1gtpw7twageYdTIf0Onb3O4tvTOMn-bkM,8334
 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
-cloudpss/model/revision.py,sha256=IFznBKirwpfqadyCNJWPGL7lTpQxbCmU1fxdI5AvoA4,4002
+cloudpss/model/model.py,sha256=ee4CNtaLxXHD-T3jTGmqDpPC2nlCKs0wtuo_1FGvZSk,26866
+cloudpss/model/revision.py,sha256=E3H-FOXsiwy1MDZC-Ky-QkzvOb5HApYSXP0llf8yJXQ,4038
 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/graphqlUtil.py,sha256=_bdHFlusvZd5p4I1iVq5nEKqeC2RdyiXbnfv7oQBvQA,332
+cloudpss/utils/httprequests.py,sha256=5FXdXU5GUrsmreL7nEnJe1eD564HyrT9_379SRzwjrU,1907
 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.15.dist-info/METADATA,sha256=KOqxUSwk2EAQaYAS8rdF8ksGhxjSHkRji366qm6Zqpg,2402
+cloudpss-4.5.15.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cloudpss-4.5.15.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
+cloudpss-4.5.15.dist-info/RECORD,,