cloudpss 4.1.1b9__py3-none-any.whl → 4.5.1__py3-none-any.whl

cloudpss/ieslab/IESLabPlan.py

@@ -1,14 +1,14 @@
 import json
 
 from cloudpss.ieslab.DataManageModel import IESPlanDataManageModel
-from cloudpss.ieslab.EvaluationModel import IESLabEvaluationModel
+from cloudpss.ieslab.EvaluationModel import IESLabPlanEvaluationModel
 from cloudpss.ieslab.PlanModel import IESLabPlanModel
 from cloudpss.runner.IESLabTypicalDayResult import IESLabTypicalDayResult
 from ..utils import request
 from ..model.model import Model
 from cloudpss.runner.runner import  Runner
 from cloudpss.runner.IESLabPlanResult import IESLabPlanResult
-from cloudpss.runner.IESLabEvaluationResult import IESLabEvaluationResult
+from cloudpss.runner.IESLabEvaluationResult import IESLabPlanEvaluationResult
 
 class IESLabPlan(object):
     def __init__(self, project={}):
@@ -23,9 +23,9 @@ class IESLabPlan(object):
             self.model = Model.fetch(self.__modelRid)
         self.dataManageModel = IESPlanDataManageModel(self.id)
         self.planModel = IESLabPlanModel(self.id)
-        self.evaluationModel = IESLabEvaluationModel(self.id)
+        self.evaluationModel = IESLabPlanEvaluationModel(self.id)
         self.currentPlanResult = IESLabPlanResult(self.id)
-        self.currentEvaluationResult = IESLabEvaluationResult(self.id)
+        self.currentEvaluationResult = IESLabPlanEvaluationResult(self.id)
 
     @staticmethod
     def fetch(simulationId):

cloudpss/ieslab/PlanModel.py

@@ -1,12 +1,15 @@
-from cloudpss.runner.IESLabPlanResult import IESLabPlanResult
-from cloudpss.runner.runner import HttpRunner, Runner
+from cloudpss.runner.IESLabPlanResult import IESLabPlanResult, IESLabOptResult
+from cloudpss.runner.runner import HttpRunner, HttpOPTRunner
+from cloudpss.model import Model
+from cloudpss.model.revision import ModelRevision
 from ..utils import request, fileLoad
 import json
 from enum import IntEnum, unique
 
 
 class IESLabPlanModel(object):
-    _baseUri = 'api/ieslab-plan/taskmanager/getSimuLastTasks'
+    _baseUri = 'api/ieslab-plan/rest'
+    _runUri = 'api/ieslab-plan/taskmanager'
 
     def __init__(self, simulationId):
         '''
@@ -14,44 +17,83 @@ class IESLabPlanModel(object):
         '''
         self.simulationId = simulationId
         self.optimizationInfo = self.GetOptimizationInfo()
-        self.OptimizationMode = OptimizationMode
+        # self.OptimizationMode = OptimizationMode
 
-    def _fetchItemData(self, url):
+    def _fetchItemData(self, url, params):
         '''
             获取当前算例的优化目标设置信息
 
-            :return: enum 类型，代表经济性优化和环保性优化的类型
+            :return: List 类型，包括优化目标和全局参数储能动作灵敏度，若没有设置则返回 []
         '''
-        r = request('GET', url, params={"simuid": self.simulationId})
+        r = request('GET', url, params=params)
         data = json.loads(r.text)
-        return data
+        return data['results']
 
     def GetOptimizationInfo(self):
         '''
             获取当前算例的优化目标设置信息
 
-            :return: enum 类型，代表经济性优化和环保性优化的类型
+            :return: Dict 类型，例如：{'OptimizationMode': <OptimizationMode.经济性: 0>, 'StoSen': 0.1}
         '''
         try:
