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

cloudpss/job/view/EMTView.py

@@ -1,6 +1,6 @@
 import copy
 import uuid
-
+from deprecated import deprecated
 from .view import View
 class EMTView(View):
     """
@@ -36,7 +36,7 @@ class EMTView(View):
     
     def getPlot(self, index: int):
         '''
-            获取指定序号的数据分组
+            获取指定序号的曲线分组
 
             :params: index 图表位置
 
@@ -100,12 +100,13 @@ class EMTView(View):
         else:
             raise Exception('sender is None')
     
+    
     def writeShm(self,path,buffer,offset):
         """
-            写内存接口
+            写内存接口 （未最终确定，后续版本进行修改，使用时注意版本）
         """
         if self._sender is not None:
-            self._sender.write({'type': 'memory', 'path': path,'value':buffer,'offset':offset})
+            self._sender.write({'type': 'memory', 'path': path,'buffer':buffer,'offset':offset})
         else:
             raise Exception('transmitter is None')
     
@@ -136,7 +137,6 @@ class EMTView(View):
 
         self._writeEvent('time','-1','1',{'SimuCtrl': eventData})
             
-        
     def _snapshotControl(self,ctrlType,snapshotNumber,log):
         """
             断面控制
@@ -151,8 +151,7 @@ class EMTView(View):
         }
         eventData = {}
         eventData = {'SnapshotCtrl': param}
-        self._writeEvent('time','-1','1',{'SnapshotCtrl': eventData})
-        
+        self._writeEvent('time','-1','1',{'SnapshotCtrl': eventData})  
     def saveSnapshot(self,snapshotNumber,log='保存断面成功'):
         """
             通过事件链保存断面
@@ -164,7 +163,6 @@ class EMTView(View):
         """
         self._snapshotControl('1',snapshotNumber,log)
         
