cloudpss 4.1.1b7__py3-none-any.whl → 4.5.13__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

@@ -4,6 +4,8 @@ import json
 import signal
 import sys
 from ..utils import MatlabDataEncoder
+import threading
+import queue
 
 
 class EventSample(object):
@@ -23,7 +25,23 @@ class EventSample(object):
              eventHandlerKwargs] in self.__eventHandlerSample:
             eventHandlerSample(*eventHandlerArgs, **eventHandlerKwargs)
 
+class EventInput(object):
+    def __init__(self):
+        self.__eventHandlerSample = []
 
+    def __iadd__(self, EventHandler):
+        self.__eventHandlerSample.append(EventHandler)
+        return self
+
+    def __isub__(self, EventHandler):
+        self.__eventHandlerSample.remove(EventHandler)
+        return self
+
+    def __call__(self, *args, **kwargs):
+        for [eventHandlerSample] in self.__eventHandlerSample:
+            # 调用事件处理程序
+            if eventHandlerSample:
+                eventHandlerSample(*args, **kwargs)
 class Args(dict):
     """
         参数类
@@ -87,7 +105,9 @@ class FunctionExecution(object):
         self.token = kwargs.get('token', None)
         self.functionToken = kwargs.get('functionToken', None)
         self.__abortedEvents = EventSample()
+        self.__inputEvents = EventInput()
         self._args = None
+        self.__input_thread = None
         signal.signal(signal.SIGINT, self._on_abort)
 
     @property
@@ -99,6 +119,26 @@ class FunctionExecution(object):
         self._args = val
 
     @staticmethod
+    def __listObj2Array(data):
+        arr=[]
+        for item in data:
+            if type(item) is list:
+                arr.append(FunctionExecution.__listObj2Array(item))
+            elif type(item) is dict and ('ɵid' in item or '?id' in item ):
+                a = list(range(len(item)-1))
+                for k, v in item.items():
+                    if k == 'ɵid' or k == '?id':
+                        continue
+                    k = int(k)
+                    if type(v) is list:
+                        a[k] = FunctionExecution.__listObj2Array(v)
+                    else:
+                        a[k] = v
+                arr.append(a)       
+            else:
+                arr.append(item)
+        return arr
+    @staticmethod
     def __loadArgs():
         """加载当前任务参数
 
@@ -110,9 +150,12 @@ class FunctionExecution(object):
             if k.startswith('CLOUDPSS_JOB_ARG-'):
                 s = k.split('-')
                 key = bytes.decode(bytes.fromhex(s[1]))
-                # print(key, v, flush=True)
-
-                args[key] = json.loads(v)
+                data = json.loads(v)
+                
+                if type(data) is list:
+                    data = FunctionExecution.__listObj2Array(data)
+                
+                args[key] = data
         return args
 
     def feedDog(self):
@@ -162,6 +205,23 @@ class FunctionExecution(object):
         '''
         sys.exit(code)
 
+    def input_thread(self):
+        while True:
+            user_input = input()
+            self.__inputEvents(user_input)
+            
+    def on_input(self, func):
+        """
+            监听input事件
+
+            :params func 响应后的回调函数
+        """
+        if self.__input_thread is None:
+            self.__input_thread = threading.Thread(target=self.input_thread, args=())
+            self.__input_thread.start()
+            self.log('cloudpss input stream is ready', 'debug')
+        self.__inputEvents += [func]
+        
     def print(self, data):
         print(json.dumps(data, cls=MatlabDataEncoder)+'\n', flush=True)
 
@@ -392,8 +452,17 @@ class FunctionExecution(object):
                 'title': title,
                 'traces':
                 [self.__plotlyDataToTrace(trace) for trace in traces],
-                'xAxis': layout.get('xaxis', {}),
-                'yAxis': layout.get('yaxis', {}),
+                'layout': layout,
             }
         }
+        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,10 +83,9 @@ class DataManageModel(object):
             
             :return: 无
         '''
