cloudpss 4.5.2__tar.gz → 4.5.4__tar.gz

{cloudpss-4.5.2 → cloudpss-4.5.4}/PKG-INFO

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

{cloudpss-4.5.2 → cloudpss-4.5.4}/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-4.5.2 → cloudpss-4.5.4}/cloudpss/model/implements/diagram.py

@@ -1,3 +1,4 @@
+import re
 from .component import Component
 from typing import Optional
 import uuid
@@ -140,7 +141,7 @@ class DiagramImplement(object):
                     position["y"] += 5
         return True
 
-    def updateComponent(self, key: str, args: dict) -> bool:
+    def updateComponent(self, key: str, **kwargs: dict) -> bool:
         """
         更新元件
 
@@ -150,10 +151,36 @@ class DiagramImplement(object):
 
         >>>> diagram.updateComponent(key)
         """
-        component = self.cells.get(key)
-        if not component:
+        component = self.cells.get(key,None)
+        if component is None:
             return False
-        for k, v in self.cells.items():
-            if k == key:
-                v.__dict__.update(args)
-                return True
+        for k, v in kwargs.items():
+            if component.__dict__.get(k,None) is None:
+                raise Exception(f"Component has no attribute {k}")
+            if k == 'args' and not isinstance(v, dict):
+                raise Exception(f"Component args must be dict")
+            if k == 'pins' and not isinstance(v, dict):
+                raise Exception(f"Component pins must be dict")
+            if k == 'position' and not isinstance(v, dict):
+                raise Exception(f"Component position must be dict")
+            if k == 'size' and not isinstance(v, dict):
+                raise Exception(f"Component size must be dict")
+            if k == 'style' and not isinstance(v, dict):
+                raise Exception(f"Component style must be dict")
+            if k == 'props' and not isinstance(v, dict):
+                raise Exception(f"Component props must be dict")
+            if k == 'context' and not isinstance(v, dict):
+                raise Exception(f"Component context must be dict")
+            
+            if k == 'definition' and not re.match(r'^model/([!()\-.0-9@A-Z\[\]_a-z{}~]{1,240})/([!()\-.0-9@A-Z\[\]_a-z{}~]{1,240})$', v):
+                raise Exception(f"Component definition must be in the format of 'model/owner/key'")
+            
+            if k == 'zIndex' and v < 0:
+                raise Exception(f"Component zIndex must be greater than 0")
+            
+            if isinstance(v, dict):
+                component.__dict__[k].update(v)
+                continue
+            
+            component.__dict__[k] = v
+            

{cloudpss-4.5.2 → cloudpss-4.5.4}/cloudpss/model/model.py

@@ -137,7 +137,7 @@ class Model(object):
             raise ValueError("不存在拓扑实现")
         return diagramImplement.removeComponent(key)
     
-    def updateComponent(self, key, args):
+    def updateComponent(self, key, **kwargs):
         """
         更新元件实现
 
@@ -148,7 +148,7 @@ class Model(object):
         diagramImplement = self.revision.getImplements().getDiagram()
         if diagramImplement is None:
             raise ValueError("不存在拓扑实现")
-        return diagramImplement.updateComponent(key, args)
+        return diagramImplement.updateComponent(key, **kwargs)
 
 
     def getComponentsByRid(self, rid: str):
@@ -397,6 +397,7 @@ class Model(object):
         data = IO.load(filePath, format)
         return data
 
+
     @staticmethod
     def dump(model, file, format="yaml", compress="gzip"):
         """

{cloudpss-4.5.2 → cloudpss-4.5.4}/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-4.5.2 → cloudpss-4.5.4}/cloudpss/utils/IO.py

@@ -2,6 +2,7 @@ import io
 import json
 import ubjson
 import yaml
+from yaml.dumper import SafeDumper
 import gzip
 import base64
 import struct
@@ -85,6 +86,7 @@ class IO(object):
             result = ubjson.dumpb(obj)
         if format == 'yaml':
             result = yaml.dump(obj).encode(encoding="utf-8")
+
         if result is None:
             assert False, 'format not support'
         if compress == 'gzip':
@@ -104,7 +106,7 @@ class IO(object):
         if format == 'ubjson':
             return ubjson.loadb(byt)
         if format == 'yaml':
-            return yaml.load(io.BytesIO(byt), Loader=yaml.BaseLoader)
+            return yaml.load(io.BytesIO(byt), Loader=yaml.FullLoader)
         assert False, 'format not support'
 
     @staticmethod

cloudpss-4.5.4/cloudpss/version.py

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

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

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

cloudpss-4.5.2/cloudpss/version.py

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