topologicpy 0.4.25__tar.gz → 0.4.26__tar.gz

{topologicpy-0.4.25/src/topologicpy.egg-info → topologicpy-0.4.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.4.25
+Version: 0.4.26
 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

{topologicpy-0.4.25 → topologicpy-0.4.26}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61"]
 build-backend = "setuptools.build_meta"
 [project]
 name = "topologicpy"
-version = "0.4.25"
+version = "0.4.26"
 authors = [
   { name="Wassim Jabi", email="wassim.jabi@gmail.com" },
 ]

{topologicpy-0.4.25 → topologicpy-0.4.26}/src/topologicpy/DGL.py

@@ -1532,8 +1532,10 @@ class DGL:
         """
         if not path:
             return None
-        file = open(path)
-        if not file:
+        try:
+            file = open(path)
+        except:
+            print("DGL.GraphsByDGCNNPath - Error: the DGCNN file is not a valid file. Returning None.")
             return None
         return DGL.GraphsByDGCNNFile(file=file, categories=categories, bidirectional=bidirectional)
 

{topologicpy-0.4.25 → topologicpy-0.4.26}/src/topologicpy/Graph.py

@@ -367,7 +367,7 @@ class Graph:
             try:
                 from tqdm.auto import tqdm
             except:
-                print("DGL - Error: Could not import tqdm")
+                print("Graph.BetweenessCentrality - Error: Could not import tqdm")
 
         if not isinstance(graph, topologic.Graph):
             print("Graph.BetweenessCentrality - Error: The input graph is not a valid graph. Returning None.")
@@ -535,16 +535,19 @@ class Graph:
         if not nodes_file_path:
             print("Graph.ByCSVPath - Error: the input edges_file_path is not a valid path. Returning None.")
             return None
-        graphs_file = open(graphs_file_path)
-        if not graphs_file:
+        try:
+            graphs_file = open(graphs_file_path)
+        except:
             print("Graph.ByCSVPath - Error: the graphs file is not a valid file. Returning None.")
             return None
-        edges_file = open(edges_file_path)
-        if not edges_file:
+        try:
+            edges_file = open(edges_file_path)
+        except:
             print("Graph.ByCSVPath - Error: the edges file is not a valid file. Returning None.")
             return None
-        nodes_file = open(nodes_file_path)
-        if not nodes_file:
+        try:
+            nodes_file = open(nodes_file_path)
+        except:
             print("Graph.ByCSVPath - Error: the nodes file is not a valid file. Returning None.")
             return None
         return Graph.ByCSVFile(graphs_file, edges_file, nodes_file,
@@ -611,17 +614,17 @@ class Graph:
         # Using split by line
         lines = graphs_string.split('\n')[1:-1]
         lines = [l for l in lines if lines != None or lines != ""]
-        pd_graphs = pd.DataFrame([row.split(',') for row in lines], 
+        pd_graphs = pd.DataFrame([row.split(',')[0:3] for row in lines], 
                         columns=[graph_id_header, graph_label_header, num_nodes_header])
         
         lines = edges_string.split('\n')[1:-1]
         lines = [l for l in lines if lines != None or lines != ""]
-        edges = pd.DataFrame([row.split(',') for row in lines], 
+        edges = pd.DataFrame([row.split(',')[0:3] for row in lines], 
                         columns=[graph_id_header, src_header, dst_header])
 
         lines = nodes_string.split('\n')[1:-1]
         lines = [l for l in lines if lines[-1] != None or lines[-1] != ""]
-        nodes = pd.DataFrame([row.split(',') for row in lines], 
+        nodes = pd.DataFrame([row.split(',')[0:5] for row in lines], 
                         columns=[graph_id_header, node_label_header, node_X_header, node_Y_header, node_Z_header])
 
         graphs = []
@@ -648,7 +651,12 @@ class Graph:
             graph_dict["node_features"] = []
             num_nodes = num_nodes_dict[graph_id]
             graph_label = label_dict[graph_id]
-            labels.append(int(graph_label))
+            if graph_label.isnumeric():
+                if graph_label.isdecimal():
+                    graph_label = int(graph_label)
+                else:
+                    graph_label = float(graph_label)
+            labels.append(float(graph_label))
 
             # Find the nodes and their labels and features
             nodes_of_id = nodes_group.get_group(graph_id)
@@ -722,9 +730,10 @@ class Graph:
         if not path:
             print("Graph.ByDGCNNPath - Error: the input path is not a valid path. Returning None.")
             return None
-        file = open(path)
-        if not file:
-            print("Graph.ByDGCNNPath - Error: the input file is not a valid file. Returning None.")
+        try:
+            file = open(path)
+        except:
+            print("Graph.ByDGCNNPath - Error: the DGCNN file is not a valid file. Returning None.")
             return None
         return Graph.ByDGCNNFile(file, key=key)
     

{topologicpy-0.4.25 → topologicpy-0.4.26}/src/topologicpy/Topology.py

@@ -1287,9 +1287,10 @@ class Topology():
         if not path:
             print("Topology.ByBREPPath - Error: the input path is not a valid path. Returning None.")
             return None
-        file = open(path)
-        if not file:
-            print("Topology.ByBREPPath - Error: the input file is not a valid file. Returning None.")
+        try:
+            file = open(path)
+        except:
+            print("Topology.ByBREPPath - Error: the BREP file is not a valid file. Returning None.")
             return None
         return Topology.ByBREPFile(file)
     
@@ -1668,9 +1669,10 @@ class Topology():
         if not path:
             print("Topology.ByJSONPath - Error: the input path is not a valid path. Returning None.")
             return None
-        file = open(path)
-        if not file:
-            print("Topology.ByJSONPath - Error: the input file is not a valid file. Returning None.")
+        try:
+            file = open(path)
+        except:
+            print("Topology.ByJSONPath - Error: the JSON file is not a valid file. Returning None.")
             return None
         return Topology.ByJSONFile(file=file, tolerance=tolerance)
 
@@ -1959,7 +1961,11 @@ class Topology():
         if not path:
             print("Topology.ByOBJPath - Error: the input path is not a valid path. Returning None.")
             return None
-        file = open(path)
+        try:
+            file = open(path)
+        except:
+            print("Topology.ByOBJPath - Error: the OBJ file is not a valid file. Returning None.")
+            return None
         return Topology.ByOBJFile(file, transposeAxes=transposeAxes, progressBar=progressBar, renderer=renderer, tolerance=tolerance)
     
     @staticmethod
@@ -2184,7 +2190,11 @@ class Topology():
         if not path:
             print("Topology.ByXYZPath - Error: the input path is not a valid path. Returning None.")
             return None
-        file = open(path)
+        try:
+            file = open(path)
+        except:
+            print("Topology.ByXYZPath - Error: the XYZ file is not a valid file. Returning None.")
+            return None
         return Topology.ByXYZFile(file, frameIdKey=frameIdKey, vertexIdKey=frameIdKey)
     
     @staticmethod

{topologicpy-0.4.25 → topologicpy-0.4.26}/src/topologicpy/__init__.py

@@ -2,7 +2,7 @@ import sys
 import os, re
 from sys import platform
 
-__version__ = '0.4.25'
+__version__ = '0.4.26'
 __version_info__ = tuple([ int(num) for num in __version__.split('.')])
 
 if platform == 'win32':
@@ -14,7 +14,7 @@ sitePackagesFolderName = os.path.join(os.path.dirname(os.path.realpath(__file__)
 test1 = os.path.dirname(os.path.realpath(__file__))
 topologicFolderName = [filename for filename in os.listdir(sitePackagesFolderName) if filename.startswith("topologic")][0]
 topologicPath = os.path.join(sitePackagesFolderName, topologicFolderName)
-sys.path.append(topologicPath)
+sys.path.append(topologicPath.replace(".libs",""))
 
 import topologic
 

{topologicpy-0.4.25 → topologicpy-0.4.26/src/topologicpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.4.25
+Version: 0.4.26
 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