cloudpss 4.0.14__tar.gz → 4.0.16__tar.gz

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

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

{cloudpss-4.0.14 → cloudpss-4.0.16}/cloudpss/model/model.py

@@ -394,7 +394,6 @@ class Model(object):
             if matchObj:
                 self.rid = 'model/' + username + '/' + key
                 try:
-                    r = request('GET', 'api/resources/' + self.rid)
                     return Model.update(self)
                 except:
                     return Model.create(self)
@@ -408,7 +407,6 @@ class Model(object):
             elif owner[0] != username:
                 rid = re.sub(t, username, self.rid)
                 try:
-                    r = request('GET', 'api/resources/' + self.rid)
                     return Model.create(self)
                 except:
                     raise Exception(rid + ' 该资源已存在，无法重复创建,请修改 key')
@@ -448,7 +446,7 @@ class Model(object):
         auth = (65539 if publicRead else 65537) if isPublic else 0
         revision = ModelRevision.create(model.revision, model.revision.hash)
 
-        return graphql_request(
+        r= graphql_request(
             modelQuery, {
                 'a': {
                     'rid': model.rid,
@@ -466,7 +464,9 @@ class Model(object):
                     },
                 }
             })
-
+        if "errors" in r:
+            raise Exception(r["errors"][0]["message"])
+        return r
     @staticmethod
     def update(model):
         """
@@ -506,7 +506,7 @@ class Model(object):
         if xVersion==3:
             tags=model.tags
         
-        return graphql_request(
+        r= graphql_request(
             modelQuery, {
                 'a': {
                     'rid': model.rid,
@@ -524,6 +524,9 @@ class Model(object):
                     },
                 }
             })
+        if "errors" in r:
+            raise Exception(r["errors"][0]["message"])
+        return r
 
     def fetchTopology(
         self,

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

@@ -46,13 +46,13 @@ class MessageStreamReceiver(object):
         path = head + '://' + str(u[1]) + '/api/streams/id/' + id
         if fr0m is not None:
             path = path + '&from=' + str(fr0m)
-        ws = websocket.WebSocketApp(path,
+        self.ws = websocket.WebSocketApp(path,
                                     on_open=on_open,
                                     on_message=on_message,
                                     on_error=on_error,
                                     on_close=on_close)
-        ws.run_forever()
-        return ws
+        self.ws.run_forever()
+        return self.ws
 
     ###下面是兼容Receiver部分功能实现
     def on_message(self, ws, message):

cloudpss-4.0.16/cloudpss/version.py

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

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

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

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

@@ -16,15 +16,14 @@ if __name__ == '__main__':
     cloudpss.setToken(
         'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcm5hbWUiOiJhZG1pbiIsInNjb3BlcyI6WyJtb2RlbDo5ODMzNSIsImZ1bmN0aW9uOjk4MzM1IiwiYXBwbGljYXRpb246OTgzMzUiXSwicm9sZXMiOlsiYWRtaW4iXSwidHlwZSI6ImFwcGx5IiwiZXhwIjoxNzI0NTU3MDIzLCJub3RlIjoiYSIsImlhdCI6MTY5MzQ1MzAyM30._Xuyo62ESKLcIAFeNdnfBM44yPiiXli9OPKvXDzL2rPV4J1_qsGZP--bsS1tXAVy-x8ooUIIAAG1yhwmZuk7-Q')
     print('Token done')
-    
-    job = cloudpss.currentJob()
-    print(job.args,flush=True)
-    # project = cloudpss.Model.fetch('model/admin/7744b02b-0636-5a39-8c16-eca939259ee1')
+    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= project.fetchTopology(config={'args':{}})
 
     # topology.dump(topology,'test.json')
     

cloudpss-4.0.14/cloudpss/version.py

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