cloudpss 4.1.1b7__py3-none-any.whl → 4.1.1b9__py3-none-any.whl

cloudpss/dslab/files/files.py

@@ -1,18 +1,26 @@
-from .curveData import 基准出力曲线, 基准出力曲线2, 基准出力曲线3, 负荷曲线, 策略曲线
+from .curveData import 基准出力曲线, 基准出力曲线2, 基准出力曲线3, 负荷曲线, 策略曲线, 运行策略曲线
+
+extra_paths = {
+    '光伏': 基准出力曲线,
+    '光伏曲线': 基准出力曲线,
+    '风机': 基准出力曲线,
+    '风机曲线': 基准出力曲线,
+    '燃气': 基准出力曲线2,
+    '燃气曲线': 基准出力曲线,
+    '水电': 基准出力曲线2,
+    '水电曲线': 基准出力曲线,
+    '火电': 基准出力曲线2,
+    '火电曲线': 基准出力曲线,
+    '生物质发电': 基准出力曲线2,
+    '生物质发电曲线': 基准出力曲线,
+    '垃圾电厂': 基准出力曲线2,
+    '垃圾电厂曲线': 基准出力曲线,
+    '负荷分类':  负荷曲线,
+    '负荷用户':  负荷曲线,
+    '储能运行策略': 运行策略曲线,
+}
 
 def getCurveData(kind):
-    extra_paths = {
-        '光伏': 基准出力曲线,
-        '风机': 基准出力曲线,
-        '燃气': 基准出力曲线2,
-        '水电': 基准出力曲线2,
-        '常规小火电': 基准出力曲线2,
-        '生物质发电': 基准出力曲线2,
-        '垃圾电厂': 基准出力曲线2,
-        '负荷分类':  负荷曲线,
-        '负荷用户':  负荷曲线,
-        '储能配置': 策略曲线,
-    }
     if kind in extra_paths:
         return extra_paths[kind]
     else :

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,3 +130,81 @@ class IESLabPlan(object):
             :return: Boolean
         '''
         return self.planModel.kill()
+
+    @staticmethod
+    def createProjectGroup(group_name, desc=None, createById=None):
+        '''
+            创建项目组
+
+            :params group_name: String 项目组名称 
+            :params desc: String 项目组描述 可选参数
+            :params createById Int 父项目组id  可选参数，如果是从已有项目组导入的项目组，必填此项
+
+            :return: Int 返回创建的项目组id
+        '''
+        try:
+            if createById is None: 
+                isImport = 0
+            else:
+                isImport = 1
+            payload = {
+                'group_name': group_name,
+                'desc': desc,
+                'isImport': isImport,
+                'createById': createById,
+            }
+            r = request(
+                'POST', 'api/ieslab-plan/rest/projectgroup/', data=json.dumps(payload))
+            project = json.loads(r.text)
+            return project.get('id', None)
+        except Exception as e:
+            raise Exception('创建项目组失败')
+
+    @staticmethod  
+    def createProject(name, project_group, start_date, end_date, construction_cycle, desc=None, createById=None):
+        '''
+            创建项目
+
+            :params name: String 项目名称 
+            :params project_group: Int 父项目组id
+            :param start_date: Int 项目开始年限，范围在[1500,3000]之间
+            :param end_date: Int 项目结束年限，范围在项目开始时间之后且不超过五十年
+            :param construction_cycle: Int 项目建设周期(年), 必须小于等于 项目结束年限 - 项目开始年限
+            :params desc: String 项目描述, 可选参数
+            :params createById Int 父项目id, 可选参数, 如果是从已有项目导入的项目，必填此项
+
+            :return: Int 返回创建的项目id
+        '''
+        try:
+            if start_date < 1500 or start_date > 3000:
+                raise Exception('项目开始年限错误，范围在[1500,3000]之间')
+            if end_date < start_date or end_date > start_date + 50:
+                raise Exception('项目结束年限错误，范围在项目开始时间之后且不超过五十年')
+            if construction_cycle > end_date - start_date:
+                raise Exception('项目建设周期错误，必须小于等于 项目结束年限 - 项目开始年限')
+            if createById is None: 
+                payload = {
+                    'name': name,
+                    'project_group': project_group,
+                    'start_date': start_date,
+                    'end_date': end_date,
+                    'construction_cycle': construction_cycle,
+                    'desc': desc
+                }
+            else:
+                payload = {
+                    'name': name,
+                    'project_group': project_group,
+                    'start_date': start_date,
+                    'end_date': end_date,
+                    'construction_cycle': construction_cycle,
+                    'desc': desc,
+                    'createById': createById
+                }
+            r = request(
+                'POST', 'api/ieslab-plan/rest/simu/', data=json.dumps(payload))
+            project = json.loads(r.text)
+            return project.get('id', None)
+        except Exception as e:
+            raise Exception('创建项目失败')
+

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):
         '''
             初始化
         '''
@@ -36,26 +36,7 @@ class IESLabSimulation(object):
             return IESLabSimulation(project,model)
         except:
             raise Exception('未查询到当前算例')
-    @staticmethod
-    async def fetchAsync(simulationId):
-        '''
-            获取算例信息
-
-            :params: simulationId string类型，代表数据项的算例id
-
-            :return: IESLabSimulation
-        '''
-        try:
-            r = request(
-                'GET', 'api/ieslab-simulation/rest/simu/{0}/'.format(simulationId))
-            project = json.loads(r.text)
-            modelRid = project.get('model', None)
-            model=None
-            if modelRid is not None:
-                model =await Model.fetchAsync(modelRid)
-            return IESLabSimulation(project,model)
-        except:
-            raise Exception('未查询到当前算例')
+   
     def run(self, job=None, name=None):
         '''
             调用仿真 
