cloudpss 4.5.6__tar.gz → 4.5.8__tar.gz

{cloudpss-4.5.6 → cloudpss-4.5.8}/PKG-INFO

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

{cloudpss-4.5.6 → cloudpss-4.5.8}/cloudpss/model/topology.py

@@ -17,13 +17,16 @@ class ModelTopology():
         mappings   拓扑分析后的一些映射数据
 
 
+    """
+    __ReqParam="""
+        components
+        mappings
     """
     __modelTopologyQuery = """
             query($a:ModelTopologyInput!){
             modelTopology(input:$a){
-                components
-                mappings
-            }}
+                
+            
         """
     __All__ = ['ModelTopology']
 
@@ -76,7 +79,17 @@ class ModelTopology():
                 'maximumDepth': maximumDepth
             }
         }
-        data = graphql_request(ModelTopology.__modelTopologyQuery, variables, **kwargs)
+        
+        ports = kwargs.get('ports', False)
+        if ports:
+            ModelTopology.__ReqParam += """
+                ports
+            """
+            del kwargs['ports']
+        query = ModelTopology.__modelTopologyQuery + ModelTopology.__ReqParam + "}}"
+        
+        
+        data = graphql_request(query, variables, **kwargs)
         if 'errors' in data:
             raise Exception(data['errors'][0]['message'])
 

{cloudpss-4.5.6 → cloudpss-4.5.8}/cloudpss/utils/httprequests.py

@@ -33,7 +33,7 @@ def request(method, uri, baseUrl=None, params={}, token=None, **kwargs):
     if (uri.startswith('graphql')):
         if 'X-Cloudpss-Version' not in r.headers:
             raise Exception(
-                '当前SDK版本（ver 3.X.X）与服务器版本（3.0.0 以下）不兼容，请更换服务器地址或更换SDK版本。')
+                '当前SDK版本（ver '+__version__ +'）与服务器版本（3.0.0 以下）不兼容，请更换服务器地址或更换SDK版本。')
         os.environ['X_CLOUDPSS_VERSION'] = r.headers['X-Cloudpss-Version']
         if float(r.headers['X-Cloudpss-Version']) >= 5:
             raise Exception('当前SDK版本（ver '+__version__ +'）与服务器版本（ver ' +

cloudpss-4.5.8/cloudpss/version.py

@@ -0,0 +1 @@
+__version__ = '4.5.8'

{cloudpss-4.5.6 → cloudpss-4.5.8}/cloudpss.egg-info/PKG-INFO

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

{cloudpss-4.5.6 → cloudpss-4.5.8}/cloudpss.egg-info/SOURCES.txt

@@ -96,4 +96,5 @@ test/test_in_new_web_1.py
 test/test_modepower_ampratio(3).py
 test/test_ws.py
 test/test_ws2.py
+test/test_ws3.py
 test/testb.py

{cloudpss-4.5.6 → cloudpss-4.5.8}/test/test_ws.py

@@ -52,7 +52,7 @@ class WebsocketClient():
         return self._status
         
     async def create(self):
-       asyncio.create_task(self.websocket_connect('ws://10.101.10.45/api/streams/id/2638cc71-2b02-4a78-ad7d-d186c54ecc7b'))
+       asyncio.create_task(self.websocket_connect('ws://www.rpssc.top:52694/api/streams/id/a454e6b7-e677-41df-a4e8-6202ff3cb35e'))
        
 async def main():
     ws=WebsocketClient()

{cloudpss-4.5.6 → cloudpss-4.5.8}/test/test_ws2.py

@@ -87,7 +87,7 @@ class WebsocketClient():
         
     async def create(self):
     #    await self.websocket_connect('ws://10.101.10.45/api/streams/id/bb30285a-7d11-484b-a8b0-4855cf8bf8ed')
-        await self.websocket_connect('ws://10.101.10.45/api/streams/id/2638cc71-2b02-4a78-ad7d-d186c54ecc7b')
+        await self.websocket_connect('ws://www.rpssc.top:52694/api/streams/id/1d3b2722-dd65-42c2-ac91-a232e44582c9')
     #    asyncio.create_task(self.websocket_connect('ws://10.101.10.45/api/streams/id/bb30285a-7d11-484b-a8b0-4855cf8bf8ed'))
     
 async def main():

cloudpss-4.5.8/test/test_ws3.py

@@ -0,0 +1,49 @@
+
+import time
+import threading
+import websocket
+# ws://10.101.10.45/api/streams/token/fe943635-0dc9-40c8-8a27-39d02af66894
+
+    
+class WebsocketClient():
+    message = []
+    _status=0
+    # __init__(self):
+    def on_close(self, *args, **kwargs):
+        self._status = 1
+        print("close")
+    def on_error(self,  *args, **kwargs):
+        self._status = 1
+        print("error",args,kwargs)
+    def on_open(self,ws, *args, **kwargs):
+        self._status = 1
+        print("open")
+    def on_message(self,  *args, **kwargs):
+        self._status = 0
+        print("on_message")
+    # websocket
+    def connect(self):
+        self._status = 0
+        path = "ws://www.rpssc.top:52694/api/streams/id/a454e6b7-e677-41df-a4e8-6202ff3cb35e"
+        self.ws = websocket.WebSocketApp(
+            path,
+            on_open=self.on_open,
+            on_message=self.on_message,
+            on_error=self.on_error,
+            on_close=self.on_close,
+        )
+        thread = threading.Thread(target=self.ws.run_forever, kwargs={'ping_interval':60,'ping_timeout':5,'reconnect':True})
+        thread.setDaemon(True)
+        thread.start()
+        while not self._status:
+            time.sleep(0)
+       
+def main():
+    ws=WebsocketClient()
+    ws.connect()
+    print("start")
+    while ws._status == 0:
+        time.sleep(0)
+        pass
+if __name__ == '__main__':
+    main()

cloudpss-4.5.6/cloudpss/version.py

@@ -1 +0,0 @@
-__version__ = '4.5.6'