topologicpy 0.8.92__py3-none-any.whl → 0.8.93__py3-none-any.whl

topologicpy/Topology.py

@@ -838,10 +838,15 @@ class Topology():
         """
 
         from topologicpy.Dictionary import Dictionary
+        import inspect
 
         if not Topology.IsInstance(topology, "Topology"):
             if not silent:
                 print("Topology.Apertures - Error: the input topology parameter is not a valid topology. Returning None.")
+                print("Topology:", topology)
+                curframe = inspect.currentframe()
+                calframe = inspect.getouterframes(curframe, 2)
+                print('caller name:', calframe[1][3])
             return None
         
         apertures = []
@@ -2521,39 +2526,41 @@ class Topology():
                     f = Face.ByWires(eb, ib)
                     new_faces.append(f)
                 topology = Topology.SelfMerge(Cluster.ByTopologies(new_faces))
-                if removeCoplanarFaces:
-                    topology = Topology.RemoveCoplanarFaces(topology, epsilon=epsilon, tolerance=tolerance)
-                if transferDictionaries:
-                    element_dict = {
-                        "TOPOLOGIC_id": str(Topology.UUID(topology)),
-                        "TOPOLOGIC_name": getattr(element, 'Name', "Untitled"),
-                        "TOPOLOGIC_type": Topology.TypeAsString(topology),
-                        "IFC_global_id": getattr(element, 'GlobalId', 0),
-                        "IFC_name": getattr(element, 'Name', "Untitled"),
-                        "IFC_type": element_type
-                    }
-
-                    # Optionally add property sets
-                    psets = {}
-                    if hasattr(element, 'IsDefinedBy'):
-                        for rel in element.IsDefinedBy:
-                            if rel.is_a('IfcRelDefinesByProperties'):
-                                pdef = rel.RelatingPropertyDefinition
-                                if pdef and pdef.is_a('IfcPropertySet'):
-                                    key = f"IFC_{pdef.Name}"
-                                    props = {}
-                                    for prop in pdef.HasProperties:
-                                        if prop.is_a('IfcPropertySingleValue') and prop.NominalValue:
-                                            props[f"IFC_{prop.Name}"] = prop.NominalValue.wrappedValue
-                                    psets[key] = props
-
-                    final_dict = Dictionary.ByPythonDictionary(element_dict)
-                    if psets:
-                        pset_dict = Dictionary.ByPythonDictionary(psets)
-                        final_dict = Dictionary.ByMergedDictionaries([final_dict, pset_dict])
-                    
-                    topology = Topology.SetDictionary(topology, final_dict)
-                topologies.append(topology)
+                if Topology.IsInstance(topology, "topology"):
+                    if removeCoplanarFaces:
+                        topology = Topology.RemoveCoplanarFaces(topology, epsilon=epsilon, tolerance=tolerance)
+                    if Topology.IsInstance(topology, "topology"):
+                        if transferDictionaries:
+                            element_dict = {
+                                "TOPOLOGIC_id": str(Topology.UUID(topology)),
+                                "TOPOLOGIC_name": getattr(element, 'Name', "Untitled"),
+                                "TOPOLOGIC_type": Topology.TypeAsString(topology),
+                                "IFC_global_id": getattr(element, 'GlobalId', 0),
+                                "IFC_name": getattr(element, 'Name', "Untitled"),
+                                "IFC_type": element_type
+                            }
+
+                            # Optionally add property sets
+                            psets = {}
+                            if hasattr(element, 'IsDefinedBy'):
+                                for rel in element.IsDefinedBy:
+                                    if rel.is_a('IfcRelDefinesByProperties'):
+                                        pdef = rel.RelatingPropertyDefinition
+                                        if pdef and pdef.is_a('IfcPropertySet'):
+                                            key = f"IFC_{pdef.Name}"
+                                            props = {}
+                                            for prop in pdef.HasProperties:
+                                                if prop.is_a('IfcPropertySingleValue') and prop.NominalValue:
+                                                    props[f"IFC_{prop.Name}"] = prop.NominalValue.wrappedValue
+                                            psets[key] = props
+
+                            final_dict = Dictionary.ByPythonDictionary(element_dict)
+                            if psets:
+                                pset_dict = Dictionary.ByPythonDictionary(psets)
+                                final_dict = Dictionary.ByMergedDictionaries([final_dict, pset_dict])
+                            
+                            topology = Topology.SetDictionary(topology, final_dict)
+                        topologies.append(topology)
             if not it.next():
                 break
 
@@ -11904,7 +11911,7 @@ class Topology():
         return Topology._Boolean(topologyA, topologyB, operation="union", tranDict=tranDict, tolerance=tolerance, silent=silent)
 
     @staticmethod
-    def UUID(topology, namespace="topologicpy"):
+    def UUID(topology, namespace="topologicpy", silent: bool = False):
         """
         Generate a UUID v5 based on the provided content and a fixed namespace.
         
@@ -11913,7 +11920,9 @@ class Topology():
         topology : topologic_core.Topology
             The input topology
         namespace : str , optional
-            The base namescape to use for generating the UUID
+            The base namescape to use for generating the UUID.
+        silent : bool , optional
+            If set to True, error and warning messages are suppressed. Default is False.
 
         Returns
         -------
