topologicpy 0.5.7__tar.gz → 0.5.9__tar.gz

{topologicpy-0.5.7/src/topologicpy.egg-info → topologicpy-0.5.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.5.7
+Version: 0.5.9
 Summary: An Advanced Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 Project-URL: Homepage, https://github.com/wassimj/TopologicPy
@@ -13,21 +13,11 @@ Requires-Python: <3.12,>=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy
-Requires-Dist: pandas
 Requires-Dist: scipy
-Requires-Dist: scikit-learn
-Requires-Dist: ifcopenshell
-Requires-Dist: ladybug
-Requires-Dist: honeybee
-Requires-Dist: honeybee-energy
-Requires-Dist: networkx
-Requires-Dist: openstudio
+Requires-Dist: pandas
 Requires-Dist: tqdm
 Requires-Dist: plotly
-Requires-Dist: pyvis
 Requires-Dist: lark
-Requires-Dist: webcolors
-Requires-Dist: rdflib
 
 # topologicpy
 

{topologicpy-0.5.7 → topologicpy-0.5.9}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61"]
 build-backend = "setuptools.build_meta"
 [project]
 name = "topologicpy"
-version = "0.5.7"
+version = "0.5.9"
 authors = [
   { name="Wassim Jabi", email="wassim.jabi@gmail.com" },
 ]
@@ -17,21 +17,11 @@ classifiers = [
 ]
 dependencies = [
     "numpy",
-    "pandas",
     "scipy",
-    "scikit-learn",
-    "ifcopenshell",
-    "ladybug",
-    "honeybee",
-    "honeybee-energy",
-    "networkx",
-    "openstudio",
+    "pandas",
     "tqdm",
     "plotly",
-    "pyvis",
     "lark",
-    "webcolors",
-    "rdflib",
 ]
 [project.urls]
 "Homepage" = "https://github.com/wassimj/TopologicPy"

{topologicpy-0.5.7 → topologicpy-0.5.9}/src/topologicpy/Color.py

@@ -35,7 +35,23 @@ class Color:
         list
             The color expressed as an [r, g, b] or an [r, g, b, a] list.
         """
-        import webcolors
+        import warnings
+        import os
+        try:
+            import webcolors
+        except:
+            print("Color.ByCSSNamedColor - Information: Installing required webcolors library.")
+            try:
+                os.system("pip install webcolors")
+            except:
+                os.system("pip install webcolors --user")
+            try:
+                import webcolors
+                print("Color.ByCSSNamedColor - Information: webcolors library installed correctly.")
+            except:
+                warnings.warn("Color.ByCSSNamedColor - Error: Could not import webcolors library. Please manually install webcolors. Returning None.")
+                return None
+
         if not alpha == None:
             if not 0.0 <= alpha <= 1.0:
                 print("Color.ByCSSNamedColor - Error: alpha is not within the valid range of 0 to 1. Returning None.")
@@ -262,9 +278,23 @@ class Color:
         str
             The CSS named color that most closely matches the input color.
         """
-
-        import webcolors
         import numbers
+        import warnings
+        import os
+        try:
+            import webcolors
+        except:
+            print("Color.CSSNamedColor - Information: Installing required webcolors library.")
+            try:
+                os.system("pip install webcolors")
+            except:
+                os.system("pip install webcolors --user")
+            try:
+                import webcolors
+                print("Color.CSSNamedColor - Information: webcolors library installed correctly.")
+            except:
+                warnings.warn("Color.CSSNamedColor - Error: Could not import webcolors library. Please manually install webcolors. Returning None.")
+                return None
 
         if not isinstance(color, list):
             print("Color.CSSNamedColor - Error: The input color parameter is not a valid list. Returning None.")

{topologicpy-0.5.7 → topologicpy-0.5.9}/src/topologicpy/DGL.py

@@ -94,24 +94,6 @@ except:
     except:
         warnings.warn("DGL - Error: Could not import dgl. The installation of the correct version of the dgl library is not trivial and is highly dependent on your hardward and software configuration. Please consult the dgl installation instructions.")
 
-try:
-    from sklearn import metrics
-    from sklearn.model_selection import KFold
-    from sklearn.metrics import accuracy_score
-except:
-    print("DGL - Installing required scikit-learn (sklearn) library.")
-    try:
-        os.system("pip install scikit-learn")
-    except:
-        os.system("pip install scikit-learn --user")
-    try:
-        from sklearn import metrics
-        from sklearn.model_selection import KFold
-        from sklearn.metrics import accuracy_score
-        print("DGL - scikit-learn (sklearn) library installed correctly.")
-    except:
-        raise Exception("DGL - Error: Could not import scikit-learn (sklearn).")
-
 try:
     from tqdm.auto import tqdm
 except:
@@ -715,6 +697,20 @@ class _GraphRegressorKFold:
     
     
     def train(self):
+        try:
+            from sklearn.model_selection import KFold
+        except:
+            print("DGL - Installing required scikit-learn (sklearn) library.")
+            try:
+                os.system("pip install scikit-learn")
+            except:
+                os.system("pip install scikit-learn --user")
+            try:
+                from sklearn.model_selection import KFold
+                print("DGL - scikit-learn (sklearn) library installed correctly.")
+            except:
+                warnings.warn("DGL - Error: Could not import scikit-learn (sklearn). Please try to install scikit-learn manually. Returning None.")
+                return None
         device = torch.device("cpu")
 
         # The number of folds (This should come from the hparams)
@@ -904,6 +900,22 @@ class _GraphClassifierHoldout:
                                                     batch_size=hparams.batch_size,
                                                     drop_last=False)
     def train(self):
