cloudpss 4.5.1a4__py3-none-any.whl → 4.5.1a5__py3-none-any.whl

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/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/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/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.1-alpha.4'
+__version__ = '4.5.1-alpha.5'

{cloudpss-4.5.1a4.dist-info → cloudpss-4.5.1a5.dist-info}/METADATA

@@ -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.dist-info → cloudpss-4.5.1a5.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=eGA062vl8AmZfcIp-LER6wH9XoJb0sNElWP_UI1RVzg,30
+cloudpss/version.py,sha256=WQQpTkl0Fv5kum9EfUBunVFJl-fchr774Np_AamkokQ,30
 cloudpss/asyncio/__init__.py,sha256=CJGopQl_vz3z3fJsK7NjMX5uzkzfrJrbqKVhyYqlYWc,198
 cloudpss/asyncio/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
 cloudpss/asyncio/job/job.py,sha256=Bn2BEERw1J8YarFauTzVrGJK7nmaoMsdlrFUqiHRth4,3897
@@ -14,8 +14,8 @@ cloudpss/asyncio/utils/AsyncIterable.py,sha256=AIWYrTnmjsIfOowE3asZlexdHNhpK2gm7
 cloudpss/asyncio/utils/__init__.py,sha256=F-rCvgRAGcV-fFO7o-dsXwooyhcVpElWoBEQM67kO7c,84
 cloudpss/asyncio/utils/httpAsyncRequest.py,sha256=KIck-3uQwGcHMIJ6632_Zo0syc4GnNG2EoUXmQh54ck,2692
 cloudpss/dslab/__init__.py,sha256=UdLDA9OArvLndHtumYAMMHdr5h8S6DrZCYkXIi2Mb4Y,45
-cloudpss/dslab/dataManageModel.py,sha256=NeG2YbIappMxAOCZGfFUcOBwo2Kyhh27kHMFK37re60,12711
-cloudpss/dslab/dslab.py,sha256=K__KohK6w6Alj3WCmLJQ2pr_RPFvvtnce2C6tdLhTIE,9914
+cloudpss/dslab/dataManageModel.py,sha256=iOtpQ2uG4nK2pXztf_wnDnn4OAvX4yokGvXbbSQjqAw,12857
+cloudpss/dslab/dslab.py,sha256=HTr8dKy6UNbQfX9NlCxmgL7OTwuBoHIwF9kW7PjcoXU,10751
 cloudpss/dslab/financialAnalysisModel.py,sha256=t9cZ03yWvLN5ojVeLp-UGgFBIFVU5wbnn5E0UHZA0ws,5062
 cloudpss/dslab/files/__init__.py,sha256=l2g0VadtTiMW39zwCwHPHUC01Kbklb_nFUPVeQ16FwM,58
 cloudpss/dslab/files/curveData.py,sha256=GU_DTTKjVn_ln9Hx0q9CFgfmNtokZi7b4DYSzGeP5dk,4291778
@@ -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=DPMiG_M-baWUAX7o9vL7p_Zr-r9nnTky5OYjig_yenU,9613
+cloudpss/runner/runner.py,sha256=fBsJEzquXP87ynWBfW9zynH9EzK9aLCaZHu1GqnbI7w,9727
 cloudpss/runner/storage.py,sha256=zFET_zwPIOF2Cnh9sgFiS0HFxV1OmVsU34bGUQ6PpkA,4162
 cloudpss/runner/transform.py,sha256=krOgTZiJSJAb5QSwerAqlbC4Ma0PKi__0WOZlAxw4O8,11613
 cloudpss/utils/IO.py,sha256=sm6p53AFgE1b56Bh0qt_E2TFP5tLr0WQDzIVRlsNgFA,5321
@@ -73,8 +73,9 @@ cloudpss/utils/dataEncoder.py,sha256=5PUPb844eOGgFnYrMM8bdjdKH_MZz0lk-67uo8TvwEo
 cloudpss/utils/graphqlUtil.py,sha256=zGEhRZvy5JMipFKFxjDmbc-HQP3aPZ5noDwi-RTXWSk,280
 cloudpss/utils/httprequests.py,sha256=KYE8iIqaBEN6gTdxFgUyvdKf3kbSizxxgmNN8_1BQjQ,1850
 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.1a4.dist-info/METADATA,sha256=w_5acTa5b8_g4khe4TZB2P00TwOfowToLtpDNIkiu7E,2403
-cloudpss-4.5.1a4.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cloudpss-4.5.1a4.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
-cloudpss-4.5.1a4.dist-info/RECORD,,
+cloudpss-4.5.1a5.dist-info/METADATA,sha256=MSrlV6VoOl_i2PFTjg1Lb9ySbBYtzol2zQoa73tEuus,2403
+cloudpss-4.5.1a5.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cloudpss-4.5.1a5.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
+cloudpss-4.5.1a5.dist-info/RECORD,,