cloudpss 4.5.14__tar.gz → 4.5.16__tar.gz

{cloudpss-4.5.14 → cloudpss-4.5.16}/PKG-INFO

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

{cloudpss-4.5.14 → cloudpss-4.5.16}/cloudpss/job/job.py

@@ -65,6 +65,7 @@ class Job(Generic[T]):
         input,
         output,
         position,
+        **kwargs
     ):
         super(Job, self).__init__()
         self.id = id
@@ -84,9 +85,10 @@ class Job(Generic[T]):
         self.__receiver = None
         self.__sender = None
         self._result = None
+        self.baseUrl = kwargs.get("baseUrl", None)
 
     @staticmethod
-    def fetch(id):
+    def fetch(id, **kwargs):
         """
         获取job信息
         """
@@ -94,11 +96,10 @@ class Job(Generic[T]):
             raise Exception("id is None")
        
         variables = {"_a": {"id": id}}
-
-        r =  graphql_request(Job.__jobQuery, variables)
+        r =  graphql_request(Job.__jobQuery, variables,**kwargs)
         if "errors" in r:
             raise Exception(r["errors"])
-        return Job(**r["data"]["job"])
+        return Job(**r["data"]["job"],**kwargs)
         
     
     # @staticmethod
@@ -162,7 +163,7 @@ class Job(Generic[T]):
         }
         return variables
     @staticmethod
-    def create(revisionHash, job, config, name=None, rid=None, policy=None, **kwargs):
+    def create(revisionHash, job, config, name=None, rid=None, policy=None,  **kwargs):
         """
         创建一个运行任务
 
@@ -177,11 +178,11 @@ class Job(Generic[T]):
         >>> runner = Runner.runRevision(revision,job,config,'')
         """
         variables=Job.__createJobVariables(job, config, revisionHash, rid=rid, policy=policy, **kwargs)
-        r =  graphql_request(Job.__createJobQuery, variables)
+        r =  graphql_request(Job.__createJobQuery, variables,**kwargs)
         if "errors" in r:
             raise Exception(r["errors"])
         id = r["data"]["job"]["id"]
-        return  Job.fetch(id)
+        return  Job.fetch(id,**kwargs)
         
     
 
@@ -202,7 +203,7 @@ class Job(Generic[T]):
         if receiver is not None:
             self.__receiver = receiver
         if self.__receiver is None:
-            self.__receiver = MessageStreamReceiver(self.output)
+            self.__receiver = MessageStreamReceiver(self.output,baseUrl=self.baseUrl)
             self.__receiver.connect(**kwargs)
         return self.__receiver
 
@@ -216,7 +217,7 @@ class Job(Generic[T]):
         if sender is not None:
             self.__sender = sender
         if self.__sender is None:
-            self.__sender = MessageStreamSender(self.input)
+            self.__sender = MessageStreamSender(self.input,baseUrl=self.baseUrl)
         self.__sender.connect_legacy(**kwargs)
         return self.__sender
     
@@ -265,7 +266,7 @@ class Job(Generic[T]):
 
     
 
-    def abort(self,timeout=3):
+    def abort(self,timeout=3,**kwargs):
         """
         中断当前运行实例
         """
