cloudpss 4.0.0a7__tar.gz → 4.0.2__tar.gz

{cloudpss-4.0.0a7 → cloudpss-4.0.2}/PKG-INFO

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

{cloudpss-4.0.0a7 → cloudpss-4.0.2}/cloudpss/utils/httprequests.py

@@ -24,7 +24,7 @@ def request(method, uri, baseUrl=None, params={}, token=None, **kwargs):
             raise Exception(
                 '当前SDK版本（ver 3.X.X）与服务器版本（3.0.0 以下）不兼容，请更换服务器地址或更换SDK版本。')
         os.environ['X_CLOUDPSS_VERSION'] = r.headers['X-Cloudpss-Version']
-        if float(r.headers['X-Cloudpss-Version']) > 4:
+        if float(r.headers['X-Cloudpss-Version']) >= 5:
             raise Exception('当前SDK版本（ver '+__version__ +'）与服务器版本（ver ' +
                             r.headers['X-Cloudpss-Version'] +
                             '.X.X）不兼容，请更换服务器地址或更换SDK版本(pip 使用 pip install -U cloudpss 命令更新, conda 使用 conda update cloudpss 命令更新)。')

cloudpss-4.0.2/cloudpss/version.py

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

{cloudpss-4.0.0a7 → cloudpss-4.0.2}/cloudpss.egg-info/PKG-INFO

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

{cloudpss-4.0.0a7 → cloudpss-4.0.2}/cloudpss.egg-info/SOURCES.txt

@@ -47,5 +47,11 @@ cloudpss/utils/yamlLoader.py
 test/test-sdk.py
 test/test-snapshot.py
 test/test.py
+test/test7950.py
+test/testAsync.py
+test/testEvent.py
+test/testRt copy.py
+test/testRt.py
 test/testSend.py
-test/test_in_new_web_1.py
+test/test_in_new_web_1.py
+test/testb.py

cloudpss-4.0.2/test/test7950.py

@@ -0,0 +1,34 @@
+import os, sys
+
+sys.path.append(os.path.join(os.path.dirname(__file__), '../'))
+import cloudpss
+import json
+import time
+if __name__ == '__main__':
+    print('start')
+    cloudpss.setToken(
+        'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcm5hbWUiOiJhZG1pbiIsInNjb3BlcyI6W10sInR5cGUiOiJhcHBseSIsImV4cCI6MTcyNjkwMjA0MCwiaWF0IjoxNjk1Nzk4MDQwfQ.qktX85dOW21jJb-sunrXZjiYSAj94ZRfh6XPE_pnMGsBMXffRc5zp40sDuJ4jVSlI2ak6ybAsm9vbY0cPWpiBg'
+    )
+
+    os.environ['CLOUDPSS_API_URL'] = 'http://10.101.10.119/'
+    ts1 = time.time()
+    ### 获取指定 rid 的项目
+    model = cloudpss.Model.fetch('model/admin/core_test')
+
+    job=model.jobs[2]
+    job['args']['n_cpu']='8'
+    job['args']['@debug']='min_cpu=0'
+    
+    ts2 = time.time()
+    print('time 1:', ts2 - ts1, flush=True)
+    runner = model.run()
+    while not runner.status():
+        time.sleep(1)
+
+    logs = runner.result.getLogs()
+    for log in logs:
+        if log['type'] == 'log':
+            if log['data']['content'].find('thread 0 total time')>0:
+                print(log['data']['content'])
+                break
+    print('end')

cloudpss-4.0.2/test/testAsync.py

@@ -0,0 +1,33 @@
+# define an asynchronous iterator
+import asyncio
+
+
+class AsyncIterator():
+    # constructor, define some state
+    def __init__(self):
+        self.counter = 0
+ 
+    # create an instance of the iterator
+    def __aiter__(self):
+        return self
+ 
+    # return the next awaitable
+    async def __anext__(self):
+        # check for no further items
+        if self.counter >= 10:
+            raise StopAsyncIteration
+        # increment the counter
+        self.counter += 1
+        await asyncio.sleep(1)
+        # return the counter value
+        return self.counter
+
+async def testAsync():
+    # create an instance of the iterator
+    asyncIterator = AsyncIterator()
+    # iterate over the async iterator
+    async for item in asyncIterator:
+        print(item)
+
+if __name__ == "__main__":
+    asyncio.run(testAsync())

