cloudpss 4.0.0a7__py3-none-any.whl → 4.0.2__py3-none-any.whl

cloudpss/job/view/view.py

@@ -0,0 +1,122 @@
+
+
+from ..messageStreamSender import MessageStreamSender
+from ..messageStreamReceiver import MessageStreamReceiver
+
+
+class View(object):
+    """
+        结果视图基类，提供基础的结果获取接口
+    """
+    def __init__(self, receiver:MessageStreamReceiver,sender:MessageStreamSender=None) -> None:
+        """
+            初始化
+        """
+        self.result = {}
+        self._receiver = receiver
+        self._sender = sender
+        self.__logsIndex = 0
+        
+    def __deepModify(self, dict1, dict2):
+
+        for key, val in dict1.items():
+            if type(val) is dict:
+                self.__deepModify(val, dict2[key])
+            else:
+                dict2[key] = val
+                
+    def modify(self, data, model):
+        """
+            通过指定消息修改算例文件
+
+            :params: data 消息字典 {}
+            :params: model  项目
+
+            >>> message= view.modify(data,model)
+
+        """
+        modifyData = data['data']
+        payload = modifyData['payload']
+        self.__deepModify(payload, model)
+    
+    def getMessagesByKey(self, key):
+        """
+            获取指定 key 的消息数据
+
+            :params key: 数据key
+
+            :returns: 对应 key 的数据数组
+
+            >>> message= db.getMessagesByKey('log')
+        """
+
+        result = []
+        for val in self._receiver:
+            if val.get('key', None) == key:
+                result.append(val)
+        return result
+
+    def getMessagesByType(self, type):
+        """
+            获取指定类型的消息数据
+
+            :params type: 数据类型
+
+            :returns: 对应类型的数据数组
+
+            >>> message= db.getMessagesByType('log')
+        """
+
+        result = []
+        for val in self._receiver:
+            if val['type'] == type:
+                result.append(val)
+        return result
+
+    def getMessage(self, index):
+        """
+            获取指定位置的消息数据
+
+            :params index: 数据的位置信息
+
+            :returns: 消息数据
+
+            >>> message= db.getMessage(1)
+        """
+        return self._receiver.messages[index]
+
+    def getMessages(self):
+        """
+            获取所有消息数据
+
+            :returns: 消息数据数组
+        """
+        return self._receiver.messages
+    
+    
+    def getLogs(self):
+        '''
+            获取当前任务的日志
+
+            >>>logs= result.getLogs()
+            {...}
+        '''
+        result = []
+        length = len(self._receiver.messages)
+        if (length > self.__logsIndex):
+            for num in range(self.__logsIndex, length):
+                val = self.getMessage(num)
+                if val['type'] == 'log':
+                    result.append(val)
+            self.__logsIndex = length
+        return result
+    
+    
+    @property
+    def end(self):
+        """
+            获取当前连接状态
+
+            :returns: 当前连接状态  0:关闭 1:打开
+        """
+        return self._receiver.end

cloudpss/utils/IO.py

@@ -5,6 +5,7 @@ import yaml
 import gzip
 import base64
 import struct
+import zstandard as zstd
 
 
 def float32Array(_loader, node):
@@ -56,7 +57,8 @@ def int32Array(_loader, node):
 yaml.add_constructor('tag:yaml.org,2002:js/Float32Array', float32Array)
 yaml.add_constructor('tag:yaml.org,2002:js/Float64Array', float64Array)
 yaml.add_constructor('tag:yaml.org,2002:js/Uint8Array', uint8Array)
-yaml.add_constructor('tag:yaml.org,2002:js/Uint8ClampedArray', uint8ClampedArray)
+yaml.add_constructor('tag:yaml.org,2002:js/Uint8ClampedArray',
+                     uint8ClampedArray)
 yaml.add_constructor('tag:yaml.org,2002:js/Uint16Array', uint16Array)
 yaml.add_constructor('tag:yaml.org,2002:js/Uint32Array', uint32Array)
 yaml.add_constructor('tag:yaml.org,2002:js/Int8Array', int8Array)
