topologicpy 0.8.58__py3-none-any.whl → 0.8.61__py3-none-any.whl

topologicpy/Kuzu.py

@@ -476,7 +476,7 @@ class Kuzu:
     def GraphsByQuery(
         manager,
         query: str,
-        params: dict | None = None,
+        params: dict = None,
         silent: bool = False,
     ):
         """

topologicpy/Plotly.py

@@ -286,7 +286,7 @@ class Plotly:
                     vertexSizeKey: str = None,
                     vertexLabelKey: str = None,
                     vertexBorderColor: str = "black",
-                    vertexBorderWidth: float = 1,
+                    vertexBorderWidth: float = 0,
                     vertexBorderColorKey: str = None,
                     vertexBorderWidthKey: float = None,
                     vertexGroupKey: str = None,
@@ -570,7 +570,7 @@ class Plotly:
                             if not temp_color == None:
                                 borderColors[m] = Color.AnyToHex(temp_color)
                         if not borderWidthKey == None:
-                            temp_width = Dictionary.ValueAtKey(d, key=borderWidthKey)
+                            temp_width = Dictionary.ValueAtKey(d, key=borderWidthKey, defaultValue=borderWidth)
                             if temp_width == None or temp_width <= 0:
                                borderSizes[m] = 0
                             else:
@@ -615,8 +615,9 @@ class Plotly:
                             showlegend=showLegend,
                             marker=dict(color=colors,
                                         size=sizes,
-                                        symbol="circle", 
+                                        symbol="circle",
                                         opacity=1,
+                                        line=dict(width=0),
                                         sizemode="diameter"),
                             mode=mode,
                             customdata = labels,
@@ -637,6 +638,7 @@ class Plotly:
                                             size=borderSizes,
                                             symbol="circle", 
                                             opacity=1,
+                                            line=dict(width=0),
                                             sizemode="diameter"),
                                 mode=mode
                                 )
@@ -748,11 +750,11 @@ class Plotly:
                 d = dict_clusters[j][0] # All dicitonaries have same values in dictionaries, so take first one.
                 if d:
                     if not colorKey == None:
-                        d_color = Color.AnyToHex(Dictionary.ValueAtKey(d, key=colorKey, default=color))
+                        d_color = Color.AnyToHex(Dictionary.ValueAtKey(d, key=colorKey, defaultValue=color))
                     if not dashKey == None:
-                        d_dash = Dictionary.ValueAtKey(d, key=dashKey, default=dash)
+                        d_dash = Dictionary.ValueAtKey(d, key=dashKey, defaultValue=dash)
                     if not arrowSizeKey == None:
-                        d_arrowSize = Dictionary.ValueAtKey(d, key=arrowSizeKey, default=arrowSize)
+                        d_arrowSize = Dictionary.ValueAtKey(d, key=arrowSizeKey, defaultValue=arrowSize)
                     if not labelKey == None:
                         labels.append(str(Dictionary.ValueAtKey(d, labelKey, "")))
                     if not widthKey == None:
@@ -927,7 +929,7 @@ class Plotly:
         vertexColorKey : str , optional
             The dictionary key under which to find the vertex color.The default is None.
         vertexBorderWidth : float , optional
-            The desired width of the border of the output vertices. Default is 1.
+            The desired width of the border of the output vertices. Default is 0.
         vertexBorderColor : str , optional
             The desired color of the border of the output vertices. This can be any plotly color string and may be specified as:
             - A hex string (e.g. '#ff0000')

topologicpy/Topology.py

@@ -1994,6 +1994,7 @@ class Topology():
             return 
 
         def convert_entity(entity, file, sides=36):
+            e = None
             entity_type = entity.dxftype()
             python_dict = entity.dxf.all_existing_dxf_attribs()
             keys = python_dict.keys()
@@ -2389,7 +2390,7 @@ class Topology():
         return topology
     '''
     @staticmethod
-    def ByJSONFile(file, tolerance=0.0001):
+    def ByJSONFile(file, tolerance: float = 0.0001, silent: bool = False):
         """
         Imports the topology from a JSON file.
 
@@ -2399,6 +2400,8 @@ class Topology():
             The input JSON file.
         tolerance : float , optional
             The desired tolerance. Default is 0.0001.
+        silent : bool , optional
+            If set to True, error and warning messages are suppressed. Default is False.
 
         Returns
         -------
