cloudpss 4.0.16__tar.gz → 4.0.18__tar.gz

{cloudpss-4.0.16 → cloudpss-4.0.18}/PKG-INFO

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

{cloudpss-4.0.16 → cloudpss-4.0.18}/cloudpss/runner/MessageStreamReceiver.py

@@ -19,7 +19,7 @@ class Message(object):
 class MessageStreamReceiver(object):
     """消息流读取函数结果"""
 
-    def __init__(self, id, db):
+    def __init__(self, id, db, **kwargs):
         self.origin = os.environ.get('CLOUDPSS_API_URL',
                                      'https://cloudpss.net/')
         self.id = id
@@ -61,8 +61,6 @@ class MessageStreamReceiver(object):
         if "when" not in msg:
             msg['when']= datetime.datetime.now()
         self.db.storeMessage(msg)
-        if(msg['type']=='terminate'):
-            self.close(self.ws)
 
     def on_error(self, ws, error):
         msg = {
@@ -88,6 +86,7 @@ class MessageStreamReceiver(object):
 
     def close(self, ws):
         ws.close()
+        self._status = 1
 
     def status(self):
         return self._status

{cloudpss-4.0.16 → cloudpss-4.0.18}/cloudpss/runner/runner.py

@@ -74,6 +74,7 @@ class Runner(Generic[T]):
         """
         if self.receiver is None:
             raise Exception('not find receiver')
+        time.sleep(0)
         return self.receiver.status()
 
     def __listen(self, **kwargs):
@@ -142,6 +143,16 @@ class Runner(Generic[T]):
             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,
+            rid,
+            f"model/@sdk/{str(int(time.time() * random.random()))}",
+        ]
+        
+        PARENT_JOB_ID =kwargs.get("PARENT_JOB_ID",None)
+        if PARENT_JOB_ID is not None:
+            context.append(f"job/parent/{PARENT_JOB_ID}")
         variables = {
             "input": {
                 "args": {
@@ -150,11 +161,7 @@ class Runner(Generic[T]):
                     "_ModelArgs": config["args"],
                     "implement":implement
                 },
-                "context": [
-                    function,
-                    rid,
-                    f"model/@sdk/{str(int(time.time() * random.random()))}",
-                ],
+                "context": context,
                 "policy": policy,
                 "debug":debugargs
             }
@@ -184,7 +191,7 @@ class Runner(Generic[T]):
 
 
         query = '''mutation($input:CreateJobInput!){job:createJob(input:$input){id input output status position}}'''
-        variables = Runner.__createJobVariables(job, config, revisionHash, rid,policy)
+        variables = Runner.__createJobVariables(job, config, revisionHash, rid,policy, **kwargs)
         r = graphql_request(query, variables)
         if 'errors' in r:
             raise Exception(r['errors'])

cloudpss-4.0.18/cloudpss/version.py

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

{cloudpss-4.0.16 → cloudpss-4.0.18}/cloudpss.egg-info/PKG-INFO

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

{cloudpss-4.0.16 → cloudpss-4.0.18}/cloudpss.egg-info/requires.txt

@@ -6,7 +6,7 @@ PyJWT
 numpy
 PyYAML
 requests
-websocket-client
+websocket-client>=1.4.0
 pytz
 deprecated
 zstandard

{cloudpss-4.0.16 → cloudpss-4.0.18}/setup.py

@@ -24,6 +24,6 @@ setup(
     python_requires='>=3.7',
     install_requires=[
         'cffi', 'cryptography', 'cycler', 'pycparser', 'PyJWT', 'numpy',
-        'PyYAML', 'requests', 'websocket-client', 'pytz', 'deprecated','zstandard','py-ubjson'
+        'PyYAML', 'requests', 'websocket-client>=1.4.0', 'pytz', 'deprecated','zstandard','py-ubjson'
     ],
 )

{cloudpss-4.0.16 → cloudpss-4.0.18}/test/test.py

@@ -16,16 +16,14 @@ if __name__ == '__main__':
     cloudpss.setToken(
         'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcm5hbWUiOiJhZG1pbiIsInNjb3BlcyI6WyJtb2RlbDo5ODMzNSIsImZ1bmN0aW9uOjk4MzM1IiwiYXBwbGljYXRpb246OTgzMzUiXSwicm9sZXMiOlsiYWRtaW4iXSwidHlwZSI6ImFwcGx5IiwiZXhwIjoxNzI0NTU3MDIzLCJub3RlIjoiYSIsImlhdCI6MTY5MzQ1MzAyM30._Xuyo62ESKLcIAFeNdnfBM44yPiiXli9OPKvXDzL2rPV4J1_qsGZP--bsS1tXAVy-x8ooUIIAAG1yhwmZuk7-Q')
     print('Token done')
-    project = cloudpss.Model.fetch('model/admin/aaaa')
-    project.save(key='asdfasd111')
-    # topology =project.fetchTopology()
-    # topology = cloudpss.ModelTopology.fetch("-xrS3SewFhpVYKBtIXLk-XDLCQRQnUmlIbXS3s4sdPUkPKeAMhXHjRgZD1JPjPfQ","emtp",{'args':{}})
+    # project = cloudpss.Model.fetch('model/admin/7744b02b-0636-5a39-8c16-eca939259ee1')
+    topology = cloudpss.ModelTopology.fetch("-xrS3SewFhpVYKBtIXLk-XDLCQRQnUmlIbXS3s4sdPUkPKeAMhXHjRgZD1JPjPfQ","emtp",{'args':{}})
     
     
     
     # topology= project.fetchTopology(config={'args':{}})
 
-    # topology.dump(topology,'test.json')
+    topology.dump(topology,'test.json')
     
     
     

cloudpss-4.0.16/cloudpss/version.py

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