-        list = ['thermalLoads', 'electricLoads', 'fuels', 'typhoon', 'rainfall', 'earthquake', 'extremeCold']
+        list = ['thermalLoads', 'heatingLoad', 'coolingLoad', 'electricLoads', 'fuels', 'typhoon', 'rainfall', 'earthquake', 'extremeCold', 'HydrogenLoad', 'ammoniaLoad']
         for kind,value in self._kindUrlMap.items():
             try:
-            
                 if kind in list:
                     dataList = self._fetchItemData(self._kindUrlMap[kind], None)
                 else:
@@ -102,12 +101,13 @@ class DataManageModel(object):
 
     def GetDataItem(self, ID: str):
         '''
-            获取ID对应的元素信息
+            获取ID对应的数据信息
             
             :params: ID string类型，代表数据项的标识符，可以在所有类型的数据项中实现唯一标识
             
             :return: dict类型，为源数据的引用，返回该数据项的信息
         '''
+
         data = self._itemDataMap.get(str(ID),None)
         
         assert (data is not None), "找不到数据"
@@ -125,6 +125,7 @@ class DataManageModel(object):
         assert (dataType in self._kindNameMap
                 or dataType in self._kindUrlMap), "数据类型不存在"
         kind = self._kindNameMap.get(dataType, dataType)
+        print(kind)
         return copy.deepcopy(self._kindItemDataMap[kind])
 
     def AddDataItem(self, dataType, data):
@@ -151,7 +152,7 @@ class DataManageModel(object):
             self._kindIdMap[str(data['id'])]=kind
             self._itemDataMap[str(data['timeid'])]=data
             self._itemDataMap[str(data['id'])]=data
-            if kind in ['thermalLoads', 'electricLoads', 'fuels']:
+            if kind in ['thermalLoads', 'heatingLoad','coolingLoad', 'electricLoads', 'fuels', 'ammoniaLoad']:
                 dataList = self._fetchItemData(self._kindUrlMap[kind], None)
                 self._kindItemDataMap[kind] = dataList
                 return dataList[-1]['id']
@@ -281,11 +282,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",
@@ -314,7 +339,7 @@ class IESSimulationDataManageModel(DataManageModel):
         "台风灾害": "typhoon",
         "降雨灾害": "rainfall",
         "地震灾害": "earthquake",
-        "极寒灾害": "extremeCold"
+        "极寒灾害": "extremeCold",
     }
     _kindUrlMap = {
         "PhotovoltaicSys": "api/ieslab-simulation/rest/dpcs/",
@@ -344,7 +369,7 @@ class IESSimulationDataManageModel(DataManageModel):
         "typhoon":  "api/ieslab-simulation/rest/typhoon/",
         "rainfall": "api/ieslab-simulation/rest/rainfall/",
         "earthquake": "api/ieslab-simulation/rest/earthquake/",
-        "extremeCold": "api/ieslab-simulation/rest/extremeCold/"
+        "extremeCold": "api/ieslab-simulation/rest/extremeCold/",
     }
     pass
 
@@ -352,6 +377,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",
@@ -363,6 +389,7 @@ class IESPlanDataManageModel(DataManageModel):
         "吸收式制冷机": "AbsorptionChiller",
         "蓄电池": "Battery",
         "储水罐": "WaterTank",
+        "蓄冰空调": "IceStorageAC",
         "变压器": "Transformer",
         "传输线": "TransferLine",
         "模块化多电平变流器": "MMC",
@@ -380,7 +407,8 @@ class IESPlanDataManageModel(DataManageModel):
         "台风灾害": "typhoon",
         "降雨灾害": "rainfall",
         "地震灾害": "earthquake",