@@ -2406,14 +2409,21 @@ class Topology():
             The list of imported topologies (Warning: the list could contain 0, 1, or many topologies, but this method will always return a list)
 
         """
+        import json
         if not file:
-            print("Topology.ByJSONFile - Error: the input file parameter is not a valid file. Returning None.")
+            if not silent:
+                print("Topology.ByJSONFile - Error: the input file parameter is not a valid file. Returning None.")
+            return None
+        try:
+            json_dict = json.load(file)
+        except Exception as e:
+            if not silent:
+                print("Topology.ByJSONFile - Error: Could not load the JSON file: {e}. Returning None.")
             return None
-        json_dict = json.load(file)
-        return Topology.ByJSONDictionary(json_dict, tolerance=tolerance)
+        return Topology.ByJSONDictionary(json_dict, tolerance=tolerance, silent=silent)
     
     @staticmethod
-    def ByJSONPath(path, tolerance=0.0001):
+    def ByJSONPath(path, tolerance: float = 0.0001, silent: bool = False):
         """
         Imports the topology from a JSON file.
 
@@ -2423,6 +2433,8 @@ class Topology():
             The file path to the json file.
         tolerance : float , optional
             The desired tolerance. Default is 0.0001.
+        silent : bool , optional
+            If set to True, error and warning messages are suppressed. Default is False.
 
         Returns
         -------
@@ -2432,15 +2444,20 @@ class Topology():
         """
         import json
         if not path:
-            print("Topology.ByJSONPath - Error: the input path parameter is not a valid path. Returning None.")
+            if not silent:
+                print("Topology.ByJSONPath - Error: the input path parameter is not a valid path. Returning None.")
             return None
-        with open(path) as file:
-            json_dict = json.load(file)
-        entities = Topology.ByJSONDictionary(json_dict, tolerance=tolerance)
-        return entities
+        try:
+            with open(path) as file:
+                json_dict = json.load(file)
+        except Exception as e:
+            if not silent:
+                print("Topology.ByJSONPath - Error: Could not load file: {e}. Returning None.")
+            return None
+        return Topology.ByJSONDictionary(json_dict, tolerance=tolerance, silent=silent)
     
     @staticmethod
-    def ByJSONDictionary(jsonDictionary, tolerance=0.0001):
+    def ByJSONDictionary(jsonDictionary: dict, tolerance: float = 0.0001, silent: bool = False):
         """
         Imports the topology from a JSON dictionary.
 
@@ -2450,6 +2467,8 @@ class Topology():
             The input JSON dictionary.
         tolerance : float , optional
             The desired tolerance. Default is 0.0001.
+        silent : bool , optional
+            If set to True, error and warning messages are suppressed. Default is False.
 
         Returns
         -------
@@ -2488,41 +2507,41 @@ class Topology():
             # Create basic topological entities
             if entity_type == 'Vertex':
                 parent_entity = Vertex.ByCoordinates(*entity['coordinates'])
-                parent_entity = Topology.SetDictionary(parent_entity, entity_dict)
+                parent_entity = Topology.SetDictionary(parent_entity, entity_dict, silent=silent)
                 vertices[entity['uuid']] = parent_entity
 
             elif entity_type == 'Edge':
                 vertex1 = vertices[entity['vertices'][0]]
                 vertex2 = vertices[entity['vertices'][1]]
-                parent_entity = Edge.ByVertices([vertex1, vertex2])
-                parent_entity = Topology.SetDictionary(parent_entity, entity_dict)
+                parent_entity = Edge.ByVertices([vertex1, vertex2], tolerance=tolerance, silent=silent)
+                parent_entity = Topology.SetDictionary(parent_entity, entity_dict, silent=silent)
                 edges[entity['uuid']] = parent_entity
 
             elif entity_type == 'Wire':
                 wire_edges = [edges[uuid] for uuid in entity['edges']]
-                parent_entity = Wire.ByEdges(wire_edges)
-                parent_entity = Topology.SetDictionary(parent_entity, entity_dict)
+                parent_entity = Wire.ByEdges(wire_edges, tolerance=tolerance, silent=silent)
+                parent_entity = Topology.SetDictionary(parent_entity, entity_dict, silent=silent)
                 wires[entity['uuid']] = parent_entity
 
             elif entity_type == 'Face':
                 face_wires = [wires[uuid] for uuid in entity['wires']]
                 if len(face_wires) > 1:
-                    parent_entity = Face.ByWires(face_wires[0], face_wires[1:])
+                    parent_entity = Face.ByWires(face_wires[0], face_wires[1:], tolerance=tolerance, silent=silent)
                 else:
-                    parent_entity = Face.ByWire(face_wires[0])
-                parent_entity = Topology.SetDictionary(parent_entity, entity_dict)
+                    parent_entity = Face.ByWire(face_wires[0], tolerance=tolerance, silent=silent)
+                parent_entity = Topology.SetDictionary(parent_entity, entity_dict, silent=silent)
                 faces[entity['uuid']] = parent_entity
 
             elif entity_type == 'Shell':
                 shell_faces = [faces[uuid] for uuid in entity['faces']]