@@ -11924,6 +11933,16 @@ class Topology():
         import uuid
         from topologicpy.Dictionary import Dictionary
         from topologicpy.Graph import Graph
+        import inspect
+
+        if not Topology.IsInstance(topology, "topology"):
+            if not silent:
+                print("Topology.UUID - Error: The input topology parameter is not a valid topology. Returning None.")
+                print("Topology:", topology)
+                curframe = inspect.currentframe()
+                calframe = inspect.getouterframes(curframe, 2)
+                print('caller name:', calframe[1][3])
+            return None
 
         predefined_namespace_dns = uuid.UUID('6ba7b810-9dad-11d1-80b4-00c04fd430c8')
         namespace_uuid = uuid.uuid5(predefined_namespace_dns, namespace)
@@ -11935,14 +11954,14 @@ class Topology():
             final_str = verts_str+edges_str+dict_str
             uuid_str = uuid.uuid5(namespace_uuid, final_str)
         else:
-            cellComplexes = Topology.CellComplexes(topology, silent=True)
-            cells = Topology.Cells(topology, silent=True)
-            shells = Topology.Shells(topology, silent=True)
-            faces = Topology.Faces(topology, silent=True)
-            wires = Topology.Wires(topology, silent=True)
-            edges = Topology.Edges(topology, silent=True)
-            vertices = Topology.Vertices(topology, silent=True)
-            apertures = Topology.Apertures(topology, subTopologyType="all")
+            cellComplexes = Topology.CellComplexes(topology, silent=True) or []
+            cells = Topology.Cells(topology, silent=True) or []
+            shells = Topology.Shells(topology, silent=True) or []
+            faces = Topology.Faces(topology, silent=True) or []
+            wires = Topology.Wires(topology, silent=True) or []
+            edges = Topology.Edges(topology, silent=True) or []
+            vertices = Topology.Vertices(topology, silent=True) or []
+            apertures = Topology.Apertures(topology, subTopologyType="all") or []
             subTopologies = cellComplexes+cells+shells+faces+wires+edges+vertices+apertures
             dictionaries = [Dictionary.PythonDictionary(Topology.Dictionary(topology))]
             dictionaries += [Dictionary.PythonDictionary(Topology.Dictionary(s)) for s in subTopologies]

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.8.92'
+__version__ = '0.8.93'

{topologicpy-0.8.92.dist-info → topologicpy-0.8.93.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: topologicpy
-Version: 0.8.92
+Version: 0.8.93
 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.92.dist-info → topologicpy-0.8.93.dist-info}/RECORD

@@ -26,14 +26,14 @@ topologicpy/ShapeGrammar.py,sha256=q_BvMKOBDW3GVSRjPLIGAZkHW2egw3mTOPzIyEpYOLg,2
 topologicpy/Shell.py,sha256=2EPzDT_t0IAjBRYPDuKNAz_Ax_HaEkvNpXBxDkPdcTg,101084
 topologicpy/Speckle.py,sha256=-eiTqJugd7pHiHpD3pDUcDO6CGhVyPV14HFRzaqEoaw,18187
 topologicpy/Sun.py,sha256=ezisiHfc2nd7A_8w0Ykq2VgbS0A9WNSg-tBwvfTQAVM,36735
-topologicpy/Topology.py,sha256=Q2uivQaKrvfYX1e1sRZkNi1HXWrrVDqDKRhF9esUnog,548668
+topologicpy/Topology.py,sha256=B8Ifgv2rWlfhjzoHeuNOofxML_zEIFDuc-nXUVQHV8g,549927
 topologicpy/Vector.py,sha256=pEC8YY3TeHGfGdeNgvdHjgMDwxGabp5aWjwYC1HSvMk,42236
 topologicpy/Vertex.py,sha256=26TrlX9OCZUN-lMlZG3g4RHTWBqw69NW4AOEgRz_YMo,91269
 topologicpy/Wire.py,sha256=OzMTI5vxJ8XJPgwDAB31666Dz2Sp7H_U9oCnm81gPQA,272312
 topologicpy/__init__.py,sha256=RMftibjgAnHB1vdL-muo71RwMS4972JCxHuRHOlU428,928
-topologicpy/version.py,sha256=S19MYIjxGesLc99Q4qttRtyqcN1JTaTrknAmmrZH4S8,23
-topologicpy-0.8.92.dist-info/licenses/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
-topologicpy-0.8.92.dist-info/METADATA,sha256=AUltiuak0trtBqGFWTznW6Xlc_irgAW7Y-9QUsGRXX8,10535
-topologicpy-0.8.92.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-topologicpy-0.8.92.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.8.92.dist-info/RECORD,,
+topologicpy/version.py,sha256=RdWx3Y_QmIJKCA6l7kMMEkyg_LsudVQdkeSqFo0Zk8o,23
+topologicpy-0.8.93.dist-info/licenses/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
+topologicpy-0.8.93.dist-info/METADATA,sha256=Pt_CPB53UTwU0aiDbVU9mUhHldLyJS4ir40Aj9vylZI,10535
+topologicpy-0.8.93.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+topologicpy-0.8.93.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.8.93.dist-info/RECORD,,