cloudpss 4.5.22__tar.gz → 4.5.24__tar.gz

{cloudpss-4.5.22 → cloudpss-4.5.24}/PKG-INFO

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

{cloudpss-4.5.22 → cloudpss-4.5.24}/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.22 → cloudpss-4.5.24}/cloudpss/model/model.py

@@ -400,7 +400,7 @@ class Model(object):
         if not os.path.exists(filePath):
             raise FileNotFoundError("未找到文件")
         data = IO.load(filePath, format)
-        return data
+        return Model(data)
 
 
     @staticmethod

{cloudpss-4.5.22 → cloudpss-4.5.24}/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.24/cloudpss/version.py

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

{cloudpss-4.5.22 → cloudpss-4.5.24}/cloudpss.egg-info/PKG-INFO

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

{cloudpss-4.5.22 → cloudpss-4.5.24}/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.22 → cloudpss-4.5.24}/test/test-topology1.py

@@ -14,9 +14,9 @@ if __name__ == '__main__':
     cloudpss.setToken(
         'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcm5hbWUiOiJhZG1pbiIsInNjb3BlcyI6WyJtb2RlbDo5ODM2NyIsImZ1bmN0aW9uOjk4MzY3IiwiYXBwbGljYXRpb246MzI4MzEiXSwicm9sZXMiOlsiYWRtaW4iXSwidHlwZSI6ImFwcGx5IiwiZXhwIjoxNzY2MzA3MzU1LCJub3RlIjoiYWEiLCJpYXQiOjE3NTA3NTUzNTV9.iYh3otDGy-f7dKyIUd8xpnEuwVuRDfmBVsI112XeCZBe7sZLdyBb6a4XqOd8AoyTzFcpLj7rF1PQcT4mhEf6kA')
     print('Token done')
-    project = cloudpss.Model.fetch('model/admin/xx11')
+    project = cloudpss.Model.fetch('model/admin/atest')
     # topology = cloudpss.ModelTopology.fetch("-xrS3SewFhpVYKBtIXLk-XDLCQRQnUmlIbXS3s4sdPUkPKeAMhXHjRgZD1JPjPfQ","emtp",{'args':{}})
-    topology= project.fetchTopology(config={'args':{}},maximumDepth=50)
+    topology= project.fetchTopology(implementType='emtp',config={'args':{}},maximumDepth=50)
     print(topology.components)
     
     

cloudpss-4.5.24/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.22/cloudpss/version.py

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

cloudpss-4.5.22/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()
-   
-