cloudpss 4.1.1b8__py3-none-any.whl → 4.5.0__py3-none-any.whl

cloudpss/model/revision.py

@@ -1,12 +1,11 @@
-import asyncio
-from cloudpss.utils.httpAsyncRequest import graphql_fetch
+from cloudpss.job.job import Job
 from .topology import ModelTopology
 from .implements import ModelImplement
-from ..utils import request, graphql_request
-from ..runner import Runner
+from ..utils import  graphql_request
 
 
 class ModelRevision(object):
+    
     """
         表示一个项目的版本数据
 
@@ -23,6 +22,12 @@ class ModelRevision(object):
 
 
     """
+    
+    __createModelRevisionQuery = """
+                    mutation($a:CreateModelRevisionInput!){createModelRevision(input:$a){
+                            hash
+                    }}
+                """
 
     def __init__(self, revision: dict = {}):
         """
@@ -56,21 +61,27 @@ class ModelRevision(object):
         """
 
         return self.implements
-
-    async def run(self, job, config, name=None, rid='', policy=None, **kwargs):
+    
+    def run(self, job, config, name=None, policy=None,stop_on_entry=None,rid=None, **kwargs):
         """
-            运行某个指定版本的项目
+            运行当前版本
 
             :params job:  调用仿真时使用的计算方案，为空时使用项目的第一个计算方案
             :params config:  调用仿真时使用的参数方案，为空时使用项目的第一个参数方案
             :params name:  任务名称，为空时使用项目的参数方案名称和计算方案名称
             :params rid:  项目rid，可为空
 
-            :return: 返回一个ModelRevision
+            :return: 返回一个运行实例
 
             >>> revision.run(revision,job,config,'')
         """
-        return await ModelRevision.createAsync(self)
+        revision= ModelRevision.create(self)
+        if stop_on_entry is not None:
+            job['args']['stop_on_entry'] = stop_on_entry
+        return Job.create(
+            revision["hash"], job, config, name=name, rid=rid, policy=policy, **kwargs
+        )
+    
 
     @staticmethod
     def create(revision, parentHash=None):
@@ -85,36 +96,19 @@ class ModelRevision(object):
             {hash:'4043acbddb9ce0c6174be65573c0380415bc48186c74a459f88865313743230c'}
         """
 
-        return  asyncio.run(ModelRevision.createAsync(revision, parentHash))
-        
-    @staticmethod
-    async def createAsync(revision, parentHash=None):
-        """
-            创建一个新版本
-
-            :params: revision 版本数据
-
-            :return: 项目版本hash
-
-            >>> ModelRevision.create(model.revision)
-            {hash:'4043acbddb9ce0c6174be65573c0380415bc48186c74a459f88865313743230c'}
-        """
-
-        query = """
-                    mutation($a:CreateModelRevisionInput!){createModelRevision(input:$a){
-                            hash
-                    }}
-                """
         r = revision.toJSON()
-        del r['hash']
+        if 'hash' in r:
+            del r['hash']
         variables = {'a': {**r, 'parent': parentHash}}
-
-        r = await graphql_fetch(query, variables)
+        r = graphql_request(ModelRevision.__createModelRevisionQuery, variables)
         if 'errors' in r:
             raise Exception(r['errors'])
+        
         return r['data']['createModelRevision']
+        
+    
 
-    async def fetchTopology(self, implementType, config, maximumDepth):
+    def fetchTopology(self, implementType, config, maximumDepth, **kwargs):
         """
             获取当前项目版本的拓扑数据
 
@@ -131,6 +125,7 @@ class ModelRevision(object):
         """
 
         if self.hash is not None:
-            return await ModelTopology.fetch(self.hash, implementType, config,
-                                       maximumDepth)
+            return ModelTopology.fetch(self.hash, implementType, config,
+                                       maximumDepth, **kwargs)
         return None
+

cloudpss/model/topology.py

@@ -1,7 +1,6 @@
 import asyncio
 import json
 
-from cloudpss.utils.httpAsyncRequest import graphql_fetch
 from ..utils import request, graphql_request
 
 
@@ -19,6 +18,13 @@ class ModelTopology():
 
 
     """
