cloudpss 4.5.1a4__tar.gz → 4.5.2__tar.gz

{cloudpss-4.5.1a4 → cloudpss-4.5.2}/PKG-INFO

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

{cloudpss-4.5.1a4 → cloudpss-4.5.2}/cloudpss/__init__.py

@@ -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','IESLabOpt','__version__','Job','DSLab'
+    'function', 'Project', 'currentJob', 'IESLabSimulation', 'IESLabPlan','IESLabOpt','__version__','Job'
 ]
 
 

{cloudpss-4.5.1a4 → cloudpss-4.5.2}/cloudpss/job/job.py

@@ -202,7 +202,7 @@ class Job(Generic[T]):
         if receiver is not None:
             self.__receiver = receiver
         if self.__receiver is None:
-            self.__receiver = MessageStreamReceiver(self.output)
+            self.__receiver = MessageStreamReceiver(self)
             self.__receiver.connect(**kwargs)
         return self.__receiver
 
@@ -216,7 +216,7 @@ class Job(Generic[T]):
         if sender is not None:
             self.__sender = sender
         if self.__sender is None:
-            self.__sender = MessageStreamSender(self.input)
+            self.__sender = MessageStreamSender(self)
         self.__sender.connect_legacy(**kwargs)
         return self.__sender
     
@@ -259,9 +259,7 @@ class Job(Generic[T]):
         sender =  self.write()
         if resultType is None:
             resultType = getResultClass(self.context[0])
-        self._result= resultType(receiver, sender)
-        
-        return self._result
+        return resultType(receiver, sender)
 
     
 

{cloudpss-4.5.1a4 → cloudpss-4.5.2}/cloudpss/job/messageStreamReceiver.py

@@ -1,9 +1,5 @@
-import datetime
 import logging
 import sys
-
-from cloudpss.job.TemplateManager import TemplateManager
-
 from .jobReceiver import JobReceiver
 import os
 from urllib.parse import urlparse
@@ -11,6 +7,7 @@ import websocket
 import pytz
 import threading
 import time
+
 utc_tz = pytz.timezone("UTC")
 
 from ..utils.IO import IO
@@ -21,30 +18,15 @@ class Message(object):
         self.id = id
         self.token = token
 
-    
-    
+
 class MessageStreamReceiver(JobReceiver):
-    def __init__(self, output):
+    def __init__(self, job):
         super().__init__()
-        self.id = output
+        self.job = job
+        self.id =self.job.output
         self.origin = os.environ.get("CLOUDPSS_API_URL", "https://cloudpss.net/")
         self.__hasOpen = False
-        self.templates=TemplateManager()
-        self.timeOffset=0
-        self.lastMessageTime=0
-    
-    
-    def updateTime(self,timestamp):
-        self.lastMessageTime = timestamp
-        
-    ## 判断是否到达当前时间点的数据或者消息流结束
-    def isEnd(self):
-        
-        if self.status == 1:
-            return True
-        logging.debug('lastMessageTime',self.lastMessageTime)
-        return (self.lastMessageTime/1000)>=time.time()-self.timeOffset
-        
+
     def __path(self, from_=None):
         if self.id is None:
             raise Exception("id is None")
@@ -57,32 +39,21 @@ class MessageStreamReceiver(JobReceiver):
   
     ###下面是兼容Receiver部分功能实现
     def __on_message_legacy(self,  *args, **kwargs):
+        
         if type(args[0]) != websocket.WebSocketApp:
             message = args[0]
         else:
             message = args[1]
         return self.__on_message(message)
+
     def __on_message(self, message):
         
         data = IO.deserialize(message, "ubjson")
-        self.updateTime(data["timestamp"])
         self.ws.url = self.__path(data["id"])
         msg = IO.deserialize(data["data"], "ubjson")
-        
-        if type(msg) is list:
-            if len(msg) == 3:
-                pass
-                
-                templateMessage = self.templates.invoke(msg)
-                # print(templateMessage)
-                for m in templateMessage:
-                    self.messages.append(m)
-                return
-            else:
-                self.templates.create(msg)
-                return
-        
         self.messages.append(msg)
+        if(msg['type']=='terminate'):
+            self.close(self.ws)
         return msg
 
 
@@ -130,10 +101,6 @@ class MessageStreamReceiver(JobReceiver):
     
     def __on_open(self,ws, *args, **kwargs):
         self.ws = ws
-        gmt_format = '%a, %d %b %Y %H:%M:%S GMT'
-        serverTime = datetime.datetime.strptime(ws.sock.headers['date'],gmt_format)
-        self.timeOffset = time.time()+time.timezone-serverTime.timestamp()
-        
         logging.debug(f"MessageStreamReceiver on_open")
         self._status = 0
         self.__hasOpen = True
@@ -161,7 +128,7 @@ class MessageStreamReceiver(JobReceiver):
        
 
     def connect(self):