+
+        try:
+            from sklearn.metrics import accuracy_score
+        except:
+            print("DGL - Installing required scikit-learn (sklearn) library.")
+            try:
+                os.system("pip install scikit-learn")
+            except:
+                os.system("pip install scikit-learn --user")
+            try:
+                from sklearn.metrics import accuracy_score
+                print("DGL - scikit-learn (sklearn) library installed correctly.")
+            except:
+                warnings.warn("DGL - Error: Could not import scikit-learn (sklearn). Please try to install scikit-learn manually. Returning None.")
+                return None
+        
         #device = torch.device("cuda:0" if torch.cuda.is_available() else "cpu")
         device = torch.device("cpu")
         # Init the loss and accuracy reporting lists
@@ -951,6 +963,20 @@ class _GraphClassifierHoldout:
             self.validation_loss_list.append(self.validation_loss)
         
     def validate(self):
+        try:
+            from sklearn.metrics import accuracy_score
+        except:
+            print("DGL - Installing required scikit-learn (sklearn) library.")
+            try:
+                os.system("pip install scikit-learn")
+            except:
+                os.system("pip install scikit-learn --user")
+            try:
+                from sklearn.metrics import accuracy_score
+                print("DGL - scikit-learn (sklearn) library installed correctly.")
+            except:
+                warnings.warn("DGL - Error: Could not import scikit-learn (sklearn). Please try to install scikit-learn manually. Returning None.")
+                return None
         #device = torch.device("cuda:0" if torch.cuda.is_available() else "cpu")
         device = torch.device("cpu")
         temp_loss_list = []
@@ -969,6 +995,20 @@ class _GraphClassifierHoldout:
         self.validation_loss = np.mean(temp_loss_list).item()
     
     def test(self):
+        try:
+            from sklearn.metrics import accuracy_score
+        except:
+            print("DGL - Installing required scikit-learn (sklearn) library.")
+            try:
+                os.system("pip install scikit-learn")
+            except:
+                os.system("pip install scikit-learn --user")
+            try:
+                from sklearn.metrics import accuracy_score
+                print("DGL - scikit-learn (sklearn) library installed correctly.")
+            except:
+                warnings.warn("DGL - Error: Could not import scikit-learn (sklearn). Please try to install scikit-learn manually. Returning None.")
+                return None
         if self.test_dataloader:
             temp_loss_list = []
             temp_acc_list = []
@@ -1073,6 +1113,23 @@ class _GraphClassifierKFold:
                                             lr=self.hparams.lr, maximize=self.hparams.maximize, weight_decay=self.hparams.weight_decay)
 
     def train(self):
+
+        try:
+            from sklearn.model_selection import KFold
+            from sklearn.metrics import accuracy_score
+        except:
+            print("DGL - Installing required scikit-learn (sklearn) library.")
+            try:
+                os.system("pip install scikit-learn")
+            except:
+                os.system("pip install scikit-learn --user")
+            try:
+                from sklearn.model_selection import KFold
+                from sklearn.metrics import accuracy_score
+                print("DGL - scikit-learn (sklearn) library installed correctly.")
+            except:
+                warnings.warn("DGL - Error: Could not import scikit-learn (sklearn). Please try to install scikit-learn manually. Returning None.")
+                return None
         # The number of folds (This should come from the hparams)
         k_folds = self.hparams.k_folds
 
@@ -1176,6 +1233,20 @@ class _GraphClassifierKFold:
         self.validation_loss_list = self.validation_loss_list[ind]
         
     def validate(self):