cloudpss-4.0.2/test/testEvent.py

@@ -0,0 +1,46 @@
+import os,sys
+import time
+import uuid
+sys.path.append(os.path.join(os.path.dirname(__file__), '..\\'))
+import cloudpss 
+import logging
+
+def next(m):
+    m.write({'type': 'debug', 'step': '-1'})
+def goto(m,step):
+    m.write({'type': 'debug', 'step': step})
+def pause(m):
+    m.write({'type': 'debug', 'step': 10})
+
+
+def memory(m,path,buffer,offset):
+    m.write({'type': 'memory', 'path': path,'value':buffer,'offset':offset})
+    
+
+    
+if __name__ == '__main__':
+    # logging.basicConfig(level=logging.DEBUG)
+    os.environ['CLOUDPSS_API_URL'] = 'http://10.101.10.45/'
+    cloudpss.setToken('eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcm5hbWUiOiJhZG1pbiIsInNjb3BlcyI6WyJtb2RlbDo5ODMzNSIsImZ1bmN0aW9uOjk4MzM1IiwiYXBwbGljYXRpb246OTgzMzUiXSwicm9sZXMiOlsiYWRtaW4iXSwidHlwZSI6ImFwcGx5IiwiZXhwIjoxNzI2MjA4NjM5LCJub3RlIjoidGVzdDIiLCJpYXQiOjE2OTUxMDQ2Mzl9.ZlFSPCH3u4OSBlDBJWve4GZkWIZAku_DI1j-or-uDtAtyDy-RZecn7RBhymsILNPsmKnwkXcx1UnsjRNiAf5yA')
+    # job = cloudpss.Job.fetch()
+    
+    model = cloudpss.Model.fetch('model/admin/debug')
+    
+    jobConfig = model.jobs[4]
+    jobConfig['args']['stop_on_entry']='1'
+    modelJob =model.run(job=jobConfig)
+    
+    view =modelJob.result
+    i=0
+    while not view.end:
+        i+=1
+        print(view.getLogs())
+        # print(view.getPlots())
+        print('status2',view.end)
+        view.next()
+        view.control({
+            "key":"/component_new_constant_1",
+            "value":str(i),
+            'uuid': str(uuid.uuid1()),
+        })
+        time.sleep(0.01)

cloudpss-4.0.2/test/testRt copy.py

@@ -0,0 +1,107 @@
+import os,sys
+import time
+
+import socketio
+import threading
+import struct
+sio = socketio.Client()
+class SocketStream():
+    def __init__(self):
+        # sio.connect('ws://10.101.10.119/',socketio_path='/api/real-time/socket.io')
+        pass
+    
+    def connect(self):
+        sio.emit('start-job', { 'type': 'start-job', 'context': 'real-time-data' })
+        sio.emit('real-time-data', { 'type': 'real-time-data', 'context': 'real-time-data' })
+        sio.emit('data-panel', { 'type': 'data-panel', 'context': 'real-time-data' })
+        print("I'm connected!")
+    
+    @sio.event
+    def connect_error(self,data):
+        print("The connection failed!")
+
+    @sio.event
+    def disconnect(self):
+        print("I'm disconnected!")
+        
+    @sio.on('data-panel')
+    def on_event(self,data):
+        print( data)
+    @sio.on('start-job')
+    def start_job(self,data):
+        print( data)
+    @sio.on('stop-job')
+    def stop_job(self,data):
+        print( data)    
+    @sio.on('close-job')
+    def close_job(self,data):
+        print( data)  
+    @sio.on('recording')
+    def recording(self,data):
+        print( data)
+    @sio.on('load-record-data')
+    def load_record_data(self,data):
+        print( data)
+    @sio.on('real-time-data')
+    def real_time_data(self,data):
+        data =struct.unpack('f'*int(len(data)/4),data)
+        
+        print(len(data))
+                         
+    
+if __name__ == '__main__':
+    # logging.basicConfig(level=logging.DEBUG)
+    os.environ['CLOUDPSS_API_URL'] = 'ws://10.101.10.119/'
+    # job = cloudpss.Job.fetch()
+    
+    
+    # @sio.event
+    # def connect():
+    #     sio.emit('start-job', { 'type': 'start-job', 'context': 'real-time-data' })
+    #     sio.emit('real-time-data', { 'type': 'real-time-data', 'context': 'real-time-data' })
+    #     sio.emit('data-panel', { 'type': 'data-panel', 'context': 'real-time-data' })
+    #     print("I'm connected!")
+
+    # @sio.event
+    # def connect_error(data):
+    #     print("The connection failed!")
+
+    # @sio.event
+    # def disconnect():
+    #     print("I'm disconnected!")
+        
+    # @sio.on('data-panel')
+    # def on_event(data):
+    #     print( data)
+    # @sio.on('start-job')
+    # def start_job(data):
+    #     print( data)
+    # @sio.on('stop-job')
+    # def stop_job(data):
+    #     print( data)    
+    # @sio.on('close-job')
+    # def close_job(data):
+    #     print( data)  
+    # @sio.on('recording')
+    # def recording(data):
+    #     print( data)
+    # @sio.on('load-record-data')
+    # def load_record_data(data):
+    #     print( data)
+    # @sio.on('real-time-data')
+    # def real_time_data(data):
+    #     data =struct.unpack('f'*int(len(data)/4),data)
+        
+    #     print(len(data))
+        
+    
+    sio.connect('ws://10.101.10.119/',socketio_path='/api/real-time/socket.io')
+   
+    thread = threading.Thread(target=sio.wait, args=())
+    thread.setDaemon(True)
+    thread.start()
+        
+    while True:
+        time.sleep(1)
+        print('main')
+        pass