-        "极寒灾害": "extremeCold"
+        "极寒灾害": "extremeCold",
+        "换热器": "HeatExchanger",
     }
     _kindUrlMap = {
         "PhotovoltaicSys": "api/ieslab-plan/rest/dpcs/",
@@ -389,10 +417,11 @@ class IESPlanDataManageModel(DataManageModel):
         "HeatPump": "api/ieslab-plan/rest/dhscs/",
         "GasBoiler": "api/ieslab-plan/rest/dhscs/",
         "HPSolarCollector": "api/ieslab-plan/rest/dhscs/",
-        "CompRefrg": "api/ieslab-plan/rest/dhscs/",
+        "CompRefrg": "api/ieslab-simulation/rest/dhscs/",
         "AbsorptionChiller": "api/ieslab-plan/rest/dhscs/",
         "Battery": "api/ieslab-plan/rest/escs/",
         "WaterTank": "api/ieslab-plan/rest/escs/",
+        "IceStorageAC": "api/ieslab-plan/rest/escs/",
         "Transformer": "api/ieslab-plan/rest/dstcs/",
         "TransferLine": "api/ieslab-plan/rest/dstcs/",
         "MMC": "api/ieslab-plan/rest/dstcs/",
@@ -410,6 +439,112 @@ class IESPlanDataManageModel(DataManageModel):
         "typhoon":  "api/ieslab-plan/rest/typhoon/",
         "rainfall": "api/ieslab-plan/rest/rainfall/",
         "earthquake": "api/ieslab-plan/rest/earthquake/",
-        "extremeCold": "api/ieslab-plan/rest/extremeCold/"
+        "extremeCold": "api/ieslab-plan/rest/extremeCold/",
+        "HeatExchanger": "api/ieslab-plan/rest/hstcs/",
+    }
+    pass
+
+class IESOptDataManageModel(DataManageModel):
+    _baseUri = 'api/ieslab-opt/'
+    _weatherUrl = 'api/ieslab-opt/rest/weather_data/'
+    _kindNameMap = {
+        "光伏": "PhotovoltaicSys",
+        "风机": "WindPowerGenerator",
+        "燃料发电机组": "GasTurbine",
+        "空气源热泵": "HeatPump",
+        "燃气锅炉": "GasBoiler",
+        "太阳能集热器": "HPSolarCollector",
+        "吸收式热泵": "AbsorptionHeatPump",
+        "单工况制冷机": "SingleConChiller",
+        "双工况制冷机": "DualConChiller",
+        "吸收式制冷机": "AbsorptionChiller",
+        "蓄电池": "Battery",
+        "蓄冰槽": "IceStorageAC",
+        "变压器": "Transformer",
+        "传输线": "TransferLine",
+        "模块化多电平变流器": "MMC",
+        "离心泵": "CentrifugalPump",
+        "管道": "Pipe",
+        "热负荷": "heatingLoad",
+        "冷负荷": "coolingLoad",
+        "电负荷": "electricLoads",
+        "燃料": "fuels",
+        "热": "HVACHeating",
+        "冷": "HVACCooling",
+        "常数电价": "常数电价",
+        "分时电价": "分时电价",
+        "阶梯电价": "阶梯电价",
+        "分时阶梯电价": "分时阶梯电价",
+        "台风灾害": "typhoon",
+        "降雨灾害": "rainfall",
+        "地震灾害": "earthquake",
+        "极寒灾害": "extremeCold",
+        "PEM燃料电池": "PEMF",
+        "SOFC": "SOFC",
+        "碱性电解槽": "ALK",
+        "PEM电解槽": "PEME",
+        "SOEC": "SOEC",
+        "储氢罐": "HydrogenTank",
+        "储热罐": "HeatStoTank",
+        "储冷罐": "CoolStoTank",
+        "换热器": "HeatExchanger",
+        "氢气压缩设备": "HydrogenCompression",
+        "氢负荷": "HydrogenLoad",
+        "氢": "HydrogenProductionFuels",
+        "运氢槽车": "HydrogenTanker",
+        "制氨设备": "AmmoniaProduction",
+        "储氨罐": "AmmoniaStoTank",
+        "制氮设备": "NitrogenProduction",
+        "氨负荷": "ammoniaLoad",
+    }
+    _kindUrlMap = {
+        "PhotovoltaicSys": "api/ieslab-opt/rest/dpcs/",
+        "WindPowerGenerator": "api/ieslab-opt/rest/dpcs/",
+        "GasTurbine": "api/ieslab-opt/rest/dpcs/",
+        "HeatPump": "api/ieslab-opt/rest/dhscs/",
+        "GasBoiler": "api/ieslab-opt/rest/dhscs/",
+        "HPSolarCollector": "api/ieslab-opt/rest/dhscs/",
+        "AbsorptionHeatPump": "api/ieslab-opt/rest/dhscs/",
+        "SingleConChiller": "api/ieslab-opt/rest/dhscs/",
+        "DualConChiller": "api/ieslab-opt/rest/dhscs/",
+        "AbsorptionChiller": "api/ieslab-opt/rest/dhscs/",
+        "Battery": "api/ieslab-opt/rest/escs/",
+        "IceStorageAC": "api/ieslab-opt/rest/escs/",
+        "Transformer": "api/ieslab-opt/rest/dstcs/",
+        "TransferLine": "api/ieslab-opt/rest/dstcs/",
+        "MMC": "api/ieslab-opt/rest/dstcs/",
+        "CentrifugalPump": "api/ieslab-opt/rest/hstcs/",
+        "Pipe": "api/ieslab-opt/rest/hstcs/",
+        "heatingLoad": "api/ieslab-opt/rest/heatingLoad/",
+        "coolingLoad": "api/ieslab-opt/rest/coolingLoad/",
+        "electricLoads": "api/ieslab-opt/rest/electricLoads/",
+        "fuels": "api/ieslab-opt/rest/fuels/",
+        "HVACHeating": "api/ieslab-opt/rest/hots/",
+        "HVACCooling": "api/ieslab-opt/rest/colds/",
+        "常数电价": "api/ieslab-opt/rest/elects/",
+        "分时电价": "api/ieslab-opt/rest/elects/",
+        "阶梯电价": "api/ieslab-opt/rest/elects/",
+        "分时阶梯电价": "api/ieslab-opt/rest/elects/",
+        "typhoon":  "api/ieslab-opt/rest/typhoon/",
+        "rainfall": "api/ieslab-opt/rest/rainfall/",
+        "earthquake": "api/ieslab-opt/rest/earthquake/",
+        "extremeCold": "api/ieslab-opt/rest/extremeCold/",
+        "HydrogenTank": "api/ieslab-opt/rest/escs/",
+        "HeatStoTank": "api/ieslab-opt/rest/escs/",
+        "CoolStoTank": "api/ieslab-opt/rest/escs/",
+        "HeatExchanger": "api/ieslab-opt/rest/hstcs/",
+        "HydrogenCompression": "api/ieslab-opt/rest/hsec/",
+        "HydrogenLoad": "api/ieslab-opt/rest/hydrogenLoad/",
+        "HydrogenProductionFuels": "api/ieslab-opt/rest/hydrogen/",
+        "HydrogenTanker": "api/ieslab-opt/rest/hydrogen/",
+        "PEMF": "api/ieslab-opt/rest/dhscs/",
+        "SOFC": "api/ieslab-opt/rest/dhscs/",
+        "ALK": "api/ieslab-opt/rest/hpc/",
+        "PEME": "api/ieslab-opt/rest/hpc/",
+        "SOEC": "api/ieslab-opt/rest/hpc/",
+        "AmmoniaProduction": "api/ieslab-opt/rest/apc/",
+        "AmmoniaStoTank": "api/ieslab-opt/rest/escs/",
+        "NitrogenProduction": "api/ieslab-opt/rest/asec/",
+        "ammoniaLoad": "api/ieslab-opt/rest/ammoniaLoad/",
     }
     pass

