cloudpss 4.5.15__tar.gz → 4.5.17__tar.gz

{cloudpss-4.5.15 → cloudpss-4.5.17}/PKG-INFO

@@ -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 → cloudpss-4.5.17}/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.15 → cloudpss-4.5.17}/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-4.5.15 → cloudpss-4.5.17}/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-4.5.15 → cloudpss-4.5.17}/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.15 → cloudpss-4.5.17}/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.17/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.17/cloudpss/version.py

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

{cloudpss-4.5.15 → cloudpss-4.5.17}/cloudpss.egg-info/PKG-INFO

@@ -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 → cloudpss-4.5.17}/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

cloudpss-4.5.15/cloudpss/version.py

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