cloudpss 4.0.17__tar.gz → 4.0.19__tar.gz

{cloudpss-4.0.17 → cloudpss-4.0.19}/PKG-INFO

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

{cloudpss-4.0.17 → cloudpss-4.0.19}/cloudpss/function/functionExecution.py

@@ -419,4 +419,14 @@ class FunctionExecution(object):
                 'yAxis': layout.get('yaxis', {}),
             }
         }
+        self.print(result)
+        
+    def custom(self, data, key=None,verb='replace'):
+        result = {
+            'key': key,
+            'version': 1,
+            'verb': verb,
+            'type': 'custom',
+            'data': data
+        }
         self.print(result)

{cloudpss-4.0.17 → cloudpss-4.0.19}/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

{cloudpss-4.0.17 → cloudpss-4.0.19}/cloudpss/runner/runner.py

@@ -143,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": {
@@ -151,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
             }
@@ -185,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.19/cloudpss/version.py

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

{cloudpss-4.0.17 → cloudpss-4.0.19}/cloudpss.egg-info/PKG-INFO

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

{cloudpss-4.0.17 → cloudpss-4.0.19}/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.17 → cloudpss-4.0.19}/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.19/test/test.py

@@ -0,0 +1,29 @@
+
+import time
+import sys
+import os
+
+sys.path.append(os.path.join(os.path.dirname(__file__), '..\\'))
+import cloudpss
+import time
+import numpy as np
+import pandas as pd
+import json
+
+if __name__ == '__main__':
+    os.environ['CLOUDPSS_API_URL'] = 'http://10.101.10.45/'
+    print('CLOUDPSS connected')
+    cloudpss.setToken(
+        'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcm5hbWUiOiJhZG1pbiIsInNjb3BlcyI6WyJtb2RlbDo5ODMzNSIsImZ1bmN0aW9uOjk4MzM1IiwiYXBwbGljYXRpb246OTgzMzUiXSwicm9sZXMiOlsiYWRtaW4iXSwidHlwZSI6ImFwcGx5IiwiZXhwIjoxNzI0NTU3MDIzLCJub3RlIjoiYSIsImlhdCI6MTY5MzQ1MzAyM30._Xuyo62ESKLcIAFeNdnfBM44yPiiXli9OPKvXDzL2rPV4J1_qsGZP--bsS1tXAVy-x8ooUIIAAG1yhwmZuk7-Q')
+    print('Token done')
+    # 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')
+    
+    
+    

{cloudpss-4.0.17 → cloudpss-4.0.19}/test/testRt.py

@@ -46,7 +46,7 @@ class RealTimeSream(socketio.ClientNamespace):
         virtual_input=self.config['virtual_input']
         virtual_output=self.config['virtual_output']
         display=self.config['display']
-        
+        data=data['data']
         d ={}
         for x,v in display.items():
             d[v]=x
@@ -79,7 +79,8 @@ class RealTimeSream(socketio.ClientNamespace):
         d ={}
         for x,v in display.items():
             d[v]=x
-        data =struct.unpack('d'*int(len(msg)/8),msg)
+        data =msg['data']
+        data =struct.unpack('d'*int(len(data)/8),data)
         i = 0
         runTime =0
         self.series=[]
@@ -140,7 +141,7 @@ if __name__ == '__main__':
     # logging.basicConfig(level=logging.DEBUG)
     job = cloudpss.currentJob()
     
-    remoteAddr= job.args.get('remoteAddr','http://10.101.10.91/')
+    remoteAddr= job.args.get('remoteAddr','http://10.101.10.104:13336/')
     
     if not remoteAddr.startswith('http://'):
         remoteAddr='http://'+remoteAddr
@@ -154,12 +155,13 @@ if __name__ == '__main__':
         job.custom(inputNumericValue,'numeric')
         job.custom(outputNumericValue,'output')
         # print(json.dumps(inputNumericValue),flush=True)
+        # print(json.dumps(outputNumericValue),flush=True)
         
     def chartCallBack(series):
-        for serie in series:
-            job.plot([serie],key=serie['name'])
+        # for serie in series:
+            # job.plot([serie],key=serie['name'])
         # job.plot(series,key='test1')
-    
+        pass
     def onStartJob(config):
         virtual_input=config['virtual_input']
         virtual_output=config['virtual_output']

{cloudpss-4.0.17 → cloudpss-4.0.19}/test/testRt2.py

@@ -134,7 +134,7 @@ if __name__ == '__main__':
     # logging.basicConfig(level=logging.DEBUG)
     job = cloudpss.currentJob()
     
-    remoteAddr= job.args.get('remoteAddr','http://10.101.10.91/')
+    remoteAddr= job.args.get('remoteAddr','http://10.101.10.104/')
     
     inputKey= job.args.get('inputKey',None)
     inputValue= job.args.get('inputValue',None)

cloudpss-4.0.17/cloudpss/version.py

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

cloudpss-4.0.17/test/test.py

@@ -1,42 +0,0 @@
-
-import time
-import sys
-import os
-
-sys.path.append(os.path.join(os.path.dirname(__file__), '..\\'))
-import cloudpss
-import time
-import numpy as np
-import pandas as pd
-import json
-
-if __name__ == '__main__':
-    # os.environ['CLOUDPSS_API_URL'] = 'http://10.101.10.45/'
-    # print('CLOUDPSS connected')
-    # 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':{}})
-    
-    
-    
-    # topology= project.fetchTopology(config={'args':{}})
-
-    # topology.dump(topology,'test.json')
-    
-    # tk=None
-    tk = 'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcm5hbWUiOiJhZG1pbiIsInNjb3BlcyI6WyJicm93c2VyIl0sInR5cGUiOiJicm93c2VyIiwiZXhwIjoxNzE2NTM4OTY0LCJpYXQiOjE3MTM4NjA1NjR9.caupiw4utZ_K-OwaHxBnuU0yLYcsNWZXwRuEp80Ij2ENW3ckP7HUUaUBEewfpTYRaXS4MnWq2zz1KJGJnrh_4A'
-    apiURL = 'http://cloudpss-calculate.local.ddns.cloudpss.net/'
-    print('Start')
-    username = 'admin' #用户名
-    projectKey = 'zdh_sx_test'
-
-    cloudpss.setToken(tk)
-    os.environ['CLOUDPSS_API_URL'] = apiURL
-    project = cloudpss.Model.fetch('model/'+username+'/'+projectKey)
-    
-    
-