cloudpss/ieslab/EvaluationModel.py

@@ -1,13 +1,14 @@
 import time
-from cloudpss.runner.runner import HttpRunner, Runner
-from cloudpss.runner.IESLabEvaluationResult import IESLabEvaluationResult
+from cloudpss.runner.runner import HttpRunner, Runner, HttpOPTRunner
+from cloudpss.runner.IESLabEvaluationResult import IESLabPlanEvaluationResult, IESLabOptEvaluationResult
 from ..utils import request
 import json
 from enum import IntEnum, unique
 
 class IESLabEvaluationModel(object):
-    _baseUri = 'api/ieslab-plan/rest/'
-    _taskUri = 'api/ieslab-plan/taskmanager/getSimuLastTasks'
+    _baseUri = ''
+    _taskUri = ''
+    _runUri = ''
     _kindNameMap = {
         "投资组成": "investmentbanchandproportion",
         "资金来源": "capitalsource",
@@ -123,16 +124,16 @@ class IESLabEvaluationModel(object):
                 dict_result[v] = list['results']
         return dict_result
 
-    def run(self, planID, type=None) -> Runner[IESLabEvaluationResult]:
+    def run(self, planID, type=None) -> HttpRunner[IESLabPlanEvaluationResult]:
         '''
             运行方案评估
 
             :param planID int类型，表示优化方案的ID，数值位于0~优化方案数量之间
             :params type:  string类型，任务类型：环保评价/能效评价
 
-            :return: Runner[IESLabEvaluationResult]
+            :return: Runner[IESLabPlanEvaluationResult]
         '''
-        url = 'api/ieslab-plan/taskmanager/saveDataToclickhouse'
+        url =  self._runUri
         CMD_TYPE = type if type is None else self._evaluationType[type]
         try:
             timeId = int(time.time() * 1000)
@@ -172,7 +173,7 @@ class IESLabEvaluationModel(object):
         '''
         return self.run(planID, 'energyEvaluation')
 
-    def GetRunner(self, planID) -> Runner[IESLabEvaluationResult]:
+    def GetRunner(self, planID) -> Runner[IESLabPlanEvaluationResult]:
         '''
             获得运行实例
 
@@ -186,4 +187,74 @@ class IESLabEvaluationModel(object):
 @unique
 class OptimizationMode(IntEnum):
     经济性 = 0
-    环保性 = 1
+    环保性 = 1
+
+
+class IESLabPlanEvaluationModel(IESLabEvaluationModel):
+    _baseUri = 'api/ieslab-plan/rest/'
+    _taskUri = 'api/ieslab-plan/taskmanager/getSimuLastTasks'
+    _runUri = 'api/ieslab-plan/taskmanager/saveDataToclickhouse'
+
+    def run(self, planID, type=None) -> HttpRunner[IESLabPlanEvaluationResult]:
+        '''
+            运行方案评估
+
+            :param planID int类型，表示优化方案的ID，数值位于0~优化方案数量之间
+            :params type:  string类型，任务类型：环保评价/能效评价
+
+            :return: HttpRunner[IESLabEvaluationResult]
+        '''
+        url =  self._runUri
+        CMD_TYPE = type if type is None else self._evaluationType[type]
+        try:
+            timeId = int(time.time() * 1000)
+            r = request('GET',
+                        url,
+                        params={
+                            "simuid": self.simulationId,
+                            "planId": planID,
+                            "CMD_TYPE": CMD_TYPE
+                        })
+            data = json.loads(r.text)
+            return HttpRunner({'rid': 'function/ieslab/evaluation'},
+                self.simulationId,
+                timeId=timeId,
+                planId=planID,
+                cmdType=CMD_TYPE)
+        except:
+            raise Exception('方案评估开始计算失败')
+
+
+class IESLabOptEvaluationModel(IESLabEvaluationModel):
+    _baseUri = 'api/ieslab-opt/rest/'
+    _taskUri = 'api/ieslab-opt/taskmanager/getSimuLastTasks'
+    _runUri = 'api/ieslab-opt/taskmanager/saveDataToclickhouse'
+
+    def run(self, planID, type=None) -> HttpOPTRunner[IESLabOptEvaluationResult]:
+        '''
+            运行方案评估
+
+            :param planID int类型，表示优化方案的ID，数值位于0~优化方案数量之间
+            :params type:  string类型，任务类型：环保评价/能效评价
+
+            :return: HttpRunner[IESLabEvaluationResult]
+        '''
+        url =  self._runUri
+        CMD_TYPE = type if type is None else self._evaluationType[type]
+        try:
+            timeId = int(time.time() * 1000)
+            r = request('GET',
+                        url,
+                        params={
+                            "simuid": self.simulationId,
+                            "planId": planID,
+                            "CMD_TYPE": CMD_TYPE
+                        })
+            data = json.loads(r.text)
+            return HttpOPTRunner({'rid': 'function/ieslab/evaluation'},
+                self.simulationId,
+                timeId=timeId,
+                planId=planID,
+                cmdType=CMD_TYPE)
+        except:
+            raise Exception('方案评估开始计算失败')