cloudpss 4.1.1a12__py3-none-any.whl → 4.1.1a13__py3-none-any.whl

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

@@ -1 +1 @@
-__version__ = '4.1.1-alpha.12'
+__version__ = '4.1.1-alpha.13'

{cloudpss-4.1.1a12.dist-info → cloudpss-4.1.1a13.dist-info}/METADATA

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

{cloudpss-4.1.1a12.dist-info → cloudpss-4.1.1a13.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cloudpss/__init__.py,sha256=mW9gPztzpnqRGs47bj7Qo5iKMagT4CkBOEYZBzSHtPk,802
 cloudpss/verify.py,sha256=KF4Gd59DGvCyIEkRD7rNnekWw22XxJpi3DW6keb6j4c,1498
-cloudpss/version.py,sha256=DRQcOuEj-3Vf8nDL3UCq7C1GMbl5nyt0FogmI2JlruQ,31
+cloudpss/version.py,sha256=lac000KPi8fXbvg3XzMZvBOBjWFrdxOHqQuMSjkNgaY,31
 cloudpss/asyncio/__init__.py,sha256=CJGopQl_vz3z3fJsK7NjMX5uzkzfrJrbqKVhyYqlYWc,198
 cloudpss/asyncio/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
 cloudpss/asyncio/job/job.py,sha256=ExA-8JVOWWW5neVvNazPk4i3Z-q8xqYBL4qXU1m3rgM,3891
@@ -17,11 +17,11 @@ cloudpss/function/__init__.py,sha256=TNzChB-gQF6oB62F423evpUlgcp6s03D4pKKs89Lz4Q
 cloudpss/function/function.py,sha256=llomkfnTmKMiFJYJ2mKnmAEoIjTNVCnjCUUyiJMOV1s,29
 cloudpss/function/functionExecution.py,sha256=o5S6EK6v2lXH4CY18dl2xSNgAYywpAGAToEIPk-q6Ms,14894
 cloudpss/function/job.py,sha256=LdzaTyjvBcMZIyLstSZnt79d2eREljx2HnNoilDp03A,13162
-cloudpss/ieslab/DataManageModel.py,sha256=8KJB8a2de5KVV3i7k5nvA4WvxH20F3x7jU6S6XqJTZY,20330
+cloudpss/ieslab/DataManageModel.py,sha256=G4FzLcEE5st9j6v679q3NxtcEfgYk2qUJt_OTSEc_b0,21921
 cloudpss/ieslab/EvaluationModel.py,sha256=SD7VB81wZnebGQWpx-eTQMQxe6ekFUFycQxz6RyYwOI,6721
 cloudpss/ieslab/IESLabPlan.py,sha256=fL7uiVJNOkx5HYu6XX0HPrtrOCs455ff7NE1UgJ3vG4,8329
 cloudpss/ieslab/IESLabSimulation.py,sha256=-EJFkhklN9ao-nbfk7Lz6JCHboFCSDcn5R2jr3_Z7_A,4046
-cloudpss/ieslab/PlanModel.py,sha256=Iw_XptR8SwCrxE9Jhjq8TdPk3NW-5dnh7LATmohwwWY,4785
+cloudpss/ieslab/PlanModel.py,sha256=Z_7pME2GHhBMYk9bXu8hKjP_NpM_SUAUr3-I2o_7DPo,4883
 cloudpss/ieslab/__init__.py,sha256=kiyUaGRgtwqs0EI2dBBqLVK5V65u1PcY7YTFJX1T0yw,186
 cloudpss/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
 cloudpss/job/job.py,sha256=aLDq6S0tbbb7Mr9CuhzGxJX2vZO91PBojWfgywuwjn8,7551
@@ -30,7 +30,7 @@ cloudpss/job/jobPolicy.py,sha256=Va3jvx7kPTN4WPc9I2uF5Hl2FW75zXGWenbdOb-xyXg,404
 cloudpss/job/jobQueue.py,sha256=31Q7NCjb_51d1JOokVyxIfP1r6S_A-ObySJKwt8MxR8,416
 cloudpss/job/jobReceiver.py,sha256=b52Q7eQjVXi1C8xP2koix6N0GdQy_ar0YJ33KyPfsSA,919
 cloudpss/job/jobTres.py,sha256=1wwdvwxpYKOfsZ1R95Wkhyg_QYMzqzKoaLJLdB-bD88,148
-cloudpss/job/messageStreamReceiver.py,sha256=2EvI7BC8u43UYYUMXXyjxQntc5E7xVt9C3n8yi6ztyE,4201
+cloudpss/job/messageStreamReceiver.py,sha256=eWbwG6rdlBitPXoIoQdduw2tG06pv-NxbhkOE-C2_Jo,4137
 cloudpss/job/messageStreamSender.py,sha256=CZ81diUIjruUol-gUS_l4QnUSctkFg6JPBfALsvpXU4,2389
 cloudpss/job/view/EMTView.py,sha256=x7vNedo-RyH8Ukm5YaQSec6BPcskqopwGGyVDMVxV8U,6933
 cloudpss/job/view/IESLabSimulationView.py,sha256=_hD-fdEwC6U8hQYbXliNMEii0WxiteglQZuLOSQmMOM,76
@@ -67,7 +67,7 @@ cloudpss/utils/graphqlUtil.py,sha256=swl6XT1UmUQHdHjMWw3M0i8meEmVKNQvX0SHsbgg8TU
 cloudpss/utils/httprequests.py,sha256=09nxqw1b56H-QefZxOUcvdPgA4U6Zq96JcRSYM5NP5o,1729
 cloudpss/utils/matlab.py,sha256=SLwVt790BjklJK2XNELt9R2n_1ej9Y8QsTIdFkKXLWE,795
 cloudpss/utils/yamlLoader.py,sha256=bv_vPDK_e0n_vZ5FwpDJ_NJWqMAwfU3AbhkvQIxPCy4,2677
-cloudpss-4.1.1a12.dist-info/METADATA,sha256=uSmHChggm-x2Jbz2ZlomyBQNDo4KEA_ReyR5FaXY_ls,2394
-cloudpss-4.1.1a12.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cloudpss-4.1.1a12.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
-cloudpss-4.1.1a12.dist-info/RECORD,,
+cloudpss-4.1.1a13.dist-info/METADATA,sha256=xrwAlYP-2M5KLNq0C7T827p-Uu9H-McCUUD-N3YD9Xc,2394
+cloudpss-4.1.1a13.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cloudpss-4.1.1a13.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
+cloudpss-4.1.1a13.dist-info/RECORD,,