-
     def control(self,controlParam,eventTime='-1',eventTimeType='1'):
         """
             控制仿真
@@ -190,10 +188,10 @@ class EMTView(View):
     
     def monitor(self,monitorParam,eventTime='-1',eventTimeType='1'):
         
-        if type(controlParam) is not list:
-            controlParam=[controlParam]
+        if type(monitorParam) is not list:
+            monitorParam=[monitorParam]
         para={}
-        for param in controlParam:
+        for param in monitorParam:
             para[param['key']]={
                 'a': {
                     'uuid':param['uuid'] if param.get('uuid',None) is not None else str(uuid.uuid1()),

cloudpss/job/view/IESLabTypicalDayView.py

@@ -1,13 +1,80 @@
 from .IESView import IESView
-
+import re
+import copy
 class IESLabTypicalDayView(IESView):
-    def GetTypicalDayNum():
+    
+    def __init__(self, *args, **kwargs):
+        """
+            初始化
+        """
+        IESView.__init__(self, *args, **kwargs)
+        self.__plotIndex = 0
+        self.__typicalIndex = 0
+        self.__type_list =['电负荷', '热负荷','冷负荷','总辐射','散射辐射', '直射辐射',  '天顶角', '环境温度', '土壤温度', '10m风速', '50m风速', '建筑物高度风速', '风机高度风速']
+        self.result = {'TypicalMonth': [],'TypicalDay': []}
+        for i in range(12):
+            self.result['TypicalMonth'].append({'月份': int, '持续天数': [],'电负荷': [], '热负荷': [],'冷负荷':[],'总辐射': [],'直射辐射': [],'散射辐射': [],'天顶角': [],
+                                                '环境温度': [], '土壤温度': [], '建筑物高度风速': [], '风机高度风速': [],'10m风速': [], '50m风速': [] })
+    def __readPlotResult(self):
+        length = self.getMessageLength()
+        if (length > self.__plotIndex):
+            for num in range(self.__plotIndex, length):# update TypicalMonth
+                val = self.getMessage(num)
+                if val['type'] == 'plot':
+                    key_list = re.split('-month',val['key'])#分别为类型和月份
+                    # print(key_list)
+                    self.result['TypicalMonth'][int(key_list[1])-1]['月份'] = int(key_list[1])
+                    if key_list[0] in ['总辐射','散射辐射']:#从第一类数据中分析每个月各个典型日的天数
+                        typicalNum = len(val['data']['traces'])
+                        for i in range(typicalNum):
+                            self.result['TypicalMonth'][int(key_list[1])-1]['持续天数'].append(int(re.findall('\d+',val['data']['traces'][i]['name'])[1]))
+                    # 每个月各类型数据的各个典型日的数据，由于部分月份可能没有电冷热负荷，某月的某个典型日可能缺少冷热负荷
+                    for i in range(typicalNum):
+                        self.result['TypicalMonth'][int(key_list[1])-1][key_list[0]].append([])
+                    for i in range(len(val['data']['traces'])):
+                        self.result['TypicalMonth'][int(key_list[1])-1][key_list[0]][int(re.findall('\d+',val['data']['traces'][i]['name'])[0])-1] = copy.deepcopy(val['data']['traces'][i]['y'])
+            self.__plotIndex = length
+            # update TypicalDay based on TypicalMonth
+            for m in range(12):
+                for i in range(len(self.result['TypicalMonth'][m]['持续天数'])):
+                    self.result['TypicalDay'].append({'info':{'typicalDayID': int, 'name': str, 'duration': int, 'maxElectricalLoad': 0.0, 'maxHeatLoad': 0.0, 'maxCoolLoad': 0.0}, 
+                                                      'data': {'电负荷': [], '热负荷': [],'冷负荷':[],'总辐射': [],'直射辐射': [],'散射辐射': [],'天顶角': [],
+                                                               '环境温度': [], '土壤温度': [], '建筑物高度风速': [], '风机高度风速': [],'10m风速': [], '50m风速': []}})
+                    self.result['TypicalDay'][-1]['info']['typicalDayID'] = self.__typicalIndex
+                    self.result['TypicalDay'][-1]['info']['name'] = str(m+1) + '月典型日' + str(i+1)
+                    self.result['TypicalDay'][-1]['info']['duration'] = self.result['TypicalMonth'][m]['持续天数'][i]
+                    if self.result['TypicalMonth'][m]['电负荷']:
+                        if self.result['TypicalMonth'][m]['电负荷'][i]:
+                            self.result['TypicalDay'][-1]['info']['maxElectricalLoad'] = max(self.result['TypicalMonth'][m]['电负荷'][i])
+                    if self.result['TypicalMonth'][m]['热负荷']:
+                        if self.result['TypicalMonth'][m]['热负荷'][i]:
+                            self.result['TypicalDay'][-1]['info']['maxHeatLoad'] = max(self.result['TypicalMonth'][m]['热负荷'][i])
+                    if self.result['TypicalMonth'][m]['冷负荷']:
+                        if self.result['TypicalMonth'][m]['冷负荷'][i]:
+                            self.result['TypicalDay'][-1]['info']['maxCoolLoad'] = max(self.result['TypicalMonth'][m]['冷负荷'][i])
+                    for type_i in self.__type_list:
+                        if self.result['TypicalMonth'][m][type_i]:
+                            self.result['TypicalDay'][-1]['data'][type_i] = self.result['TypicalMonth'][m][type_i][i]
+                    self.__typicalIndex += 1
+    def GetTypical(self):
+        '''
+            获取所有的 GetTypical 典型日数据
+
+            >>> result.GetTypical()
+            {...}
+        '''
+        self.__readPlotResult()
+        return self.result['TypicalDay']
+    def GetTypicalDayNum(self):
         '''
             获取当前result的典型日数量
             
             :return: int类型，代表典型日数量
         '''
-    def GetTypicalDayInfo(dayID):
+        
+        self.__readPlotResult()
+        return self.__typicalIndex
+    def GetTypicalDayInfo(self,dayID):
         '''
             获取dayID对应典型日的基础信息
             
@@ -15,7 +82,10 @@ class IESLabTypicalDayView(IESView):
             
             :return: dict类型，代表典型日的基础信息，包括典型日所代表的日期范围、典型日的名称等
         '''
-    def GetTypicalDayCurve(dayID, dataType):
+        self.__readPlotResult()
+        return self.result['TypicalDay'][dayID].get('info','没有该数据')
+        
+    def GetTypicalDayCurve(self,dayID, dataType):
         '''
             获取dayID对应典型日下dataType参数的时序曲线
             
@@ -24,4 +94,43 @@ class IESLabTypicalDayView(IESView):
             
             :return: list<float>类型，代表以1h为时间间隔的该参数的日内时序曲线
         '''
-    pass
+        self.__readPlotResult()
+        return self.result['TypicalDay'][dayID]['data'].get(dataType,'没有该类型数据')
+    
+    def GetTypicalMonth(self):
+        '''
+            获取所有的 GetTypicalMonth 数据
+            
+            >>> result.GetTypicalMonth()
+            
+            :return: list<dict>类型，代表各月各类型的典型日数据
+        '''
+        self.__readPlotResult()
+        return self.result['TypicalMonth']
+    
+    def GetTypicalMonthNum(self,monthID):
+        '''
+            获取第monthID月各类型的典型日数据
+
+            >>> result.GetTypicalMonthNum()
+            
+            :params: monthID int类型，表示典型月的ID，数值位于 1-12 之间
+
+            :return: dict类型，代表第monthID月各类型的典型日数据
+            {...}
+        '''
+        self.__readPlotResult()
+        return self.result['TypicalMonth'][monthID-1]
+        
+    
+    def GetTypicalMonthCurve(self,monthID, dataType):
+        '''
+            获取dayID对应典型日下dataType参数的时序曲线
+            
+            :params: monthID int类型，表示典型月的ID，数值位于 1-12 之间
+            :params: dataType enum类型，标识总辐射、环境温度、土壤温度、建筑物高度风速、风机高度风速、电负荷、热负荷、冷负荷的参数类型
+            
+            :return: list<list>类型，代表以1h为时间间隔的该参数的典型日内时序曲线
+        '''
+        self.__readPlotResult()
+        return self.result['TypicalMonth'][monthID-1].get(dataType,'没有该类型数据')

cloudpss/job/view/view.py

@@ -1,9 +1,10 @@
 
 
+import sys
+from deprecated import deprecated
 from ..messageStreamSender import MessageStreamSender
 from ..messageStreamReceiver import MessageStreamReceiver
 
-
 class View(object):
     """
         结果视图基类，提供基础的结果获取接口
