cloudpss 4.1.1b9__tar.gz → 4.5.1__tar.gz

{cloudpss-4.1.1b9 → cloudpss-4.5.1}/PKG-INFO

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

{cloudpss-4.1.1b9 → cloudpss-4.5.1}/cloudpss/__init__.py

@@ -1,5 +1,5 @@
 # coding=UTF-8
-from cloudpss.ieslab import IESLabSimulation, IESLabPlan
+from cloudpss.ieslab import IESLabSimulation, IESLabPlan, IESLabOpt
 from .verify import setToken
 from .runner import Runner, Result, EMTResult, PowerFlowResult
 from .model import Model, ModelRevision, ModelTopology
@@ -9,11 +9,10 @@ from . import function
 from .job import Job
 from .function import FunctionExecution
 from .version import __version__
-from .dslab import DSLab
 __all__ = [
     'setToken', 'Model', 'ModelRevision', 'ModelTopology', 'Runner', 'Result',
     'PowerFlowResult', 'EMTResult', 'MatlabDataEncoder', 'DateTimeEncode',
-    'function', 'Project', 'currentJob', 'IESLabSimulation', 'IESLabPlan','__version__','Job','DSLab'
+    'function', 'Project', 'currentJob', 'IESLabSimulation', 'IESLabPlan','IESLabOpt','__version__','Job'
 ]
 
 

{cloudpss-4.1.1b9 → cloudpss-4.5.1}/cloudpss/asyncio/job/job.py

@@ -72,13 +72,13 @@ class Job(JobBase):
         variables = {"input": {"id": id, "timeout": timeout}}
         await graphql_request(query, variables)
         
-    async def view(self, viewType:F)->F:
+    async def result(self, resultType:F)->F:
         """
         获取当前运行实例的输出
         """
         receiver = await self.read()
         sender = await self.write()
-        self._result= viewType(receiver, sender)
+        self._result= resultType(receiver, sender)
         return self._result
     
     async def write(self, sender=None, dev=False, **kwargs) -> MessageStreamSender:

{cloudpss-4.1.1b9 → cloudpss-4.5.1}/cloudpss/function/functionExecution.py

@@ -99,6 +99,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 +130,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):

{cloudpss-4.1.1b9 → cloudpss-4.5.1}/cloudpss/ieslab/DataManageModel.py

@@ -83,46 +83,21 @@ class DataManageModel(object):
             
             :return: 无
         '''
-        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
+        list = ['thermalLoads', 'heatingLoad', 'coolingLoad', 'electricLoads', 'fuels', 'typhoon', 'rainfall', 'earthquake', 'extremeCold', 'HydrogenLoad']
+        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
 
     def GetDataItem(self, ID: str):
         '''
@@ -132,6 +107,7 @@ class DataManageModel(object):
             
             :return: dict类型，为源数据的引用，返回该数据项的信息
         '''
+
         data = self._itemDataMap.get(str(ID),None)
         
         assert (data is not None), "找不到数据"
@@ -175,7 +151,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']:
                 dataList = self._fetchItemData(self._kindUrlMap[kind], None)
                 self._kindItemDataMap[kind] = dataList
                 return dataList[-1]['id']
@@ -362,7 +338,7 @@ class IESSimulationDataManageModel(DataManageModel):
         "台风灾害": "typhoon",
         "降雨灾害": "rainfall",
         "地震灾害": "earthquake",
-        "极寒灾害": "extremeCold"
+        "极寒灾害": "extremeCold",
     }
     _kindUrlMap = {
         "PhotovoltaicSys": "api/ieslab-simulation/rest/dpcs/",
@@ -392,7 +368,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
 
@@ -412,6 +388,7 @@ class IESPlanDataManageModel(DataManageModel):
         "吸收式制冷机": "AbsorptionChiller",
         "蓄电池": "Battery",
         "储水罐": "WaterTank",
+        "蓄冰空调": "IceStorageAC",
         "变压器": "Transformer",
         "传输线": "TransferLine",
         "模块化多电平变流器": "MMC",
@@ -429,7 +406,8 @@ class IESPlanDataManageModel(DataManageModel):
         "台风灾害": "typhoon",
         "降雨灾害": "rainfall",
         "地震灾害": "earthquake",
-        "极寒灾害": "extremeCold"
+        "极寒灾害": "extremeCold",
+        "换热器": "HeatExchanger",
     }
     _kindUrlMap = {
         "PhotovoltaicSys": "api/ieslab-plan/rest/dpcs/",
@@ -438,10 +416,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/",
@@ -459,6 +438,100 @@ 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",
+        "单工况制冷机": "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",
+        "换热器": "HeatExchanger",
+        "氢气压缩设备": "HydrogenCompression",
+        "氢负荷": "HydrogenLoad",
+        "氢": "HydrogenProductionFuels",
+        "运氢槽车": "HydrogenTanker"
+    }
+    _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/",
+        "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/",
+        "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/",
     }
     pass

{cloudpss-4.1.1b9 → cloudpss-4.5.1}/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('方案评估开始计算失败')