cloudpss 4.0.11__tar.gz → 4.0.13__tar.gz

{cloudpss-4.0.11 → cloudpss-4.0.13}/PKG-INFO

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

{cloudpss-4.0.11 → cloudpss-4.0.13}/cloudpss/function/functionExecution.py

@@ -99,6 +99,26 @@ class FunctionExecution(object):
         self._args = val
 
     @staticmethod
+    def __listObj2Array(data):
+        arr=[]
+        for item in data:
+            if type(item) is list:
+                arr.append(FunctionExecution.__listObj2Array(item))
+            elif type(item) is dict and 'ɵid' in item :
+                a = list(range(len(item)-1))
+                for k, v in item.items():
+                    if k == 'ɵid': 
+                        continue
+                    k = int(k)
+                    if type(v) is list:
+                        a[k] = FunctionExecution.__listObj2Array(v)
+                    else:
+                        a[k] = v
+                arr.append(a)       
+            else:
+                arr.append(item)
+        return arr
+    @staticmethod
     def __loadArgs():
         """加载当前任务参数
 
@@ -110,9 +130,12 @@ class FunctionExecution(object):
             if k.startswith('CLOUDPSS_JOB_ARG-'):
                 s = k.split('-')
                 key = bytes.decode(bytes.fromhex(s[1]))
-                # print(key, v, flush=True)
-
-                args[key] = json.loads(v)
+                data = json.loads(v)
+                
+                if type(data) is list:
+                    data = FunctionExecution.__listObj2Array(data)
+                
+                args[key] = data
         return args
 
     def feedDog(self):

{cloudpss-4.0.11 → cloudpss-4.0.13}/cloudpss/model/model.py

@@ -562,7 +562,6 @@ class Model(object):
         for param in paramters:
             for val in param['items']:
                 if config['args'].get(val['key'],None) is None:
-                    print(val['key'])
                     config['args'][val['key']] = val['value']
     
     def runEMT(self,job=None,config=None)->Runner[EMTResult]:

cloudpss-4.0.13/cloudpss/version.py

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

{cloudpss-4.0.11 → cloudpss-4.0.13}/cloudpss.egg-info/PKG-INFO

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

{cloudpss-4.0.11 → cloudpss-4.0.13}/cloudpss.egg-info/SOURCES.txt

@@ -54,10 +54,13 @@ test/test-sdk.py
 test/test-sdk1.py
 test/test-snapshot.py
 test/test-topology.py
+test/test-topology1.py
+test/test-yield.py
 test/test.py
 test/test7950.py
 test/testAsync.py
 test/testEvent.py
+test/testRt-test.py
 test/testRt.py
 test/testRt2.py
 test/testSend.py

cloudpss-4.0.13/test/test-yield.py

@@ -0,0 +1,16 @@
+import time
+def foo():
+    print("starting...")
+    for i in range(5):
+        print("before yield...",i)
+        res = yield 4
+        print("res:",res)
+g = foo()
+print(next(g))
+print("*"*20)
+time.sleep(2)
+print(next(g))
+print(next(g))
+print(next(g))
+print(next(g))
+print(next(g))

cloudpss-4.0.13/test/test.py

@@ -0,0 +1,32 @@
+
+import time
+import sys
+import os
+
+sys.path.append(os.path.join(os.path.dirname(__file__), '..\\'))
+import cloudpss
+import time
+import numpy as np
+import pandas as pd
+import json
+
+if __name__ == '__main__':
+    os.environ['CLOUDPSS_API_URL'] = 'http://10.101.10.45/'
+    print('CLOUDPSS connected')
+    cloudpss.setToken(
+        'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcm5hbWUiOiJhZG1pbiIsInNjb3BlcyI6WyJtb2RlbDo5ODMzNSIsImZ1bmN0aW9uOjk4MzM1IiwiYXBwbGljYXRpb246OTgzMzUiXSwicm9sZXMiOlsiYWRtaW4iXSwidHlwZSI6ImFwcGx5IiwiZXhwIjoxNzI0NTU3MDIzLCJub3RlIjoiYSIsImlhdCI6MTY5MzQ1MzAyM30._Xuyo62ESKLcIAFeNdnfBM44yPiiXli9OPKvXDzL2rPV4J1_qsGZP--bsS1tXAVy-x8ooUIIAAG1yhwmZuk7-Q')
+    print('Token done')
+    
+    job = cloudpss.currentJob()
+    print(job.args,flush=True)
+    # project = cloudpss.Model.fetch('model/admin/7744b02b-0636-5a39-8c16-eca939259ee1')
+    # topology = cloudpss.ModelTopology.fetch("-xrS3SewFhpVYKBtIXLk-XDLCQRQnUmlIbXS3s4sdPUkPKeAMhXHjRgZD1JPjPfQ","emtp",{'args':{}})
+    
+    
+    
+    # # topology= project.fetchTopology(config={'args':{}})
+
+    # topology.dump(topology,'test.json')
+    
+    
+    

cloudpss-4.0.13/test/testRt-test.py

@@ -0,0 +1,148 @@
+import os,sys
+import time
+sys.path.append(os.path.join(os.path.dirname(__file__), '..\\'))
+import cloudpss 
+import socketio
+import threading
+import struct
+import json
+
+class RealTimeSream(socketio.ClientNamespace):
+    
+    config = None
+    messages = []
+    series=[]
+    outputNumericValue={}
+    inputNumericValue={}
+    
+    end=False
+    
+    def __init__(self, namespace=None, *args, **kwargs):
+        super().__init__(namespace)
+        self.numericValueCallBack = kwargs.get('numericValueCallBack',None)
+        self.chartCallBack = kwargs.get('chartCallBack',None)
+        self.onStartJob = kwargs.get('onStartJob',None)
+        setattr(self, 'on_data-panel', self.on_data_panel)
+        setattr(self, 'on_start-job', self.on_start_job)
+        setattr(self, 'on_real-time-data', self.on_chart_data)
+        
+        
+        
+        
+    def on_connect(self):
+        print('connect')
+        # self.emit('start-job', { 'type': 'start-job', 'context': 'real-time-data' })
+        # self.emit('real-time-data', { 'type': 'real-time-data', 'context': 'real-time-data' })
+        # self.emit('data-panel', { 'type': 'data-panel', 'context': 'real-time-data' })
+        pass
+
+    def on_disconnect(self):
+        print('disconnect')
+        pass
+
+    def on_data_panel(self, data):
+        # self.numericValue=data
+        virtual_input=self.config['virtual_input']
+        virtual_output=self.config['virtual_output']
+        display=self.config['display']
+        
+        d ={}
+        for x,v in display.items():
+            d[v]=x
+        
+        for i in range(0,virtual_input):
+            self.inputNumericValue[d[i]]=data[i]
+        for i in range(0,virtual_output): 
+            self.outputNumericValue[d[virtual_input+i]]=data[virtual_input+i]
+        if self.numericValueCallBack is not None:
+            self.numericValueCallBack(self.inputNumericValue,self.outputNumericValue)
+        
+    def on_chart_data(self,msg):
+        print(msg)
+
+    def on_start_job(self,data):
+        self.config =data
+        if self.onStartJob is not None:
+            self.onStartJob(self.config)
+        print( 'on_start_job',self.config)
+        
+    
+        
+    def close(self):
+        self.end =True
+        self.disconnect()
+        
+    @staticmethod
+    def connect(*args, **kwargs):
+        sio = socketio.Client()
+        stream = RealTimeSream('',*args, **kwargs)
+        
+        sio.register_namespace(stream)
+        
+        url = os.environ.get('CLOUDPSS_API_URL')
+        
+        if url is None:
+            url = 'http://10.101.10.91/'
+        
+        
+        print('connect to ',url,flush=True)
+        sio.connect(url,socketio_path='/api/real-time/socket.io')
+    
+        thread = threading.Thread(target=sio.wait, args=())
+        thread.setDaemon(True)
+        thread.start()
+        return stream
+
+if __name__ == '__main__':
+    # logging.basicConfig(level=logging.DEBUG)
+    job = cloudpss.currentJob()
+    
+    remoteAddr= job.args.get('remoteAddr','http://10.101.10.91/')
+    
+    if not remoteAddr.startswith('http://'):
+        remoteAddr='http://'+remoteAddr
+    
+    os.environ['CLOUDPSS_API_URL'] = remoteAddr
+    
+    
+    
+    def numericValueCallBack(inputNumericValue,outputNumericValue):
+        # job.log(json.dumps(inputNumericValue),key='numeric')
+        job.custom(inputNumericValue,'numeric')
+        job.custom(outputNumericValue,'output')
+        # print(json.dumps(inputNumericValue),flush=True)
+        
+    def chartCallBack(series):
+        for serie in series:
+            job.plot([serie],key=serie['name'])
+        # job.plot(series,key='test1')
+    
+    def onStartJob(config):
+        virtual_input=config['virtual_input']
+        virtual_output=config['virtual_output']
+        display=config['display']
+        d ={}
+        for x,v in display.items():
+            d[v]=x
+        items =[]
+        for i in range(0,virtual_output): 
+            items.append({'title': d[virtual_input+i], 'placeholder': 'Data loading', 'html': False, 'query': d[virtual_input+i]})
+        
+        job.container(items,key='output_container')
+            # print(d[virtual_input+i],flush=True)
+            # outputNumericValue[d[virtual_input+i]]=data[virtual_input+i]
+        
+
+    stream = RealTimeSream.connect(onStartJob=onStartJob,numericValueCallBack=numericValueCallBack,chartCallBack=chartCallBack)
+    def exitCallback():
+        stream.close()
+        time.sleep(1)
+        print('exit')
+        job.exit(0)
+
+    job.on_abort(exitCallback, args=(), kwargs={})
+    
+    print('start',flush=True)
+    while not stream.end :
+        time.sleep(1)
+        pass

cloudpss-4.0.11/cloudpss/version.py

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