cloudpss 4.5.2__tar.gz → 4.5.3__tar.gz

{cloudpss-4.5.2 → cloudpss-4.5.3}/PKG-INFO

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

{cloudpss-4.5.2 → cloudpss-4.5.3}/cloudpss/model/implements/diagram.py

@@ -1,3 +1,4 @@
+import re
 from .component import Component
 from typing import Optional
 import uuid
@@ -140,7 +141,7 @@ class DiagramImplement(object):
                     position["y"] += 5
         return True
 
-    def updateComponent(self, key: str, args: dict) -> bool:
+    def updateComponent(self, key: str, **kwargs: dict) -> bool:
         """
         更新元件
 
@@ -150,10 +151,36 @@ class DiagramImplement(object):
 
         >>>> diagram.updateComponent(key)
         """
-        component = self.cells.get(key)
-        if not component:
+        component = self.cells.get(key,None)
+        if component is None:
             return False
-        for k, v in self.cells.items():
-            if k == key:
-                v.__dict__.update(args)
-                return True
+        for k, v in kwargs.items():
+            if component.__dict__.get(k,None) is None:
+                raise Exception(f"Component has no attribute {k}")
+            if k == 'args' and not isinstance(v, dict):
+                raise Exception(f"Component args must be dict")
+            if k == 'pins' and not isinstance(v, dict):
+                raise Exception(f"Component pins must be dict")
+            if k == 'position' and not isinstance(v, dict):
+                raise Exception(f"Component position must be dict")
+            if k == 'size' and not isinstance(v, dict):
+                raise Exception(f"Component size must be dict")
+            if k == 'style' and not isinstance(v, dict):
+                raise Exception(f"Component style must be dict")
+            if k == 'props' and not isinstance(v, dict):
+                raise Exception(f"Component props must be dict")
+            if k == 'context' and not isinstance(v, dict):
+                raise Exception(f"Component context must be dict")
+            
+            if k == 'definition' and not re.match(r'^model/([!()\-.0-9@A-Z\[\]_a-z{}~]{1,240})/([!()\-.0-9@A-Z\[\]_a-z{}~]{1,240})$', v):
+                raise Exception(f"Component definition must be in the format of 'model/owner/key'")
+            
+            if k == 'zIndex' and v < 0:
+                raise Exception(f"Component zIndex must be greater than 0")
+            
+            if isinstance(v, dict):
+                component.__dict__[k].update(v)
+                continue
+            
+            component.__dict__[k] = v
+            

{cloudpss-4.5.2 → cloudpss-4.5.3}/cloudpss/model/model.py

@@ -137,7 +137,7 @@ class Model(object):
             raise ValueError("不存在拓扑实现")
         return diagramImplement.removeComponent(key)
     
-    def updateComponent(self, key, args):
+    def updateComponent(self, key, **kwargs):
         """
         更新元件实现
 
@@ -148,7 +148,7 @@ class Model(object):
         diagramImplement = self.revision.getImplements().getDiagram()
         if diagramImplement is None:
             raise ValueError("不存在拓扑实现")
-        return diagramImplement.updateComponent(key, args)
+        return diagramImplement.updateComponent(key, **kwargs)
 
 
     def getComponentsByRid(self, rid: str):
@@ -397,6 +397,7 @@ class Model(object):
         data = IO.load(filePath, format)
         return data
 
+
     @staticmethod
     def dump(model, file, format="yaml", compress="gzip"):
         """

{cloudpss-4.5.2 → cloudpss-4.5.3}/cloudpss/utils/IO.py

@@ -2,6 +2,7 @@ import io
 import json
 import ubjson
 import yaml
+from yaml.dumper import SafeDumper
 import gzip
 import base64
 import struct
@@ -85,6 +86,7 @@ class IO(object):
             result = ubjson.dumpb(obj)
         if format == 'yaml':
             result = yaml.dump(obj).encode(encoding="utf-8")
+
         if result is None:
             assert False, 'format not support'
         if compress == 'gzip':
@@ -104,7 +106,7 @@ class IO(object):
         if format == 'ubjson':
             return ubjson.loadb(byt)
         if format == 'yaml':
-            return yaml.load(io.BytesIO(byt), Loader=yaml.BaseLoader)
+            return yaml.load(io.BytesIO(byt), Loader=yaml.FullLoader)
         assert False, 'format not support'
 
     @staticmethod

cloudpss-4.5.3/cloudpss/version.py

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

{cloudpss-4.5.2 → cloudpss-4.5.3}/cloudpss.egg-info/PKG-INFO

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

cloudpss-4.5.2/cloudpss/version.py

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