cloudpss 4.5.21__py3-none-any.whl → 4.5.22__py3-none-any.whl

cloudpss/model/model.py

@@ -487,6 +487,20 @@ class Model(object):
 
         revision = ModelRevision.create(model.revision, model.revision.hash)
 
+        # 使用默认权限对象，但如果model的permissions字段中有相关权限值就使用model中的数值
+        default_permissions = {
+            "moderator": 98367,
+            "member": 65551,
+            "everyone": 0
+        }
+        
+        # 如果model有permissions字段，则合并权限值
+        model_permissions = getattr(model, 'permissions', {})
+        if isinstance(model_permissions, dict):
+            permissions = {**default_permissions, **model_permissions}
+        else:
+            permissions = default_permissions
+
         return graphql_request(
             Model.__create_model,
             {
@@ -499,11 +513,7 @@ class Model(object):
                     "name": model.name,
                     "description": model.description,
                     "tags": model.tags,
-                    "permissions": {
-                       "moderator": 98367,
-                        "member": 65551,
-                        "everyone": 0
-                    },
+                    "permissions": permissions,
                 }
             },
             **kwargs
@@ -543,6 +553,20 @@ class Model(object):
         if xVersion==3:
             tags=model.tags
         
+        # 使用默认权限对象，但如果model的permissions字段中有相关权限值就使用model中的数值
+        default_permissions = {
+            "moderator": 98367,
+            "member": 65551,
+            "everyone": 0
+        }
+        
+        # 如果model有permissions字段，则合并权限值
+        model_permissions = getattr(model, 'permissions', {})
+        if isinstance(model_permissions, dict):
+            permissions = {**default_permissions, **model_permissions}
+        else:
+            permissions = default_permissions
+
         r= graphql_request(
             Model.__update_model, {
                 'a': {

cloudpss/model/topology.py

@@ -56,7 +56,7 @@ class ModelTopology():
         f.close()
         
     @staticmethod
-    def fetch(hash, implementType, config, maximumDepth=None, **kwargs):
+    def fetch(hash, implementType, config, maximumDepth=None,topology=None, **kwargs):
         """
             获取拓扑
 
@@ -86,6 +86,12 @@ class ModelTopology():
                 ports
             """
             del kwargs['ports']
+        
+        if topology is not None:
+            if not isinstance(topology, ModelTopology):
+                raise TypeError("topology must be an instance of ModelTopology")
+            variables['a']['topology'] = topology.toJSON()
+            
         query = ModelTopology.__modelTopologyQuery + ModelTopology.__ReqParam + "}}"
         
         

cloudpss/utils/graphqlUtil.py

@@ -1,11 +1,13 @@
 # coding=UTF-8
 import json
 from cloudpss.utils import request
+from cloudpss.utils.IO import IO
 
 
 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)
+    
+    r = request('POST', 'graphql', data=IO.serialize(payload,'json'),baseUrl=baseUrl,token=token, **kwargs)
 
     return json.loads(r.text)

cloudpss/utils/httprequests.py

@@ -18,8 +18,8 @@ def request(method, uri, baseUrl=None, params={}, token=None, **kwargs):
     if token:
         headers = {
             'Authorization': 'Bearer ' + token,
-            'Content-Type': 'application/json; charset=utf-8',
-                "User-Agent": "cloudpss-sdk-python/" + __version__
+            'Content-Type': 'application/json+gzip; charset=utf-8',
+            "User-Agent": "cloudpss-sdk-python/" + __version__
         }
     else:
         raise Exception('token undefined')

cloudpss/version.py

@@ -1 +1 @@
-__version__ = '4.5.21'
+__version__ = '4.5.22'

{cloudpss-4.5.21.dist-info → cloudpss-4.5.22.dist-info}/METADATA

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

{cloudpss-4.5.21.dist-info → cloudpss-4.5.22.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cloudpss/__init__.py,sha256=xnA-UjehYOzH6KV7vOXHwdbGEiw6g_OPKzrbZA9Fuc8,858
 cloudpss/verify.py,sha256=KF4Gd59DGvCyIEkRD7rNnekWw22XxJpi3DW6keb6j4c,1498
-cloudpss/version.py,sha256=5o-yK2bcKanjtwdvS_27NC3wnJi4LDG-QwBvq1hXlSM,23
+cloudpss/version.py,sha256=37SK3BQ80PnwEhUte9lXm7sBCUQ2l2xYAtxuOs0ThmA,23
 cloudpss/asyncio/__init__.py,sha256=CJGopQl_vz3z3fJsK7NjMX5uzkzfrJrbqKVhyYqlYWc,198
 cloudpss/asyncio/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
 cloudpss/asyncio/job/job.py,sha256=Bn2BEERw1J8YarFauTzVrGJK7nmaoMsdlrFUqiHRth4,3897
@@ -47,9 +47,9 @@ cloudpss/job/result/__init__.py,sha256=dRWZNoX33cukgrNl6sMkQM3hdQrGHCpwIktoayrpP
 cloudpss/job/result/result.py,sha256=UvtHWNPhVq1NsmuE4m-iy9BywacgLCYRfQMEBusFdpc,4290
 cloudpss/model/__init__.py,sha256=SNq-bfwcQtDHtTNBYppfUEs8wkjfrQfGeywx7igmvOs,151
 cloudpss/model/jobDefinitions.py,sha256=uuTwpqStlg3YDmfxbU2PVi_Tf18opa0kYLCMGaOP-qA,3749
-cloudpss/model/model.py,sha256=ee4CNtaLxXHD-T3jTGmqDpPC2nlCKs0wtuo_1FGvZSk,26866
+cloudpss/model/model.py,sha256=k473FY7zfHmv0yAYYHeWfBKo5Mjz0suYpZ7YXYzudVo,27856
 cloudpss/model/revision.py,sha256=E3H-FOXsiwy1MDZC-Ky-QkzvOb5HApYSXP0llf8yJXQ,4038
-cloudpss/model/topology.py,sha256=MJF3rQBLWus4RVO6L3Zwih7SWYjRWsLMcrcIBxCmIwM,2617
+cloudpss/model/topology.py,sha256=hs1LN1r-eToENzk_flOhW4i0yT6M_-NcYgDYnkrW6kA,2882
 cloudpss/model/implements/__init__.py,sha256=88L_wF9SSzxsbtqwStWIPH4LxaKq7TVcssHQ62YBnls,67
 cloudpss/model/implements/component.py,sha256=uNSpkZKChdXLiO40Ev4P3oQ1di2Hu4YjcBOb0I8Bf0c,734
 cloudpss/model/implements/diagram.py,sha256=GnNWgM8jKc9L2lMDv3YZJVGnMa6dvE4rljF7PnSXjrY,6133
@@ -70,12 +70,12 @@ cloudpss/runner/transform.py,sha256=krOgTZiJSJAb5QSwerAqlbC4Ma0PKi__0WOZlAxw4O8,
 cloudpss/utils/IO.py,sha256=FsFp3V8I1-P0YiBGmjKwbMalBrVKMHUxTjFZFOtv0CQ,5357
 cloudpss/utils/__init__.py,sha256=jWVHSOqJQWU0fpg2UbWSEQoLCb2Uys-vH5Uqkb0ihNA,326
 cloudpss/utils/dataEncoder.py,sha256=5PUPb844eOGgFnYrMM8bdjdKH_MZz0lk-67uo8TvwEo,885
-cloudpss/utils/graphqlUtil.py,sha256=_bdHFlusvZd5p4I1iVq5nEKqeC2RdyiXbnfv7oQBvQA,332
-cloudpss/utils/httprequests.py,sha256=ZHVNYBh5wPLJPuVwIndyV43kgRQ4MP4i-qafqqoHOgI,1962
+cloudpss/utils/graphqlUtil.py,sha256=xeEzT--bqGkERigQVzmMyYxMaN4JnMgCzI07aY9bSec,379
+cloudpss/utils/httprequests.py,sha256=utBRZ5trImSdUOZiiLa6tVDd8CtRhD9qC2lZq_n13R8,1963
 cloudpss/utils/matlab.py,sha256=SLwVt790BjklJK2XNELt9R2n_1ej9Y8QsTIdFkKXLWE,795
 cloudpss/utils/parseDebugArgs.py,sha256=r8EptSHG9D-U7dT3pHFDclL-8G2La9w4GEjUAY-rsMc,3174
 cloudpss/utils/yamlLoader.py,sha256=bv_vPDK_e0n_vZ5FwpDJ_NJWqMAwfU3AbhkvQIxPCy4,2677
-cloudpss-4.5.21.dist-info/METADATA,sha256=DnZzvifDYVtetAmUcL00oamgJ583y-CWsxJoZ_A7DSI,2402
-cloudpss-4.5.21.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cloudpss-4.5.21.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
-cloudpss-4.5.21.dist-info/RECORD,,
+cloudpss-4.5.22.dist-info/METADATA,sha256=Fivz6Ld6Cn1bIzLaGZP9p7K2kiFT5UmR7WA0h8obNc4,2402
+cloudpss-4.5.22.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cloudpss-4.5.22.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
+cloudpss-4.5.22.dist-info/RECORD,,