cloudpss 4.1.1a11__tar.gz → 4.1.1a13__tar.gz

{cloudpss-4.1.1a11 → cloudpss-4.1.1a13}/PKG-INFO

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

{cloudpss-4.1.1a11 → cloudpss-4.1.1a13}/cloudpss/function/functionExecution.py

@@ -396,4 +396,14 @@ class FunctionExecution(object):
                 'yAxis': layout.get('yaxis', {}),
             }
         }
+        self.print(result)
+        
+    def custom(self, data, key=None,verb='replace'):
+        result = {
+            'key': key,
+            'version': 1,
+            'verb': verb,
+            'type': 'custom',
+            'data': data
+        }
         self.print(result)

{cloudpss-4.1.1a11 → cloudpss-4.1.1a13}/cloudpss/ieslab/DataManageModel.py

@@ -83,26 +83,50 @@ class DataManageModel(object):
             
             :return: 无
         '''
-        list = ['thermalLoads', 'electricLoads', 'fuels', 'typhoon', 'rainfall', 'earthquake', 'extremeCold']
-        for kind,value in self._kindUrlMap.items():
-            try:
+        try:
+            r = request('GET',
+                    self._dataManageUrl,
+                    params={
+                        "simulationId": self.simulationId
+                        ,
+                    })
+            data = json.loads(r.text)
+            info = data['info']
+            for kind,value in info.items():
+                if kind =='Weather':
+                    continue
+                
+                for k,data in value.items():
+                    self._kindItemDataMap[k]=value
+                    for val in data:
+                        self._itemDataMap[str(val['timeid'])]=val
+                        self._itemDataMap[str(val['id'])]=val
+                        self._kindIdMap[str(val['timeid'])]=k
+                        self._kindIdMap[str(val['id'])]=k
+        except Exception as e:
+            print('获取数据失败',e)
+            pass
+
+        # list = ['thermalLoads', 'electricLoads', 'fuels', 'typhoon', 'rainfall', 'earthquake', 'extremeCold']
+        # for kind,value in self._kindUrlMap.items():
+        #     try:
             
-                if kind in list:
-                    dataList = self._fetchItemData(self._kindUrlMap[kind], None)
-                else:
-                    dataList = self._fetchItemData(self._kindUrlMap[kind], kind)
-            except Exception as e:
-                pass
-            self._kindItemDataMap[kind]=dataList
-            for val in dataList:
-                self._itemDataMap[str(val['timeid'])]=val
-                self._itemDataMap[str(val['id'])]=val
-                self._kindIdMap[str(val['timeid'])]=kind
-                self._kindIdMap[str(val['id'])]=kind
+        #         if kind in list:
+        #             dataList = self._fetchItemData(self._kindUrlMap[kind], None)
+        #         else:
+        #             dataList = self._fetchItemData(self._kindUrlMap[kind], kind)
+        #     except Exception as e:
+        #         pass
+        #     self._kindItemDataMap[kind]=dataList
+        #     for val in dataList:
+        #         self._itemDataMap[str(val['timeid'])]=val
+        #         self._itemDataMap[str(val['id'])]=val
+        #         self._kindIdMap[str(val['timeid'])]=kind
+        #         self._kindIdMap[str(val['id'])]=kind
 
     def GetDataItem(self, ID: str):
         '''
-            获取ID对应的元素信息
+            获取ID对应的数据信息
             
             :params: ID string类型，代表数据项的标识符，可以在所有类型的数据项中实现唯一标识
             
@@ -281,11 +305,35 @@ class DataManageModel(object):
                         })
             weatherData = json.loads(r.text)
             return weatherData['results']
+        
+    def UpdateAtmosData(self, data):
+        '''
+            更新气象数据
+            :data:  list类型，表示数据内容，其数据结构应满足对应数据项的满足如下结构要求：
+                        "lat": string类型 坐标纬度
+                        "lng": string类型 坐标经度
+                        "time": string类型 表示时间 需满足格式YYYY-MM-DD hh:mm:ss 如"2016-01-01 00:00:00"
+                        "t10m": string类型 表示环境温度（℃）
+                        "lwgab_swgdn": string类型 表示太阳辐射强度（W/m2）
+                        "u10m": string类型 距地面10m处东向风速（m/s）
+                        "u50m": string类型 距地面50m处东向风速（m/s）
+                        "v10m": string类型 距地面10m处北向风速（m/s）
+                        "v50m": string类型 距地面50m处北向风速（m/s）
+                        "adj_sfc_sw_direct_all_1h": string类型 短波直射强度（W/m²）
+                        "adj_sfc_sw_diff_all_1h": string类型 短波散射强度（W/m²）
+                        "solar_zen_angle_1h": string类型 太阳天顶角°
+            :return: bool 类型，返回True 更新成功
+        '''
+        r = request('POST',
+                    self._weatherUrl,
+                    data=json.dumps({"sid":self.simulationId, "data":data}))
+        return r.ok
 
 
 class IESSimulationDataManageModel(DataManageModel):
     _baseUri = 'api/ieslab-simulation/'
     _weatherUrl = 'api/ieslab-simulation/rest/weather_data/'
