cloudpss 4.5.20__tar.gz → 4.5.22__tar.gz

{cloudpss-4.5.20 → cloudpss-4.5.22}/PKG-INFO

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

{cloudpss-4.5.20 → cloudpss-4.5.22}/cloudpss/job/TemplateCompiler.py

@@ -1,6 +1,7 @@
 import json
 from collections import namedtuple
 from typing import Any, Dict, List, Union
+import copy
 
 PARSER_STATUS_TEXT = 0
 PARSER_STATUS_EXPRESSION_SIMPLE = 1
@@ -239,7 +240,7 @@ class TemplateCompiler:
 def template(templates,options={}):
     def compile_template(expression, type):
         if type == 'formula':
-            return f'context[{json.dumps(expression)}]'
+            return f'copy.deepcopy(context[{json.dumps(expression)}])'
         elif type == 'interpolation':
             return f"context[{json.dumps(expression)}] ?? ''"
         raise ValueError(f'Unsupported type: {type}')

{cloudpss-4.5.20 → cloudpss-4.5.22}/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-4.5.20 → cloudpss-4.5.22}/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-4.5.20 → cloudpss-4.5.22}/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-4.5.20 → cloudpss-4.5.22}/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-4.5.22/cloudpss/version.py

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

{cloudpss-4.5.20 → cloudpss-4.5.22}/cloudpss.egg-info/PKG-INFO

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

cloudpss-4.5.22/test/test-topology1.py

@@ -0,0 +1,37 @@
+
+import time
+import sys
+import os
+
+sys.path.append(os.path.join(os.path.dirname(__file__), '..\\'))
+import cloudpss
+import time
+import json
+
+if __name__ == '__main__':
+    os.environ['CLOUDPSS_API_URL'] = 'http://10.101.10.45/'
+    print('CLOUDPSS connected')
+    cloudpss.setToken(
+        'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcm5hbWUiOiJhZG1pbiIsInNjb3BlcyI6WyJtb2RlbDo5ODM2NyIsImZ1bmN0aW9uOjk4MzY3IiwiYXBwbGljYXRpb246MzI4MzEiXSwicm9sZXMiOlsiYWRtaW4iXSwidHlwZSI6ImFwcGx5IiwiZXhwIjoxNzY2MzA3MzU1LCJub3RlIjoiYWEiLCJpYXQiOjE3NTA3NTUzNTV9.iYh3otDGy-f7dKyIUd8xpnEuwVuRDfmBVsI112XeCZBe7sZLdyBb6a4XqOd8AoyTzFcpLj7rF1PQcT4mhEf6kA')
+    print('Token done')
+    project = cloudpss.Model.fetch('model/admin/xx11')
+    # topology = cloudpss.ModelTopology.fetch("-xrS3SewFhpVYKBtIXLk-XDLCQRQnUmlIbXS3s4sdPUkPKeAMhXHjRgZD1JPjPfQ","emtp",{'args':{}})
+    topology= project.fetchTopology(config={'args':{}},maximumDepth=50)
+    print(topology.components)
+    
+    
+    topology.dump(topology,'testTopology.json',indent=2)
+    
+    
+    # topology2 = cloudpss.ModelTopology.fetch('', 'emtp', {'args': {}}, maximumDepth=5, topology=topology)
+    
+    
+    # print(topology2.components)
+    # topology2.dump(topology2,'testTopology2.json',indent=2)
+    
+    
+    # topology3= project.fetchTopology(config={'args':{}},maximumDepth=5)
+    # print(topology3.components)
+    
+    
+    # topology3.dump(topology3,'testTopology3.json',indent=2)

cloudpss-4.5.22/test/testb.py

@@ -0,0 +1,16 @@
+import os,sys
+import time
+
+import socketio
+import threading
+import struct
+Uninitialized = type("Uninitialized", (), {})()
+
+def pp():
+   x=b=c=q=x=t=Uninitialized
+   print(x,b,c,q,x,t)
+                         
+if __name__ == '__main__':
+   pp()
+   
+        

cloudpss-4.5.20/cloudpss/version.py

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

cloudpss-4.5.20/test/test-topology1.py

@@ -1,31 +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/asdfsadd')
-    # topology = cloudpss.ModelTopology.fetch("-xrS3SewFhpVYKBtIXLk-XDLCQRQnUmlIbXS3s4sdPUkPKeAMhXHjRgZD1JPjPfQ","emtp",{'args':{}})
-    topology= project.fetchTopology(config={'args':{}},maximumDepth=50)
-    print(topology.components)
-    # topology.dump(topology,'test.json')
-    
-    
-    # # topology= project.fetchTopology(config={'args':{}})
-
-    # topology.dump(topology,'test.json')
-    
-    
-    

cloudpss-4.5.20/test/testb.py

@@ -1,18 +0,0 @@
-import os,sys
-import time
-
-import socketio
-import threading
-import struct
-
-                         
-if __name__ == '__main__':
-   a = [1.21,2.22,3.33]
-   x = struct.pack('d'*len(a),*a)
-   print(x)
-   print(len(x))
-   
-   t = struct.unpack('d'*int(len(x)/8),x)
-   
-        
-   print(t)