cloudpss 4.0.13__py3-none-any.whl → 4.0.15__py3-none-any.whl

cloudpss/function/functionExecution.py

@@ -104,10 +104,10 @@ class FunctionExecution(object):
         for item in data:
             if type(item) is list:
                 arr.append(FunctionExecution.__listObj2Array(item))
-            elif type(item) is dict and 'ɵid' in item :
+            elif type(item) is dict and ('ɵid' in item or '?id' in item ):
                 a = list(range(len(item)-1))
                 for k, v in item.items():
-                    if k == 'ɵid': 
+                    if k == 'ɵid' or k == '?id':
                         continue
                     k = int(k)
                     if type(v) is list:

cloudpss/runner/MessageStreamReceiver.py

@@ -46,13 +46,13 @@ class MessageStreamReceiver(object):
         path = head + '://' + str(u[1]) + '/api/streams/id/' + id
         if fr0m is not None:
             path = path + '&from=' + str(fr0m)
-        ws = websocket.WebSocketApp(path,
+        self.ws = websocket.WebSocketApp(path,
                                     on_open=on_open,
                                     on_message=on_message,
                                     on_error=on_error,
                                     on_close=on_close)
-        ws.run_forever()
-        return ws
+        self.ws.run_forever()
+        return self.ws
 
     ###下面是兼容Receiver部分功能实现
     def on_message(self, ws, message):

cloudpss/version.py

@@ -1 +1 @@
-__version__ = '4.0.13'
+__version__ = '4.0.15'

{cloudpss-4.0.13.dist-info → cloudpss-4.0.15.dist-info}/METADATA

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

{cloudpss-4.0.13.dist-info → cloudpss-4.0.15.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cloudpss/__init__.py,sha256=Ov8K45KxSsPalPErvTRUb2GvPdJ3myucFqx7s37_YZo,777
 cloudpss/verify.py,sha256=KF4Gd59DGvCyIEkRD7rNnekWw22XxJpi3DW6keb6j4c,1498
-cloudpss/version.py,sha256=FKt4TKBQunwNAckNkDBIz0uu30gURt6qmMJaMDFBbxw,22
+cloudpss/version.py,sha256=lnKft8HBmV_8Oq80IA_j2_DQBKvxEcPSHD_1T8bxseI,22
 cloudpss/asyncio/__init__.py,sha256=CJGopQl_vz3z3fJsK7NjMX5uzkzfrJrbqKVhyYqlYWc,198
 cloudpss/asyncio/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
 cloudpss/asyncio/job/job.py,sha256=ExA-8JVOWWW5neVvNazPk4i3Z-q8xqYBL4qXU1m3rgM,3891
@@ -22,7 +22,7 @@ cloudpss/dslab/files/curveData.py,sha256=GU_DTTKjVn_ln9Hx0q9CFgfmNtokZi7b4DYSzGe
 cloudpss/dslab/files/files.py,sha256=vS0VhAh1lb8oFw51E2rAsb0WpmqM9F9IprxNCAPqH1s,934
 cloudpss/function/__init__.py,sha256=TNzChB-gQF6oB62F423evpUlgcp6s03D4pKKs89Lz4Q,1629
 cloudpss/function/function.py,sha256=llomkfnTmKMiFJYJ2mKnmAEoIjTNVCnjCUUyiJMOV1s,29
-cloudpss/function/functionExecution.py,sha256=j2O6k5n7lTw6mJjWu0GYxcIhew3oNaEjbrgreLVlJaM,15475
+cloudpss/function/functionExecution.py,sha256=ZHHKC5cz2Rp8dZan_MGGCAOXMp0fdngnUeq1FQ3M0CQ,15507
 cloudpss/function/job.py,sha256=LdzaTyjvBcMZIyLstSZnt79d2eREljx2HnNoilDp03A,13162
 cloudpss/ieslab/DataManageModel.py,sha256=YMpwp04GmkaK1gCnzp5tNAoPwkVfa9AkJPviqNOat7s,19445
 cloudpss/ieslab/EvaluationModel.py,sha256=SD7VB81wZnebGQWpx-eTQMQxe6ekFUFycQxz6RyYwOI,6721
@@ -57,7 +57,7 @@ cloudpss/runner/DSLabResult.py,sha256=xJqKA3e1KSXQmLDe9_T6fG1exdE9j7EjfIfvBMmqiJ
 cloudpss/runner/IESLabEvaluationResult.py,sha256=uFNLiN5kzlzSGlLIq3ybuRwB-ufYytflVrXV5g7voOU,5841
 cloudpss/runner/IESLabPlanResult.py,sha256=dCyTbMtITy9XDjE42knrpJrvaH7dvFgfQMZbx9hybRs,6862
 cloudpss/runner/IESLabTypicalDayResult.py,sha256=3egAzmv32sr4wKaVgLxsM75ScSb08F4-iLEbuPkoi_c,8001
-cloudpss/runner/MessageStreamReceiver.py,sha256=_G_7LIFdm7EtOf046nT-V3HNmygAm2oo5WYl4m27jKY,2832
+cloudpss/runner/MessageStreamReceiver.py,sha256=sjZPZFbfepMIb-kgAl3zBcin0idIIL-37vpUmxvP3DI,2847
 cloudpss/runner/__init__.py,sha256=aZ00V2AzQNBbER0xi6pqFFyiLFM-6r1fxvzdxxUJA_4,241
 cloudpss/runner/receiver.py,sha256=d8vOtBJ_Iqo3syJXgFFxwii1MXF7CyHRoXy6eT81Zq4,4096
 cloudpss/runner/result.py,sha256=GFpd7848gsLRuzhVcWbCwmAjR84Lhik_3pNCjOV8VOY,13291
@@ -71,7 +71,7 @@ cloudpss/utils/graphqlUtil.py,sha256=swl6XT1UmUQHdHjMWw3M0i8meEmVKNQvX0SHsbgg8TU
 cloudpss/utils/httprequests.py,sha256=-RYi1Dc4QDqqupuw0x-lq74dFvCqPrZfCJKgrdolEpk,1643
 cloudpss/utils/matlab.py,sha256=SLwVt790BjklJK2XNELt9R2n_1ej9Y8QsTIdFkKXLWE,795
 cloudpss/utils/yamlLoader.py,sha256=KRlRkHFltOjqxa_sesdBLf1W5J7XTgvubszsSw-XR0U,2885
-cloudpss-4.0.13.dist-info/METADATA,sha256=7LhtnxaiDT7M8dyYGzNfTwY5DYVYTsCPdzFzDUUX7qI,2369
-cloudpss-4.0.13.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cloudpss-4.0.13.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
-cloudpss-4.0.13.dist-info/RECORD,,
+cloudpss-4.0.15.dist-info/METADATA,sha256=BST4dVg2PQlePESP1mYhm8crmfKOqhT8zktPuJr0UFU,2369
+cloudpss-4.0.15.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cloudpss-4.0.15.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
+cloudpss-4.0.15.dist-info/RECORD,,