cloudpss 4.5.16__tar.gz → 4.5.18__tar.gz

{cloudpss-4.5.16 → cloudpss-4.5.18}/PKG-INFO

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

{cloudpss-4.5.16 → cloudpss-4.5.18}/cloudpss/job/job.py

@@ -4,6 +4,7 @@ import re
 import time
 
 from cloudpss.job.result.result import Result
+from cloudpss.utils.parseDebugArgs import parse_debug_args
 from .result import getResultClass
 
 from cloudpss.utils.IO import IO
@@ -134,9 +135,12 @@ class Job(Generic[T]):
         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]
+            parsed = parse_debug_args(debug)
+            if parsed is not None:
+                debugargs = parsed
+            # 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,
             f"model/@sdk/{str(int(time.time() * random.random()))}",

{cloudpss-4.5.16 → cloudpss-4.5.18}/cloudpss/job/messageStreamReceiver.py

@@ -27,7 +27,6 @@ class MessageStreamReceiver(JobReceiver):
     def __init__(self, output,**kwargs):
         super().__init__()
         self.id = output
-        print(kwargs)
         self.origin = kwargs.get("baseUrl",None)
         if self.origin is None:
             self.origin =os.environ.get("CLOUDPSS_API_URL", "https://cloudpss.net/")

{cloudpss-4.5.16 → cloudpss-4.5.18}/cloudpss/model/implements/diagram.py

@@ -73,7 +73,7 @@ class DiagramImplement(object):
 
         >>>> diagram.addComponent(args)
         """
-        id = "comp_" + str(uuid.uuid4())
+        id = "comp_" + str(uuid.uuid4()).replace("-", "_")
         shape = "diagram-component"
         definition = definition
         label = label or definition

{cloudpss-4.5.16 → cloudpss-4.5.18}/cloudpss/runner/runner.py

@@ -7,6 +7,7 @@ import random
 from deprecated import deprecated
 
 from cloudpss.utils.graphqlUtil import graphql_request
+from cloudpss.utils.parseDebugArgs import parse_debug_args
 from .receiver import Receiver
 from .MessageStreamReceiver import MessageStreamReceiver
 from .result import IESLabSimulationResult, PowerFlowResult, EMTResult, Result, IESResult
@@ -164,9 +165,12 @@ class Runner(Generic[T]):
         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]
+            parsed = parse_debug_args(debug)
+            if parsed is not None:
+                debugargs = parsed
+            # 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,

cloudpss-4.5.18/cloudpss/utils/parseDebugArgs.py

@@ -0,0 +1,93 @@
+def parse_debug_args(debug=None):
+    if not debug or not isinstance(debug, str):
+        return None
+
+    tokens = []
+
+    # 1. 先按照非转义的空格拆分字符串，获取每个 token
+    current_token = ''
+    escaping = False  # 表示当前是否在处理转义字符
+
+    for char in debug:
+        if escaping:
+            # 如果上一个字符是 '\'，则把当前字符直接添加到 token，并保留 '\' 以供二阶段使用
+            current_token += '\\' + char
+            escaping = False
+        elif char == '\\':
+            # 开始转义
+            escaping = True
+        elif char.isspace():
+            # 如果遇到空格 (并且不在转义状态)，说明一个 token 结束
+            if current_token:
+                tokens.append(current_token)
+                current_token = ''
+        else:
+            # 普通字符，直接添加
+            current_token += char
+
+    # 最后一个 token 加入数组（如果有的话）
+    if current_token:
+        tokens.append(current_token)
+
+    if not tokens:
+        return None
+
+    # 2. 对每个 token，找第一个非转义的 '=' 分割 key/value
+    entries = []
+
+    for token in tokens:
+        key = ''
+        value = ''
+        has_equal = False
+        escaping = False
+
+        # 我们只需要区分第一处真正的 '='
+        for char in token:
+            if escaping:
+                # 处理转义字符
+                if char == 'b':
+                    escaped_char = '\b'
+                elif char == 'f':
+                    escaped_char = '\f'
+                elif char == 'n':
+                    escaped_char = '\n'
+                elif char == 'r':
+                    escaped_char = '\r'
+                elif char == 't':
+                    escaped_char = '\t'
+                elif char == 'v':
+                    escaped_char = '\v'
+                else:
+                    escaped_char = char
+                
+                # 直接添加当前字符
+                if not has_equal:
+                    key += escaped_char
+                else:
+                    if escaped_char in ['\\', '$']:
+                        # 保留转义字符
+                        value += '\\' + escaped_char
+                    else:
+                        value += escaped_char
+                escaping = False
+            elif char == '\\':
+                escaping = True
+            elif char == '=' and not has_equal:
+                # 遇到第一个非转义的 '=' 时，视为 key/value 分隔
+                has_equal = True
+            else:
+                # 普通字符
+                if not has_equal:
+                    key += char
+                else:
+                    value += char
+
+        # 添加 key 和 value 到 entries 列表
+        entries.append((key, value))
+
+    return dict(entries)
+
+# 示例用法
+# debug_str = r"TASK_CMD=cloudpssrun:mkl DOCKER_MOUNT=/dev/disk/by-id:/dev/disk/by-id:ro\n/home/cloudpss/NR_ADPSS_HVDC37.key:/usr/include/NR_ADPSS_HVDC37.key:ro\n"
+# result = parse_debug_args(debug_str)
+# print(result)

cloudpss-4.5.18/cloudpss/version.py

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

{cloudpss-4.5.16 → cloudpss-4.5.18}/cloudpss.egg-info/PKG-INFO

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

{cloudpss-4.5.16 → cloudpss-4.5.18}/cloudpss.egg-info/SOURCES.txt

@@ -80,6 +80,7 @@ cloudpss/utils/dataEncoder.py
 cloudpss/utils/graphqlUtil.py
 cloudpss/utils/httprequests.py
 cloudpss/utils/matlab.py
+cloudpss/utils/parseDebugArgs.py
 cloudpss/utils/yamlLoader.py
 test/test-async.py
 test/test-async2.py
@@ -95,6 +96,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,6 +104,7 @@ 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

cloudpss-4.5.18/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.18/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.16/cloudpss/version.py

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