cloudpss 4.5.1a4__py3-none-any.whl → 4.5.3__py3-none-any.whl

cloudpss/__init__.py

@@ -9,11 +9,10 @@ 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','DSLab'
+    'function', 'Project', 'currentJob', 'IESLabSimulation', 'IESLabPlan','IESLabOpt','__version__','Job'
 ]
 
 

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.output)
+            self.__receiver = MessageStreamReceiver(self)
             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.input)
+            self.__sender = MessageStreamSender(self)
         self.__sender.connect_legacy(**kwargs)
         return self.__sender
     
@@ -259,9 +259,7 @@ class Job(Generic[T]):
         sender =  self.write()
         if resultType is None:
             resultType = getResultClass(self.context[0])
-        self._result= resultType(receiver, sender)
-        
-        return self._result
+        return resultType(receiver, sender)
 
     
 

cloudpss/job/messageStreamReceiver.py

@@ -1,9 +1,5 @@
-import datetime
 import logging
 import sys
-
-from cloudpss.job.TemplateManager import TemplateManager
-
 from .jobReceiver import JobReceiver
 import os
 from urllib.parse import urlparse
@@ -11,6 +7,7 @@ import websocket
 import pytz
 import threading
 import time
+
 utc_tz = pytz.timezone("UTC")
 
 from ..utils.IO import IO
@@ -21,30 +18,15 @@ class Message(object):
         self.id = id
         self.token = token
 
-    
-    
+
 class MessageStreamReceiver(JobReceiver):
-    def __init__(self, output):
+    def __init__(self, job):
         super().__init__()
-        self.id = output
+        self.job = job
+        self.id =self.job.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):
-        
-        if self.status == 1:
-            return True
-        logging.debug('lastMessageTime',self.lastMessageTime)
-        return (self.lastMessageTime/1000)>=time.time()-self.timeOffset
-        
+
     def __path(self, from_=None):
         if self.id is None:
             raise Exception("id is None")
@@ -57,32 +39,21 @@ 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.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)
+        if(msg['type']=='terminate'):
+            self.close(self.ws)
         return msg
 
 
@@ -130,10 +101,6 @@ 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
@@ -161,7 +128,7 @@ class MessageStreamReceiver(JobReceiver):
        
 
     def connect(self):
-        self._status = 0
+        self._status = 1
         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, input):
+    def __init__(self, job):
         super().__init__()
-        self.input = input
+        self.job = job
         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.input is None:
+        if self.job.input is None:
             raise Exception("id is None")
