cloudpss 4.5.6__py3-none-any.whl → 4.5.8__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. cloudpss/model/topology.py +17 -4
  2. cloudpss/utils/httprequests.py +1 -1
  3. cloudpss/version.py +1 -1
  4. {cloudpss-4.5.6.dist-info → cloudpss-4.5.8.dist-info}/METADATA +1 -1
  5. {cloudpss-4.5.6.dist-info → cloudpss-4.5.8.dist-info}/RECORD +7 -7
  6. {cloudpss-4.5.6.dist-info → cloudpss-4.5.8.dist-info}/WHEEL +0 -0
  7. {cloudpss-4.5.6.dist-info → cloudpss-4.5.8.dist-info}/top_level.txt +0 -0
cloudpss/model/topology.py CHANGED
@@ -17,13 +17,16 @@ class ModelTopology():
17
17
  mappings 拓扑分析后的一些映射数据
18
18
 
19
19
 
20
+ """
21
+ __ReqParam="""
22
+ components
23
+ mappings
20
24
  """
21
25
  __modelTopologyQuery = """
22
26
  query($a:ModelTopologyInput!){
23
27
  modelTopology(input:$a){
24
- components
25
- mappings
26
- }}
28
+
29
+
27
30
  """
28
31
  __All__ = ['ModelTopology']
29
32
 
@@ -76,7 +79,17 @@ class ModelTopology():
76
79
  'maximumDepth': maximumDepth
77
80
  }
78
81
  }
79
- data = graphql_request(ModelTopology.__modelTopologyQuery, variables, **kwargs)
82
+
83
+ ports = kwargs.get('ports', False)
84
+ if ports:
85
+ ModelTopology.__ReqParam += """
86
+ ports
87
+ """
88
+ del kwargs['ports']
89
+ query = ModelTopology.__modelTopologyQuery + ModelTopology.__ReqParam + "}}"
90
+
91
+
92
+ data = graphql_request(query, variables, **kwargs)
80
93
  if 'errors' in data:
81
94
  raise Exception(data['errors'][0]['message'])
82
95
 
cloudpss/utils/httprequests.py CHANGED
@@ -33,7 +33,7 @@ def request(method, uri, baseUrl=None, params={}, token=None, **kwargs):
33
33
  if (uri.startswith('graphql')):
34
34
  if 'X-Cloudpss-Version' not in r.headers:
35
35
  raise Exception(
36
- '当前SDK版本（ver 3.X.X）与服务器版本（3.0.0 以下）不兼容，请更换服务器地址或更换SDK版本。')
36
+ '当前SDK版本（ver '+__version__ +'）与服务器版本（3.0.0 以下）不兼容，请更换服务器地址或更换SDK版本。')
37
37
  os.environ['X_CLOUDPSS_VERSION'] = r.headers['X-Cloudpss-Version']
38
38
  if float(r.headers['X-Cloudpss-Version']) >= 5:
39
39
  raise Exception('当前SDK版本（ver '+__version__ +'）与服务器版本（ver ' +
cloudpss/version.py CHANGED
@@ -1 +1 @@
1
- __version__ = '4.5.6'
1
+ __version__ = '4.5.8'
{cloudpss-4.5.6.dist-info → cloudpss-4.5.8.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: cloudpss
3
- Version: 4.5.6
3
+ Version: 4.5.8
4
4
  Summary: cloudpss sdk
5
5
  Home-page: https://www.cloudpss.net
6
6
  Author: cloudpss
{cloudpss-4.5.6.dist-info → cloudpss-4.5.8.dist-info}/RECORD RENAMED
@@ -1,6 +1,6 @@
1
1
  cloudpss/__init__.py,sha256=1RNmUBhoxYUutZiTS-XJ9yBoNGGh8Mpt1uY6ETlSBDc,825
2
2
  cloudpss/verify.py,sha256=KF4Gd59DGvCyIEkRD7rNnekWw22XxJpi3DW6keb6j4c,1498
3
- cloudpss/version.py,sha256=TFyk9IBr6CsbTxfBo-HSMa3S8xPdgBzQ7PDGZfhUxEE,22
3
+ cloudpss/version.py,sha256=VJgGed2f6PuHFLm9vKthQ3P8jaQA1PqtglDV5CblY2I,22
4
4
  cloudpss/asyncio/__init__.py,sha256=CJGopQl_vz3z3fJsK7NjMX5uzkzfrJrbqKVhyYqlYWc,198
5
5
  cloudpss/asyncio/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
6
6
  cloudpss/asyncio/job/job.py,sha256=Bn2BEERw1J8YarFauTzVrGJK7nmaoMsdlrFUqiHRth4,3897
@@ -49,7 +49,7 @@ cloudpss/model/__init__.py,sha256=SNq-bfwcQtDHtTNBYppfUEs8wkjfrQfGeywx7igmvOs,15
49
49
  cloudpss/model/jobDefinitions.py,sha256=uuTwpqStlg3YDmfxbU2PVi_Tf18opa0kYLCMGaOP-qA,3749
50
50
  cloudpss/model/model.py,sha256=hS64Tb6JJvLDaCi4mBPUGbXvmzc-nQxlHtnh7OQpreo,27179
51
51
  cloudpss/model/revision.py,sha256=IFznBKirwpfqadyCNJWPGL7lTpQxbCmU1fxdI5AvoA4,4002
52
- cloudpss/model/topology.py,sha256=tKaOACAw9r9SppgxrhK-ZjMsG_jGLiNOzPnlIPLo964,2333
52
+ cloudpss/model/topology.py,sha256=MJF3rQBLWus4RVO6L3Zwih7SWYjRWsLMcrcIBxCmIwM,2617
53
53
  cloudpss/model/implements/__init__.py,sha256=88L_wF9SSzxsbtqwStWIPH4LxaKq7TVcssHQ62YBnls,67
54
54
  cloudpss/model/implements/component.py,sha256=uNSpkZKChdXLiO40Ev4P3oQ1di2Hu4YjcBOb0I8Bf0c,734
55
55
  cloudpss/model/implements/diagram.py,sha256=ILBq7oZVb2ZThmm_HdwGmGX0sZPwetoT4SSVN0xFqzo,6053
@@ -71,10 +71,10 @@ cloudpss/utils/IO.py,sha256=FsFp3V8I1-P0YiBGmjKwbMalBrVKMHUxTjFZFOtv0CQ,5357
71
71
  cloudpss/utils/__init__.py,sha256=jWVHSOqJQWU0fpg2UbWSEQoLCb2Uys-vH5Uqkb0ihNA,326
72
72
  cloudpss/utils/dataEncoder.py,sha256=5PUPb844eOGgFnYrMM8bdjdKH_MZz0lk-67uo8TvwEo,885
73
73
  cloudpss/utils/graphqlUtil.py,sha256=zGEhRZvy5JMipFKFxjDmbc-HQP3aPZ5noDwi-RTXWSk,280
74
- cloudpss/utils/httprequests.py,sha256=ZcCwS2KM7y2TwWTo0YRLNJVozih4h0F5ignn-CeBREU,1846
74
+ cloudpss/utils/httprequests.py,sha256=1AzngOGVRRSUuI3duE75w1dRlQ7AvexnJL4aXxpDOhk,1857
75
75
  cloudpss/utils/matlab.py,sha256=SLwVt790BjklJK2XNELt9R2n_1ej9Y8QsTIdFkKXLWE,795
76
76
  cloudpss/utils/yamlLoader.py,sha256=bv_vPDK_e0n_vZ5FwpDJ_NJWqMAwfU3AbhkvQIxPCy4,2677
77
- cloudpss-4.5.6.dist-info/METADATA,sha256=0kAO4WlLa92IKgCGyWHSnENGw_8f8f_KXxNms5MuNGo,2401
78
- cloudpss-4.5.6.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
79
- cloudpss-4.5.6.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
80
- cloudpss-4.5.6.dist-info/RECORD,,
77
+ cloudpss-4.5.8.dist-info/METADATA,sha256=CF3EZn5Fd8RJlQM8FdMiLftpxpc0tDt5pqEhRLRyCRQ,2401
78
+ cloudpss-4.5.8.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
79
+ cloudpss-4.5.8.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
80
+ cloudpss-4.5.8.dist-info/RECORD,,