cloudpss 4.0.9__py3-none-any.whl → 4.0.11__py3-none-any.whl

cloudpss/model/model.py

@@ -205,6 +205,7 @@ class Model(object):
 
         config = deepcopy(self.configs[0])
         config['name'] = name
+        self.__updateConfigDefault(config)
         return config
 
     def addConfig(self, config):
@@ -218,6 +219,7 @@ class Model(object):
         """
 
         self.configs.append(config)
+        self.__updateConfigDefault(config)
         return config
 
     @staticmethod
@@ -324,6 +326,7 @@ class Model(object):
         if config is None:
             currentConfig = self.context['currentConfig']
             config = self.configs[currentConfig]
+        self.__updateConfigDefault(config)
         return self.revision.run(job, config, name, self.rid, **kwargs)
 
     def iesSimulationRun(self, job=None, config=None, name=None, **kwargs):
@@ -552,6 +555,16 @@ class Model(object):
                 maximumDepth)
         return None
 
+    def __updateConfigDefault(self, config):
+        paramters = self.revision.parameters
+        if paramters is None:
+            return
+        for param in paramters:
+            for val in param['items']:
+                if config['args'].get(val['key'],None) is None:
+                    print(val['key'])
+                    config['args'][val['key']] = val['value']
+    
     def runEMT(self,job=None,config=None)->Runner[EMTResult]:
         '''
             运行 emtp 内核，如果当前 model 没有创建  Job 时报错，默认使用第一个计算方案，进行仿真。
@@ -575,6 +588,7 @@ class Model(object):
         if config is None:
             currentConfig = self.context['currentConfig']
             config = self.configs[currentConfig]
+        
         return self.run(job=job, config=config)
 
     def runSFEMT(self,job=None,config=None)->Runner[EMTResult]:

cloudpss/runner/runner.py

@@ -117,6 +117,49 @@ class Runner(Generic[T]):
         graphql_request(query, variables)
 
 
+    @staticmethod
+    def __createJobVariables(job, config, revisionHash, rid, policy, **kwargs):
+        # 处理policy字段
+        if policy is None:
+            policy = {}
+            if policy.get("tres", None) is None:
+                policy["tres"] = {}
+            policy["queue"] = job["args"].get("@queue", 1)
+            policy["priority"] = job["args"].get("@priority", 0)
+            tres = {"cpu": 1, "ecpu": 0, "mem": 0}
+            tresStr = job["args"].get("@tres", "")
+            for t in re.split("\s+", tresStr):
+                if t == "":
+                    continue
+                k, v = t.split("=")
+                tres[k] = float(v)  # type: ignore
+            policy["tres"] = tres
+        function = job["rid"].replace("job-definition/cloudpss/", "function/CloudPSS/")
+        implement = kwargs.get("implement", None)
+        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]
+        variables = {
+            "input": {
+                "args": {
+                    **job["args"],
+                    "_ModelRevision": revisionHash,
+                    "_ModelArgs": config["args"],
+                    "implement":implement
+                },
+                "context": [
+                    function,
+                    rid,
+                    f"model/@sdk/{str(int(time.time() * random.random()))}",
+                ],
+                "policy": policy,
+                "debug":debugargs
+            }
+        }
+        return variables
     @staticmethod
     def create(revisionHash,
                job,
@@ -139,42 +182,9 @@ class Runner(Generic[T]):
             >>> runner = Runner.runRevision(revision,job,config,'')
         '''
 
-        #处理policy字段
-        if policy is None:
-            policy = {}
-            if policy.get('tres', None) is None:
-                policy['tres'] = {}
-            policy['queue'] = job['args'].get('@queue', 1)
-            policy['priority'] = job['args'].get('@priority', 0)
-            tres = {'cpu': 1, 'ecpu': 0, 'mem': 0}
-            tresStr = job['args'].get('@tres', '')
-            for t in re.split('\s+', tresStr):
-                if t == '':
-                    continue
-                k, v = t.split('=')
-                tres[k] = float(v)  #type: ignore
-            policy['tres'] = tres
 
         query = '''mutation($input:CreateJobInput!){job:createJob(input:$input){id input output status position}}'''
-        function = job['rid'].replace('job-definition/cloudpss/',
-                                      'function/CloudPSS/')
-        variables = {
-            'input': {
-                "args":
-                {
-                    **job['args'],
-                    '_ModelRevision' : revisionHash,
-                    '_ModelArgs' : config['args']
-                },
-                "context": [
-                    function,
-                    f"model/@sdk/{str(int(time.time() * random.random()))}",
-                    rid
-                ],
-                "policy":
-                policy,
-            }
-        }
+        variables = Runner.__createJobVariables(job, config, revisionHash, rid,policy)
         r = graphql_request(query, variables)
         if 'errors' in r:
             raise Exception(r['errors'])

cloudpss/version.py

@@ -1 +1 @@
-__version__ = '4.0.9'
+__version__ = '4.0.11'

{cloudpss-4.0.9.dist-info → cloudpss-4.0.11.dist-info}/METADATA

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

{cloudpss-4.0.9.dist-info → cloudpss-4.0.11.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cloudpss/__init__.py,sha256=Ov8K45KxSsPalPErvTRUb2GvPdJ3myucFqx7s37_YZo,777
 cloudpss/verify.py,sha256=KF4Gd59DGvCyIEkRD7rNnekWw22XxJpi3DW6keb6j4c,1498
-cloudpss/version.py,sha256=2oNKSIKlnfdd0ZbA1rgLav4jBtGlvL2-YyRkzkXQ-4Y,21
+cloudpss/version.py,sha256=sdtjfBeJZTJftxJnJqDQWlcNEVcMwxpLtEjGi92XS0A,22
 cloudpss/asyncio/__init__.py,sha256=CJGopQl_vz3z3fJsK7NjMX5uzkzfrJrbqKVhyYqlYWc,198
 cloudpss/asyncio/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
 cloudpss/asyncio/job/job.py,sha256=ExA-8JVOWWW5neVvNazPk4i3Z-q8xqYBL4qXU1m3rgM,3891
@@ -37,7 +37,7 @@ cloudpss/job/view/__init__.py,sha256=j_X6aFeY-wa6_0r1EixE0rrvGz_67m4fIqOLmUbkxqY
 cloudpss/job/view/view.py,sha256=JEv3uWw2DTKNmtdvviztH4Y5Hp2ucFXPNrGOkFv8byU,4280
 cloudpss/model/__init__.py,sha256=SNq-bfwcQtDHtTNBYppfUEs8wkjfrQfGeywx7igmvOs,151
 cloudpss/model/jobDefinitions.py,sha256=XqjaaWOLU7zlVHM7TQJbZ3rNBWfBY7eT-5aE6EAatcQ,3770
-cloudpss/model/model.py,sha256=1yq36RkXJIKIZARMGiDt9MThI5x9bs6-SgO_8Vptqxg,26010
+cloudpss/model/model.py,sha256=e5U0nvSd4dTiqV0kGQQV4PDEOjzaMaWqb8wGZbWlkBQ,26527
 cloudpss/model/revision.py,sha256=YZU7OJV6kC5eyQd7iQwwvZ6gjW3eZNmcm3yQDkUOOKs,3764
 cloudpss/model/topology.py,sha256=eJVxvdVOjvLz6jd3Q4MgAMBKVvM8ZWby8gLkIta-K5Y,2234
 cloudpss/model/implements/__init__.py,sha256=88L_wF9SSzxsbtqwStWIPH4LxaKq7TVcssHQ62YBnls,67
@@ -53,7 +53,7 @@ cloudpss/runner/MessageStreamReceiver.py,sha256=_G_7LIFdm7EtOf046nT-V3HNmygAm2oo
 cloudpss/runner/__init__.py,sha256=aZ00V2AzQNBbER0xi6pqFFyiLFM-6r1fxvzdxxUJA_4,241
 cloudpss/runner/receiver.py,sha256=d8vOtBJ_Iqo3syJXgFFxwii1MXF7CyHRoXy6eT81Zq4,4096
 cloudpss/runner/result.py,sha256=GFpd7848gsLRuzhVcWbCwmAjR84Lhik_3pNCjOV8VOY,13291
-cloudpss/runner/runner.py,sha256=207PVoD3mjPiqWy6Qt3L5EU0woO7jmv_xj_bRuE9tDU,7299
+cloudpss/runner/runner.py,sha256=dyh_Sm38F-W8HatjRuVFEqd5Jla-d_GasRZ978zdMvw,7808
 cloudpss/runner/storage.py,sha256=zFET_zwPIOF2Cnh9sgFiS0HFxV1OmVsU34bGUQ6PpkA,4162
 cloudpss/runner/transform.py,sha256=krOgTZiJSJAb5QSwerAqlbC4Ma0PKi__0WOZlAxw4O8,11613
 cloudpss/utils/IO.py,sha256=Uh1NOlBn15Jl5_aWS2QRO2-QsKlFT9o8DPtP8-8Z2PA,5314
@@ -63,7 +63,7 @@ cloudpss/utils/graphqlUtil.py,sha256=swl6XT1UmUQHdHjMWw3M0i8meEmVKNQvX0SHsbgg8TU
 cloudpss/utils/httprequests.py,sha256=-RYi1Dc4QDqqupuw0x-lq74dFvCqPrZfCJKgrdolEpk,1643
 cloudpss/utils/matlab.py,sha256=SLwVt790BjklJK2XNELt9R2n_1ej9Y8QsTIdFkKXLWE,795
 cloudpss/utils/yamlLoader.py,sha256=KRlRkHFltOjqxa_sesdBLf1W5J7XTgvubszsSw-XR0U,2885
-cloudpss-4.0.9.dist-info/METADATA,sha256=QFCkrdrZ42g811aO48rq2YLeqgwLjSQKyxgTORyVIe4,2368
-cloudpss-4.0.9.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cloudpss-4.0.9.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
-cloudpss-4.0.9.dist-info/RECORD,,
+cloudpss-4.0.11.dist-info/METADATA,sha256=3_b5weJo20GM4_TdHC45UlKfty0s5cQdWYgpv5E8SwI,2369
+cloudpss-4.0.11.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cloudpss-4.0.11.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
+cloudpss-4.0.11.dist-info/RECORD,,