cloudpss 4.5.3__py3-none-any.whl → 4.5.5__py3-none-any.whl

cloudpss/function/functionExecution.py

@@ -415,8 +415,7 @@ class FunctionExecution(object):
                 'title': title,
                 'traces':
                 [self.__plotlyDataToTrace(trace) for trace in traces],
-                'xAxis': layout.get('xaxis', {}),
-                'yAxis': layout.get('yaxis', {}),
+                'layout': layout,
             }
         }
         self.print(result)

cloudpss/ieslab/PlanModel.py

@@ -17,7 +17,6 @@ class IESLabPlanModel(object):
         '''
         self.simulationId = simulationId
         self.optimizationInfo = self.GetOptimizationInfo()
-        # self.OptimizationMode = OptimizationMode
 
     def _fetchItemData(self, url, params):
         '''
@@ -29,69 +28,31 @@ class IESLabPlanModel(object):
         data = json.loads(r.text)
         return data['results']
 
+  
     def GetOptimizationInfo(self):
         '''
             获取当前算例的优化目标设置信息
 
-            :return: Dict 类型，例如：{'OptimizationMode': <OptimizationMode.经济性: 0>, 'StoSen': 0.1}
+            :return: enum 类型，代表经济性优化和环保性优化的类型
         '''
         try:
-            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']
-                }
+            data = self._fetchItemData(self._baseUri)
+            for e in OptimizationMode:
+                if (e.value == data['data']['optimizationpara']
+                    ['OptimizationMode']):
+                    return e
         except:
-            raise Exception('获得优化目标设置失败')
+            return OptimizationMode['经济性']
 
-    def SetOptimizationInfo(self, data: dict):
+    def SetOptimizationInfo(self, optType):
         '''
+            无对应接口
             设置当前算例的优化目标
 
-            :param data: dict 类型，例如：{'OptimizationMode': <OptimizationMode.经济性: 0>, 'StoSen': 0.1}
-
-            :return: boolean 类型，为 True 则设置成功
+            :param optType: enum 类型，代表经济性优化和环保性优化的类型
         '''