-        if self.input == "00000000-0000-0000-0000-000000000000":
+        if self.job.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.input
+        path = head + "://" + str(u[1]) + "/api/streams/token/" + self.job.input
         logging.debug(f"MessageStreamSender data from websocket: {path}")
 
         self.ws = websocket.WebSocketApp(

cloudpss/job/result/IESLabTypicalDayResult.py

@@ -10,51 +10,49 @@ class IESLabTypicalDayResult(IESResult):
         IESResult.__init__(self, *args, **kwargs)
         self.__plotIndex = 0
         self.__typicalIndex = 0
-        self.__type_list =['电负荷', '热负荷','冷负荷','总辐射','散射辐射', '直射辐射',  '天顶角', '环境温度', '土壤温度', '10m风速', '50m风速', '建筑物高度风速', '风机高度风速']
-        self.result = {'TypicalMonth': [],'TypicalDay': []}
-        for i in range(12):
-            self.result['TypicalMonth'].append({'月份': int, '持续天数': [],'电负荷': [], '热负荷': [],'冷负荷':[],'总辐射': [],'直射辐射': [],'散射辐射': [],'天顶角': [],
-                                                '环境温度': [], '土壤温度': [], '建筑物高度风速': [], '风机高度风速': [],'10m风速': [], '50m风速': [] })
+        self.__type_list =['总辐射','散射辐射', '直射辐射','天顶角', '环境温度', '湿球温度','土壤温度', '10m风速', '50m风速','电负荷', '热负荷','冷负荷','氢负荷']
+        self.__map_load = { 'maxElectricalLoad':'电负荷', 'maxHeatLoad':'热负荷','maxCoolLoad':'冷负荷','maxHydrogenLoad':'氢负荷' }
+        
+        self.result = {'TypicalMonth': [{'月份': int,'持续天数': [],**{key: [] for key in self.__type_list}} for i in range(12)],'TypicalDay': []}
     def __readPlotResult(self):
         length = self.getMessageLength()
         if (length > self.__plotIndex):
             for num in range(self.__plotIndex, length):# update TypicalMonth
                 val = self.getMessage(num)
-                if val['type'] == 'plot':
-                    key_list = re.split('-month',val['key'])#分别为类型和月份
-                    # print(key_list)
-                    self.result['TypicalMonth'][int(key_list[1])-1]['月份'] = int(key_list[1])
-                    if key_list[0] in ['总辐射','散射辐射']:#从第一类数据中分析每个月各个典型日的天数
-                        typicalNum = len(val['data']['traces'])
-                        for i in range(typicalNum):
-                            self.result['TypicalMonth'][int(key_list[1])-1]['持续天数'].append(int(re.findall('\d+',val['data']['traces'][i]['name'])[1]))
-                    # 每个月各类型数据的各个典型日的数据，由于部分月份可能没有电冷热负荷，某月的某个典型日可能缺少冷热负荷
-                    for i in range(typicalNum):
-                        self.result['TypicalMonth'][int(key_list[1])-1][key_list[0]].append([])
-                    for i in range(len(val['data']['traces'])):
-                        self.result['TypicalMonth'][int(key_list[1])-1][key_list[0]][int(re.findall('\d+',val['data']['traces'][i]['name'])[0])-1] = copy.deepcopy(val['data']['traces'][i]['y'])
+                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):
-                for i in range(len(self.result['TypicalMonth'][m]['持续天数'])):
-                    self.result['TypicalDay'].append({'info':{'typicalDayID': int, 'name': str, 'duration': int, 'maxElectricalLoad': 0.0, 'maxHeatLoad': 0.0, 'maxCoolLoad': 0.0}, 
-                                                      'data': {'电负荷': [], '热负荷': [],'冷负荷':[],'总辐射': [],'直射辐射': [],'散射辐射': [],'天顶角': [],
-                                                               '环境温度': [], '土壤温度': [], '建筑物高度风速': [], '风机高度风速': [],'10m风速': [], '50m风速': []}})
-                    self.result['TypicalDay'][-1]['info']['typicalDayID'] = self.__typicalIndex
-                    self.result['TypicalDay'][-1]['info']['name'] = str(m+1) + '月典型日' + str(i+1)
-                    self.result['TypicalDay'][-1]['info']['duration'] = self.result['TypicalMonth'][m]['持续天数'][i]
-                    if self.result['TypicalMonth'][m]['电负荷']:
-                        if self.result['TypicalMonth'][m]['电负荷'][i]:
-                            self.result['TypicalDay'][-1]['info']['maxElectricalLoad'] = max(self.result['TypicalMonth'][m]['电负荷'][i])
-                    if self.result['TypicalMonth'][m]['热负荷']:
-                        if self.result['TypicalMonth'][m]['热负荷'][i]:
-                            self.result['TypicalDay'][-1]['info']['maxHeatLoad'] = max(self.result['TypicalMonth'][m]['热负荷'][i])
-                    if self.result['TypicalMonth'][m]['冷负荷']:
-                        if self.result['TypicalMonth'][m]['冷负荷'][i]:
-                            self.result['TypicalDay'][-1]['info']['maxCoolLoad'] = max(self.result['TypicalMonth'][m]['冷负荷'][i])
+                typical_month_m = self.result['TypicalMonth'][m]
+                typical_month_m_day = len(typical_month_m['持续天数'])
+                for i in range(typical_month_m_day):
+                    self.result['TypicalDay'].append({'info':{'typicalDayID': int, 'name': str, 'duration': int, **{key: 0.0 for key in self.__map_load}},
+                    'data': {**{key: [] for key in self.__type_list}}})
+                    typical_day_index = self.result['TypicalDay'][self.__typicalIndex]
+                    typical_day_index['info']['typicalDayID'] = self.__typicalIndex
+                    typical_day_index['info']['name'] = str(m+1) + '月典型日' + str(i+1)
+                    typical_day_index['info']['duration'] = typical_month_m['持续天数'][i]
+                    for key,value in self.__map_load.items():
+                        # 分别处理该典型日无此类型负荷数据，缺少后序典型日，缺少前序典型日的情况
+                        if typical_month_m.get(value) and i <len(typical_month_m[value]) and len(typical_month_m[value][i]):
+                            typical_day_index['info'][key] = max(typical_month_m[value][i])
                     for type_i in self.__type_list:
-                        if self.result['TypicalMonth'][m][type_i]:
-                            self.result['TypicalDay'][-1]['data'][type_i] = self.result['TypicalMonth'][m][type_i][i]
+                        # 某月冷热负荷可能缺少后续典型日数据
+                        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 GetTypical(self):
         '''

cloudpss/job/result/__init__.py

@@ -24,6 +24,7 @@ RESULT = {
     'function/CloudPSS/ieslab-simulation': IESLabSimulationResult,
     'function/CloudPSS/ieslab-gmm':IESLabTypicalDayResult,
     'function/CloudPSS/ieslab-optimization': IESResult,
+    'function/CloudPSS/ieslab-gmm-opt':IESLabTypicalDayResult,
 }
 
 

cloudpss/job/result/result.py

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

cloudpss/model/implements/diagram.py

@@ -1,3 +1,4 @@
+import re
 from .component import Component
 from typing import Optional
 import uuid
@@ -140,7 +141,7 @@ class DiagramImplement(object):
                     position["y"] += 5
         return True
 
-    def updateComponent(self, key: str, args: dict) -> bool:
+    def updateComponent(self, key: str, **kwargs: dict) -> bool:
         """
         更新元件
 
@@ -150,10 +151,36 @@ class DiagramImplement(object):
 
         >>>> diagram.updateComponent(key)
         """
-        component = self.cells.get(key)
-        if not component:
+        component = self.cells.get(key,None)
+        if component is None:
             return False
-        for k, v in self.cells.items():
-            if k == key:
-                v.__dict__.update(args)
-                return True
+        for k, v in kwargs.items():
+            if component.__dict__.get(k,None) is None:
+                raise Exception(f"Component has no attribute {k}")
+            if k == 'args' and not isinstance(v, dict):
+                raise Exception(f"Component args must be dict")
+            if k == 'pins' and not isinstance(v, dict):
+                raise Exception(f"Component pins must be dict")
+            if k == 'position' and not isinstance(v, dict):
+                raise Exception(f"Component position must be dict")
+            if k == 'size' and not isinstance(v, dict):
+                raise Exception(f"Component size must be dict")
+            if k == 'style' and not isinstance(v, dict):
+                raise Exception(f"Component style must be dict")
+            if k == 'props' and not isinstance(v, dict):
+                raise Exception(f"Component props must be dict")
+            if k == 'context' and not isinstance(v, dict):
+                raise Exception(f"Component context must be dict")
+            
+            if k == 'definition' and not re.match(r'^model/([!()\-.0-9@A-Z\[\]_a-z{}~]{1,240})/([!()\-.0-9@A-Z\[\]_a-z{}~]{1,240})$', v):
+                raise Exception(f"Component definition must be in the format of 'model/owner/key'")
+            
+            if k == 'zIndex' and v < 0:
+                raise Exception(f"Component zIndex must be greater than 0")
+            
+            if isinstance(v, dict):
+                component.__dict__[k].update(v)
+                continue
+            
+            component.__dict__[k] = v
+            

cloudpss/model/model.py

@@ -137,7 +137,7 @@ class Model(object):
             raise ValueError("不存在拓扑实现")
         return diagramImplement.removeComponent(key)
     
-    def updateComponent(self, key, args):
+    def updateComponent(self, key, **kwargs):
         """
         更新元件实现
 
@@ -148,7 +148,7 @@ class Model(object):
         diagramImplement = self.revision.getImplements().getDiagram()
         if diagramImplement is None:
             raise ValueError("不存在拓扑实现")
-        return diagramImplement.updateComponent(key, args)
+        return diagramImplement.updateComponent(key, **kwargs)
 
 
     def getComponentsByRid(self, rid: str):
@@ -397,6 +397,7 @@ class Model(object):
         data = IO.load(filePath, format)
         return data
 
+
     @staticmethod
     def dump(model, file, format="yaml", compress="gzip"):
         """

cloudpss/runner/result.py

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

cloudpss/runner/runner.py

@@ -15,8 +15,7 @@ from .IESLabEvaluationResult import IESLabEvaluationResult, IESLabPlanEvaluation
 from .IESLabTypicalDayResult import IESLabTypicalDayResult
 from .storage import Storage
 from ..utils import request
-from typing import  TypeVar,  Generic
-from .DSLabResult import DSLabResult
+from typing import TypeVar, Generic
 import re
 
 RECEIVER = {
@@ -36,10 +35,6 @@ IES_LAB_OPT_RESULT = {
     'function/ieslab/evaluation': IESLabOptEvaluationResult,
 }
 
-DS_LAB_RESULT = {
-    'function/ieslab/evaluation': DSLabResult
-}
-
 RESULT_DB = {
     'function/CloudPSS/emtp': EMTResult,
     'function/CloudPSS/emtps': EMTResult,
@@ -245,16 +240,7 @@ class HttpRunner(Runner[T]):
         if self.__taskId is None:
             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/IO.py

@@ -2,6 +2,7 @@ import io
 import json
 import ubjson
 import yaml
+from yaml.dumper import SafeDumper
 import gzip
 import base64
 import struct
@@ -85,6 +86,7 @@ class IO(object):
             result = ubjson.dumpb(obj)
         if format == 'yaml':
             result = yaml.dump(obj).encode(encoding="utf-8")
+
         if result is None:
             assert False, 'format not support'
         if compress == 'gzip':
@@ -104,7 +106,7 @@ class IO(object):
         if format == 'ubjson':
             return ubjson.loadb(byt)
         if format == 'yaml':
-            return yaml.load(io.BytesIO(byt), Loader=yaml.BaseLoader)
+            return yaml.load(io.BytesIO(byt), Loader=yaml.FullLoader)
         assert False, 'format not support'
 
     @staticmethod

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.1-alpha.4'
+__version__ = '4.5.3'

{cloudpss-4.5.1a4.dist-info → cloudpss-4.5.3.dist-info}/METADATA

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

{cloudpss-4.5.1a4.dist-info → cloudpss-4.5.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
-cloudpss/__init__.py,sha256=xnA-UjehYOzH6KV7vOXHwdbGEiw6g_OPKzrbZA9Fuc8,858
+cloudpss/__init__.py,sha256=1RNmUBhoxYUutZiTS-XJ9yBoNGGh8Mpt1uY6ETlSBDc,825
 cloudpss/verify.py,sha256=KF4Gd59DGvCyIEkRD7rNnekWw22XxJpi3DW6keb6j4c,1498
-cloudpss/version.py,sha256=eGA062vl8AmZfcIp-LER6wH9XoJb0sNElWP_UI1RVzg,30
+cloudpss/version.py,sha256=Qwf2PqCgwNBpHE5DrBEwfOiFsFvEpa01UTldrgQkx9Q,22
 cloudpss/asyncio/__init__.py,sha256=CJGopQl_vz3z3fJsK7NjMX5uzkzfrJrbqKVhyYqlYWc,198
 cloudpss/asyncio/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
 cloudpss/asyncio/job/job.py,sha256=Bn2BEERw1J8YarFauTzVrGJK7nmaoMsdlrFUqiHRth4,3897
@@ -34,25 +34,25 @@ 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=pV-J0VBnyExIabzt2hMnIvLFdowWz-QT0DuR80Gv9AE,8297
+cloudpss/job/job.py,sha256=ciphBMfRkIK1bvZ1zrbuISojXiixoNwQRlCzfEVWOa8,8240
 cloudpss/job/jobReceiver.py,sha256=PNYxcN33LiXZVyc4tzhPlpWxKnyWO_ElKjJ9wsxsroI,925
-cloudpss/job/messageStreamReceiver.py,sha256=JtS-p0ka8eVVyG4I00G_A4Vu_uI-l3TfBrX_Fhojxow,5269
-cloudpss/job/messageStreamSender.py,sha256=QQO6XtoZNLiUJXeSZmim-XFDBrb9i-JAjMPHKXcscZA,2365
+cloudpss/job/messageStreamReceiver.py,sha256=VvrDewFjiZxMHZJUoMh2_CYC1bmcztY1TrNx0WSsQIU,4133
+cloudpss/job/messageStreamSender.py,sha256=MCgMP6Epgu2md_rhZhHeGv8q8sObF_wHfL3WpANoreM,2371
 cloudpss/job/result/EMTResult.py,sha256=xC9ws7bH-2nhpF8lqzZLqcOL-IcYS-JeBboEHgX96wk,6941
 cloudpss/job/result/IESLabSimulationResult.py,sha256=a47Ic1vvfHTK_vEokOZxJBnQReqYOWux_aePPic_Hrs,84
-cloudpss/job/result/IESLabTypicalDayResult.py,sha256=0u8FrxDUpujJvCWRk4jRtHzw-WHmvPR38nKj6-iccw4,7827
+cloudpss/job/result/IESLabTypicalDayResult.py,sha256=YugatJHMqLGhSHXFhoorVzcGgEk8dH3dUyGLRsCIhqk,7452
 cloudpss/job/result/IESResult.py,sha256=TLMTlDuvTUWnsJSUxXt8XTlXZGaVPmxZwia_JOcej88,3852
 cloudpss/job/result/PowerFlowResult.py,sha256=KoImlmsEEZyMriuoE_MSHBQu4k9MSDUuZ8E2SRLndWE,2097
-cloudpss/job/result/__init__.py,sha256=irh05EkRXewQz_khP5Da0h_GoNBE5Biyx_ycoXnI7Is,1502
-cloudpss/job/result/result.py,sha256=mWt4HyrI0y-l97Q8tcAiMyW9lm0timgxaRerLXPnefk,4280
+cloudpss/job/result/__init__.py,sha256=6zpp_s3Mcdi__FVfrBNLXw4Ee5ZBNgoZuYPJ8cqbj-c,1566
+cloudpss/job/result/result.py,sha256=kNAQ0X605pKRVFZ0FGULZn177zoPCrMeXLE7eCAVjFA,4282
 cloudpss/model/__init__.py,sha256=SNq-bfwcQtDHtTNBYppfUEs8wkjfrQfGeywx7igmvOs,151
 cloudpss/model/jobDefinitions.py,sha256=uuTwpqStlg3YDmfxbU2PVi_Tf18opa0kYLCMGaOP-qA,3749
-cloudpss/model/model.py,sha256=gYMBf_jspoRSwb0QgARvJGXVtDlaQvQjp_B9QMYvXwE,27170
+cloudpss/model/model.py,sha256=hS64Tb6JJvLDaCi4mBPUGbXvmzc-nQxlHtnh7OQpreo,27179
 cloudpss/model/revision.py,sha256=IFznBKirwpfqadyCNJWPGL7lTpQxbCmU1fxdI5AvoA4,4002
 cloudpss/model/topology.py,sha256=tKaOACAw9r9SppgxrhK-ZjMsG_jGLiNOzPnlIPLo964,2333
 cloudpss/model/implements/__init__.py,sha256=88L_wF9SSzxsbtqwStWIPH4LxaKq7TVcssHQ62YBnls,67
 cloudpss/model/implements/component.py,sha256=uNSpkZKChdXLiO40Ev4P3oQ1di2Hu4YjcBOb0I8Bf0c,734
-cloudpss/model/implements/diagram.py,sha256=25g40EhqcFsqNeTQYEG2mqxV_oG0B0kb3xT_NvN7ia8,4582
+cloudpss/model/implements/diagram.py,sha256=ILBq7oZVb2ZThmm_HdwGmGX0sZPwetoT4SSVN0xFqzo,6053
 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
@@ -63,18 +63,18 @@ cloudpss/runner/IESLabTypicalDayResult.py,sha256=-9D0TRsXEYJIgGKYFPZHjR7URyPypN7
 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=Q8RcfUnvilxPo6yvtjH6dXePaCqrBjQCljur3rem2pU,13290
-cloudpss/runner/runner.py,sha256=DPMiG_M-baWUAX7o9vL7p_Zr-r9nnTky5OYjig_yenU,9613
+cloudpss/runner/result.py,sha256=GFpd7848gsLRuzhVcWbCwmAjR84Lhik_3pNCjOV8VOY,13291
+cloudpss/runner/runner.py,sha256=pfidTchkoVTFUB9pUmZn9ulVDag9DLGo0pIxsD-nRu0,9168
 cloudpss/runner/storage.py,sha256=zFET_zwPIOF2Cnh9sgFiS0HFxV1OmVsU34bGUQ6PpkA,4162
 cloudpss/runner/transform.py,sha256=krOgTZiJSJAb5QSwerAqlbC4Ma0PKi__0WOZlAxw4O8,11613
-cloudpss/utils/IO.py,sha256=sm6p53AFgE1b56Bh0qt_E2TFP5tLr0WQDzIVRlsNgFA,5321
+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=KYE8iIqaBEN6gTdxFgUyvdKf3kbSizxxgmNN8_1BQjQ,1850
+cloudpss/utils/httprequests.py,sha256=ZcCwS2KM7y2TwWTo0YRLNJVozih4h0F5ignn-CeBREU,1846
 cloudpss/utils/matlab.py,sha256=SLwVt790BjklJK2XNELt9R2n_1ej9Y8QsTIdFkKXLWE,795
 cloudpss/utils/yamlLoader.py,sha256=bv_vPDK_e0n_vZ5FwpDJ_NJWqMAwfU3AbhkvQIxPCy4,2677
-cloudpss-4.5.1a4.dist-info/METADATA,sha256=w_5acTa5b8_g4khe4TZB2P00TwOfowToLtpDNIkiu7E,2403
-cloudpss-4.5.1a4.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cloudpss-4.5.1a4.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
-cloudpss-4.5.1a4.dist-info/RECORD,,
+cloudpss-4.5.3.dist-info/METADATA,sha256=85B-9dgbPdsSS961DOPKWRoKeYn-8nYA2JJkSJRAJzM,2401
+cloudpss-4.5.3.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cloudpss-4.5.3.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
+cloudpss-4.5.3.dist-info/RECORD,,