@@ -278,8 +279,8 @@ class Job(Generic[T]):
         '''
         variables = {
             'input': {
-                'id': self.taskId,
+                'id': self.id,
                 'timeout': timeout
             }
         }
-        graphql_request(query, variables)
+        graphql_request(query, variables,**kwargs)

{cloudpss-4.5.14 → cloudpss-4.5.16}/cloudpss/job/messageStreamReceiver.py

@@ -24,10 +24,13 @@ class Message(object):
     
     
 class MessageStreamReceiver(JobReceiver):
-    def __init__(self, output):
+    def __init__(self, output,**kwargs):
         super().__init__()
         self.id = output
-        self.origin = os.environ.get("CLOUDPSS_API_URL", "https://cloudpss.net/")
+        print(kwargs)
+        self.origin = kwargs.get("baseUrl",None)
+        if self.origin is None:
+            self.origin =os.environ.get("CLOUDPSS_API_URL", "https://cloudpss.net/")
         self.__hasOpen = False
         self.templates=TemplateManager()
         self.timeOffset=0
@@ -74,7 +77,6 @@ class MessageStreamReceiver(JobReceiver):
                     pass
                     
                     templateMessage = self.templates.invoke(msg)
-                    # print(templateMessage)
                     for m in templateMessage:
                         self.messages.append(m)
                     return
@@ -85,7 +87,6 @@ class MessageStreamReceiver(JobReceiver):
             self.messages.append(msg)
             return msg
         except Exception as e:
-            print(msg)
             self.ws.close()
             return None
 

{cloudpss-4.5.14 → cloudpss-4.5.16}/cloudpss/job/messageStreamSender.py

@@ -12,10 +12,12 @@ import logging
 
 
 class MessageStreamSender:
-    def __init__(self, input):
+    def __init__(self, input,**kwargs):
         super().__init__()
         self.input = input
-        self.origin = os.environ.get("CLOUDPSS_API_URL", "https://cloudpss.net/")
+        self.origin = kwargs.get("baseUrl",None)
+        if self.origin is None:
+            self.origin =os.environ.get("CLOUDPSS_API_URL", "https://cloudpss.net/")
         self.__hasOpen = False
 
     def __on_message(self, ws, message):

{cloudpss-4.5.14 → cloudpss-4.5.16}/cloudpss/job/result/EMTResult.py

@@ -145,15 +145,21 @@ class EMTResult(Result):
         else:
             raise Exception('transmitter is None')
         
-    def send(self,message):
+    def send(self,message=None):
         """
             发送消息
         """
         if self._sender is not None:
-            val =message
+            val ={
+                "type": 'virtual_input',
+                "data": message,
+            } 
             if type(message) is VirtualInput:
                 val = message.toJson()
             
+            if message is  None:
+                val = self.virtualInput.toJson()
+            
             self._sender.write(val)
         else:
             raise Exception('transmitter is None')

{cloudpss-4.5.14 → cloudpss-4.5.16}/cloudpss/model/model.py

@@ -298,7 +298,7 @@ class Model(object):
         return config
 
     @staticmethod
-    def fetchMany(name=None, cursor=[], pageSize=10,owner=None):
+    def fetchMany(name=None, cursor=[], pageSize=10,owner=None,**kwargs):
         """
         获取用户可以运行的项目列表
 
@@ -332,13 +332,13 @@ class Model(object):
         if name is not None:
             variables["_search"] = name
 
-        data = graphql_request(Model.__models_query, {"input": variables})
+        data = graphql_request(Model.__models_query, {"input": variables},**kwargs)
         if "errors" in data:
             raise Exception(data["errors"][0]["message"])
         return data["data"]["models"]['items']
 
     @staticmethod
-    def fetch(rid):
+    def fetch(rid,**kwargs):
         """
         获取项目
 
@@ -349,7 +349,7 @@ class Model(object):
         >>> model=Model.fetch('model/Demo/test')
 
         """
-        data = graphql_request(Model.__model_query, {"rid": rid})
+        data = graphql_request(Model.__model_query, {"rid": rid},**kwargs)
         if "errors" in data:
             raise Exception(data["errors"][0]["message"])
         return Model(data["data"]["model"])
@@ -464,7 +464,7 @@ class Model(object):
 
 
     @staticmethod
-    def create(model):
+    def create(model,**kwargs):
         """
         新建项目
 
@@ -506,12 +506,13 @@ class Model(object):
                     },
                 }
             },
+            **kwargs
         )
 
     
 
     @staticmethod
-    def update(model):
+    def update(model,**kwargs):
         """
         更新项目
 
@@ -555,7 +556,7 @@ class Model(object):
                     'tags': tags,
                     "permissions": permissions,
                 }
-            })
+            },**kwargs)
         if "errors" in r:
             raise Exception(r["errors"][0]["message"])
         return r

{cloudpss-4.5.14 → cloudpss-4.5.16}/cloudpss/model/revision.py

@@ -75,7 +75,8 @@ class ModelRevision(object):
 
             >>> revision.run(revision,job,config,'')
         """
-        revision= ModelRevision.create(self)
+        
+        revision= ModelRevision.create(self,**kwargs)
         if stop_on_entry is not None:
             job['args']['stop_on_entry'] = stop_on_entry
         return Job.create(
@@ -84,7 +85,7 @@ class ModelRevision(object):
     
 
     @staticmethod
-    def create(revision, parentHash=None):
+    def create(revision, parentHash=None, **kwargs):
         """
             创建一个新版本
 
@@ -95,12 +96,11 @@ class ModelRevision(object):
             >>> ModelRevision.create(model.revision)
             {hash:'4043acbddb9ce0c6174be65573c0380415bc48186c74a459f88865313743230c'}
         """
-
         r = revision.toJSON()
         if 'hash' in r:
             del r['hash']
         variables = {'a': {**r, 'parent': parentHash}}
-        r = graphql_request(ModelRevision.__createModelRevisionQuery, variables)
+        r = graphql_request(ModelRevision.__createModelRevisionQuery, variables,**kwargs)
         if 'errors' in r:
             raise Exception(r['errors'])
         

cloudpss-4.5.16/cloudpss/utils/graphqlUtil.py

@@ -0,0 +1,11 @@
+# coding=UTF-8
+import json
+from cloudpss.utils import request
+
+
+def graphql_request(query, variables=None, baseUrl=None,token=None,**kwargs):
+    payload = {'query': query, 'variables': variables}
+    
+    r = request('POST', 'graphql', data=json.dumps(payload),baseUrl=baseUrl,token=token, **kwargs)
+
+    return json.loads(r.text)

{cloudpss-4.5.14 → cloudpss-4.5.16}/cloudpss/utils/httprequests.py

@@ -12,7 +12,8 @@ def request(method, uri, baseUrl=None, params={}, token=None, **kwargs):
     if baseUrl == None:
         baseUrl = os.environ.get('CLOUDPSS_API_URL', 'https://cloudpss.net/')
     url = requests.compat.urljoin(baseUrl,uri)
-    token = os.environ.get('CLOUDPSS_TOKEN', None)
+    if token is None:
+        token = os.environ.get('CLOUDPSS_TOKEN', None)
     
     if token:
         headers = {

cloudpss-4.5.16/cloudpss/version.py

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

{cloudpss-4.5.14 → cloudpss-4.5.16}/cloudpss.egg-info/PKG-INFO

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

{cloudpss-4.5.14 → cloudpss-4.5.16}/cloudpss.egg-info/SOURCES.txt

@@ -107,4 +107,5 @@ test/test_modepower_ampratio(3).py
 test/test_ws.py
 test/test_ws2.py
 test/test_ws3.py
-test/testb.py
+test/testb.py
+test/testkey.py

cloudpss-4.5.16/test/testkey.py

@@ -0,0 +1,3 @@
+x=input("请输入一个数：")
+
+print(x)

cloudpss-4.5.14/cloudpss/utils/graphqlUtil.py

@@ -1,11 +0,0 @@
-# coding=UTF-8
-import json
-from cloudpss.utils import request
-
-
-def graphql_request(query, variables=None, **kwargs):
-    payload = {'query': query, 'variables': variables}
-    
-    r = request('POST', 'graphql', data=json.dumps(payload), **kwargs)
-
-    return json.loads(r.text)

cloudpss-4.5.14/cloudpss/version.py

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