cloudpss 4.5.1a4__tar.gz → 4.5.1a5__tar.gz

{cloudpss-4.5.1a4 → cloudpss-4.5.1a5}/PKG-INFO

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

{cloudpss-4.5.1a4 → cloudpss-4.5.1a5}/cloudpss/dslab/dataManageModel.py

@@ -278,6 +278,10 @@ class DataManageModel(object):
     
             :return: list<dict>类型，返回该种类下所有数据项的列表
         '''
+        # 检查extra是否为空
+        if not data['extra']:
+            raise ValueError("extra 不能为空，必须包含有效的数据")
+
         url = f"{self._baseUri}rest/{kind}"
         r = {
             'id': data.get('id', ''),

{cloudpss-4.5.1a4 → cloudpss-4.5.1a5}/cloudpss/dslab/dslab.py

@@ -168,6 +168,20 @@ class DSLab(object):
         if job['rid'] != rid:
             raise Exception("不是短路电流计算方案内核运行生成算法的计算方案")
         return self.run(job=job, name=name)
+
+    @staticmethod
+    def getProjectGroupList():
+        '''
+            获取项目组列表
+
+            :return: List[Dict] 返回项目组列表
+        '''
+        try:
+            r = request('GET', 'api/dslab/rest/group')
+            groupList = json.loads(r.text)
+            return groupList
+        except Exception as e:
+            raise Exception('获取项目组列表失败')
     
     @staticmethod
     def createProjectGroup(name, description=None, createById=None):
@@ -196,18 +210,19 @@ class DSLab(object):
             if r.ok:
                 r = request('GET', 'api/dslab/rest/group')
                 groupList = json.loads(r.text)
-                id = groupList[len(groupList) -1].get('id', None)
+                id = groupList[len(groupList) -1].get('id', None)\
+                
                 return id
         except Exception as e:
             raise Exception('创建项目组失败')
         
     @staticmethod
-    def createProject(name, gid, description=None, initialTerm=None, build=None, operate=None, yearsInOperation=None):
+    def createProject(name, groupName, description=None, initialTerm=None, build=None, operate=None, yearsInOperation=None):
         '''
             创建项目
 
             :params name: String 项目名称 
-            :params gid: Int 父项目组id,
+            :params groupName: String 父项目组名称,
             :params description: String 项目描述, 可选参数
             :params initialTerm: String 项目起始年限，可选参数
             :params build: String 项目建设期（年），可选参数
