cloudpss 4.5.7__py3-none-any.whl → 4.5.9__py3-none-any.whl

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/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/version.py

@@ -1 +1 @@
-__version__ = '4.5.7'
+__version__ = '4.5.9'

{cloudpss-4.5.7.dist-info → cloudpss-4.5.9.dist-info}/METADATA

@@ -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.dist-info → cloudpss-4.5.9.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cloudpss/__init__.py,sha256=1RNmUBhoxYUutZiTS-XJ9yBoNGGh8Mpt1uY6ETlSBDc,825
 cloudpss/verify.py,sha256=KF4Gd59DGvCyIEkRD7rNnekWw22XxJpi3DW6keb6j4c,1498
-cloudpss/version.py,sha256=I0FSCHd9Pa_7Ek3IY0C7azF66BycdQqo1RaqANTP2x8,22
+cloudpss/version.py,sha256=xGdaPJqc07-IU62quHl65eRw-4ZSqCOIvpSy2ca3mQ0,22
 cloudpss/asyncio/__init__.py,sha256=CJGopQl_vz3z3fJsK7NjMX5uzkzfrJrbqKVhyYqlYWc,198
 cloudpss/asyncio/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
 cloudpss/asyncio/job/job.py,sha256=Bn2BEERw1J8YarFauTzVrGJK7nmaoMsdlrFUqiHRth4,3897
@@ -22,7 +22,7 @@ cloudpss/dslab/files/curveData.py,sha256=GU_DTTKjVn_ln9Hx0q9CFgfmNtokZi7b4DYSzGe
 cloudpss/dslab/files/files.py,sha256=vS0VhAh1lb8oFw51E2rAsb0WpmqM9F9IprxNCAPqH1s,934
 cloudpss/function/__init__.py,sha256=TNzChB-gQF6oB62F423evpUlgcp6s03D4pKKs89Lz4Q,1629
 cloudpss/function/function.py,sha256=llomkfnTmKMiFJYJ2mKnmAEoIjTNVCnjCUUyiJMOV1s,29
-cloudpss/function/functionExecution.py,sha256=thR3yz3dN3AFwJ411OpJV3JccB65yRS2tw9S4YKYjqU,15695
+cloudpss/function/functionExecution.py,sha256=YM2hS0Ao3jhMJodqFfxk0JAK7ZR00MPh-U2foBWshT0,16897
 cloudpss/function/job.py,sha256=LdzaTyjvBcMZIyLstSZnt79d2eREljx2HnNoilDp03A,13162
 cloudpss/ieslab/DataManageModel.py,sha256=5YqS_-xaLT8yTqEyjm3_mgO8mi8JESvibrUleFfYlsA,25520
 cloudpss/ieslab/EvaluationModel.py,sha256=hGZmuaB8lL9LVti_TCG-qCfK_bA-HJgdxYt7oMmVrXY,9399
@@ -49,7 +49,7 @@ cloudpss/model/__init__.py,sha256=SNq-bfwcQtDHtTNBYppfUEs8wkjfrQfGeywx7igmvOs,15
 cloudpss/model/jobDefinitions.py,sha256=uuTwpqStlg3YDmfxbU2PVi_Tf18opa0kYLCMGaOP-qA,3749
 cloudpss/model/model.py,sha256=hS64Tb6JJvLDaCi4mBPUGbXvmzc-nQxlHtnh7OQpreo,27179
 cloudpss/model/revision.py,sha256=IFznBKirwpfqadyCNJWPGL7lTpQxbCmU1fxdI5AvoA4,4002
-cloudpss/model/topology.py,sha256=I4zChvtMQd6QeVDlm_CxN1pSjnmL9TFltkdKskBW5TI,2355
+cloudpss/model/topology.py,sha256=MJF3rQBLWus4RVO6L3Zwih7SWYjRWsLMcrcIBxCmIwM,2617
 cloudpss/model/implements/__init__.py,sha256=88L_wF9SSzxsbtqwStWIPH4LxaKq7TVcssHQ62YBnls,67
 cloudpss/model/implements/component.py,sha256=uNSpkZKChdXLiO40Ev4P3oQ1di2Hu4YjcBOb0I8Bf0c,734
 cloudpss/model/implements/diagram.py,sha256=ILBq7oZVb2ZThmm_HdwGmGX0sZPwetoT4SSVN0xFqzo,6053
@@ -74,7 +74,7 @@ cloudpss/utils/graphqlUtil.py,sha256=zGEhRZvy5JMipFKFxjDmbc-HQP3aPZ5noDwi-RTXWSk
 cloudpss/utils/httprequests.py,sha256=1AzngOGVRRSUuI3duE75w1dRlQ7AvexnJL4aXxpDOhk,1857
 cloudpss/utils/matlab.py,sha256=SLwVt790BjklJK2XNELt9R2n_1ej9Y8QsTIdFkKXLWE,795
 cloudpss/utils/yamlLoader.py,sha256=bv_vPDK_e0n_vZ5FwpDJ_NJWqMAwfU3AbhkvQIxPCy4,2677
-cloudpss-4.5.7.dist-info/METADATA,sha256=rWxqOC5Hhx9kii5GbLd9pPu6Qtzt304QUMl2uNwJE5k,2401
-cloudpss-4.5.7.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cloudpss-4.5.7.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
-cloudpss-4.5.7.dist-info/RECORD,,
+cloudpss-4.5.9.dist-info/METADATA,sha256=pXYw_t8cxFUdKKa-tbqAyvWaNxBYtdD-RPP1PLU0dLY,2401
+cloudpss-4.5.9.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cloudpss-4.5.9.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
+cloudpss-4.5.9.dist-info/RECORD,,