-            data = self._fetchItemData(self._baseUri)
-            for e in OptimizationMode:
-                if (e.value == data['data']['optimizationpara']
-                    ['OptimizationMode']):
-                    return e
+            url = f'{self._baseUri}/simuOpt/'
+            params = {"simu_id": self.simulationId}
+            r = self._fetchItemData(url, params)
+            if (len(r) == 0): 
+                return {
+                    "OptimizationMode": OptimizationMode['经济性'],
+                    "StoSen": 0.1
+                }
+            else:
+                value = json.loads(r[0]['opt_params'])
+                return {
+                    "OptimizationMode": OptimizationMode(value['OptimizationMode']),
+                    "StoSen": value['StoSen']
+                }
         except:
-            return OptimizationMode['经济性']
+            raise Exception('获得优化目标设置失败')
 
-    def SetOptimizationInfo(self,   optType):
+    def SetOptimizationInfo(self, data: dict):
         '''
-            无对应接口
             设置当前算例的优化目标
 
-            :param optType: enum 类型，代表经济性优化和环保性优化的类型
-        '''
-        self.optimizationInfo = optType
-        return True
+            :param data: dict 类型，例如：{'OptimizationMode': <OptimizationMode.经济性: 0>, 'StoSen': 0.1}
 
-    def run(self) -> Runner[IESLabPlanResult]:
+            :return: boolean 类型，为 True 则设置成功
+        '''
+        try:
+            url = f'{self._baseUri}/simuOpt/'
+            params = {"simu_id": self.simulationId}
+            r = self._fetchItemData(url, params)
+            opt_params = {
+                "OptimizationMode": data.get('OptimizationMode', '').value,
+                "StoSen": data.get('StoSen', ''),
+                "ProjectPeriod": "20"
+            }
+            if(len(r) == 0):
+                payload = {
+                    "simu_id": self.simulationId,
+                    "opt_params": json.dumps(opt_params)
+                }
+                r = request('POST',
+                            url,
+                            data=json.dumps(payload))
+                return True
+            else:
+                url2 = f'{self._baseUri}/simuOpt/{r[0]["id"]}/'
+                payload = {
+                    "simu_id": self.simulationId,
+                    "opt_params": json.dumps(opt_params),
+                    "id": r[0]["id"]
+                }
+                r = request('PUT',
+                            url2,
+                            data=json.dumps(payload))
+                return True
+        except:
+            return False
+    
+    def run(self) -> HttpRunner[IESLabPlanResult]:
         '''
             生成方案优选算例
 
@@ -61,10 +103,12 @@ class IESLabPlanModel(object):
         if isRunning:
             raise Exception('该算例正在运行！请从浏览器算例页面点击结束运行或者调用IESPlan对象的kill接口终止计算后重试！')
         else:
-            url = 'api/ieslab-plan/taskmanager/runOptimization'
-            if self.optimizationInfo is None:
-                self.optimizationInfo = OptimizationMode['经济性']
-            optType = self.optimizationInfo.value or 0
+            url = f'api/{self._runUri}/runOptimization'
+            opt = {
+                "OptimizationMode": self.optimizationInfo.get('OptimizationMode', 0).value,
+                "ProjectPeriod": "20",
+                "StoSen": self.optimizationInfo.get('StoSen', 0.1)
+            }
             try:
                 r = request('GET',
                             url,
@@ -72,17 +116,14 @@ class IESLabPlanModel(object):
                                 "simuid":
                                 self.simulationId,
                                 "optPara":
-                                json.dumps({
-                                    "OptimizationMode": optType,
-                                    "ProjectPeriod": "20"
-                                })
+                                json.dumps(opt)
                             })
                 data = json.loads(r.text)
                 return HttpRunner({}, self.simulationId)
             except:
                 raise Exception('生成方案优选算例失败')
 
