cloudpss 4.0.8__tar.gz → 4.0.10__tar.gz

{cloudpss-4.0.8 → cloudpss-4.0.10}/PKG-INFO

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

{cloudpss-4.0.8 → cloudpss-4.0.10}/cloudpss/model/model.py

@@ -237,8 +237,10 @@ class Model(object):
                 ...
             ]
         """
-
-        
+        if owner is None:
+            owner=userName()
+        elif owner=='*':
+            owner=None
         query = """query($input:ModelsInput!){models(input:$input){cursor total count items{rid name description owner tags updatedAt }}}"""
         variables = {
             "cursor": cursor,
@@ -258,7 +260,6 @@ class Model(object):
 
         if "errors" in data:
             raise Exception(data["errors"][0]["message"])
-        print(data["data"]["models"]['items'])
         return data["data"]["models"]['items']
 
     @staticmethod

{cloudpss-4.0.8 → cloudpss-4.0.10}/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-4.0.10/cloudpss/version.py

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

{cloudpss-4.0.8 → cloudpss-4.0.10}/cloudpss.egg-info/PKG-INFO

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

cloudpss-4.0.8/cloudpss/version.py

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