@@ -71,19 +52,65 @@ class IESLabSimulation(object):
 
         job['args']['simulationId'] = self.id
         return self.model.run(job, name=name)
-
-    async def runAsync(self, job=None, name=None):
+    
+    @staticmethod
+    def createProjectGroup(group_name, desc=None, createById=None):
         '''
-            调用仿真 
+            创建项目组
 
-            :params job:  调用仿真时使用的计算方案，不指定将使用算例保存时选中的计算方案
-            :params name:  任务名称，为空时使用项目的参数方案名称和计算方案名称
+            :params group_name: String 项目组名称 
+            :params desc: String 项目组描述 可选参数
+            :params createById Int 父项目组id  可选参数，如果是从已有项目组导入的项目组，必填此项
 
-            :return: 返回一个运行实例
+            :return: Int 返回创建的项目组id
         '''
-        if job is None:
-            currentJob = self.model.context['currentJob']
-            job = self.model.jobs[currentJob]
+        try:
+            if createById is None: 
+                isImport = 0
+            else:
+                isImport = 1
+            payload = {
+                'group_name': group_name,
+                'desc': desc,
+                'isImport': isImport,
+                'createById': createById,
+            }
+            r = request(
+                'POST', 'api/ieslab-simulation/rest/projectgroup/', data=json.dumps(payload))
+            project = json.loads(r.text)
+            return project.get('id', None)
+        except Exception as e:
+            raise Exception('创建项目组失败')
 
-        job['args']['simulationId'] = self.id
-        return await self.model.runAsync(job, name=name)
+    @staticmethod 
+    def createProject(name, project_group, desc=None, createById=None):
+        '''
+            创建项目
+
+            :params name: String 项目名称 
+            :params project_group: Int 父项目组id,
+            :params desc: String 项目描述, 可选参数
+            :params createById Int 父项目id, 可选参数, 如果是从已有项目导入的项目，必填此项
+
+            :return: Int 返回创建的项目id
+        '''
+        try:
+            if createById is None: 
+                payload = {
+                    'name': name,
+                    'project_group': project_group,
+                    'desc': desc
+                }
+            else:
+                payload = {
+                    'name': name,
+                    'project_group': project_group,
+                    'desc': desc,
+                    'createById': createById
+                }
+            r = request(
+                'POST', 'api/ieslab-simulation/rest/simu/', data=json.dumps(payload))
+            project = json.loads(r.text)
+            return project.get('id', None)
+        except Exception as e:
+            raise Exception('创建项目失败')

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