+    __modelTopologyQuery = """
+            query($a:ModelTopologyInput!){
+            modelTopology(input:$a){
+                components
+                mappings
+            }}
+        """
     __All__ = ['ModelTopology']
 
     def __init__(self, topology: dict = {}):
@@ -47,11 +53,7 @@ class ModelTopology():
         f.close()
         
     @staticmethod
-    def fetch(hash, implementType, config, maximumDepth=None):
-       return asyncio.run(ModelTopology.fetchAsync(hash, implementType, config, maximumDepth))
-        
-    @staticmethod
-    async def fetchAsync(hash, implementType, config, maximumDepth=None):
+    def fetch(hash, implementType, config, maximumDepth=None, **kwargs):
         """
             获取拓扑
 
@@ -66,14 +68,6 @@ class ModelTopology():
 
         """
         args = {} if config is None else config['args']
-        query = """
-            query($a:ModelTopologyInput!){
-            modelTopology(input:$a){
-                components
-                mappings
-            }}
-        """
-
         variables = {
             "a": {
                 'hash': hash,
@@ -82,8 +76,12 @@ class ModelTopology():
                 'maximumDepth': maximumDepth
             }
         }
-        data = await graphql_fetch(query, variables)
+        data = graphql_request(ModelTopology.__modelTopologyQuery, variables, **kwargs)
         if 'errors' in data:
             raise Exception(data['errors'][0]['message'])
 
         return ModelTopology(data['data']['modelTopology'])
+        
+    
+
+

cloudpss/runner/IESLabEvaluationResult.py

@@ -3,7 +3,7 @@ from ..utils.httprequests import request
 
 
 class IESLabEvaluationResult(object):