-    def GetRunner(self) -> Runner[IESLabPlanResult]:
+    def GetRunner(self) -> HttpRunner[IESLabPlanResult]:
         '''
             获得运行实例
 
@@ -100,7 +141,7 @@ class IESLabPlanModel(object):
             data = res.get('data', {})
             if data is not None:
                 taskID = data.get('task_id', '')
-        url = f'api/ieslab-plan/taskmanager/removeOptimizationTask'
+        url = f'{self._runUri}/removeOptimizationTask'
         try:
             r = request('GET',
                         url,
@@ -141,6 +182,204 @@ class IESLabPlanModel(object):
         return isRunning
 
 
+  
+class IESLabOptModel(object):
+    _baseUri = 'api/ieslab-opt/rest'
+    _runUri = 'api/ieslab-opt/taskmanager'
+
+
+    def __init__(self, simulationId, rid):
+        '''
+            初始化
+        '''
+        self.simulationId = simulationId
+        self.rid = rid
+        self.optimizationInfo = self.GetOptimizationInfo()
+
+    def _fetchItemData(self, url, params):
+        '''
+            获取当前算例的优化目标设置信息
+
+            :return: List 类型，包括优化目标和全局参数储能动作灵敏度，若没有设置则返回 []
+        '''
+        r = request('GET', url, params=params)
+        data = json.loads(r.text)
+        return data['results']
+
+    def GetOptimizationInfo(self):
+        '''
+            获取当前算例的优化目标设置信息
+
+            :return: Dict 类型，例如：{'OptGoal': <OptimizationMode.经济性: 0>, 'StoSen': "10", '@debug': '', 'clustering_algorithm': '0', 'num_method': '0', 'PowUnPrice': '1000', 'HeatAbandonPrice': '1000'}
+        '''
+        try:
+            url = f'{self._baseUri}/simuOpt/'
+            params = {"simu_id": self.simulationId}
+            r = self._fetchItemData(url, params)
+            if (len(r) == 0): 
+                return {
+                    "OptGoal": OptimizationMode['经济性'],
+                    "StoSen": "10",
+                    "@debug": "",
+                    "clustering_algorithm": "0",
+                    "num_method": "0",
+                    "PowUnPrice": "1000",
+                    "HeatAbandonPrice": "1000"
+                }
+            else:
+                value = json.loads(r[0]['opt_params'])
+                return {
+                    "OptGoal": OptimizationMode(int(value['OptGoal'])),
+                    "StoSen": value['StoSen'],
+                    "@debug": value["@debug"],
+                    "clustering_algorithm": value["clustering_algorithm"],
+                    "num_method": value["num_method"],
+                    "PowUnPrice": value["PowUnPrice"],
+                    "HeatAbandonPrice": value["HeatAbandonPrice"]
+                }
+        except:
+            raise Exception('获得优化目标设置失败')
+
+    def SetOptimizationInfo(self, data: dict):
+        '''
+            设置当前算例的优化目标
+
+            :param data: dict 类型，例如：{'OptGoal': <OptimizationMode.经济性: 0>, 'StoSen': "10", '@debug': '', 'clustering_algorithm': '0', 'num_method': '0', 'PowUnPrice': '1000', 'HeatAbandonPrice': '1000'}
+
+            :return: boolean 类型，为 True 则设置成功
+        '''
+        try:
+            url = f'{self._baseUri}/simuOpt/'
+            params = {"simu_id": self.simulationId}
+            r = self._fetchItemData(url, params)
+            opt_params = {
+                "OptGoal": data.get('OptGoal', ''),
+                "StoSen": data.get('StoSen', ''),
+                "@debug": data.get('@debug', ''),
+                "clustering_algorithm": data.get('clustering_algorithm', ''),
+                "num_method": data.get('num_method', ''),
+                "PowUnPrice": data.get('PowUnPrice', ''),
+                "HeatAbandonPrice": data.get('HeatAbandonPrice', '')
+            }
+            if(len(r) == 0):
+                payload = {
+                    "simu_id": self.simulationId,
+                    "opt_params": json.dumps(opt_params)
+                }
+                r = request('POST',
+                            url,
+                            data=json.dumps(payload))
+                return True
+            else:
+                url2 = f'{self._baseUri}/simuOpt/{r[0]["id"]}/'
+                payload = {
+                    "simu_id": self.simulationId,
+                    "opt_params": json.dumps(opt_params),
+                    "id": r[0]["id"]
+                }
+                r = request('PUT',
+                            url2,
+                            data=json.dumps(payload))
+                return True
+        except:
+            return False
+    
+    def run(self) -> HttpOPTRunner[IESLabOptResult]:
+        '''
+            生成方案优选算例
+
+            :return: Runner[IESLabOptResult]
+        '''
+        isRunning = self.GetLastTaskResult()
+        if isRunning:
+            raise Exception('该算例正在运行！请从浏览器算例页面点击结束运行或者调用IESPlan对象的kill接口终止计算后重试！')
+        else:
+            # 通过 rid 获取 model
+            model = Model.fetch(self.rid)
+            # 通过 model 获取 revision
+            revision = ModelRevision.create(model.revision, model.revision.hash)
+            hash = revision.get('hash', '')
+            url = f'{self._runUri}/runOptimization'
+            opt = {
+                "OptGoal": self.optimizationInfo.get('OptGoal', 0).value,
+                "StoSen": self.optimizationInfo.get('StoSen', 10),
+                "@debug": self.optimizationInfo.get('@debug', ''),
+                "clustering_algorithm": self.optimizationInfo.get('clustering_algorithm', '0'),
+                "num_method": self.optimizationInfo.get('num_method', '0'),
+                "PowUnPrice": self.optimizationInfo.get('PowUnPrice', '1000'),
+                "HeatAbandonPrice": self.optimizationInfo.get('HeatAbandonPrice', '1000'),
+            }
+            try:
+                r = request('GET',
+                            url,
+                            params={
+                                "simuid":
+                                self.simulationId,
+                                "optPara":
+                                json.dumps(opt),
+                                "revision": hash
+                            })
+                data = json.loads(r.text)
+                return HttpOPTRunner({}, self.simulationId)
+            except:
+                raise Exception('生成方案优选算例失败')
+
+    def GetRunner(self) -> HttpOPTRunner[IESLabOptResult]:
+        '''
+            获得运行实例
+
+            :return: Runner[IESLabOptResult]
+        '''
+        return HttpOPTRunner({}, self.simulationId)
+    
+    def kill(self) -> bool:
+        '''
+            停止并删除当前运行的优化算例
+        '''
+        res = IESLabOptResult(self.simulationId).getLastTaskResult()
+        error = res.get('error', 0)
+        if error == 0:
+            data = res.get('data', {})
+            if data is not None:
+                taskID = data.get('task_id', '')
+        url = f'{self._runUri}/removeOptimizationTask'
+        try:
+            r = request('GET',
+                        url,
+                        params={
+                            "taskid": taskID,
+                            "stopFlag": '2'
+                        })
+            json.loads(r.text)
+            return True
+        except:
+            return False
+
+    def GetLastTaskResult(self)-> bool:
+        '''
+            获取最后一次运行的taskID的运行结果与日志
+
+            :return: boolean 类型
+        '''
+        isRunning = True
+        res = IESLabOptResult(self.simulationId).getLastTaskResult()
+        error = res.get('error', 0)
+        if error == 0:
+            data = res.get('data', {})
+            if data is not None:
+                status = data.get('status', '')
+                if status == 'stop':
+                    isRunning = False
+        logs = IESLabOptResult(self.simulationId).GetLogs()
+        if logs is not None:
+            for log in logs:
+                if(log.get('data', '') == 'run ends'):
+                    isRunning = False
+                    break
+        return isRunning
+
+
+
 # @unique
 class OptimizationMode(IntEnum):
     经济性 = 0

cloudpss/ieslab/__init__.py

@@ -1,4 +1,5 @@
 from .IESLabSimulation import IESLabSimulation
 from .IESLabPlan import IESLabPlan
 from .PlanModel import OptimizationMode
-__all__ = ['IESLabSimulation','IESLabPlan', 'OptimizationMode']
+from .IESLabOpt import IESLabOpt
+__all__ = ['IESLabSimulation','IESLabPlan', 'OptimizationMode', 'IESLabOpt']

cloudpss/job/job.py

@@ -3,8 +3,8 @@ import random
 import re
 import time
 
-from cloudpss.job.view.view import View
-from .view import getViewClass
+from cloudpss.job.result.result import Result
+from .result import getResultClass
 
 from cloudpss.utils.IO import IO
 from .messageStreamReceiver import MessageStreamReceiver
@@ -13,7 +13,7 @@ from cloudpss.utils.graphqlUtil import graphql_request
 from .messageStreamSender import MessageStreamSender
 from typing import Any, Callable, Generic, TypeVar
 F = TypeVar('F', bound=Callable[..., Any])
-T = TypeVar('T', bound=Callable[..., View])
+T = TypeVar('T', bound=Callable[..., Result])
 class Job(Generic[T]):
     """docstring for Job"""
     __jobQuery = """query($_a:JobInput!){
@@ -112,7 +112,7 @@ class Job(Generic[T]):
 
     
     @staticmethod
-    def __createJobVariables(job, config, revisionHash, rid, policy, **kwargs):
+    def __createJobVariables(job, config, revisionHash, rid=None, policy=None, **kwargs):
         # 处理policy字段
         if policy is None:
             policy = {}
@@ -136,6 +136,17 @@ class Job(Generic[T]):
             t= [ i.split('=') for i in re.split(r'\s+',debug) if i.find('=')>0]
             for i in t:
                 debugargs[i[0]]=i[1]
+        context=[
+            function,
+            f"model/@sdk/{str(int(time.time() * random.random()))}",
+        ]
+        if rid is not None and rid != "":
+            context.append(rid)
+            
+        PARENT_JOB_ID =kwargs.get("PARENT_JOB_ID",None)
+        if PARENT_JOB_ID is not None:
+            context.append(f"job/parent/{PARENT_JOB_ID}")
+            
         variables = {
             "input": {
                 "args": {
@@ -144,18 +155,14 @@ class Job(Generic[T]):
                     "_ModelArgs": config["args"],
                     "implement":implement
                 },
-                "context": [
-                    function,
-                    rid,
-                    f"model/@sdk/{str(int(time.time() * random.random()))}",
-                ],
+                "context": context,
                 "policy": policy,
                 "debug":debugargs
             }
         }
         return variables
     @staticmethod
-    def create(revisionHash, job, config, name=None, rid="", policy=None, **kwargs):
+    def create(revisionHash, job, config, name=None, rid=None, policy=None, **kwargs):
         """
         创建一个运行任务
 
@@ -169,7 +176,7 @@ class Job(Generic[T]):
 
         >>> runner = Runner.runRevision(revision,job,config,'')
         """
-        variables=Job.__createJobVariables(job, config, revisionHash, rid, policy)
+        variables=Job.__createJobVariables(job, config, revisionHash, rid=rid, policy=policy, **kwargs)
         r =  graphql_request(Job.__createJobQuery, variables)
         if "errors" in r:
             raise Exception(r["errors"])
@@ -229,8 +236,9 @@ class Job(Generic[T]):
         """
         连接接收器和发送器
         """
-        viewType = getViewClass(self.context[0])
-        self._result = self.view(viewType)
+        resultType = getResultClass(self.context[0])
+        
+        self._result = self._resultView(resultType)
         
     @property
     def result(self)->T:
@@ -241,17 +249,17 @@ class Job(Generic[T]):
             self.__connect()
         return self._result
    
-    
-    def view(self, viewType:F=None)->F:
+        
+        
+    def _resultView(self, resultType=None):
         """
         获取当前运行实例的输出
         """
         receiver =  self.read()
         sender =  self.write()
-        if viewType is None:
-            viewType = getViewClass(self.context[0])
-        
-        return viewType(receiver, sender)
+        if resultType is None:
+            resultType = getResultClass(self.context[0])
+        return resultType(receiver, sender)
 
     
 

cloudpss/job/jobReceiver.py

@@ -21,7 +21,7 @@ class JobReceiver(object):
             return message
         raise StopIteration()
 
-    def view(self, ViewType):
+    def result(self, resultType):
         """
             获取指定类型的视图数据
 
@@ -31,7 +31,7 @@ class JobReceiver(object):
 
             >>> view= receiver.view(EMTView)
         """
-        return ViewType(self)
+        return resultType(self)
     
     @property
     @deprecated(version='3.0', reason="该方法将在 5.0 版本移除")

cloudpss/job/{view/EMTView.py → result/EMTResult.py}

@@ -1,8 +1,8 @@
 import copy
 import uuid
 from deprecated import deprecated
-from .view import View
-class EMTView(View):
+from .result import Result
+class EMTResult(Result):
     """
         电磁暂态结果视图， 
 

cloudpss/job/result/IESLabSimulationResult.py

@@ -0,0 +1,5 @@
+from .IESResult import IESResult
+
+
+class IESLabSimulationResult(IESResult):
+    pass

cloudpss/job/{view/IESLabTypicalDayView.py → result/IESLabTypicalDayResult.py}

@@ -1,13 +1,13 @@
-from .IESView import IESView
+from .IESResult import IESResult
 import re
 import copy
-class IESLabTypicalDayView(IESView):
+class IESLabTypicalDayResult(IESResult):
     
     def __init__(self, *args, **kwargs):
         """
             初始化
         """
-        IESView.__init__(self, *args, **kwargs)
+        IESResult.__init__(self, *args, **kwargs)
         self.__plotIndex = 0
         self.__typicalIndex = 0
         self.__type_list =['电负荷', '热负荷','冷负荷','总辐射','散射辐射', '直射辐射',  '天顶角', '环境温度', '土壤温度', '10m风速', '50m风速', '建筑物高度风速', '风机高度风速']

cloudpss/job/{view/IESView.py → result/IESResult.py}

@@ -1,9 +1,9 @@
 import copy
 import collections
 
-from cloudpss.job.view.view import View
+from cloudpss.job.result.result import Result
 
-class IESView(View):
+class IESResult(Result):
     """
         综合能源结果视图， 
 

cloudpss/job/{view/PowerFlowView.py → result/PowerFlowResult.py}

@@ -1,10 +1,10 @@
 import copy
 import re
 
-from .view import View
+from .result import Result
 
 
-class PowerFlowView(View):
+class PowerFlowResult(Result):
     """
         潮流结果视图， 
 

cloudpss/job/result/__init__.py

@@ -0,0 +1,39 @@
+from .IESResult import IESResult
+from .result import Result
+from .EMTResult import EMTResult
+from .PowerFlowResult import PowerFlowResult
+from .IESLabSimulationResult import IESLabSimulationResult
+from .IESLabTypicalDayResult import IESLabTypicalDayResult
+from ..messageStreamReceiver import MessageStreamReceiver
+from ..messageStreamSender import MessageStreamSender
+__all__ = [
+    'Result','EMTResult','PowerFlowResult','IESLabSimulationResult','IESResult','IESLabTypicalDayResult','MessageStreamReceiver','MessageStreamSender'
+]
+
+RESULT = {
+    'function/CloudPSS/emtp': EMTResult,
+    'function/CloudPSS/emtps': EMTResult,
+    'function/CloudPSS/sfemt': EMTResult,
+    'function/CloudPSS/power-flow': PowerFlowResult,
+    'function/CloudPSS/ies-simulation': IESResult,
+    'function/CloudPSS/ies-optimization': IESResult,
+    'function/ies/ies-optimization': IESResult,
+    'function/CloudPSS/three-phase-powerFlow': PowerFlowResult,
+    'function/ies/ies-simulation': IESLabSimulationResult,
+    'function/ies/ies-gmm':IESLabTypicalDayResult,
+    'function/CloudPSS/ieslab-simulation': IESLabSimulationResult,
+    'function/CloudPSS/ieslab-gmm':IESLabTypicalDayResult,
+    'function/CloudPSS/ieslab-optimization': IESResult,
+}
+
+
+def getResultClass(rid: str) -> Result:
+    """
+    获取仿真结果视图
+
+    :param rid: 仿真任务的 rid
+    :param db: 仿真任务的数据库
+
+    :return: 仿真结果视图
+    """
+    return RESULT.get(rid, Result)

cloudpss/job/{view/view.py → result/result.py}

@@ -5,7 +5,7 @@ from deprecated import deprecated
 from ..messageStreamSender import MessageStreamSender
 from ..messageStreamReceiver import MessageStreamReceiver
 
-class View(object):
+class Result(object):
     """
         结果视图基类，提供基础的结果获取接口
     """