@@ -73,7 +75,7 @@ class IO(object):
     def serialize(obj, format, compress='gzip') -> bytes:
         """
         根据format序列化模型
-        format 支持 json, ubjson, yaml
+        format 支持 json, ubjson, yaml, zstd
         compress 支持 gzip
         """
         result = None
@@ -87,13 +89,15 @@ class IO(object):
             assert False, 'format not support'
         if compress == 'gzip':
             return gzip.compress(result)
+        if compress == 'zstd':
+            return zstd.ZstdCompressor().compress(result)
         return result
 
     @staticmethod
     def deserialize(byt, format):
         """
         根据format反序列化模型
-        format 支持 json, ubjson, yaml
+        format 支持 json, ubjson, yaml, zstd
         """
         if format == 'json':
             return json.loads(byt)
@@ -111,12 +115,17 @@ class IO(object):
         """
         ### 读取文件
         f = open(file, 'r+', encoding='utf-8')
-        t = f.buffer.read(2)
+        t = f.buffer.read(4)
         f.close()
         ### 判断文件格式是否是gzip或其他格式
-        if t == b'\x1f\x8b':
+        if t[0:2] == b'\x1f\x8b':
             with gzip.open(file, 'rb') as input_file:
                 return IO.deserialize(input_file.read(), format)  # type:ignore
+        if t == b'\x28\xb5\x2f\xfd':
+            with open(file, 'rb') as input_file:
+                return IO.deserialize(
+                    zstd.ZstdDecompressor().decompress(input_file.read()),
+                    format)
         else:
             with open(file, 'rb') as f:
                 data = f.read()
@@ -127,7 +136,7 @@ class IO(object):
     def dump(obj, file, format, compress='gzip'):
         """
         根据format将模型保存到文件中
