cloudpss 4.1.1a12__tar.gz → 4.1.1a14__tar.gz

{cloudpss-4.1.1a12 → cloudpss-4.1.1a14}/PKG-INFO

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

{cloudpss-4.1.1a12 → cloudpss-4.1.1a14}/cloudpss/ieslab/DataManageModel.py

@@ -83,25 +83,29 @@ class DataManageModel(object):
             
             :return: 无
         '''
-        r = request('GET',
+        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
+            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():
@@ -301,6 +305,29 @@ 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):

{cloudpss-4.1.1a12 → cloudpss-4.1.1a14}/cloudpss/ieslab/PlanModel.py

@@ -41,7 +41,7 @@ class IESLabPlanModel(object):
         except:
             return OptimizationMode['经济性']
 
-    def SetOptimizationInfo(self,   ):
+    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.1a12 → cloudpss-4.1.1a14}/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)
+        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.1a14/cloudpss/version.py

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

{cloudpss-4.1.1a12 → cloudpss-4.1.1a14}/cloudpss.egg-info/PKG-INFO

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

{cloudpss-4.1.1a12 → cloudpss-4.1.1a14}/test/testRt.py

@@ -19,16 +19,16 @@ class RealTimeSream(socketio.ClientNamespace):
     
     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)
-        self.numericValueCallBack = kwargs.get('numericValueCallBack',None)
-        self.chartCallBack = kwargs.get('chartCallBack',None)
-        self.onStartJob = kwargs.get('onStartJob',None)
+        
         
         
         
@@ -169,14 +169,14 @@ if __name__ == '__main__':
             d[v]=x
         items =[]
         for i in range(0,virtual_output): 
-            items.append({'title': d[virtual_input+i], 'placeholder': 'Data loading', 'html': False, 'query': {'type': 'plot', 'key': d[virtual_input+i]}})
+            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(numericValueCallBack=numericValueCallBack,chartCallBack=chartCallBack)
+    stream = RealTimeSream.connect(onStartJob=onStartJob,numericValueCallBack=numericValueCallBack,chartCallBack=chartCallBack)
     def exitCallback():
         stream.close()
         time.sleep(1)

cloudpss-4.1.1a12/cloudpss/version.py

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