-                parent_entity = Shell.ByFaces(shell_faces)
-                parent_entity = Topology.SetDictionary(parent_entity, entity_dict)
+                parent_entity = Shell.ByFaces(shell_faces, tolerance=tolerance, silent=silent)
+                parent_entity = Topology.SetDictionary(parent_entity, entity_dict, silent=silent)
                 shells[entity['uuid']] = parent_entity
 
             elif entity_type == 'Cell':
                 cell_shells = [shells[uuid] for uuid in entity['shells']]
                 if len(cell_shells) > 1:
-                    parent_entity = Cell.ByShells(cell_shells[0], cell_shells[1:])
+                    parent_entity = Cell.ByShells(cell_shells[0], cell_shells[1:], tolerance=tolerance, silent=silent)
                 else:
                     parent_entity = Cell.ByShell(cell_shells[0])
                 parent_entity = Topology.SetDictionary(parent_entity, entity_dict)
@@ -2648,7 +2667,7 @@ class Topology():
         return top_level_list
     
     @staticmethod
-    def ByJSONString(string, tolerance=0.0001):
+    def ByJSONString(string: str, tolerance: float = 0.0001, silent: bool = False):
         """
         Imports the topology from a JSON string.
 
@@ -2658,6 +2677,8 @@ class Topology():
             The input JSON string.
         tolerance : float , optional
             The desired tolerance. Default is 0.0001.
+        silent : bool , optional
+            If set to True, error and warning messages are suppressed. Default is False.
 
         Returns
         -------
@@ -2665,9 +2686,13 @@ class Topology():
             The list of imported topologies (Warning: the list could contain 0, 1, or many topologies, but this method will always return a list)
 
         """
-
-        json_dict = json.loads(string)
-        return Topology.ByJSONDictionary(json_dict, tolerance=tolerance)
+        try:
+            json_dict = json.loads(string)
+        except Exception as e:
+            if not silent:
+                print(f"Topology.ByJSONString - Error: Could not read the input string: {e}. Returning None.")
+            return None 
+        return Topology.ByJSONDictionary(json_dict, tolerance=tolerance, silent=silent)
 
     @staticmethod
     def ByMeshData(dictionary, transferDictionaries: bool = False, mantissa: int = 6, tolerance: float = 0.0001, silent: bool = False):

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.8.58'
+__version__ = '0.8.61'

