cloudpss 4.1.1a1__tar.gz → 4.1.1a2__tar.gz

{cloudpss-4.1.1a1 → cloudpss-4.1.1a2}/PKG-INFO

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

{cloudpss-4.1.1a1 → cloudpss-4.1.1a2}/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-4.1.1a1 → cloudpss-4.1.1a2}/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-4.1.1a1 → cloudpss-4.1.1a2}/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-4.1.1a1 → cloudpss-4.1.1a2}/cloudpss/utils/httpAsyncRequest.py

@@ -74,6 +74,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-4.1.1a2/cloudpss/version.py

@@ -0,0 +1 @@
+__version__ = '4.1.1-alpha.2'

{cloudpss-4.1.1a1 → cloudpss-4.1.1a2}/cloudpss.egg-info/PKG-INFO

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

{cloudpss-4.1.1a1 → cloudpss-4.1.1a2}/cloudpss.egg-info/requires.txt

@@ -11,3 +11,4 @@ pytz
 deprecated
 py-ubjson
 aiohttp
+zstandard

{cloudpss-4.1.1a1 → cloudpss-4.1.1a2}/setup.py

@@ -24,6 +24,6 @@ setup(
     python_requires='>=3.7',
     install_requires=[
         'cffi', 'cryptography', 'cycler', 'pycparser', 'PyJWT', 'numpy',
-        'PyYAML', 'requests', 'websocket-client', 'pytz', 'deprecated','py-ubjson','aiohttp'
+        'PyYAML', 'requests', 'websocket-client', 'pytz', 'deprecated','py-ubjson','aiohttp','zstandard'
     ],
 )

cloudpss-4.1.1a1/cloudpss/version.py

@@ -1 +0,0 @@
-__version__ = '4.1.1-alpha.1'