-    _baseUri = 'api/ieslab-plan/taskmanager/'
+    _baseUri = ''
     _kindNameMap = {
         "利润与利润分配": "getEconomyResult",
         "财务计划现金": "getFinancialPlanCashFlowResult",
@@ -77,7 +77,7 @@ class IESLabEvaluationResult(object):
         '''
         assert (resultType in self._kindNameMap), "数据类型不存在"
         kind = self._kindNameMap.get(resultType, resultType)
-        url = self._baseUri + kind
+        url = self._baseUri + '/' + kind
         list = self._fetchItemData(url, planID)
         dict_result = dict()
         for val in list['results']:
@@ -93,7 +93,7 @@ class IESLabEvaluationResult(object):
             :return: array类型，代表该方案对应的概览结果
         '''
         r = request('GET',
-                    "api/ieslab-plan/taskmanager/getOverviewResult",
+                    f"{self._baseUri}/getOverviewResult",
                     params={
                         "simu_id": self.simulationId,
                         "planId": planID,
@@ -112,7 +112,7 @@ class IESLabEvaluationResult(object):
             :return: array类型，代表该方案对应的能效评价结果
         '''
         r = request('GET',
-                    "api/ieslab-plan/taskmanager/getEnergyEvaluation",
+                    f"{self._baseUri}/getEnergyEvaluation",
                     params={
                         "simu_id": self.simulationId,
                         "planId": planID,
@@ -131,7 +131,7 @@ class IESLabEvaluationResult(object):
             :return: array类型，代表该方案对应的环保评价结果
         '''
         r = request('GET',
-                    "api/ieslab-plan/taskmanager/getEnvironmentalEvaluation",
+                    f"{self._baseUri}/getEnvironmentalEvaluation",
                     params={
                         "simu_id": self.simulationId,
                         "planId": planID,
@@ -140,4 +140,12 @@ class IESLabEvaluationResult(object):
         result = json.loads(r.text)
         if len(result['results']) > 0 and len(result['results'][0]['data']) > 0:
             return result['results'][0]['data']
-        return []
+        return []
+    
+
+class IESLabPlanEvaluationResult(IESLabEvaluationResult):
+    _baseUri = 'api/ieslab-plan/taskmanager'
+
+
+class IESLabOptEvaluationResult(IESLabEvaluationResult):
+    _baseUri = 'api/ieslab-opt/taskmanager'

cloudpss/runner/IESLabPlanResult.py

@@ -1,22 +1,24 @@
 import json
 from math import fabs
 from ..utils.httprequests import request
+# from .result import IESResult
 
 
-class IESLabPlanResult(object):
+class IESLabResult(object):
+    _baseUri = ''
     taskId = None
 
-    def __init__(self, simulationId, taskId=None, **kwargs) -> None:
+    def __init__(self, simulationId, taskId=None) -> None:
         """
             初始化
             获得taskId
         """
+
         self.simulationId = simulationId
         if taskId is not None:
             self.taskId = taskId
         else:
             self.taskId = self.__getLastTask()
-        pass
 
     def __getLastTask(self):
         '''
@@ -25,7 +27,7 @@ class IESLabPlanResult(object):
             :return: string 类型
         '''
         try:
-            r=request('GET','api/ieslab-plan/taskmanager/getSimuLastTasks',params={
+            r=request('GET',f'{self._baseUri}/getSimuLastTasks',params={
                 'simuid':self.simulationId
             })
             result= json.loads(r.text)
@@ -54,7 +56,7 @@ class IESLabPlanResult(object):
         if self.taskId is None:
             raise Exception('未开始运行')
         r = request('GET',
-                    'api/ieslab-plan/taskmanager/getOptimizationLog',
+                    f'{self._baseUri}/getOptimizationLog',
                     params={
                         'simuid': self.simulationId,
                         'taskid': self.taskId
@@ -64,14 +66,14 @@ class IESLabPlanResult(object):
 
     def GetPlanNum(self):
         '''
-            获取当前result实例对应的优化方案数量
+            获取当前 result 实例对应的优化方案数量
             
             :return: int类型，代表优化方案的数量
         '''
         if self.taskId is None:
             raise Exception('未开始运行')
         r = request('GET',
-                    'api/ieslab-plan/taskmanager/getOptimizationResult',
+                    f'{self._baseUri}/getOptimizationResult',
                     params={
                         'simuid': self.simulationId,
                         'taskid': self.taskId,
@@ -84,39 +86,46 @@ class IESLabPlanResult(object):
         '''
             获取planID对应的优化方案的基础信息
             
-            :param: planID int类型，表示优化方案的ID，数值位于 0~优化方案数量 之间
+            :param: planID int 类型，表示优化方案的 ID，数值位于 0~优化方案数量 之间
             
-            :return: dict类型，代表该方案的基础信息，包括投资、运行成本、负荷总量等信息
+            :return: dict 类型，代表该方案的基础信息，包括投资、运行成本、负荷总量等信息
         '''
         if self.taskId is None:
             raise Exception('未开始运行')
+        length = self.GetPlanNum()
+        if int(planID) > length:
+            raise Exception('计算方案id未产生')
         r = request('GET',
-                'api/ieslab-plan/taskmanager/getOptimizationResult',
+                f'{self._baseUri}/getOptimizationResult',
                 params={
                     'simuid': self.simulationId,
                     'taskid': self.taskId,
                     'resultType': 0
                 })
         data = json.loads(r.text).get('data', [])
-        result = data[planID].get('data', {}).get('data', [])[0]
-        header = data[planID].get('data', {}).get('headerDesc', [])
-        dict_result = {val.get('hearderName', ''): result.get(val.get('key', ''), '') for val in header}
-        return dict_result
+        filtered_data = [item for item in data if item['id'] == planID]
+        if filtered_data:
+            result = filtered_data[0].get('data', {}).get('data', [])[0]
+            header = filtered_data[0].get('data', {}).get('headerDesc', [])
+            dict_result = {val.get('hearderName', ''): result.get(val.get('key', ''), '') for val in header}
+            return dict_result
+        else:
+            raise Exception('未查询到该方案id数据')
 
 
     def GetPlanConfiguration(self, planID):
         '''
             获取planID对应的优化方案的配置信息
             
-            :param: planID int类型，表示优化方案的ID，数值位于 0~优化方案数量 之间
+            :param: planID int 类型，表示优化方案的ID，数值位于 0~优化方案数量 之间
 
-            :return: dict类型，代表该方案的配置信息，包括每种设备的选型配置、容量配置、成本等相关信息
+            :return: dict 类型，代表该方案的配置信息，包括每种设备的选型配置、容量配置、成本等相关信息
         '''
-        len = self.GetPlanNum()
-        if int(planID) > len:
+        length = self.GetPlanNum()
+        if int(planID) > length:
             raise Exception('计算方案id未产生')
         r = request('GET',
-                    'api/ieslab-plan/taskmanager/getOptimizationResult',
+                    f'{self._baseUri}/getOptimizationResult',
                     params={
                         'simuid': self.simulationId,
                         'taskid': self.taskId,
@@ -124,10 +133,13 @@ class IESLabPlanResult(object):
                         'resultType': 1
                     })
         d = json.loads(r.text)
-        result = {}
-        for val in d['data']:
-            result[val['u_name']] = val['data']['data']
-        return result
+        if len(d['data']) == 0:
+            raise Exception('未查询到该方案id数据')
+        else: 
+            result = {}
+            for val in d['data']:
+                result[val['u_name']] = val['data']['data']
+            return result
 
     def GetComponentResult(self, planID, componentID, typicalDayName=''):
         '''
@@ -139,11 +151,11 @@ class IESLabPlanResult(object):
 
             :return: dict类型，代表该元件在不同典型日下的运行信息
         '''
-        len = self.GetPlanNum()
-        if int(planID) > len:
+        length = self.GetPlanNum()
+        if int(planID) > length:
             raise Exception('计算方案id未产生')
         r = request('GET',
-                    'api/ieslab-plan/taskmanager/getOptimizationResult',
+                    f'{self._baseUri}/getOptimizationResult',
                     params={
                         'simuid': self.simulationId,
                         'taskid': self.taskId,
@@ -153,13 +165,45 @@ class IESLabPlanResult(object):
                         'u_name': componentID
                     })
         d = json.loads(r.text)
-        dict_result = dict()
-        for val in d['data']:
-            for k, v in val.items():
-                dict_result[k] = v
-        return dict_result
+        if len(d['data']) == 0:
+            raise Exception('未查询到该方案id对应的优化方案下componentID对应元件数据')
+        else:
+            dict_result = dict()
+            for val in d['data']:
+                for k, v in val.items():
+                    dict_result[k] = v
+            return dict_result
+    
+    def GetEnergyBalanceResult(self, planID, typicalDayName=''):
+        '''
+            获取planID对应的优化方案下能量平衡图数据
+            
+            :param: planID int 类型，表示优化方案的ID，数值位于 0~优化方案数量 之间
+            :param typicalDayName str 类型，代表典型日的名称
+
+            :return: dict类型，代表该元件在不同典型日下的运行信息
+
+        '''
+        length = self.GetPlanNum()
+        if int(planID) > length:
+            raise Exception('计算方案id未产生')
+        try:
+            r = request('GET',
+                        f'{self._baseUri}/getOptimizationResult',
+                        params={
+                            'simuid': self.simulationId,
+                            'taskid': self.taskId,
+                            'resultType': 4,
+                            'typicalDay': typicalDayName,
+                            "planId": planID,
+                            "u_name": "systemData"
+                        })
+            return json.loads(r.text)
+        except:
+            raise Exception('运行失败')
+
 
-    def GetComponentTypiDays(self, planId, componentID):
+    def GetComponentTypiDays(self, planID, componentID):
         '''
             获取当前result实例对应的优化方案数量
 
@@ -170,12 +214,15 @@ class IESLabPlanResult(object):
         '''
         if self.taskId is None:
             raise Exception('未开始运行')
+        length = self.GetPlanNum()
+        if int(planID) > length:
+            raise Exception('计算方案id未产生')
         r = request('GET',
-                    'api/ieslab-plan/taskmanager/getOptimizationResult',
+                    f'{self._baseUri}/getOptimizationResult',
                     params={
                         'simuid': self.simulationId,
                         'taskid': self.taskId,
-                        "planId": planId,
+                        "planId": planID,
                         'u_name': componentID,
                         'resultType': 2
                     })
@@ -188,8 +235,17 @@ class IESLabPlanResult(object):
 
             :return: dict 类型
         '''
-        r=request('GET','api/ieslab-plan/taskmanager/getSimuLastTasks',params={
+        r=request('GET',f'{self._baseUri}/getSimuLastTasks',params={
             'simuid':self.simulationId
         })
         result= json.loads(r.text)
         return result
+
+
+class IESLabPlanResult(IESLabResult):
+    _baseUri = 'api/ieslab-plan/taskmanager'
+
+
+class IESLabOptResult(IESLabResult):
+    _baseUri = 'api/ieslab-opt/taskmanager'
+