+    _dataManageUrl = 'api/ieslab-simulation/editor/data_manage/'
     _kindNameMap = {
         "光伏": "PhotovoltaicSys",
         "风机": "WindPowerGenerator",
@@ -352,6 +400,7 @@ class IESSimulationDataManageModel(DataManageModel):
 class IESPlanDataManageModel(DataManageModel):
     _baseUri = 'api/ieslab-plan/'
     _weatherUrl = 'api/ieslab-plan/rest/weather_data/'
+    _dataManageUrl = 'api/ieslab-plan/editor/data_manage/'
     _kindNameMap = {
         "光伏": "PhotovoltaicSys",
         "风机": "WindPowerGenerator",

{cloudpss-4.1.1a11 → cloudpss-4.1.1a13}/cloudpss/ieslab/IESLabPlan.py

@@ -130,15 +130,6 @@ class IESLabPlan(object):
             :return: Boolean
         '''
         return self.planModel.kill()
-    
-    def createProjectGroup(self, name):
-        '''
-            创建项目组
-
-            :params name: 项目组名称
-
-            :return: 返回一个创建的项目组
-        '''
 
     @staticmethod
     def createProjectGroup(group_name, desc=None, createById=None):

{cloudpss-4.1.1a11 → cloudpss-4.1.1a13}/cloudpss/ieslab/IESLabSimulation.py

@@ -5,7 +5,7 @@ from .DataManageModel import IESSimulationDataManageModel
 
 
 class IESLabSimulation(object):
-    def __init__(self, project={},model=None):
+    def __init__(self, project={},model:Model=None):
         '''
             初始化
         '''

{cloudpss-4.1.1a11 → cloudpss-4.1.1a13}/cloudpss/ieslab/PlanModel.py

@@ -41,7 +41,7 @@ class IESLabPlanModel(object):
         except:
             return OptimizationMode['经济性']
 
-    def SetOptimizationInfo(self, optType):
+    def SetOptimizationInfo(self,   optType):
         '''
             无对应接口
             设置当前算例的优化目标
@@ -128,12 +128,16 @@ class IESLabPlanModel(object):
                 status = data.get('status', '')
                 if status == 'stop':
                     isRunning = False
-        logs = IESLabPlanResult(self.simulationId).GetLogs()
-        if logs is not None:
-            for log in logs:
-                if(log.get('data', '') == 'run ends'):
-                    isRunning = False
-                    break
+        try:
+            
+            logs = IESLabPlanResult(self.simulationId).GetLogs()
+            if logs is not None:
+                for log in logs:
+                    if(log.get('data', '') == 'run ends'):
+                        isRunning = False
+                        break
+        except:
+            return False
         return isRunning
 
 

{cloudpss-4.1.1a11 → cloudpss-4.1.1a13}/cloudpss/job/messageStreamReceiver.py

@@ -52,14 +52,12 @@ class MessageStreamReceiver(JobReceiver):
         self.ws.url = self.__path(data["id"])
         msg = IO.deserialize(data["data"], "ubjson")
         self.messages.append(msg)
-        # print(msg['type'])
         # if(msg['type']=='terminate'):
         #     self.close(self.ws)
         return msg
 
 
     def __on_error(self,  *args, **kwargs):
-        print('error',args,kwargs)
         logging.debug("MessageStreamReceiver error")
         msg = {
             "type": "log",

{cloudpss-4.1.1a11 → cloudpss-4.1.1a13}/cloudpss/model/model.py

@@ -1,7 +1,6 @@
 import os
 import re
 from copy import deepcopy
-
 from cloudpss.job.job import Job
 from cloudpss.job.view import EMTView, IESView, PowerFlowView
 from cloudpss.job.view.view import View
@@ -96,7 +95,7 @@ class Model(object):
         model = {**self.__dict__, "revision": self.revision.toJSON()}
         return model
 
-    def getAllComponents(self):
+    def getAllComponents(self)->dict:
         """
         获取实现
 

cloudpss-4.1.1a13/cloudpss/version.py

@@ -0,0 +1 @@
+__version__ = '4.1.1-alpha.13'

{cloudpss-4.1.1a11 → cloudpss-4.1.1a13}/cloudpss.egg-info/PKG-INFO

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

{cloudpss-4.1.1a11 → cloudpss-4.1.1a13}/cloudpss.egg-info/SOURCES.txt

@@ -85,8 +85,8 @@ test/test.py
 test/test7950.py
 test/testAsync.py
 test/testEvent.py
-test/testRt copy.py
 test/testRt.py
+test/testRt2.py
 test/testSend.py
 test/test_in_new_web_1.py
 test/test_ws.py

cloudpss-4.1.1a13/test/testRt.py

@@ -0,0 +1,191 @@
+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_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)
+        
+        
+        
+        
+    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
+        if self.onStartJob is not None:
+            self.onStartJob(self.config)
+        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,msg):
+        display=self.config['display']
+        d ={}
+        for x,v in display.items():
+            d[v]=x
+        data =struct.unpack('d'*int(len(msg)/8),msg)
+        i = 0
+        runTime =0
+        self.series=[]
+        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':  d[i-1],
+                        '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)
+        
+        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.1.1a11/test/testRt.py → cloudpss-4.1.1a13/test/testRt2.py

@@ -24,8 +24,6 @@ class RealTimeSream(socketio.ClientNamespace):
         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)
         
@@ -34,8 +32,6 @@ class RealTimeSream(socketio.ClientNamespace):
         
     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):
@@ -72,11 +68,15 @@ class RealTimeSream(socketio.ClientNamespace):
         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)
+    def on_real_time_data(self,msg):
+        display=self.config['display']
+        d ={}
+        for x,v in display.items():
+            d[v]=x
+        data =struct.unpack('d'*int(len(msg)/8),msg)
         i = 0
         runTime =0
+        self.series=[]
         channelLength=int(self.config['portNumber'])+1
         virtual_input=int(self.config['virtual_input'])
         for index in range(0,len(data)):
@@ -88,9 +88,8 @@ class RealTimeSream(socketio.ClientNamespace):
                 serieIndex = i - virtual_input - 1
                 
                 if len(self.series)-1<serieIndex:
-                    
                     serie=  {
-                        'name':  'data%d'%serieIndex,
+                        'name':  d[i-1],
                         'type': 'scatter',
                         'x': [],
                         'y': []
@@ -107,8 +106,10 @@ class RealTimeSream(socketio.ClientNamespace):
 
     def close(self):
         self.end =True
-        self.emit('close-job', { 'type': 'close-job', 'context': 'close-job' })
+        self.disconnect()
+        # self.emit('close-job', { 'type': 'close-job', 'context': 'close-job' })
     def write(self,data):
+        print('write',data,flush=True)
         self.emit('send-message', data)
     @staticmethod
     def connect(*args, **kwargs):
@@ -116,7 +117,13 @@ class RealTimeSream(socketio.ClientNamespace):
         stream = RealTimeSream('',*args, **kwargs)
         
         sio.register_namespace(stream)
-        sio.connect('ws://10.101.10.119/',socketio_path='/api/real-time/socket.io')
+        
+        url = os.environ.get('CLOUDPSS_API_URL')
+        
+        if url is None:
+            url = 'http://10.101.10.91/'
+        
+        sio.connect(url,socketio_path='/api/real-time/socket.io')
     
         thread = threading.Thread(target=sio.wait, args=())
         thread.setDaemon(True)
@@ -125,17 +132,23 @@ class RealTimeSream(socketio.ClientNamespace):
 
 if __name__ == '__main__':
     # logging.basicConfig(level=logging.DEBUG)
-    os.environ['CLOUDPSS_API_URL'] = 'ws://10.101.10.119/'
     job = cloudpss.currentJob()
     
+    remoteAddr= job.args.get('remoteAddr','http://10.101.10.91/')
+    
+    inputKey= job.args.get('inputKey',None)
+    inputValue= job.args.get('inputValue',None)
+    
+    print('inputKey',inputKey)
+    print('inputValue',inputValue)
+    if not remoteAddr.startswith('http://'):
+        remoteAddr='http://'+remoteAddr
+    
+    
+    
+    os.environ['CLOUDPSS_API_URL'] = remoteAddr
+    
     
-    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)
@@ -144,7 +157,10 @@ if __name__ == '__main__':
 
     job.on_abort(exitCallback, args=(), kwargs={})
     
-    print('start',flush=True)
-    while not stream.end :
-        time.sleep(1)
-        pass
+
+    stream = RealTimeSream.connect()
+    stream.write({inputKey:float(inputValue)})
+    time.sleep(1)
+    stream.close()
+   
+    job.exit(0)

cloudpss-4.1.1a11/cloudpss/version.py

@@ -1 +0,0 @@
-__version__ = '4.1.1-alpha.11'

cloudpss-4.1.1a11/test/testRt copy.py

@@ -1,107 +0,0 @@
-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