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

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

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

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

@@ -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.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=IsM0DmmMImTyVg6EIzloWrPatJ-kj5fR7Q-ZBYwlF4Y,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
@@ -15,13 +15,13 @@ cloudpss/asyncio/utils/__init__.py,sha256=F-rCvgRAGcV-fFO7o-dsXwooyhcVpElWoBEQM6
 cloudpss/asyncio/utils/httpAsyncRequest.py,sha256=KIck-3uQwGcHMIJ6632_Zo0syc4GnNG2EoUXmQh54ck,2692
 cloudpss/function/__init__.py,sha256=TNzChB-gQF6oB62F423evpUlgcp6s03D4pKKs89Lz4Q,1629
 cloudpss/function/function.py,sha256=llomkfnTmKMiFJYJ2mKnmAEoIjTNVCnjCUUyiJMOV1s,29
-cloudpss/function/functionExecution.py,sha256=YnuBl9dLoVYlPUrfse8_O-4uIAG0QrCIyQdDP2zaQt4,14645
+cloudpss/function/functionExecution.py,sha256=o5S6EK6v2lXH4CY18dl2xSNgAYywpAGAToEIPk-q6Ms,14894
 cloudpss/function/job.py,sha256=LdzaTyjvBcMZIyLstSZnt79d2eREljx2HnNoilDp03A,13162
-cloudpss/ieslab/DataManageModel.py,sha256=YMpwp04GmkaK1gCnzp5tNAoPwkVfa9AkJPviqNOat7s,19445
+cloudpss/ieslab/DataManageModel.py,sha256=G4FzLcEE5st9j6v679q3NxtcEfgYk2qUJt_OTSEc_b0,21921
 cloudpss/ieslab/EvaluationModel.py,sha256=SD7VB81wZnebGQWpx-eTQMQxe6ekFUFycQxz6RyYwOI,6721
-cloudpss/ieslab/IESLabPlan.py,sha256=lxeNReESNtmJN5bBZvgq57wIqyorOv-9M_TgKO87RL4,8522
-cloudpss/ieslab/IESLabSimulation.py,sha256=rkBxQC8GuVvRh6oroGa9n2QszWrkU2nMTyQOSvXRiF4,4040
-cloudpss/ieslab/PlanModel.py,sha256=Dk5ZS_8IASqzMlLeN_gIDk76Gm_ybXjGY4pULBsWvEw,4790
+cloudpss/ieslab/IESLabPlan.py,sha256=fL7uiVJNOkx5HYu6XX0HPrtrOCs455ff7NE1UgJ3vG4,8329
+cloudpss/ieslab/IESLabSimulation.py,sha256=-EJFkhklN9ao-nbfk7Lz6JCHboFCSDcn5R2jr3_Z7_A,4046
+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
@@ -41,7 +41,7 @@ cloudpss/job/view/__init__.py,sha256=j_X6aFeY-wa6_0r1EixE0rrvGz_67m4fIqOLmUbkxqY
 cloudpss/job/view/view.py,sha256=hcODAUozKnVgA-iKa_HABFoQEKDzkzDEuhvEkjh707o,4141
 cloudpss/model/__init__.py,sha256=SNq-bfwcQtDHtTNBYppfUEs8wkjfrQfGeywx7igmvOs,151
 cloudpss/model/jobDefinitions.py,sha256=XqjaaWOLU7zlVHM7TQJbZ3rNBWfBY7eT-5aE6EAatcQ,3770
-cloudpss/model/model.py,sha256=GK7SRE9QLpKoLG13IF_1fyRrCR3EDy75487klzz7MGg,25397
+cloudpss/model/model.py,sha256=u3QTBDqNDN8kBVPerovDXjgLEVQvO3-xTpVr2ieuDRY,25402
 cloudpss/model/revision.py,sha256=Dq4smv-wETfL6Tavp03q53Fx8h07th5-CDoAttEwwgw,3929
 cloudpss/model/topology.py,sha256=nTFq76CPmbkTgglI2Z-SlaJpymRkCXwehD_qE2K7f4I,2313
 cloudpss/model/implements/__init__.py,sha256=88L_wF9SSzxsbtqwStWIPH4LxaKq7TVcssHQ62YBnls,67
@@ -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.1a11.dist-info/METADATA,sha256=47DP5yPsH2LK11dks9tr9y5mJR1nI5DOAM34_xHvXU8,2394
-cloudpss-4.1.1a11.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cloudpss-4.1.1a11.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
-cloudpss-4.1.1a11.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,,