-        self._status = 0
+        self._status = 1
         path = self.__path()
         logging.info(f"receive data from websocket: {path}")
         self.ws = websocket.WebSocketApp(

{cloudpss-4.5.1a4 → cloudpss-4.5.2}/cloudpss/job/messageStreamSender.py

@@ -12,9 +12,9 @@ import logging
 
 
 class MessageStreamSender:
-    def __init__(self, input):
+    def __init__(self, job):
         super().__init__()
-        self.input = input
+        self.job = job
         self.origin = os.environ.get("CLOUDPSS_API_URL", "https://cloudpss.net/")
         self.__hasOpen = False
 
@@ -60,14 +60,14 @@ class MessageStreamSender:
         同步方法连接ws
         """
         self._status = 0
-        if self.input is None:
+        if self.job.input is None:
             raise Exception("id is None")
-        if self.input == "00000000-0000-0000-0000-000000000000":
+        if self.job.input == "00000000-0000-0000-0000-000000000000":
             return
         u = list(urlparse(self.origin))
         head = "wss" if u[0] == "https" else "ws"
 
-        path = head + "://" + str(u[1]) + "/api/streams/token/" + self.input
+        path = head + "://" + str(u[1]) + "/api/streams/token/" + self.job.input
         logging.debug(f"MessageStreamSender data from websocket: {path}")
 
         self.ws = websocket.WebSocketApp(

{cloudpss-4.5.1a4 → cloudpss-4.5.2}/cloudpss/job/result/IESLabTypicalDayResult.py

@@ -10,51 +10,49 @@ class IESLabTypicalDayResult(IESResult):
         IESResult.__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风速': [] })
+        self.__type_list =['总辐射','散射辐射', '直射辐射','天顶角', '环境温度', '湿球温度','土壤温度', '10m风速', '50m风速','电负荷', '热负荷','冷负荷','氢负荷']
+        self.__map_load = { 'maxElectricalLoad':'电负荷', 'maxHeatLoad':'热负荷','maxCoolLoad':'冷负荷','maxHydrogenLoad':'氢负荷' }
+        
+        self.result = {'TypicalMonth': [{'月份': int,'持续天数': [],**{key: [] for key in self.__type_list}} for i in range(12)],'TypicalDay': []}
     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'])
+                if val['type'] == 'plot':# 每个月各类型数据的各个典型日的数据，由于部分月份可能没有电冷热负荷，某月的某个典型日可能缺少冷热负荷
+                    key_re = re.split('-month',val['key'])#格式为：散射辐射-month1，re后分别为类型和月份
+                    typical_month_m = self.result['TypicalMonth'][int(key_re[1])-1]
+                    typical_month_m['月份'] = int(key_re[1])
+                    val_data_traces = val['data']['traces']
+                    #val['data']['traces'][i]['name']格式为：典型日1-共31天，re正则后[0]为典型日顺序，[1]为持续天数
+                    typicalNum = int(re.findall('\d+',val_data_traces[-1]['name'])[0])
+                    for i in range(typicalNum):#取该类型的最后一个典型日顺序，当该类型缺少后排典型日时，小于实际典型日数量
+                        typical_month_m[key_re[0]].append([])
+                        if key_re[0]  == '环境温度':#各类版本气象数据均有环境温度数据，其典型日数量为实际数量
+                            typical_month_m['持续天数'].append(int(re.findall('\d+',val_data_traces[i]['name'])[1]))
+                    # 当前排典型日缺少数据时，该类型数据为空list[]；当后排典型日缺少数据时，该类型数据为空
+                    for i in range(len(val_data_traces)):
+                        typical_month_m[key_re[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])
+                typical_month_m = self.result['TypicalMonth'][m]
+                typical_month_m_day = len(typical_month_m['持续天数'])
+                for i in range(typical_month_m_day):
+                    self.result['TypicalDay'].append({'info':{'typicalDayID': int, 'name': str, 'duration': int, **{key: 0.0 for key in self.__map_load}},
+                    'data': {**{key: [] for key in self.__type_list}}})
+                    typical_day_index = self.result['TypicalDay'][self.__typicalIndex]
+                    typical_day_index['info']['typicalDayID'] = self.__typicalIndex
+                    typical_day_index['info']['name'] = str(m+1) + '月典型日' + str(i+1)
+                    typical_day_index['info']['duration'] = typical_month_m['持续天数'][i]
+                    for key,value in self.__map_load.items():
+                        # 分别处理该典型日无此类型负荷数据，缺少后序典型日，缺少前序典型日的情况
+                        if typical_month_m.get(value) and i <len(typical_month_m[value]) and len(typical_month_m[value][i]):
+                            typical_day_index['info'][key] = max(typical_month_m[value][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]
+                        # 某月冷热负荷可能缺少后续典型日数据
+                        if typical_month_m[type_i] and i < len(typical_month_m[type_i]):
+                            typical_day_index['data'][type_i] = typical_month_m[type_i][i]
                     self.__typicalIndex += 1
     def GetTypical(self):
         '''

{cloudpss-4.5.1a4 → cloudpss-4.5.2}/cloudpss/job/result/__init__.py

@@ -24,6 +24,7 @@ RESULT = {
     'function/CloudPSS/ieslab-simulation': IESLabSimulationResult,
     'function/CloudPSS/ieslab-gmm':IESLabTypicalDayResult,
     'function/CloudPSS/ieslab-optimization': IESResult,
+    'function/CloudPSS/ieslab-gmm-opt':IESLabTypicalDayResult,
 }
 
 

{cloudpss-4.5.1a4 → cloudpss-4.5.2}/cloudpss/job/result/result.py

@@ -82,6 +82,7 @@ class Result(object):
 
             >>> message= db.getMessagesByType('log')
         """
+
         result = []
         for val in self._receiver:
             if val['type'] == type:

{cloudpss-4.5.1a4 → cloudpss-4.5.2}/cloudpss/runner/result.py

@@ -116,6 +116,7 @@ class Result(object):
 
             >>> message= result.getMessagesByType('log')
         """
+
         return self.db.getMessagesByType(type)
 
 

{cloudpss-4.5.1a4 → cloudpss-4.5.2}/cloudpss/runner/runner.py

@@ -15,8 +15,7 @@ from .IESLabEvaluationResult import IESLabEvaluationResult, IESLabPlanEvaluation
 from .IESLabTypicalDayResult import IESLabTypicalDayResult
 from .storage import Storage
 from ..utils import request
-from typing import  TypeVar,  Generic
-from .DSLabResult import DSLabResult
+from typing import TypeVar, Generic
 import re
 
 RECEIVER = {
@@ -36,10 +35,6 @@ IES_LAB_OPT_RESULT = {
     'function/ieslab/evaluation': IESLabOptEvaluationResult,
 }
 
-DS_LAB_RESULT = {
-    'function/ieslab/evaluation': DSLabResult
-}
-
 RESULT_DB = {
     'function/CloudPSS/emtp': EMTResult,
     'function/CloudPSS/emtps': EMTResult,
@@ -245,16 +240,7 @@ class HttpRunner(Runner[T]):
         if self.__taskId is None:
             return False
         return self.result.status()  # type: ignore
-    
-class DSLabRunner(Runner[T]):
-    def __init__(self, job, simulationId, **kwargs):
-        self.simulationId = simulationId
-        self.job = job
-        result = DS_LAB_RESULT.get(job.get('rid', ''), DSLabResult)
-        self.result: T = result(self.simulationId, **kwargs)
 
-    def status(self):
-        return self.result.status()
 
 class HttpOPTRunner(Runner[T]):
 

{cloudpss-4.5.1a4 → cloudpss-4.5.2}/cloudpss/utils/httprequests.py

@@ -29,7 +29,7 @@ def request(method, uri, baseUrl=None, params={}, token=None, **kwargs):
         del kwargs['xToken']
     
     r = requests.request(method, url, params=params, headers=headers, **kwargs)
-    
+
     if (uri.startswith('graphql')):
         if 'X-Cloudpss-Version' not in r.headers:
             raise Exception(

cloudpss-4.5.2/cloudpss/version.py

@@ -0,0 +1 @@
+__version__ = '4.5.2'

{cloudpss-4.5.1a4 → cloudpss-4.5.2}/cloudpss.egg-info/PKG-INFO

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

{cloudpss-4.5.1a4 → cloudpss-4.5.2}/cloudpss.egg-info/SOURCES.txt

@@ -20,13 +20,6 @@ cloudpss/asyncio/model/topology.py
 cloudpss/asyncio/utils/AsyncIterable.py
 cloudpss/asyncio/utils/__init__.py
 cloudpss/asyncio/utils/httpAsyncRequest.py
-cloudpss/dslab/__init__.py
-cloudpss/dslab/dataManageModel.py
-cloudpss/dslab/dslab.py
-cloudpss/dslab/financialAnalysisModel.py
-cloudpss/dslab/files/__init__.py
-cloudpss/dslab/files/curveData.py
-cloudpss/dslab/files/files.py
 cloudpss/function/__init__.py
 cloudpss/function/function.py
 cloudpss/function/functionExecution.py
@@ -38,8 +31,6 @@ cloudpss/ieslab/IESLabPlan.py
 cloudpss/ieslab/IESLabSimulation.py
 cloudpss/ieslab/PlanModel.py
 cloudpss/ieslab/__init__.py
-cloudpss/job/TemplateCompiler.py
-cloudpss/job/TemplateManager.py
 cloudpss/job/__init__.py
 cloudpss/job/job.py
 cloudpss/job/jobReceiver.py
@@ -63,7 +54,6 @@ cloudpss/model/implements/diagram.py
 cloudpss/model/implements/implement.py
 cloudpss/project/__init__.py
 cloudpss/project/project.py
-cloudpss/runner/DSLabResult.py
 cloudpss/runner/IESLabEvaluationResult.py
 cloudpss/runner/IESLabPlanResult.py
 cloudpss/runner/IESLabTypicalDayResult.py

cloudpss-4.5.1a4/cloudpss/dslab/__init__.py

@@ -1,2 +0,0 @@
-from .dslab import DSLab
-__all__ = ['DSLab']