cloudpss 4.5.7__tar.gz → 4.5.9__tar.gz

{cloudpss-4.5.7 → cloudpss-4.5.9}/PKG-INFO

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

{cloudpss-4.5.7 → cloudpss-4.5.9}/cloudpss/function/functionExecution.py

@@ -4,6 +4,8 @@ import json
 import signal
 import sys
 from ..utils import MatlabDataEncoder
+import threading
+import queue
 
 
 class EventSample(object):
@@ -23,7 +25,23 @@ class EventSample(object):
              eventHandlerKwargs] in self.__eventHandlerSample:
             eventHandlerSample(*eventHandlerArgs, **eventHandlerKwargs)
 
+class EventInput(object):
+    def __init__(self):
+        self.__eventHandlerSample = []
 
+    def __iadd__(self, EventHandler):
+        self.__eventHandlerSample.append(EventHandler)
+        return self
+
+    def __isub__(self, EventHandler):
+        self.__eventHandlerSample.remove(EventHandler)
+        return self
+
+    def __call__(self, *args, **kwargs):
+        for [eventHandlerSample] in self.__eventHandlerSample:
+            # 调用事件处理程序
+            if eventHandlerSample:
+                eventHandlerSample(*args, **kwargs)
 class Args(dict):
     """
         参数类
@@ -87,7 +105,9 @@ class FunctionExecution(object):
         self.token = kwargs.get('token', None)
         self.functionToken = kwargs.get('functionToken', None)
         self.__abortedEvents = EventSample()
+        self.__inputEvents = EventInput()
         self._args = None
+        self.__input_thread = None
         signal.signal(signal.SIGINT, self._on_abort)
 
     @property
@@ -185,6 +205,23 @@ class FunctionExecution(object):
         '''
         sys.exit(code)
 
+    def input_thread(self):
+        while True:
+            user_input = input()
+            self.__inputEvents(user_input)
+            
+    def on_input(self, func):
+        """
+            监听input事件
+
+            :params func 响应后的回调函数
+        """
+        if self.__input_thread is None:
+            self.__input_thread = threading.Thread(target=self.input_thread, args=())
+            self.__input_thread.start()
+            self.log('cloudpss input stream is ready', 'debug')
+        self.__inputEvents += [func]
+        
     def print(self, data):
         print(json.dumps(data, cls=MatlabDataEncoder)+'\n', flush=True)
 

{cloudpss-4.5.7 → cloudpss-4.5.9}/cloudpss/model/topology.py

@@ -17,14 +17,16 @@ class ModelTopology():
         mappings   拓扑分析后的一些映射数据
 
 
+    """
+    __ReqParam="""
+        components
+        mappings
     """
     __modelTopologyQuery = """
             query($a:ModelTopologyInput!){
             modelTopology(input:$a){
-                components
-                mappings
-                ports
-            }}
+                
+            
         """
     __All__ = ['ModelTopology']
 
@@ -77,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.9/cloudpss/version.py

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

{cloudpss-4.5.7 → cloudpss-4.5.9}/cloudpss.egg-info/PKG-INFO

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

cloudpss-4.5.7/cloudpss/version.py

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