@@ -217,6 +232,14 @@ class DSLab(object):
             :return: Int 返回创建的项目id
         '''
         try:
+            groupList = DSLab.getProjectGroupList()
+            matchedGroup = next((g for g in groupList if g.get('name') == groupName), None)
+            if not matchedGroup:
+                gid = DSLab.createProjectGroup(groupName)
+            else:
+                gid = matchedGroup.get('id')
+            if gid is None:
+                raise Exception(f"项目组 {groupName} 缺少 id 字段")
             payload = {
                 'name': name,
                 'gid': gid,
@@ -233,4 +256,4 @@ class DSLab(object):
             project = json.loads(r.text)
             return project.get('resource', None)
         except Exception as e:
-            raise Exception('创建项目失败')
+            raise Exception(f'创建项目失败: {e}')

{cloudpss-4.5.1a4 → cloudpss-4.5.1a5}/cloudpss/runner/runner.py

@@ -65,7 +65,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)
 
@@ -92,15 +96,14 @@ class Runner(Generic[T]):
     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 terminate(self):
@@ -148,7 +151,7 @@ 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:

cloudpss-4.5.1a5/cloudpss/version.py

@@ -0,0 +1 @@
+__version__ = '4.5.1-alpha.5'

{cloudpss-4.5.1a4 → cloudpss-4.5.1a5}/cloudpss.egg-info/PKG-INFO

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

{cloudpss-4.5.1a4 → cloudpss-4.5.1a5}/cloudpss.egg-info/SOURCES.txt

@@ -95,6 +95,7 @@ test/test-yield.py
 test/test.py
 test/test11.py
 test/test12.py
+test/test2.py
 test/test7950.py
 test/testAsync.py
 test/testEvent.py
@@ -102,8 +103,11 @@ test/testRt-test.py
 test/testRt.py
 test/testRt2.py
 test/testSend.py
+test/test_TCP.py
 test/test_in_new_web_1.py
 test/test_modepower_ampratio(3).py
 test/test_ws.py
 test/test_ws2.py
-test/testb.py
+test/test_ws3.py
+test/testb.py
+test/testkey.py

cloudpss-4.5.1a5/test/test-plot1.py

@@ -0,0 +1,12 @@
+import plotly.express as px
+import pandas as pd
+
+df = pd.DataFrame([
+    dict(Task="Job A", Start='2009-01-01', Finish='2009-02-28'),
+    dict(Task="Job B", Start='2009-03-05', Finish='2009-04-15'),
+    dict(Task="Job C", Start='2009-02-20', Finish='2009-05-30')
+])
+
+fig = px.timeline(df, x_start="Start", x_end="Finish", y="Task")
+fig.update_yaxes(autorange="reversed") # otherwise tasks are listed from the bottom up
+fig.show()

cloudpss-4.5.1a5/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/xx11')
+    # topology = cloudpss.ModelTopology.fetch("-xrS3SewFhpVYKBtIXLk-XDLCQRQnUmlIbXS3s4sdPUkPKeAMhXHjRgZD1JPjPfQ","emtp",{'args':{}})
+    topology= project.fetchTopology(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.1a5/test/test2.py

@@ -0,0 +1,56 @@
+import sys,os
+sys.path.append(os.path.join(os.path.dirname(__file__), '../'))
+import cloudpss
+import json
+import time
+# import plotly.graph_objects as go   # 使用 plotly 绘制曲线
+import numpy as np
+# from csv_write_function import csv_write_function
+
+
+# 仿真设置
+# 填写 token，注意不要加大括号{}
+# cloudpss.setToken('{token}')
+cloudpss.setToken('eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6NjM4LCJ1c2VybmFtZSI6IkNfeWFuamlvbmdjaGVuZyIsInNjb3BlcyI6WyJtb2RlbDo5ODM2NyIsImZ1bmN0aW9uOjk4MzY3IiwiYXBwbGljYXRpb246MzI4MzEiXSwicm9sZXMiOlsiQ195YW5qaW9uZ2NoZW5nIl0sInR5cGUiOiJhcHBseSIsImV4cCI6MTc3NTMwODY0Miwibm90ZSI6IllKQy10b2tlbiIsImlhdCI6MTc0NDIwNDY0Mn0.H_BdzcOh-MBFMTddb35fNXSe2TAOCgoo2E6RC4mex5k06ouD8GuT0Y60yzCXsR1jsU7YKj6x00KU2OCElg7FQQ')
+
+# 设置访问的地址，即登录后的地址到.net/为止
+os.environ['CLOUDPSS_API_URL'] = 'http://cloudpss-nari.ddns.cloudpss.net/'
+
+# 选择算例，获取指定算例 rid 的项目
+model = cloudpss.Model.fetch('model/C_yanjiongcheng/Qingdong-DC-simple')  # 注意最后那个#号不要加，写完项目名称即可。
+
+
+rid=model.rid
+configs=model.configs
+jobs=model.jobs
+print('model的rid为', rid)
+print('model的config为', configs)
+print('model的jobs为', jobs)
+
+# 选择参数方案，若未设置，则默认用 model 的第一个 config（参数方案）
+config = model.configs[0]   # Kes1.1
+
+# 选择计算方案，若未设置，则默认用 model 的第一个 job，此处选择 jobs[0]，为SimStudio中设置的第1个计算方案，即“图A”
+job = model.jobs[0]
+
+# 启动计算任务
+time1 = time.time()  # 计算当前的秒数
+runner = model.runPowerFlow(job, config)  # 运行计算方案
+
+# 监听计算任务实例的运行状态
+while not runner.status():
+    logs = runner.result.getLogs()  # 获得运行日志
+    for log in logs:
+        print(log)  # 打印每一条日志
+    # 每隔一秒判断一次运行状态
+    time.sleep(1)
+print('end')  # 运行结束
+
+time2 = time.time()  # 计算当前的秒数
+print('潮流计算花费的时间为 %.2f 秒' % (time2 - time1))
+print(cloudpss.__version__)
+
+# 获取潮流计算结果
+buses = runner.result.getBuses()  # 获取节点电压计算结果
+# print(buses)
+

cloudpss-4.5.1a5/test/test_TCP.py

@@ -0,0 +1,31 @@
+import socket
+
+def tcp_client():
+    host = '10.101.10.102'  # 服务器 IP 地址
+    port = 8802        # 服务器端口
+
+    # 创建 socket 对象
+    client_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+
+    try:
+        # 连接到服务器
+        client_socket.connect((host, port))
+        print(f"已连接到服务器 {host}:{port}")
+        # 接收服务器返回的数据
+        while True:
+            rec_msg = client_socket.recv(1024)
+            hex_representation = ' '.join(f'{byte:02x}' for byte in rec_msg)
+            print(' 客户端消息的十六进制表示: ', hex_representation)
+            # print(f"接收到来自服务器的消息: {data.decode()}")
+            
+            client_socket.send(rec_msg)
+
+    except ConnectionRefusedError:
+        print("连接失败，服务器可能未启动。")
+    finally:
+        # 关闭连接
+        client_socket.close()
+        print("客户端已关闭连接。")
+
+if __name__ == '__main__':
+    tcp_client()

{cloudpss-4.5.1a4 → cloudpss-4.5.1a5}/test/test_ws.py

@@ -52,7 +52,7 @@ class WebsocketClient():
         return self._status
         
     async def create(self):
-       asyncio.create_task(self.websocket_connect('ws://10.101.10.45/api/streams/id/2638cc71-2b02-4a78-ad7d-d186c54ecc7b'))
+       asyncio.create_task(self.websocket_connect('ws://www.rpssc.top:52694/api/streams/id/a454e6b7-e677-41df-a4e8-6202ff3cb35e'))
        
 async def main():
     ws=WebsocketClient()

{cloudpss-4.5.1a4 → cloudpss-4.5.1a5}/test/test_ws2.py

@@ -87,7 +87,7 @@ class WebsocketClient():
         
     async def create(self):
     #    await self.websocket_connect('ws://10.101.10.45/api/streams/id/bb30285a-7d11-484b-a8b0-4855cf8bf8ed')
-        await self.websocket_connect('ws://10.101.10.45/api/streams/id/2638cc71-2b02-4a78-ad7d-d186c54ecc7b')
+        await self.websocket_connect('ws://www.rpssc.top:52694/api/streams/id/1d3b2722-dd65-42c2-ac91-a232e44582c9')
     #    asyncio.create_task(self.websocket_connect('ws://10.101.10.45/api/streams/id/bb30285a-7d11-484b-a8b0-4855cf8bf8ed'))
     
 async def main():

cloudpss-4.5.1a5/test/test_ws3.py

@@ -0,0 +1,49 @@
+
+import time
+import threading
+import websocket
+# ws://10.101.10.45/api/streams/token/fe943635-0dc9-40c8-8a27-39d02af66894
+
+    
+class WebsocketClient():
+    message = []
+    _status=0
+    # __init__(self):
+    def on_close(self, *args, **kwargs):
+        self._status = 1
+        print("close")
+    def on_error(self,  *args, **kwargs):
+        self._status = 1
+        print("error",args,kwargs)
+    def on_open(self,ws, *args, **kwargs):
+        self._status = 1
+        print("open")
+    def on_message(self,  *args, **kwargs):
+        self._status = 0
+        print("on_message")
+    # websocket
+    def connect(self):
+        self._status = 0
+        path = "ws://www.rpssc.top:52694/api/streams/id/a454e6b7-e677-41df-a4e8-6202ff3cb35e"
+        self.ws = websocket.WebSocketApp(
+            path,
+            on_open=self.on_open,
+            on_message=self.on_message,
+            on_error=self.on_error,
+            on_close=self.on_close,
+        )
+        thread = threading.Thread(target=self.ws.run_forever, kwargs={'ping_interval':60,'ping_timeout':5,'reconnect':True})
+        thread.setDaemon(True)
+        thread.start()
+        while not self._status:
+            time.sleep(0)
+       
+def main():
+    ws=WebsocketClient()
+    ws.connect()
+    print("start")
+    while ws._status == 0:
+        time.sleep(0)
+        pass
+if __name__ == '__main__':
+    main()

cloudpss-4.5.1a5/test/testb.py

@@ -0,0 +1,16 @@
+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()
+   
+        

cloudpss-4.5.1a5/test/testkey.py

@@ -0,0 +1,3 @@
+x=input("请输入一个数：")
+
+print(x)

cloudpss-4.5.1a4/cloudpss/version.py

@@ -1 +0,0 @@
-__version__ = '4.5.1-alpha.4'

cloudpss-4.5.1a4/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.1a4/test/testb.py

@@ -1,18 +0,0 @@
-import os,sys
-import time
-
-import socketio
-import threading
-import struct
-
-                         
-if __name__ == '__main__':
-   a = [1.21,2.22,3.33]
-   x = struct.pack('d'*len(a),*a)
-   print(x)
-   print(len(x))
-   
-   t = struct.unpack('d'*int(len(x)/8),x)
-   
-        
-   print(t)