cloudpss 4.5.21__tar.gz → 4.5.23__tar.gz

{cloudpss-4.5.21 → cloudpss-4.5.23}/PKG-INFO

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

{cloudpss-4.5.21 → cloudpss-4.5.23}/cloudpss/job/messageStreamReceiver.py

@@ -93,6 +93,10 @@ class MessageStreamReceiver(JobReceiver):
 
     def __on_error(self,  *args, **kwargs):
         logging.debug("MessageStreamReceiver error")
+        err = args[1] if len(args)>1 else None
+        if isinstance(err, websocket.WebSocketConnectionClosedException):
+            self.close(args[0])
+            return
         msg = {
             "type": "log",
             "verb": "create",

{cloudpss-4.5.21 → cloudpss-4.5.23}/cloudpss/model/model.py

@@ -487,6 +487,20 @@ class Model(object):
 
         revision = ModelRevision.create(model.revision, model.revision.hash)
 
+        # 使用默认权限对象，但如果model的permissions字段中有相关权限值就使用model中的数值
+        default_permissions = {
+            "moderator": 98367,
+            "member": 65551,
+            "everyone": 0
+        }
+        
+        # 如果model有permissions字段，则合并权限值
+        model_permissions = getattr(model, 'permissions', {})
+        if isinstance(model_permissions, dict):
+            permissions = {**default_permissions, **model_permissions}
+        else:
+            permissions = default_permissions
+
         return graphql_request(
             Model.__create_model,
             {
@@ -499,11 +513,7 @@ class Model(object):
                     "name": model.name,
                     "description": model.description,
                     "tags": model.tags,
-                    "permissions": {
-                       "moderator": 98367,
-                        "member": 65551,
-                        "everyone": 0
-                    },
+                    "permissions": permissions,
                 }
             },
             **kwargs
@@ -543,6 +553,20 @@ class Model(object):
         if xVersion==3:
             tags=model.tags
         
+        # 使用默认权限对象，但如果model的permissions字段中有相关权限值就使用model中的数值
+        default_permissions = {
+            "moderator": 98367,
+            "member": 65551,
+            "everyone": 0
+        }
+        
+        # 如果model有permissions字段，则合并权限值
+        model_permissions = getattr(model, 'permissions', {})
+        if isinstance(model_permissions, dict):
+            permissions = {**default_permissions, **model_permissions}
+        else:
+            permissions = default_permissions
+
         r= graphql_request(
             Model.__update_model, {
                 'a': {

{cloudpss-4.5.21 → cloudpss-4.5.23}/cloudpss/model/topology.py

@@ -56,7 +56,7 @@ class ModelTopology():
         f.close()
         
     @staticmethod
-    def fetch(hash, implementType, config, maximumDepth=None, **kwargs):
+    def fetch(hash, implementType, config, maximumDepth=None,topology=None, **kwargs):
         """
             获取拓扑
 
@@ -86,11 +86,18 @@ class ModelTopology():
                 ports
             """
             del kwargs['ports']
+        
+        if topology is not None:
+            if not isinstance(topology, ModelTopology):
+                raise TypeError("topology must be an instance of ModelTopology")
+            variables['a']['topology'] = topology.toJSON()
+            
         query = ModelTopology.__modelTopologyQuery + ModelTopology.__ReqParam + "}}"
         
         
         data = graphql_request(query, variables, **kwargs)
         if 'errors' in data:
+            print(data['errors'])
             raise Exception(data['errors'][0]['message'])
 
         return ModelTopology(data['data']['modelTopology'])

{cloudpss-4.5.21 → cloudpss-4.5.23}/cloudpss/runner/IESLabPlanResult.py

@@ -55,6 +55,7 @@ class IESLabResult(object):
         '''
         if self.taskId is None:
             raise Exception('未开始运行')
+            # return []
         r = request('GET',
                     f'{self._baseUri}/getOptimizationLog',
                     params={

{cloudpss-4.5.21 → cloudpss-4.5.23}/cloudpss/utils/graphqlUtil.py

@@ -1,11 +1,13 @@
 # coding=UTF-8
 import json
 from cloudpss.utils import request
+from cloudpss.utils.IO import IO
 
 
 def graphql_request(query, variables=None, baseUrl=None,token=None,**kwargs):
     payload = {'query': query, 'variables': variables}
     
-    r = request('POST', 'graphql', data=json.dumps(payload),baseUrl=baseUrl,token=token, **kwargs)
+    
+    r = request('POST', 'graphql', data=IO.serialize(payload,'json'),baseUrl=baseUrl,token=token, **kwargs)
 
     return json.loads(r.text)

{cloudpss-4.5.21 → cloudpss-4.5.23}/cloudpss/utils/httprequests.py

@@ -18,8 +18,8 @@ def request(method, uri, baseUrl=None, params={}, token=None, **kwargs):
     if token:
         headers = {
             'Authorization': 'Bearer ' + token,
-            'Content-Type': 'application/json; charset=utf-8',
-                "User-Agent": "cloudpss-sdk-python/" + __version__
+            'Content-Type': 'application/json+gzip; charset=utf-8',
+            "User-Agent": "cloudpss-sdk-python/" + __version__
         }
     else:
         raise Exception('token undefined')

cloudpss-4.5.23/cloudpss/version.py

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

{cloudpss-4.5.21 → cloudpss-4.5.23}/cloudpss.egg-info/PKG-INFO

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

{cloudpss-4.5.21 → cloudpss-4.5.23}/test/test-topology.py

@@ -8,14 +8,16 @@ import pandas as pd
 import json
 
 if __name__ == '__main__':
-    os.environ['CLOUDPSS_API_URL'] = 'http://10.101.10.34/'
+    os.environ['CLOUDPSS_API_URL'] = 'http://cloudpss-nb2030.local.ddns.cloudpss.net/'
     print('CLOUDPSS connected')
     cloudpss.setToken(
         'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MTEsInVzZXJuYW1lIjoiemhvdXFpYW5nIiwic2NvcGVzIjpbImJyb3dzZXIiXSwicm9sZXMiOlsiKiJdLCJ0eXBlIjoiYnJvd3NlciIsImV4cCI6MTcyNTUyNjkxNywiaWF0IjoxNzIyODQ4NTE3fQ.WjTa_hQg6nhtXjpNY7pcgGHgjv9NE1YDDPepL5Xjg_Xms-HT9LUw5MBngBLvlXQtajnwAOkNVnVv49hxHcOzRQ')
     print('Token done')
-    project = cloudpss.Model.fetch('model/zhouqiang/7380b767-e594-5397-970c-959ab2c8e134')
-    print(project.revision.hash)
-    t = time.time()
+    project = cloudpss.Model.fetch('model/admin/PMSG_Model_12MW_AVM_sungrow_pscad')
+    # print(project.revision.hash)
+    # t = time.time()
+    
+    topology = project.fetchTopology(config={'args':{}},maximumDepth=10)
     # topology = cloudpss.ModelTopology.fetch("hlbBPYIyQHWzgPxdjp9lV9a92twyxA2zETzrqz4Q0fou7mfOemX-pr9OfO9eUfq4","emtp",{'args':{}})
     # topology = cloudpss.ModelTopology.fetch("JwHbZdjco9eC0nZw3fY7Iz9rqsQ4HFGJObiBW3bFuYLPCd0Vqb2vb8zNY28D1AXV","emtp",{'args':{}})
     # print(time.time()-t)

cloudpss-4.5.23/test/test-topology1.py

@@ -0,0 +1,37 @@
+
+import time
+import sys
+import os
+
+sys.path.append(os.path.join(os.path.dirname(__file__), '..\\'))
+import cloudpss
+import time
+import json
+
+if __name__ == '__main__':
+    os.environ['CLOUDPSS_API_URL'] = 'http://10.101.10.45/'
+    print('CLOUDPSS connected')
+    cloudpss.setToken(
+        'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcm5hbWUiOiJhZG1pbiIsInNjb3BlcyI6WyJtb2RlbDo5ODM2NyIsImZ1bmN0aW9uOjk4MzY3IiwiYXBwbGljYXRpb246MzI4MzEiXSwicm9sZXMiOlsiYWRtaW4iXSwidHlwZSI6ImFwcGx5IiwiZXhwIjoxNzY2MzA3MzU1LCJub3RlIjoiYWEiLCJpYXQiOjE3NTA3NTUzNTV9.iYh3otDGy-f7dKyIUd8xpnEuwVuRDfmBVsI112XeCZBe7sZLdyBb6a4XqOd8AoyTzFcpLj7rF1PQcT4mhEf6kA')
+    print('Token done')
+    project = cloudpss.Model.fetch('model/admin/3d72939f-6287-456a-92ea-8b66aab0ec65')
+    # topology = cloudpss.ModelTopology.fetch("-xrS3SewFhpVYKBtIXLk-XDLCQRQnUmlIbXS3s4sdPUkPKeAMhXHjRgZD1JPjPfQ","emtp",{'args':{}})
+    topology= project.fetchTopology(implementType='emtp',config={'args':{}},maximumDepth=50)
+    print(topology.components)
+    
+    
+    topology.dump(topology,'testTopology.json',indent=2)
+    
+    
+    # topology2 = cloudpss.ModelTopology.fetch('', 'emtp', {'args': {}}, maximumDepth=5, topology=topology)
+    
+    
+    # print(topology2.components)
+    # topology2.dump(topology2,'testTopology2.json',indent=2)
+    
+    
+    # topology3= project.fetchTopology(config={'args':{}},maximumDepth=5)
+    # print(topology3.components)
+    
+    
+    # topology3.dump(topology3,'testTopology3.json',indent=2)

cloudpss-4.5.23/test/testb.py

@@ -0,0 +1,34 @@
+import sys,os
+sys.path.append(os.path.join(os.path.dirname(__file__), '../'))
+import cloudpss
+import json
+import time
+
+if __name__ == '__main__':
+    
+      cloudpss.setToken('eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MTE1NTcsInVzZXJuYW1lIjoiYmFuZ2ppbGVnYW9sZWdhbyIsInNjb3BlcyI6WyJtb2RlbDo5ODM2NyIsImZ1bmN0aW9uOjk4MzY3IiwiYXBwbGljYXRpb246MzI4MzEiXSwicm9sZXMiOlsiYmFuZ2ppbGVnYW9sZWdhbyJdLCJ0eXBlIjoiYXBwbHkiLCJleHAiOjE3OTExODg2OTEsIm5vdGUiOiIxMjMiLCJpYXQiOjE3NjAwODQ2OTF9.RoHSICdh_6ygNuXde166K5rDujPReskYdgCcJTfTrdsXlQ4x6hleVCRedpvYbDzZZYwrwZ8XG5FT8ops3BLICg')
+
+      os.environ['CLOUDPSS_API_URL'] = 'https://cloudpss.net/'
+      
+      # 获取指定 rid 的项目
+      model = cloudpss.Model.fetch('model/songyankan/3_Gen_9_Bus')
+
+      # 修改 Gen2 发电机有功功率
+      comp = model.getComponentByKey('canvas_0_757')
+      print(comp.args)
+      comp.args['pf_P'] = '180'
+      
+      # 启动计算任务
+      config = model.configs[0]  # 若未设置，则默认用model的第一个config（参数方案）
+      job = model.jobs[0]  # 若未设置，则默认用model的第一个job（计算方案）
+      runner = model.run(job,config)
+      while not runner.status():
+         logs = runner.result.getLogs()
+         for log in logs:
+               print(log)
+         time.sleep(1)
+      print('end')
+      
+      # 打印结果
+      print(runner.result.getBranches())
+      print(runner.result.getBuses())

cloudpss-4.5.21/cloudpss/version.py

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

cloudpss-4.5.21/test/test-topology1.py

@@ -1,31 +0,0 @@
-
-import time
-import sys
-import os
-
-sys.path.append(os.path.join(os.path.dirname(__file__), '..\\'))
-import cloudpss
-import time
-import numpy as np
-import pandas as pd
-import json
-
-if __name__ == '__main__':
-    os.environ['CLOUDPSS_API_URL'] = 'http://10.101.10.45/'
-    print('CLOUDPSS connected')
-    cloudpss.setToken(
-        'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcm5hbWUiOiJhZG1pbiIsInNjb3BlcyI6WyJtb2RlbDo5ODMzNSIsImZ1bmN0aW9uOjk4MzM1IiwiYXBwbGljYXRpb246OTgzMzUiXSwicm9sZXMiOlsiYWRtaW4iXSwidHlwZSI6ImFwcGx5IiwiZXhwIjoxNzI0NTU3MDIzLCJub3RlIjoiYSIsImlhdCI6MTY5MzQ1MzAyM30._Xuyo62ESKLcIAFeNdnfBM44yPiiXli9OPKvXDzL2rPV4J1_qsGZP--bsS1tXAVy-x8ooUIIAAG1yhwmZuk7-Q')
-    print('Token done')
-    project = cloudpss.Model.fetch('model/admin/asdfsadd')
-    # topology = cloudpss.ModelTopology.fetch("-xrS3SewFhpVYKBtIXLk-XDLCQRQnUmlIbXS3s4sdPUkPKeAMhXHjRgZD1JPjPfQ","emtp",{'args':{}})
-    topology= project.fetchTopology(config={'args':{}},maximumDepth=50)
-    print(topology.components)
-    # topology.dump(topology,'test.json')
-    
-    
-    # # topology= project.fetchTopology(config={'args':{}})
-
-    # topology.dump(topology,'test.json')
-    
-    
-    

cloudpss-4.5.21/test/testb.py

@@ -1,16 +0,0 @@
-import os,sys
-import time
-
-import socketio
-import threading
-import struct
-Uninitialized = type("Uninitialized", (), {})()
-
-def pp():
-   x=b=c=q=x=t=Uninitialized
-   print(x,b,c,q,x,t)
-                         
-if __name__ == '__main__':
-   pp()
-   
-