{topologicpy-0.8.58.dist-info → topologicpy-0.8.61.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: topologicpy
-Version: 0.8.58
+Version: 0.8.61
 Summary: An AI-Powered Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 License: AGPL v3 License

{topologicpy-0.8.58.dist-info → topologicpy-0.8.61.dist-info}/RECORD

@@ -2,7 +2,7 @@ topologicpy/ANN.py,sha256=gpflv4lFypOW789vO7mSkMLaMF_ZftVOCqCvtGr6-JA,47873
 topologicpy/Aperture.py,sha256=wNn5miB_IrGCBYuQ18HXQYRva20dUC3id4AJCulL7to,2723
 topologicpy/BVH.py,sha256=JA4bb-9hgMfVZ_syzmSmTL3ueCq-0vMUGMPZxNcawAY,13023
 topologicpy/CSG.py,sha256=09la1-xzS9vr-WnV7tpJ0I-mkZ-XY0MRSd5iB50Nfgw,15556
-topologicpy/Cell.py,sha256=ndrfovjwEEQTJ0B5DuthuCBDdVg9-1i_MX8Dtj-wD4E,177330
+topologicpy/Cell.py,sha256=xkt9lfutgSwr_1lah1U5n48UnrLIggznNKUmEe2FA2g,177505
 topologicpy/CellComplex.py,sha256=Kbz63rGeE08bJfMXFvB-AptoKHiaCK5OtiV1wz8Y-Fk,68081
 topologicpy/Cluster.py,sha256=G49AuhJHQ1s819cB5MtVdmAGgkag19IC3dRP1ub1Wh4,58608
 topologicpy/Color.py,sha256=hzSmgBWhiuYc55RSipkQNIgGtgyhC5BqY8AakNYEK-U,24486
@@ -12,28 +12,28 @@ topologicpy/Dictionary.py,sha256=Z4YQ88tONWd-0X0dENQ8IZqIOa9mbBqhJkTBsHmft2g,446
 topologicpy/Edge.py,sha256=DifItuyabFDUFC7CVMlt2DeMFMNaGOqCg43iU9CPP0A,74029
 topologicpy/EnergyModel.py,sha256=hB1aiJe45gdDMFm1AhkBr-1djjtXSzn24iRpQMk43-4,57749
 topologicpy/Face.py,sha256=aX9EcR3JGbLITElhd25J0Z8m9U8KkmbYivGg3oZN-Uw,202296
-topologicpy/Graph.py,sha256=eUVSdZ_1kJ6a9Bu6fgOcFWUWPeIulVnxdWbVphucbiQ,728898
+topologicpy/Graph.py,sha256=ytXl9VLj243o9LhY0A8P_gp4_Ce_VrHW5oaC2WK6Mbc,782718
 topologicpy/Grid.py,sha256=3OsBMyHh4w8gpFOTMKHMNTpo62V0CwRNu5cwm87yDUA,18421
 topologicpy/Helper.py,sha256=Nr6pyzl0sZm4Cu11wOqoYKu6yYal5N6A9jErXnaZBJc,31765
 topologicpy/Honeybee.py,sha256=DzaG9wpkJdcDWcjOGXhuN5X0gCqypmZGBa1y5E2MkjU,48964
-topologicpy/Kuzu.py,sha256=THmXfImCVTZhvt0fH0M2-PJeFNyTnmBCf_sjXDxOraE,36305
+topologicpy/Kuzu.py,sha256=fxaDPWM5Xam7Tot0olPZsazS_7xgE_Vo-jf0Sbv3VZE,36298
 topologicpy/Matrix.py,sha256=bOofT34G3YHu9aMIWx60YHAJga4R0GbDjsZBUD4Hu_k,22706
 topologicpy/Neo4j.py,sha256=J8jU_mr5-mWC0Lg_D2dMjMlx1rY_eh8ks_aubUuTdWw,22319
-topologicpy/Plotly.py,sha256=kF7JwBMWJQAuGezaJYI6Cq7ErNwEtcKzaExOfdGPIMc,123003
+topologicpy/Plotly.py,sha256=OQvCzAXqu_QYn8iY0rjc8ZB4XwwK70pWjnnoMzDdcc0,123167
 topologicpy/Polyskel.py,sha256=oVfM4lqSMPTjnkHfsRU9VI8Blt6Vf0LVPkD9ebz7Wmw,27082
 topologicpy/PyG.py,sha256=wOsoBFxMgwZYWjj86OMkz_PJuQ02locV_djhSDD6dVc,109644
 topologicpy/ShapeGrammar.py,sha256=KYsKDLXWdflAcYMAIz84AUF-GMkbTmaBDd2-ovbilqU,23336
 topologicpy/Shell.py,sha256=ioO4raCJfXtYldQg-adpcLVeJPEA6od6cAA5ro7t6r4,96792
 topologicpy/Speckle.py,sha256=-eiTqJugd7pHiHpD3pDUcDO6CGhVyPV14HFRzaqEoaw,18187
 topologicpy/Sun.py,sha256=8S6dhCKfOhUGVny-jEk87Q08anLYMB1JEBKRGCklvbQ,36670
-topologicpy/Topology.py,sha256=R5Ac3V_ADDRDZjhpcNvhM3AvDOLU6ORvB3yILyEkxnI,472559
+topologicpy/Topology.py,sha256=O3K4B47K0ic4jMj4OC9ZuqDPV6I7QRZ6r7Q9SHPEqaI,474206
 topologicpy/Vector.py,sha256=pEC8YY3TeHGfGdeNgvdHjgMDwxGabp5aWjwYC1HSvMk,42236
 topologicpy/Vertex.py,sha256=r_3cicgpino96ymm1ANptfOuqE59b99YWwksxyPOYK4,85914
 topologicpy/Wire.py,sha256=gjgQUGHdBdXUIijgZc_VIW0E39w-smaVhhdl0jF63fQ,230466
 topologicpy/__init__.py,sha256=RMftibjgAnHB1vdL-muo71RwMS4972JCxHuRHOlU428,928
-topologicpy/version.py,sha256=DA9jSKsyKliNEMkA9DgxgAJe2EnQ3lzfjgUUq8L62sQ,23
-topologicpy-0.8.58.dist-info/licenses/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
-topologicpy-0.8.58.dist-info/METADATA,sha256=n4u-5ftRHfgKJ_qzyHToMsD2AAl7LAl8gOTOovRtDEA,10535
-topologicpy-0.8.58.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-topologicpy-0.8.58.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.8.58.dist-info/RECORD,,
+topologicpy/version.py,sha256=v9RYfeFVriaSopTI1WMyzj0QSU9vvxnXtU_efzx9Iek,23
+topologicpy-0.8.61.dist-info/licenses/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
+topologicpy-0.8.61.dist-info/METADATA,sha256=AUdc_jfqI7o0MlB6Izlr_BIUcpjbN71DLKCHBY1UYsA,10535
+topologicpy-0.8.61.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+topologicpy-0.8.61.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.8.61.dist-info/RECORD,,