cloudpss 4.1.1a1__py3-none-any.whl → 4.1.1a3__py3-none-any.whl

cloudpss/job/messageStreamReceiver.py

@@ -42,8 +42,8 @@ class MessageStreamReceiver(JobReceiver):
         path = head + "://" + str(u[1]) + "/api/streams/id/" + id
         if fr0m is not None:
             path = path + "&from=" + str(fr0m)
-        logging.info(f"receive data from websocket: {path}")
-        ws = await websocket_connect(
+        logging.info(f"MessageStreamReceiver data from websocket: {path}")
+        ws =await websocket_connect(
             path,
             open_func=on_open,
             receive_func=on_message,
@@ -58,9 +58,7 @@ class MessageStreamReceiver(JobReceiver):
     def on_message(self, message):
         data = IO.deserialize(message, "ubjson")
         msg = IO.deserialize(data["data"], "ubjson")
-        logging.debug(f"receive message: {msg}")
-        if msg.get("type", None) == "log" and self.dev:
-            print(msg)
+        print(msg)
         self.messages.append(msg)
         # if msg and type(msg) is dict and msg.get('type', None) == 'terminate':
         #     self.close(ws)
@@ -93,6 +91,7 @@ class MessageStreamReceiver(JobReceiver):
         self.messages.append(msg)
 
     def on_open(self):
+        logging.info(f"MessageStreamReceiver on_open")
         self._status = 1
         self.__hasOpen = True
         pass

cloudpss/job/messageStreamSender.py

@@ -52,15 +52,17 @@ class MessageStreamSender:
         self.ws.send_bytes(data)
 
     async def connect(self):
-        logging.info("connect")
         self._status = 0
         if self.job.input is None:
             raise Exception("id is None")
+        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.job.input
-        logging.info(f"receive data from websocket: {path}")
+        logging.info(f"MessageStreamSender data from websocket: {path}")
 
         self.ws = await websocket_connect(
             path,

cloudpss/model/topology.py

@@ -1,3 +1,4 @@
+import asyncio
 import json
 
 from cloudpss.utils.httpAsyncRequest import graphql_fetch
@@ -44,9 +45,13 @@ class ModelTopology():
         f = open(filePath, 'w', encoding='utf-8')
         json.dump(data, f, indent=indent)
         f.close()
-
+        
+    @staticmethod
+    def fetch(hash, implementType, config, maximumDepth=None):
+       return asyncio.run(ModelTopology.fetchAsync(hash, implementType, config, maximumDepth))
+        
     @staticmethod
-    async def fetch(hash, implementType, config, maximumDepth=None):
+    async def fetchAsync(hash, implementType, config, maximumDepth=None):
         """
             获取拓扑
 

cloudpss/utils/httpAsyncRequest.py

@@ -46,9 +46,8 @@ async def fetch_data(method: str, uri, data, baseUrl=None, params={}, **kwargs):
                 logging.debug("params:")
                 logging.debug(params)
                 graphql_version_check(uri, response)
-                # if "statusCode" in r.text:
-                #     t = json.loads(r.text)
-                #     raise  Exception(str(t['statusCode']) + " "+t['message'])
+                if "errors" in data:
+                    raise  Exception(data["errors"])
                 return data
             elif 400 <= response.status < 500:
                 raise Exception(f"请求失败，状态码：{response.status}")
@@ -74,6 +73,7 @@ async def websocket_connect(url, open_func, receive_func, closed_func, error_fun
             # ws.register_callback("error", lambda: error_func())
             open_func()
             async for msg in ws:
+                
                 if msg.type == WSMsgType.BINARY:
                     receive_func(msg.data)
                 if msg.type == WSMsgType.TEXT:

cloudpss/version.py

@@ -1 +1 @@
-__version__ = '4.1.1-alpha.1'
+__version__ = '4.1.1-alpha.3'

{cloudpss-4.1.1a1.dist-info → cloudpss-4.1.1a3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudpss
-Version: 4.1.1a1
+Version: 4.1.1a3
 Summary: cloudpss sdk
 Home-page: https://www.cloudpss.net
 Author: cloudpss
@@ -23,6 +23,7 @@ Requires-Dist: pytz
 Requires-Dist: deprecated
 Requires-Dist: py-ubjson
 Requires-Dist: aiohttp
+Requires-Dist: zstandard
 
 
 CloudPSS SDK

{cloudpss-4.1.1a1.dist-info → cloudpss-4.1.1a3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cloudpss/__init__.py,sha256=mW9gPztzpnqRGs47bj7Qo5iKMagT4CkBOEYZBzSHtPk,802
 cloudpss/verify.py,sha256=KF4Gd59DGvCyIEkRD7rNnekWw22XxJpi3DW6keb6j4c,1498
-cloudpss/version.py,sha256=yK8DGDCBwIb4ImcNCvxJzqpwXTilGj3MVghXWxArFfY,29
+cloudpss/version.py,sha256=hjwLs1A0VexwlRlouzvsDWnExvM7B_op0_I8hKFZtsc,29
 cloudpss/dslab/DSLabFinancialResult.py,sha256=7_ho5Xzm9ufcMXo1wCjxJe4VQxqod-6jpvVF3XjlXcw,3612
 cloudpss/dslab/__init__.py,sha256=rm3bUFSet3KZYrkKo6pfMBNfjvR3U1rwnTnEA5sE87Q,44
 cloudpss/dslab/dataManageModel.py,sha256=_a_LiZvnOup71ehgRlI5Rzu1tMO9zSF5AVBlAWcRh90,10710
@@ -26,8 +26,8 @@ cloudpss/job/jobPolicy.py,sha256=k5Ur9LYvTnWNgI9yqeCjs5E499DSOrYbYgywU8-zpC4,408
 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=_Km0Ug6z2WbSa8LPKmTdEXl3DlO7dyN6gB6Mel2azHs,3547
-cloudpss/job/messageStreamSender.py,sha256=f95ZCjcCQ7KQcH5gzfLXn6bmHkjsapM03bh_mcw4MGI,2008
+cloudpss/job/messageStreamReceiver.py,sha256=hA8UYykJEgoXaYnZSVUslnLPWRO8vq4cP4Xs9BrCz5M,3506
+cloudpss/job/messageStreamSender.py,sha256=k7M6dl1FGij5FZfqIdAK8QeE76uNKmrPcjPMTn0TVl8,2083
 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
@@ -39,7 +39,7 @@ cloudpss/model/__init__.py,sha256=SNq-bfwcQtDHtTNBYppfUEs8wkjfrQfGeywx7igmvOs,15
 cloudpss/model/jobDefinitions.py,sha256=XqjaaWOLU7zlVHM7TQJbZ3rNBWfBY7eT-5aE6EAatcQ,3770
 cloudpss/model/model.py,sha256=k50i9dQBGdwWL6uJOTAWHn5fwSBNb_klc33WMeoJUmQ,26505
 cloudpss/model/revision.py,sha256=pJv6CzYjbpLDIW37PiEZ9rFbi5ADmo6ITlGyZtS_0Ew,3729
-cloudpss/model/topology.py,sha256=2H2yURVHjS6iRNSCj8Pc-zjj71KnU4jDDwuBwmjhtM0,2303
+cloudpss/model/topology.py,sha256=W24pAQV9lJNOsx7QgRuf0O7KQxwurIgbE08DemfpDcM,2516
 cloudpss/model/implements/__init__.py,sha256=88L_wF9SSzxsbtqwStWIPH4LxaKq7TVcssHQ62YBnls,67
 cloudpss/model/implements/component.py,sha256=uNSpkZKChdXLiO40Ev4P3oQ1di2Hu4YjcBOb0I8Bf0c,734
 cloudpss/model/implements/diagram.py,sha256=N5RrrywmxOmc2KvP0nC-NiECT1tEhgJZPtiNCfvYPuc,1063
@@ -62,11 +62,11 @@ cloudpss/utils/IO.py,sha256=Uh1NOlBn15Jl5_aWS2QRO2-QsKlFT9o8DPtP8-8Z2PA,5314
 cloudpss/utils/__init__.py,sha256=jWVHSOqJQWU0fpg2UbWSEQoLCb2Uys-vH5Uqkb0ihNA,326
 cloudpss/utils/dataEncoder.py,sha256=5PUPb844eOGgFnYrMM8bdjdKH_MZz0lk-67uo8TvwEo,885
 cloudpss/utils/graphqlUtil.py,sha256=swl6XT1UmUQHdHjMWw3M0i8meEmVKNQvX0SHsbgg8TU,255
-cloudpss/utils/httpAsyncRequest.py,sha256=e8iCANMawHu8yswlP1oVuWbfS1RvO8iwwadlrQUHKpA,3781
+cloudpss/utils/httpAsyncRequest.py,sha256=t0fCXK5iVBlYMOYuLzg1L80rPQ1SvbXbeDxGb3nJ8oU,3718
 cloudpss/utils/httprequests.py,sha256=Fv5FwC8Ql0C1Acmrbr2Ep7flXjdxJINllBgPoli9to4,1719
 cloudpss/utils/matlab.py,sha256=SLwVt790BjklJK2XNELt9R2n_1ej9Y8QsTIdFkKXLWE,795
 cloudpss/utils/yamlLoader.py,sha256=bv_vPDK_e0n_vZ5FwpDJ_NJWqMAwfU3AbhkvQIxPCy4,2677
-cloudpss-4.1.1a1.dist-info/METADATA,sha256=1r7Egai-5K9KuQB_4WvZtridmaKRpFZIPXDLOUouN9g,2368
-cloudpss-4.1.1a1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cloudpss-4.1.1a1.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
-cloudpss-4.1.1a1.dist-info/RECORD,,
+cloudpss-4.1.1a3.dist-info/METADATA,sha256=9gbuxEVfmR8uFeErN-SGsJCP21ZfaypSto4zgMSb0G8,2393
+cloudpss-4.1.1a3.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cloudpss-4.1.1a3.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
+cloudpss-4.1.1a3.dist-info/RECORD,,