-        format 支持 json, ubjson, yaml
+        format 支持 json, ubjson, yaml, zstd
         compress 支持 gzip
         """
         ### 序列化
@@ -147,7 +156,9 @@ if __name__ == '__main__':
     ]
     IO.dump(obj, 'output.json.gz', 'json')
     IO.dump(obj, 'output.ubjson.gz', 'ubjson')
-    IO.dump(obj, 'output.yaml.gz', 'yaml')
+    IO.dump(obj, 'output.yaml.gz', 'yaml')  # type: ignore
+    IO.dump(obj, 'output.yaml.zstd', 'yaml', 'zstd')  # type: ignore
     print(IO.load('output.json.gz', 'json'))
     print(IO.load('output.ubjson.gz', 'ubjson'))
     print(IO.load('output.yaml.gz', 'yaml'))
+    print(IO.load('output.yaml.zstd', 'yaml'))

cloudpss/utils/httprequests.py

@@ -24,7 +24,7 @@ def request(method, uri, baseUrl=None, params={}, token=None, **kwargs):
             raise Exception(
                 '当前SDK版本（ver 3.X.X）与服务器版本（3.0.0 以下）不兼容，请更换服务器地址或更换SDK版本。')
         os.environ['X_CLOUDPSS_VERSION'] = r.headers['X-Cloudpss-Version']
-        if float(r.headers['X-Cloudpss-Version']) > 4:
+        if float(r.headers['X-Cloudpss-Version']) >= 5:
             raise Exception('当前SDK版本（ver '+__version__ +'）与服务器版本（ver ' +
                             r.headers['X-Cloudpss-Version'] +
                             '.X.X）不兼容，请更换服务器地址或更换SDK版本(pip 使用 pip install -U cloudpss 命令更新, conda 使用 conda update cloudpss 命令更新)。')

cloudpss/version.py

@@ -1 +1 @@
-__version__ = '4.0.0-alpha.7'
+__version__ = '4.0.2'

{cloudpss-4.0.0a7.dist-info → cloudpss-4.0.2.dist-info}/METADATA

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

{cloudpss-4.0.0a7.dist-info → cloudpss-4.0.2.dist-info}/RECORD

@@ -1,10 +1,10 @@
 cloudpss/__init__.py,sha256=Ov8K45KxSsPalPErvTRUb2GvPdJ3myucFqx7s37_YZo,777
 cloudpss/verify.py,sha256=KF4Gd59DGvCyIEkRD7rNnekWw22XxJpi3DW6keb6j4c,1498
-cloudpss/version.py,sha256=X8aCp5AzQdKxy0Hj-PzIAhbNl8_w6ZPVURdg7sxXObw,29
+cloudpss/version.py,sha256=X2FSVyXfKfCh487cbRC3bWEH0TAFIoyQIus2dzhKa3U,21
 cloudpss/dslab/DSLabFinancialResult.py,sha256=7_ho5Xzm9ufcMXo1wCjxJe4VQxqod-6jpvVF3XjlXcw,3612
 cloudpss/dslab/__init__.py,sha256=rm3bUFSet3KZYrkKo6pfMBNfjvR3U1rwnTnEA5sE87Q,44
-cloudpss/dslab/dataManageModel.py,sha256=F710Kt4wamUB1hrUXjICixiwyE9BWysNy1J3uYgWxwE,10131
-cloudpss/dslab/dslab.py,sha256=3Po00COxYxQ40Y_IJigXoodxwuC3IQo98CtlYsfhxaY,6332
+cloudpss/dslab/dataManageModel.py,sha256=_a_LiZvnOup71ehgRlI5Rzu1tMO9zSF5AVBlAWcRh90,10710
+cloudpss/dslab/dslab.py,sha256=XqbciGqDd22d5u983ysQQpizHBwFzuVBeGcGdIr8Ksc,8848
 cloudpss/dslab/financialAnalysisModel.py,sha256=o-s6rR74UIjj5V9oB9fjdyo3Q3ogtY3QPhxSXbiBHXk,5058
 cloudpss/dslab/files/__init__.py,sha256=l2g0VadtTiMW39zwCwHPHUC01Kbklb_nFUPVeQ16FwM,58
 cloudpss/dslab/files/curveData.py,sha256=InlQ_6ZfVkFdhK65PldvIbw_X7Pys2ci4jexZ0flL6c,4291324
@@ -19,6 +19,22 @@ cloudpss/ieslab/IESLabPlan.py,sha256=vWRExT0AE5VbR1DaQSINE65sbg0F6cXC7meXNT6Ap6Q
 cloudpss/ieslab/IESLabSimulation.py,sha256=sd27IZ2NIGqUQWWVsobUOOY_7b1QzVbUMeSmFWKianw,1746
 cloudpss/ieslab/PlanModel.py,sha256=Dk5ZS_8IASqzMlLeN_gIDk76Gm_ybXjGY4pULBsWvEw,4790
 cloudpss/ieslab/__init__.py,sha256=kiyUaGRgtwqs0EI2dBBqLVK5V65u1PcY7YTFJX1T0yw,186
+cloudpss/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
+cloudpss/job/job.py,sha256=wgw0haur_-4W51vecgSSqKqH7TPmjIa218yJn3TOO6k,8267
+cloudpss/job/jobMachine.py,sha256=wtJ7X9Cu-4KGpYvxLbvCVWv5Ku0CvsgmfThK8knLfoI,268
+cloudpss/job/jobPolicy.py,sha256=k5Ur9LYvTnWNgI9yqeCjs5E499DSOrYbYgywU8-zpC4,4083
+cloudpss/job/jobQueue.py,sha256=31Q7NCjb_51d1JOokVyxIfP1r6S_A-ObySJKwt8MxR8,416
+cloudpss/job/jobReceiver.py,sha256=kX59JLky86AXwgCWw0abfKu-yDWQ97YAV-sOObF5Kgk,740
+cloudpss/job/jobTres.py,sha256=1wwdvwxpYKOfsZ1R95Wkhyg_QYMzqzKoaLJLdB-bD88,148
+cloudpss/job/messageStreamReceiver.py,sha256=PZU31qIz0ly_Mmk2K1m23Wo6I7MxCnrbZfEYhrNWZZQ,3512
+cloudpss/job/messageStreamSender.py,sha256=kVUrmnMCAFWwmINBzXbNvW09OyZ74UtdCrx5JhlzRwM,2097
+cloudpss/job/view/EMTView.py,sha256=odEWQVEkHkx75EyN-vk9W05yXvTjBOHfWxhFJrBgv1I,6839
+cloudpss/job/view/IESLabSimulationView.py,sha256=_hD-fdEwC6U8hQYbXliNMEii0WxiteglQZuLOSQmMOM,76
+cloudpss/job/view/IESLabTypicalDayView.py,sha256=Za57f9TYcBxYeKo8fnEcOjl517v1LMDN0ua537fxcjc,1168
+cloudpss/job/view/IESView.py,sha256=bf654u2GFIarhtbPm4bgpUwzpc_hVqSCdw9dDPxKpnU,3755
+cloudpss/job/view/PowerFlowView.py,sha256=xg-KX37ENxYtEV7CRUszXfsyDmTsOKCh7agSg5K6EWQ,2089
+cloudpss/job/view/__init__.py,sha256=j_X6aFeY-wa6_0r1EixE0rrvGz_67m4fIqOLmUbkxqY,1466
+cloudpss/job/view/view.py,sha256=piPoryU3gXBMNuXxuKBXhJEwM8EYHpVRU2Sq_mNoVcM,3150
 cloudpss/model/__init__.py,sha256=SNq-bfwcQtDHtTNBYppfUEs8wkjfrQfGeywx7igmvOs,151
 cloudpss/model/jobDefinitions.py,sha256=XqjaaWOLU7zlVHM7TQJbZ3rNBWfBY7eT-5aE6EAatcQ,3770
 cloudpss/model/model.py,sha256=cMIkamN5wbtCtqQTjgQ8hRa6-oso6HQfnuYklwJXOII,25712
@@ -41,14 +57,14 @@ cloudpss/runner/result.py,sha256=MkoTQly7FjKj9mde3bnv4vBDfGJ2U4eK-HhxxdwmemE,131
 cloudpss/runner/runner.py,sha256=NbBJfCVFk9n3eYsQSjTaK12zohwqKYak-lEEOo8vWDo,5316
 cloudpss/runner/storage.py,sha256=zFET_zwPIOF2Cnh9sgFiS0HFxV1OmVsU34bGUQ6PpkA,4162
 cloudpss/runner/transform.py,sha256=krOgTZiJSJAb5QSwerAqlbC4Ma0PKi__0WOZlAxw4O8,11613
-cloudpss/utils/IO.py,sha256=0i0v-otQwcYJEDf7gGvfsJTAf0N89yimfKS--DNyP3s,4796
+cloudpss/utils/IO.py,sha256=Uh1NOlBn15Jl5_aWS2QRO2-QsKlFT9o8DPtP8-8Z2PA,5314
 cloudpss/utils/__init__.py,sha256=NU5ZAeXH733nJKooH_1cdT9ntPEYRG4Kk3PA7P6bK_s,291
 cloudpss/utils/dataEncoder.py,sha256=5PUPb844eOGgFnYrMM8bdjdKH_MZz0lk-67uo8TvwEo,885
 cloudpss/utils/graphqlUtil.py,sha256=swl6XT1UmUQHdHjMWw3M0i8meEmVKNQvX0SHsbgg8TU,255
-cloudpss/utils/httprequests.py,sha256=sIf2ZDYwHtjm9D_zBzdTDqWy8KReQajOV_BS8Wd6m7w,1642
+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.0a7.dist-info/METADATA,sha256=mPxaRnNzxCVZYf24XsQKtWmz3R0lsJ5ewPnLGRgpKuQ,2320
-cloudpss-4.0.0a7.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cloudpss-4.0.0a7.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
-cloudpss-4.0.0a7.dist-info/RECORD,,
+cloudpss-4.0.2.dist-info/METADATA,sha256=B5ede-aq6jNV-jXKAtp_qF_KDrz-Z2ZekA90onhHEVA,2318
+cloudpss-4.0.2.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cloudpss-4.0.2.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
+cloudpss-4.0.2.dist-info/RECORD,,