cloudpss 4.5.15__py3-none-any.whl → 4.5.17__py3-none-any.whl

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/job/messageStreamReceiver.py

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

cloudpss/job/messageStreamSender.py

@@ -15,7 +15,9 @@ class MessageStreamSender:
     def __init__(self, input,**kwargs):
         super().__init__()
         self.input = input
-        self.origin = kwargs.get("baseUrl",os.environ.get("CLOUDPSS_API_URL", "https://cloudpss.net/"))
+        self.origin = kwargs.get("baseUrl",None)
+        if self.origin is None:
+            self.origin =os.environ.get("CLOUDPSS_API_URL", "https://cloudpss.net/")
         self.__hasOpen = False
 
     def __on_message(self, ws, message):

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

@@ -1 +1 @@
-__version__ = '4.5.15'
+__version__ = '4.5.17'

{cloudpss-4.5.15.dist-info → cloudpss-4.5.17.dist-info}/METADATA

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

{cloudpss-4.5.15.dist-info → cloudpss-4.5.17.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cloudpss/__init__.py,sha256=xnA-UjehYOzH6KV7vOXHwdbGEiw6g_OPKzrbZA9Fuc8,858
 cloudpss/verify.py,sha256=KF4Gd59DGvCyIEkRD7rNnekWw22XxJpi3DW6keb6j4c,1498
-cloudpss/version.py,sha256=tSsepOcbNt8DX4JgJ-Dlwbcts2PAeUK69aReQTlWCkM,23
+cloudpss/version.py,sha256=odzwOZGBQ9G--qb4MBWz3OXJ2nnIAWLMQIvvMeGjDxg,23
 cloudpss/asyncio/__init__.py,sha256=CJGopQl_vz3z3fJsK7NjMX5uzkzfrJrbqKVhyYqlYWc,198
 cloudpss/asyncio/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
 cloudpss/asyncio/job/job.py,sha256=Bn2BEERw1J8YarFauTzVrGJK7nmaoMsdlrFUqiHRth4,3897
@@ -34,10 +34,10 @@ cloudpss/ieslab/__init__.py,sha256=gr1rXYw9vIAGOe60eg7LyMHP7QDXvNf4dJ5GTR_kj1Y,2
 cloudpss/job/TemplateCompiler.py,sha256=MuJDTQ54wRo5bGSvBJBJjXJ7u463dwpRkaLwIwm_hLE,9936
 cloudpss/job/TemplateManager.py,sha256=uOvctmE3P17aGWt_26d940FbRUSEs6iovFBb8T5xjd4,1115
 cloudpss/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
-cloudpss/job/job.py,sha256=vLJ7mIbrVfTWgQsUlk5bjM995wzu1q_Mee2AoW_MViM,8467
+cloudpss/job/job.py,sha256=wPRLvfTsVjFFuxuJvbTiHyDMenNP3amzt4iLwxHpTEc,8647
 cloudpss/job/jobReceiver.py,sha256=PNYxcN33LiXZVyc4tzhPlpWxKnyWO_ElKjJ9wsxsroI,925
-cloudpss/job/messageStreamReceiver.py,sha256=Yjrg8_dIq4MoqbNoQHX8LbCe916od8C1NxHa0xpWJmg,5509
-cloudpss/job/messageStreamSender.py,sha256=8I3h-y2zQQnI8zgS4NKVV2E9YmPPApX-kAzpauy0uOs,2396
+cloudpss/job/messageStreamReceiver.py,sha256=cbCzECT75ywtR2H5d0gNrTW4HS6PrNWB6yh5LXT6HLw,5593
+cloudpss/job/messageStreamSender.py,sha256=oNT4xpYR54MEk4W79GjkK4fxTTLq6DAhAA2f-v6Gzjc,2458
 cloudpss/job/result/EMTResult.py,sha256=T4LQdFMQoA1gtpw7twageYdTIf0Onb3O4tvTOMn-bkM,8334
 cloudpss/job/result/IESLabSimulationResult.py,sha256=a47Ic1vvfHTK_vEokOZxJBnQReqYOWux_aePPic_Hrs,84
 cloudpss/job/result/IESLabTypicalDayResult.py,sha256=tpWfN3G34l3qSXaTDDdPRSTXR4p7jY3AlP7o9e-A3VI,9554
@@ -52,7 +52,7 @@ cloudpss/model/revision.py,sha256=E3H-FOXsiwy1MDZC-Ky-QkzvOb5HApYSXP0llf8yJXQ,40
 cloudpss/model/topology.py,sha256=MJF3rQBLWus4RVO6L3Zwih7SWYjRWsLMcrcIBxCmIwM,2617
 cloudpss/model/implements/__init__.py,sha256=88L_wF9SSzxsbtqwStWIPH4LxaKq7TVcssHQ62YBnls,67
 cloudpss/model/implements/component.py,sha256=uNSpkZKChdXLiO40Ev4P3oQ1di2Hu4YjcBOb0I8Bf0c,734
-cloudpss/model/implements/diagram.py,sha256=-r9tTAIT_ET8ClPjcefAlBsMf2f1BytUi2F0L8pfdVc,6115
+cloudpss/model/implements/diagram.py,sha256=GnNWgM8jKc9L2lMDv3YZJVGnMa6dvE4rljF7PnSXjrY,6133
 cloudpss/model/implements/implement.py,sha256=Uld96tjXVDbVUNV8xscyy_nZWLHr3iP2DqA6S3p-XJE,954
 cloudpss/project/__init__.py,sha256=fpskY-cJGmMcTg1naVzNPtJaRG1xmSc2CFjDTin64Cw,51
 cloudpss/project/project.py,sha256=uFhOnM8ngo1_ZYz2uArtORKZquYNdOIVLXU_q1MDFI4,17698
@@ -64,7 +64,7 @@ cloudpss/runner/MessageStreamReceiver.py,sha256=dT-rKslQbRt3bMTGXupa1YrocHl2zTWO
 cloudpss/runner/__init__.py,sha256=FxiYYmssbZgRjieySzi43yPiWEF6eNos2UsoFQeD2H8,341
 cloudpss/runner/receiver.py,sha256=QU0RsbCt0EK7sCLHzfj8_QQsuPNfqXxpZi5JKm6roxA,4162
 cloudpss/runner/result.py,sha256=Q8RcfUnvilxPo6yvtjH6dXePaCqrBjQCljur3rem2pU,13290
-cloudpss/runner/runner.py,sha256=oCK1PdDNArk25v9S7xvE5r6xfQu0EKHKuxKQN0CLUHE,10093
+cloudpss/runner/runner.py,sha256=w4sImN1nymnyNkSEBhtVw4MjGpUuz_tEJAXWg0lxB6g,10273
 cloudpss/runner/storage.py,sha256=zFET_zwPIOF2Cnh9sgFiS0HFxV1OmVsU34bGUQ6PpkA,4162
 cloudpss/runner/transform.py,sha256=krOgTZiJSJAb5QSwerAqlbC4Ma0PKi__0WOZlAxw4O8,11613
 cloudpss/utils/IO.py,sha256=FsFp3V8I1-P0YiBGmjKwbMalBrVKMHUxTjFZFOtv0CQ,5357
@@ -73,8 +73,9 @@ cloudpss/utils/dataEncoder.py,sha256=5PUPb844eOGgFnYrMM8bdjdKH_MZz0lk-67uo8TvwEo
 cloudpss/utils/graphqlUtil.py,sha256=_bdHFlusvZd5p4I1iVq5nEKqeC2RdyiXbnfv7oQBvQA,332
 cloudpss/utils/httprequests.py,sha256=5FXdXU5GUrsmreL7nEnJe1eD564HyrT9_379SRzwjrU,1907
 cloudpss/utils/matlab.py,sha256=SLwVt790BjklJK2XNELt9R2n_1ej9Y8QsTIdFkKXLWE,795
+cloudpss/utils/parseDebugArgs.py,sha256=r8EptSHG9D-U7dT3pHFDclL-8G2La9w4GEjUAY-rsMc,3174
 cloudpss/utils/yamlLoader.py,sha256=bv_vPDK_e0n_vZ5FwpDJ_NJWqMAwfU3AbhkvQIxPCy4,2677
-cloudpss-4.5.15.dist-info/METADATA,sha256=KOqxUSwk2EAQaYAS8rdF8ksGhxjSHkRji366qm6Zqpg,2402
-cloudpss-4.5.15.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cloudpss-4.5.15.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
-cloudpss-4.5.15.dist-info/RECORD,,
+cloudpss-4.5.17.dist-info/METADATA,sha256=6q0FDJOJ52yNhohvngxBiDMCfWWugYVxQbla7AD1_NY,2402
+cloudpss-4.5.17.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cloudpss-4.5.17.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
+cloudpss-4.5.17.dist-info/RECORD,,