+        try:
+            from sklearn.metrics import accuracy_score
+        except:
+            print("DGL - Installing required scikit-learn (sklearn) library.")
+            try:
+                os.system("pip install scikit-learn")
+            except:
+                os.system("pip install scikit-learn --user")
+            try:
+                from sklearn.metrics import accuracy_score
+                print("DGL - scikit-learn (sklearn) library installed correctly.")
+            except:
+                warnings.warn("DGL - Error: Could not import scikit-learn (sklearn). Please try to install scikit-learn manually. Returning None.")
+                return None
         temp_loss_list = []
         temp_acc_list = []
         self.model.eval()
@@ -1192,6 +1263,22 @@ class _GraphClassifierKFold:
         self.validation_loss = np.mean(temp_loss_list).item()
     
     def test(self):
+
+        try:
+            from sklearn.metrics import accuracy_score
+        except:
+            print("DGL - Installing required scikit-learn (sklearn) library.")
+            try:
+                os.system("pip install scikit-learn")
+            except:
+                os.system("pip install scikit-learn --user")
+            try:
+                from sklearn.metrics import accuracy_score
+                print("DGL - scikit-learn (sklearn) library installed correctly.")
+            except:
+                warnings.warn("DGL - Error: Could not import scikit-learn (sklearn). Please try to install scikit-learn manually. Returning None.")
+                return None
+        
         if self.testingDataset:
             self.test_dataloader = GraphDataLoader(self.testingDataset,
                                                     batch_size=len(self.testingDataset),
@@ -1724,6 +1811,23 @@ class DGL:
 
         """
 
+        try:
+            from sklearn import metrics
+            from sklearn.metrics import accuracy_score
+        except:
+            print("DGL - Installing required scikit-learn (sklearn) library.")
+            try:
+                os.system("pip install scikit-learn")
+            except:
+                os.system("pip install scikit-learn --user")
+            try:
+                from sklearn import metrics
+                from sklearn.metrics import accuracy_score
+                print("DGL - scikit-learn (sklearn) library installed correctly.")
+            except:
+                warnings.warn("DGL - Error: Could not import scikit-learn (sklearn). Please try to install scikit-learn manually. Returning None.")
+                return None
+            
         if not isinstance(actual, list):
             print("DGL.ConfusionMatrix - ERROR: The actual input is not a list. Returning None")
             return None

{topologicpy-0.5.7 → topologicpy-0.5.9}/src/topologicpy/Dictionary.py

@@ -622,6 +622,9 @@ class Dictionary(topologic.Dictionary):
         if not isinstance(dictionary, topologic.Dictionary) and not isinstance(dictionary, dict):
             print("Dictionary.ValueAtKey - Error: The input dictionary parameter is not a valid topologic or python dictionary. Returning None.")
             return None
+        if not isinstance(key, str):
+            print("Dictionary.ValueAtKey - Error: The input key parameter is not a valid str. Returning None.")
+            return None
         if isinstance(dictionary, dict):
             attr = dictionary[key]
         elif isinstance(dictionary, topologic.Dictionary):

{topologicpy-0.5.7 → topologicpy-0.5.9}/src/topologicpy/EnergyModel.py

@@ -37,22 +37,6 @@ except:
     except:
         warnings.warn("EnergyModel - Error: Could not import tqdm.")
 
-try:
-    import openstudio
-    openstudio.Logger.instance().standardOutLogger().setLogLevel(openstudio.Fatal)
-except:
-    print("EnergyModel - Installing required openstudio library.")
-    try:
-        os.system("pip install openstudio")
-    except:
-        os.system("pip install openstudio --user")
-    try:
-        import openstudio
-        openstudio.Logger.instance().standardOutLogger().setLogLevel(openstudio.Fatal)
-        print("EnergyModel - openstudio library installed correctly.")
-    except:
-        warnings.warn("EnergyModel - Error: Could not import openstudio.")
-
 class EnergyModel:
     '''
     @staticmethod
@@ -99,8 +83,25 @@ class EnergyModel:
             The OSM model.
 
         """
+        try:
+            import openstudio
+            openstudio.Logger.instance().standardOutLogger().setLogLevel(openstudio.Fatal)
+        except:
+            print("EnergyModel.ByOSMPath - Information: Installing required openstudio library.")
+            try:
+                os.system("pip install openstudio")
+            except:
+                os.system("pip install openstudio --user")
+            try:
+                import openstudio
+                openstudio.Logger.instance().standardOutLogger().setLogLevel(openstudio.Fatal)
+                print("EnergyModel.ByOSMPath - Information: openstudio library installed correctly.")
+            except:
+                warnings.warn("EnergyModel - Error: Could not import openstudio.Please try to install openstudio manually. Returning None.")
+                return None
+        
         if not path:
-            print("EnergyModel.ByImportedOSM - Error: The input path is not valid. Returning None.")
+            print("EnergyModel.ByOSMPath - Error: The input path is not valid. Returning None.")
             return None
         translator = openstudio.osversion.VersionTranslator()
         osmPath = openstudio.openstudioutilitiescore.toPath(path)
@@ -111,26 +112,6 @@ class EnergyModel:
         else:
             osModel = osModel.get()
         return osModel
-
-    @staticmethod
-    def ByImportedOSM(path: str):
-        """
-        DEPRECATED. DO NOT USE. Instead use Topology.ByOSMPath or Topology.ByOSMFile
-        Creates an EnergyModel from the input OSM file path.
-        
-        Parameters
-        ----------
-        path : string
-            The path to the input .OSM file.
-
-        Returns
-        -------
-        openstudio.openstudiomodelcore.Model
-            The OSM model.
-
-        """
-        print("Topology.ByImportedOSM - WARNING: This method is DEPRECATED. DO NOT USE. Instead use Topology.ByOSMPath")
-        return EnergyModel.ByOSMPath(path=path)
     
     @staticmethod
     def ByTopology(building : topologic.Topology,

{topologicpy-0.5.7 → topologicpy-0.5.9}/src/topologicpy/Face.py

@@ -1786,7 +1786,7 @@ class Face(Topology):
         return Face.ByWire(wire, tolerance=tolerance)
 
     @staticmethod
-    def Triangulate(face:topologic.Face, mode: str = "classic", meshSize: float = None, tolerance: float = 0.0001) -> list:
+    def Triangulate(face:topologic.Face, mode: int = 0, meshSize: float = None, tolerance: float = 0.0001) -> list:
         """
         Triangulates the input face and returns a list of faces.
 
@@ -1796,10 +1796,18 @@ class Face(Topology):
             The input face.
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
-        mode : str , optional
-            The desired mode of meshing. Two options are available: "classic" and "mesh". They are case insensitive.
-            The "mesh" option uses the gmsh library.
-            WARNING: The "mesh" option can be very time consuming and can create very heavy geometry.
+        mode : int , optional
+            The desired mode of meshing algorithm. Several options are available:
+            0: Classic
+            1: MeshAdapt
+            3: Initial Mesh Only
+            5: Delaunay
+            6: Frontal-Delaunay
+            7: BAMG
+            8: Fontal-Delaunay for Quads
+            9: Packing of Parallelograms
+            All options other than 0 (Classic) use the gmsh library. See https://gmsh.info/doc/texinfo/gmsh.html#Mesh-options
+            WARNING: The options that use gmsh can be very time consuming and can create very heavy geometry.
         meshSize : float , optional
             The desired size of the mesh when using the "mesh" option. If set to None, it will be
             calculated automatically and set to 10% of the overall size of the face.
@@ -1810,14 +1818,11 @@ class Face(Topology):
             The list of triangles of the input face.
 
         """
-        from topologicpy.Vertex import Vertex
         from topologicpy.Wire import Wire
-        from topologicpy.Shell import Shell
         from topologicpy.Topology import Topology
-        from topologicpy.Dictionary import Dictionary
 
         # This function was contributed by Yidan Xue.
-        def generate_gmsh(face, meshSize = None, tolerance = 0.0001):
+        def generate_gmsh(face, mode="mesh", meshSize = None, tolerance = 0.0001):
             """
             Creates a gmsh of triangular meshes from the input face.
 
@@ -1921,7 +1926,9 @@ class Face(Topology):
 
             gmsh.model.geo.addPlaneSurface([i+1 for i in range(current_wire_number)])
             gmsh.model.geo.synchronize()
-            
+            if mode not in [1,3,5,6,7,8,9]:
+                mode = 6
+            gmsh.option.setNumber("Mesh.Algorithm", mode)
             gmsh.model.mesh.generate(2)         # For a 2D mesh
             nodeTags, nodeCoords, nodeParams = gmsh.model.mesh.getNodes(-1, -1)
             elemTypes, elemTags, elemNodeTags = gmsh.model.mesh.getElements(-1, -1)
@@ -1955,9 +1962,7 @@ class Face(Topology):
         normal = Face.Normal(face)
         flatFace = Topology.Flatten(face, origin=origin, direction=normal)
 
-        if "mesh" in mode.lower():
-            shell_faces = generate_gmsh(flatFace, meshSize = meshSize, tolerance = tolerance)
-        else:
+        if mode == 0:
             shell_faces = []
             for i in range(0,5,1):
                 try:
@@ -1965,7 +1970,9 @@ class Face(Topology):
                     break
                 except:
                     continue
-        
+        else:
+            shell_faces = generate_gmsh(flatFace, mode = mode, meshSize = meshSize, tolerance = tolerance)
+            
         if len(shell_faces) < 1:
             return []
         finalFaces = []