-        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
+        self.optimizationInfo = optType
+        return True
     
     def run(self) -> HttpRunner[IESLabPlanResult]:
         '''
@@ -103,12 +64,9 @@ class IESLabPlanModel(object):
         if isRunning:
             raise Exception('该算例正在运行！请从浏览器算例页面点击结束运行或者调用IESPlan对象的kill接口终止计算后重试！')
         else:
-            url = f'api/{self._runUri}/runOptimization'
-            opt = {
-                "OptimizationMode": self.optimizationInfo.get('OptimizationMode', 0).value,
-                "ProjectPeriod": "20",
-                "StoSen": self.optimizationInfo.get('StoSen', 0.1)
-            }
+            url = f'{self._runUri}/runOptimization'
+            optType = self.optimizationInfo if self.optimizationInfo is not None else OptimizationMode.经济性
+            optTypeValue = optType.value if isinstance(optType, OptimizationMode) else 0
             try:
                 r = request('GET',
                             url,
@@ -116,7 +74,10 @@ class IESLabPlanModel(object):
                                 "simuid":
                                 self.simulationId,
                                 "optPara":
-                                json.dumps(opt)
+                                json.dumps({
+                                    "OptimizationMode": optTypeValue,
+                                    "ProjectPeriod": "20"
+                                })
                             })
                 data = json.loads(r.text)
                 return HttpRunner({}, self.simulationId)

cloudpss/runner/runner.py

@@ -15,7 +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 typing import  TypeVar,  Generic
 import re
 
 RECEIVER = {
@@ -35,6 +35,8 @@ IES_LAB_OPT_RESULT = {
     'function/ieslab/evaluation': IESLabOptEvaluationResult,
 }
 
+
+
 RESULT_DB = {
     'function/CloudPSS/emtp': EMTResult,
     'function/CloudPSS/emtps': EMTResult,
@@ -60,7 +62,11 @@ class Runner(Generic[T]):
         self.taskId = taskId
         self.db = Storage(taskId, name, job, config, revision, modelRid)
         rid =job['rid'].replace('job-definition/','function/').replace('/cloudpss/','/CloudPSS/')
-        result = RESULT_DB.get(rid, Result)
+        resultClass = kwargs.get('RESULT_DB', None)
+        if resultClass is not None:
+            result = resultClass
+        else:
+            result = RESULT_DB.get(rid, Result)
         self.result: T = result(self.db)
         self.receiver = kwargs.get('receiver', None)
 
@@ -85,18 +91,25 @@ class Runner(Generic[T]):
         return self.receiver.status()
 
     def __listen(self, **kwargs):
-
         receiver = kwargs.get('RECEIVER', 'default')
-        receiverclass = None
         if type(receiver) is str:
             if receiver not in RECEIVER:
-                receiverclass = RECEIVER['default']
+                receiver = RECEIVER['default']
             else:
-                receiverclass = RECEIVER[receiver]
-        if receiverclass is None:
+                receiver = RECEIVER[receiver]
+        if receiver is None:
             raise Exception('not find receiver')
-        self.receiver = receiverclass(self.taskId, self.db, **kwargs)
+        self.receiver = receiver(self.taskId, self.db, **kwargs)
         self.receiver.connect()
+    def statusCode(self):
+        query="mutation($_a:JobInput!){job(input:$_a){status}}"
+        variables= {
+            "_a": {
+                "id": self.jobId,
+            }
+        }
+
+        return graphql_request(query,variables=variables)
 
     def terminate(self):
         """
@@ -143,19 +156,21 @@ class Runner(Generic[T]):
                 tres[k] = float(v)  # type: ignore
             policy["tres"] = tres
         function = job["rid"].replace("job-definition/cloudpss/", "function/CloudPSS/")
-        implement = kwargs.get("implement", None)
+        implement = kwargs.get("implement", kwargs.get("topology", None))
         debug = job["args"].get("@debug", None )
         debugargs={}
         if debug is not None:
             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,
-            rid,
+            
             f"model/@sdk/{str(int(time.time() * random.random()))}",
         ]
+        if rid != '':
+            context.append(rid)
         
         PARENT_JOB_ID =kwargs.get("PARENT_JOB_ID",None)
         if PARENT_JOB_ID is not None:
@@ -240,7 +255,7 @@ class HttpRunner(Runner[T]):
         if self.__taskId is None:
             return False
         return self.result.status()  # type: ignore
-
+    
 
 class HttpOPTRunner(Runner[T]):
 

cloudpss/version.py

@@ -1 +1 @@
-__version__ = '4.5.3'
+__version__ = '4.5.5'

{cloudpss-4.5.3.dist-info → cloudpss-4.5.5.dist-info}/METADATA

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

{cloudpss-4.5.3.dist-info → cloudpss-4.5.5.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cloudpss/__init__.py,sha256=1RNmUBhoxYUutZiTS-XJ9yBoNGGh8Mpt1uY6ETlSBDc,825
 cloudpss/verify.py,sha256=KF4Gd59DGvCyIEkRD7rNnekWw22XxJpi3DW6keb6j4c,1498
-cloudpss/version.py,sha256=Qwf2PqCgwNBpHE5DrBEwfOiFsFvEpa01UTldrgQkx9Q,22
+cloudpss/version.py,sha256=8YUF9sgPJQFrkTnAN6QJ6In_jhHd60fHbyYUrnmSkO8,22
 cloudpss/asyncio/__init__.py,sha256=CJGopQl_vz3z3fJsK7NjMX5uzkzfrJrbqKVhyYqlYWc,198
 cloudpss/asyncio/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
 cloudpss/asyncio/job/job.py,sha256=Bn2BEERw1J8YarFauTzVrGJK7nmaoMsdlrFUqiHRth4,3897
@@ -22,14 +22,14 @@ cloudpss/dslab/files/curveData.py,sha256=GU_DTTKjVn_ln9Hx0q9CFgfmNtokZi7b4DYSzGe
 cloudpss/dslab/files/files.py,sha256=vS0VhAh1lb8oFw51E2rAsb0WpmqM9F9IprxNCAPqH1s,934
 cloudpss/function/__init__.py,sha256=TNzChB-gQF6oB62F423evpUlgcp6s03D4pKKs89Lz4Q,1629
 cloudpss/function/function.py,sha256=llomkfnTmKMiFJYJ2mKnmAEoIjTNVCnjCUUyiJMOV1s,29
-cloudpss/function/functionExecution.py,sha256=4SR2qJbXntOjjSOrUmbjvBqED1nJyhVpI6WZKUFs1lQ,15761
+cloudpss/function/functionExecution.py,sha256=thR3yz3dN3AFwJ411OpJV3JccB65yRS2tw9S4YKYjqU,15695
 cloudpss/function/job.py,sha256=LdzaTyjvBcMZIyLstSZnt79d2eREljx2HnNoilDp03A,13162
 cloudpss/ieslab/DataManageModel.py,sha256=PH5-V1TCJ8No2NIqXu-RYHhlqCimwuCSO0Qbg4OjDq8,25323
 cloudpss/ieslab/EvaluationModel.py,sha256=hGZmuaB8lL9LVti_TCG-qCfK_bA-HJgdxYt7oMmVrXY,9399
 cloudpss/ieslab/IESLabOpt.py,sha256=KMswh-q_RpM_HU8HtKLj05p-AKBwnNrc37zy7pq6cf8,9063
 cloudpss/ieslab/IESLabPlan.py,sha256=rEf1W2pT_J3C8-TFFHVm8Llli9ySSXbBeRpd6Yz9Glk,8345
 cloudpss/ieslab/IESLabSimulation.py,sha256=-EJFkhklN9ao-nbfk7Lz6JCHboFCSDcn5R2jr3_Z7_A,4046
-cloudpss/ieslab/PlanModel.py,sha256=WHvXWNFgi7fO_M-sL9empRgHR5riCj1jeThBRT-oqEc,14088
+cloudpss/ieslab/PlanModel.py,sha256=fLWzVnRiyYRHchG2xsfUH-oCUmnF1uwbDuWNC750dWw,12612
 cloudpss/ieslab/__init__.py,sha256=gr1rXYw9vIAGOe60eg7LyMHP7QDXvNf4dJ5GTR_kj1Y,232
 cloudpss/job/TemplateCompiler.py,sha256=MuJDTQ54wRo5bGSvBJBJjXJ7u463dwpRkaLwIwm_hLE,9936
 cloudpss/job/TemplateManager.py,sha256=uOvctmE3P17aGWt_26d940FbRUSEs6iovFBb8T5xjd4,1115
@@ -64,7 +64,7 @@ cloudpss/runner/MessageStreamReceiver.py,sha256=dT-rKslQbRt3bMTGXupa1YrocHl2zTWO
 cloudpss/runner/__init__.py,sha256=FxiYYmssbZgRjieySzi43yPiWEF6eNos2UsoFQeD2H8,341
 cloudpss/runner/receiver.py,sha256=QU0RsbCt0EK7sCLHzfj8_QQsuPNfqXxpZi5JKm6roxA,4162
 cloudpss/runner/result.py,sha256=GFpd7848gsLRuzhVcWbCwmAjR84Lhik_3pNCjOV8VOY,13291
-cloudpss/runner/runner.py,sha256=pfidTchkoVTFUB9pUmZn9ulVDag9DLGo0pIxsD-nRu0,9168
+cloudpss/runner/runner.py,sha256=SJkEjDnrmRPmq1t8sbZtIbYaq-wQblv6Yx9RnyWz4c8,9583
 cloudpss/runner/storage.py,sha256=zFET_zwPIOF2Cnh9sgFiS0HFxV1OmVsU34bGUQ6PpkA,4162
 cloudpss/runner/transform.py,sha256=krOgTZiJSJAb5QSwerAqlbC4Ma0PKi__0WOZlAxw4O8,11613
 cloudpss/utils/IO.py,sha256=FsFp3V8I1-P0YiBGmjKwbMalBrVKMHUxTjFZFOtv0CQ,5357
@@ -74,7 +74,7 @@ cloudpss/utils/graphqlUtil.py,sha256=zGEhRZvy5JMipFKFxjDmbc-HQP3aPZ5noDwi-RTXWSk
 cloudpss/utils/httprequests.py,sha256=ZcCwS2KM7y2TwWTo0YRLNJVozih4h0F5ignn-CeBREU,1846
 cloudpss/utils/matlab.py,sha256=SLwVt790BjklJK2XNELt9R2n_1ej9Y8QsTIdFkKXLWE,795
 cloudpss/utils/yamlLoader.py,sha256=bv_vPDK_e0n_vZ5FwpDJ_NJWqMAwfU3AbhkvQIxPCy4,2677
-cloudpss-4.5.3.dist-info/METADATA,sha256=85B-9dgbPdsSS961DOPKWRoKeYn-8nYA2JJkSJRAJzM,2401
-cloudpss-4.5.3.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cloudpss-4.5.3.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
-cloudpss-4.5.3.dist-info/RECORD,,
+cloudpss-4.5.5.dist-info/METADATA,sha256=fCJLHxsOIHAeDSiSz3zqusz_1qjMb3iWsPWqpQ-C3ko,2401
+cloudpss-4.5.5.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cloudpss-4.5.5.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
+cloudpss-4.5.5.dist-info/RECORD,,