cloudpss-4.0.2/test/testRt.py

@@ -0,0 +1,150 @@
+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)
+        
+        setattr(self, 'on_data-panel', self.on_data_panel)
+        setattr(self, 'on_start-job', self.on_start_job)
+        setattr(self, 'on_stop-job', self.on_stop_job)
+        setattr(self, 'on_close-job', self.on_close_job)
+        setattr(self, 'on_load-record-data', self.on_load_record_data)
+        setattr(self, 'on_real-time-data', self.on_real_time_data)
+        self.numericValueCallBack = kwargs.get('numericValueCallBack',None)
+        self.chartCallBack = kwargs.get('chartCallBack',None)
+        
+        
+        
+        
+    def on_connect(self):
+        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):
+        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_start_job(self,data):
+        self.config =data
+        print( 'on_start_job',self.config)
+    def on_stop_job(self,data):
+        print('on_stop_job',flush=True)
+        self.disconnect()
+        self.end=True
+    def on_close_job(self,data):
+        print('on_close_job',flush=True)
+        self.disconnect()
+        self.end=True
+    def on_recording(self,data):
+        print( 'on_recording',data)
+    def on_load_record_data(self,data):
+        print( 'on_load_record_data',data)
+    def on_real_time_data(self,d):
+        
+        data =struct.unpack('d'*int(len(d)/8),d)
+        i = 0
+        runTime =0
+        channelLength=int(self.config['portNumber'])+1
+        virtual_input=int(self.config['virtual_input'])
+        for index in range(0,len(data)):
+            val = data[index]
+            if(index%channelLength==0):
+                i=0
+                runTime = val
+            elif i>virtual_input:
+                serieIndex = i - virtual_input - 1
+                
+                if len(self.series)-1<serieIndex:
+                    
+                    serie=  {
+                        'name':  'data%d'%serieIndex,
+                        'type': 'scatter',
+                        'x': [],
+                        'y': []
+                    }  
+                    self.series.append(serie)
+                else:
+                    serie=self.series[serieIndex]
+                
+                serie['x'].append(runTime)
+                serie['y'].append(val)
+            i+=1
+        if self.chartCallBack is not None:
+            self.chartCallBack(self.series)
+
+    def close(self):
+        self.end =True
+        self.emit('close-job', { 'type': 'close-job', 'context': 'close-job' })
+    def write(self,data):
+        self.emit('send-message', data)
+    @staticmethod
+    def connect(*args, **kwargs):
+        sio = socketio.Client()
+        stream = RealTimeSream('',*args, **kwargs)
+        
+        sio.register_namespace(stream)
+        sio.connect('ws://10.101.10.119/',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)
+    os.environ['CLOUDPSS_API_URL'] = 'ws://10.101.10.119/'
+    job = cloudpss.currentJob()
+    
+    
+    def numericValueCallBack(inputNumericValue,outputNumericValue):
+        print(inputNumericValue,flush=True)
+        
+    def chartCallBack(series):
+        job.plot(series,key='test1')
+
+    stream = RealTimeSream.connect(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.2/test/testSend.py

@@ -0,0 +1,39 @@
+import os,sys
+import time
+sys.path.append(os.path.join(os.path.dirname(__file__), '..\\'))
+import cloudpss 
+import logging
+
+def next(m):
+    m.write({'type': 'debug', 'step': '-1'})
+def goto(m,step):
+    m.write({'type': 'debug', 'step': step})
+def pause(m):
+    m.write({'type': 'debug', 'step': 10})
+
+
+def memory(m,path,buffer,offset):
+    m.write({'type': 'memory', 'path': path,'value':buffer,'offset':offset})
+    
+
+    
+if __name__ == '__main__':
+    # logging.basicConfig(level=logging.DEBUG)
+    os.environ['CLOUDPSS_API_URL'] = 'http://10.101.10.45/'
+    cloudpss.setToken('eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcm5hbWUiOiJhZG1pbiIsInNjb3BlcyI6WyJtb2RlbDo5ODMzNSIsImZ1bmN0aW9uOjk4MzM1IiwiYXBwbGljYXRpb246OTgzMzUiXSwicm9sZXMiOlsiYWRtaW4iXSwidHlwZSI6ImFwcGx5IiwiZXhwIjoxNzI2MjA4NjM5LCJub3RlIjoidGVzdDIiLCJpYXQiOjE2OTUxMDQ2Mzl9.ZlFSPCH3u4OSBlDBJWve4GZkWIZAku_DI1j-or-uDtAtyDy-RZecn7RBhymsILNPsmKnwkXcx1UnsjRNiAf5yA')
+    # job = cloudpss.Job.fetch()
+    
+    model = cloudpss.Model.fetch('model/admin/shm_test_2')
+    
+    jobConfig = model.jobs[0]
+    jobConfig['args']['stop_on_entry']='1'
+    modelJob =model.run(job=jobConfig)
+    
+    view =modelJob.result
+    i=0
+    while not view.end:
+        i+=1
+        print(view.getLogs())
+        view.next()
+        view.writeShm('flag2',float(i),0)
+        time.sleep(0.01)

cloudpss-4.0.2/test/testb.py

@@ -0,0 +1,18 @@
+import os,sys
+import time
+
+import socketio
+import threading
+import struct
+
+                         
+if __name__ == '__main__':
+   a = [1.21,2.22,3.33]
+   x = struct.pack('d'*len(a),*a)
+   print(x)
+   print(len(x))
+   
+   t = struct.unpack('d'*int(len(x)/8),x)
+   
+        
+   print(t)

cloudpss-4.0.0a7/cloudpss/version.py

@@ -1 +0,0 @@
-__version__ = '4.0.0-alpha.7'

cloudpss-4.0.0a7/test/testSend.py

@@ -1,39 +0,0 @@
-from messageStreamSend import MessageStreamSend
-import os
-import time
-
-
-def next(m):
-    m.write({'type': 'debug', 'step': '-1'})
-def goto(m,step):
-    m.write({'type': 'debug', 'step': step})
-def pause(m):
-    m.write({'type': 'debug', 'step': 10})
-
-if __name__ == '__main__':
-    os.environ['CLOUDPSS_API_URL'] = 'http://10.101.10.45/'
-    m = MessageStreamSend('882ad478-11cf-4041-b3cd-017cba15c606')
-    
-    m.connect()
-    
-    while m.status != 1:
-        time.sleep(1)
-    
-    while True:
-        next(m)
-        time.sleep(0.001)
-        # cmd = input('input cmd:')
-        # if cmd == 'next':
-        #     next(m)
-        # elif cmd == 'goto':
-        #     step = input('input step:')
-        #     goto(m,step)
-        # elif cmd == 'pause':
-        #     pause(m)
-        # elif cmd == 'exit':
-        #     break
-        # else:
-        #     print('input error')
-    
-    
-    m.close()