@@ -18,7 +19,7 @@ class View(object):
         self.__logsIndex = 0
     
     async def receive(self):
-        async for msg in self._receiver.receiver:
+        async for msg in self._receiver:
             yield msg
             
     def __len__(self):
@@ -33,7 +34,10 @@ class View(object):
 
         for key, val in dict1.items():
             if type(val) is dict:
-                self.__deepModify(val, dict2[key])
+                if type(dict2) is dict and dict2.get(key, None) is None:
+                    dict2[key] = val
+                else:
+                    self.__deepModify(val, dict2[key])
             else:
                 dict2[key] = val
                 
@@ -123,12 +127,37 @@ class View(object):
             self.__logsIndex = length
         return result
     
+    def getMessageLength(self):
+        """
+            获取消息数据的长度
+
+            :returns: 消息数据的长度
+        """
+        return len(self._receiver.messages)
+        
+    
+    def waitFor(self,timeOut=sys.maxsize):
+        """
+            阻塞方法，直到任务完成
+
+            :params timeOut: 超时时间
+        """
+        return self._receiver.waitFor(timeOut)
     
     @property
-    def end(self):
+    @deprecated(version='3.0', reason="该方法将在 5.0 版本移除")
+    def db(self):
         """
-            获取当前连接状态
+            获取数据库对象
 
-            :returns: 当前连接状态  0:关闭 1:打开
+            :returns: 数据库对象
+        """
+        return self._receiver
+    
+    def pop(self,index=-1):
+        """
+            pop 出缓存中的消息
+
+            :returns: 消息数据
         """
-        return self._receiver.end
+        return self._receiver.messages.pop(index)

cloudpss/model/implements/diagram.py

@@ -1,4 +1,6 @@
 from .component import Component
+from typing import Optional
+import uuid
 
 
 class DiagramImplement(object):
