cloudpss 4.5.22__py3-none-any.whl → 4.5.24__py3-none-any.whl

cloudpss/job/messageStreamReceiver.py

@@ -93,6 +93,10 @@ class MessageStreamReceiver(JobReceiver):
 
     def __on_error(self,  *args, **kwargs):
         logging.debug("MessageStreamReceiver error")
+        err = args[1] if len(args)>1 else None
+        if isinstance(err, websocket.WebSocketConnectionClosedException):
+            self.close(args[0])
+            return
         msg = {
             "type": "log",
             "verb": "create",

cloudpss/model/model.py

@@ -400,7 +400,7 @@ class Model(object):
         if not os.path.exists(filePath):
             raise FileNotFoundError("未找到文件")
         data = IO.load(filePath, format)
-        return data
+        return Model(data)
 
 
     @staticmethod

cloudpss/runner/IESLabPlanResult.py

@@ -55,6 +55,7 @@ class IESLabResult(object):
         '''
         if self.taskId is None:
             raise Exception('未开始运行')
+            # return []
         r = request('GET',
                     f'{self._baseUri}/getOptimizationLog',
                     params={

cloudpss/version.py

@@ -1 +1 @@
-__version__ = '4.5.22'
+__version__ = '4.5.24'

{cloudpss-4.5.22.dist-info → cloudpss-4.5.24.dist-info}/METADATA

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

{cloudpss-4.5.22.dist-info → cloudpss-4.5.24.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cloudpss/__init__.py,sha256=xnA-UjehYOzH6KV7vOXHwdbGEiw6g_OPKzrbZA9Fuc8,858
 cloudpss/verify.py,sha256=KF4Gd59DGvCyIEkRD7rNnekWw22XxJpi3DW6keb6j4c,1498
-cloudpss/version.py,sha256=37SK3BQ80PnwEhUte9lXm7sBCUQ2l2xYAtxuOs0ThmA,23
+cloudpss/version.py,sha256=e_qb2PIFhBp-PuhYPI5JzjQQOlDxeDs_3ftyqYgYjfg,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
@@ -36,7 +36,7 @@ cloudpss/job/TemplateManager.py,sha256=uOvctmE3P17aGWt_26d940FbRUSEs6iovFBb8T5xj
 cloudpss/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
 cloudpss/job/job.py,sha256=wPRLvfTsVjFFuxuJvbTiHyDMenNP3amzt4iLwxHpTEc,8647
 cloudpss/job/jobReceiver.py,sha256=PNYxcN33LiXZVyc4tzhPlpWxKnyWO_ElKjJ9wsxsroI,925
-cloudpss/job/messageStreamReceiver.py,sha256=htZSaCCGskAAq915bEJb_vIlsphIwyPhZ0qAmZzYDUk,5687
+cloudpss/job/messageStreamReceiver.py,sha256=43-K9YnsfmIyIoJnUBYe-Ax7AaxOh-AgwtU5I48L3gg,5859
 cloudpss/job/messageStreamSender.py,sha256=n7Nse_o9p7wtOYEVBNLtHtoZ969RSMo-BNonYO-rtXA,2593
 cloudpss/job/result/EMTResult.py,sha256=T4LQdFMQoA1gtpw7twageYdTIf0Onb3O4tvTOMn-bkM,8334
 cloudpss/job/result/IESLabSimulationResult.py,sha256=a47Ic1vvfHTK_vEokOZxJBnQReqYOWux_aePPic_Hrs,84
@@ -47,7 +47,7 @@ cloudpss/job/result/__init__.py,sha256=dRWZNoX33cukgrNl6sMkQM3hdQrGHCpwIktoayrpP
 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=k473FY7zfHmv0yAYYHeWfBKo5Mjz0suYpZ7YXYzudVo,27856
+cloudpss/model/model.py,sha256=mReyWB9vukfVovFohrruaGb7UCSvNJpQ3iriWV61k9k,27863
 cloudpss/model/revision.py,sha256=E3H-FOXsiwy1MDZC-Ky-QkzvOb5HApYSXP0llf8yJXQ,4038
 cloudpss/model/topology.py,sha256=hs1LN1r-eToENzk_flOhW4i0yT6M_-NcYgDYnkrW6kA,2882
 cloudpss/model/implements/__init__.py,sha256=88L_wF9SSzxsbtqwStWIPH4LxaKq7TVcssHQ62YBnls,67
@@ -58,7 +58,7 @@ cloudpss/project/__init__.py,sha256=fpskY-cJGmMcTg1naVzNPtJaRG1xmSc2CFjDTin64Cw,
 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/IESLabPlanResult.py,sha256=3CFyUtV6uY8veKQ042s80-ekdbb11IDwmB7H_8ggjKM,8898
 cloudpss/runner/IESLabTypicalDayResult.py,sha256=lr8ID_Wk4zJagirReFoBJdedXoxUYt4CSQH9uZD6kKo,8179
 cloudpss/runner/MessageStreamReceiver.py,sha256=dT-rKslQbRt3bMTGXupa1YrocHl2zTWOCHlsXcbgfhs,2812
 cloudpss/runner/__init__.py,sha256=FxiYYmssbZgRjieySzi43yPiWEF6eNos2UsoFQeD2H8,341
@@ -75,7 +75,7 @@ cloudpss/utils/httprequests.py,sha256=utBRZ5trImSdUOZiiLa6tVDd8CtRhD9qC2lZq_n13R
 cloudpss/utils/matlab.py,sha256=SLwVt790BjklJK2XNELt9R2n_1ej9Y8QsTIdFkKXLWE,795
 cloudpss/utils/parseDebugArgs.py,sha256=r8EptSHG9D-U7dT3pHFDclL-8G2La9w4GEjUAY-rsMc,3174
 cloudpss/utils/yamlLoader.py,sha256=bv_vPDK_e0n_vZ5FwpDJ_NJWqMAwfU3AbhkvQIxPCy4,2677
-cloudpss-4.5.22.dist-info/METADATA,sha256=Fivz6Ld6Cn1bIzLaGZP9p7K2kiFT5UmR7WA0h8obNc4,2402
-cloudpss-4.5.22.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cloudpss-4.5.22.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
-cloudpss-4.5.22.dist-info/RECORD,,
+cloudpss-4.5.24.dist-info/METADATA,sha256=2iC1HWIPd3f-15vvgAvCrN_wUlwWC3O_zRY7fdvCFzo,2402
+cloudpss-4.5.24.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cloudpss-4.5.24.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
+cloudpss-4.5.24.dist-info/RECORD,,