@@ -44,3 +46,114 @@ class DiagramImplement(object):
         """
 
         return self.cells
+    
+    def addComponent(
+        self,
+        definition: str,
+        label: str,
+        args: dict = {},
+        pins: dict = {},
+        canvas: Optional[str] = None,
+        position: Optional[dict] = None,
+        size: Optional[dict] = None,
+    ) -> Component:
+        """
+        添加元件
+
+        :param definition 元件定义， 连接线没有definition
+        :param label 元件标签
+        :param args 元件参数数据，连接线没有参数数据
+        :param pins 元件引脚数据，连接线没有引脚数据
+        :param canvas 元件所在图纸数据
+        :param position 元件位置数据, 连接线没有位置数据
+        :param size 元件大小数据，连接线没有大小数据
+
+        :return: Component
+
+        >>>> diagram.addComponent(args)
+        """
+        id = "comp_" + str(uuid.uuid4())
+        shape = "diagram-component"
+        definition = definition
+        label = label or definition
+        args = args.copy()
+        pins = pins.copy()
+        props = {"enabled": True}
+        context = {}
+        canvas or self.canvas[0].get("key", "canvas_0")
+        position = position.copy() if position else {"x": 0, "y": 0}
+        size = size.copy() if size else None
+        zIndex = 0
+        style = {
+            "--fill": "var(--spectrum-global-color-gray-100)",
+            "--fill-opacity": 1,
+            "--font-family": "var(--spectrum-global-font-family-base, Arial, Helvetica, sans-serif)",
+            "--stroke": "var(--spectrum-global-color-gray-900)",
+            "--stroke-opacity": 1,
+            "--stroke-width": 2,
+            "--text": "var(--spectrum-global-color-gray-900)",
+            "--text-opacity": 1,
+        }
+        diagram = {
+            "id": id,
+            "shape": shape,
+            "definition": definition,
+            "label": label,
+            "args": args,
+            "pins": pins,
+            "props": props,
+            "context": context,
+            "canvas": canvas,
+            "position": position,
+            "size": size,
+            "zIndex": zIndex,
+            "style": style,
+        }
+        component = Component(diagram)
+        self.cells[id] = component
+        return component
+
+    def removeComponent(self, key: str) -> bool:
+        """
+        删除元件
+
+        :param key: str
+        :return: bool
+
+        >>>> diagram.removeComponent(key)
+        """
+        component = self.cells.get(key)
+        if not component:
+            return False
+        position = component.position.copy()
+        del self.cells[key]
+        for edge in self.cells.values():
+            if edge.shape == "diagram-edge":
+                if edge.source.get("cell") == key:
+                    edge.source = position.copy()
+                    position["x"] += 5
+                    position["y"] += 5
+
+                if edge.target.get("cell") == key:
+                    edge.target = position.copy()
+                    position["x"] += 5
+                    position["y"] += 5
+        return True
+
+    def updateComponent(self, key: str, args: dict) -> bool:
+        """
+        更新元件
+
+        :param key: str
+        :param args: dict
+        :return: bool
+
+        >>>> diagram.updateComponent(key)
+        """
+        component = self.cells.get(key)
+        if not component:
+            return False
+        for k, v in self.cells.items():
+            if k == key:
+                v.__dict__.update(args)
+                return True

cloudpss/model/jobDefinitions.py

@@ -1,6 +1,6 @@
 JOB_DEFINITIONS = {
     "emtp": {
-        "rid": "job-definition/cloudpss/emtp",
+        "rid": "function/CloudPSS/emtp",
         "args": {
             "debug":
             "0",
@@ -48,7 +48,7 @@ JOB_DEFINITIONS = {
     },
     'sfemt': {
         "name": "移频电磁暂态仿真方案 1",
-        "rid": "job-definition/cloudpss/sfemt",
+        "rid": "function/CloudPSS/sfemt",
         "args": {
             "begin_time":
             "0",
@@ -103,7 +103,7 @@ JOB_DEFINITIONS = {
     },
     "powerFlow": {
         "name": "潮流计算方案 1",
-        "rid": "job-definition/cloudpss/power-flow",
+        "rid": "function/CloudPSS/power-flow",
         "args": {
             "UseBusVoltageAsInit": "1",
             "UseBusAngleAsInit": "1",
@@ -115,7 +115,7 @@ JOB_DEFINITIONS = {
     },
     "iesLoadPrediction": {
         "name": "负荷预测方案 1",
-        "rid": "job-definition/ies/ies-load-prediction",
+        "rid": "function/CloudPSS/ies-load-prediction",
         "arcs": {
             "startTime": "2022 -01-01 00:00:00",
             "endTime": "2022 -12-31 23:00:00",
@@ -128,7 +128,7 @@ JOB_DEFINITIONS = {
     },
     "iesPowerFlow": {
         "name": "时序潮流方案 1",
-        "rid": "job-definition/ies/ies-power-flow",
+        "rid": "function/CloudPSS/ies-power-flow",
         "arcs": {
             "startTime": "2022 -01-01 00:00:00",
             "endTime": "2022 -12-31 23:00:00",
@@ -138,7 +138,7 @@ JOB_DEFINITIONS = {
     },
     "iesEnergyStoragePlan": {
         "name": "储能规划方案 1",
-        "rid": "job-definition/ies/ies-energy-storage-plan",
+        "rid": "function/CloudPSS/ies-energy-storage-plan",
         "arcs": {
             "Planyear": "15",
             "NetConfig": [],