cpg2py 1.0.2__py3-none-any.whl → 1.0.4__py3-none-any.whl

cpg2py/__init__.py

@@ -1,9 +1,9 @@
-from pathlib import Path
 from csv import DictReader
+from pathlib import Path
 from .cpg import _Graph
 from .abc import *
 
-def cpg_graph(node_csv: Path, edge_csv: Path) -> _Graph: 
+def cpg_graph(node_csv: Path, edge_csv: Path) -> "_Graph":
     storage = Storage()
     with open(node_csv, 'r') as n_file: 
         reader = DictReader(n_file, delimiter='\t')
@@ -11,9 +11,9 @@ def cpg_graph(node_csv: Path, edge_csv: Path) -> _Graph:
             nid = node_props.get("id:int", None) 
             if nid is None: node_props.get("id") 
             if not storage.add_node(nid): 
-                print(f"Node {nid} already exists in the graph")
+                print(f"WARN: Node {nid} already exists in the graph")
             if not storage.set_node_props(nid, node_props): 
-                print(f"Failed to set properties for node {nid}")
+                print(f"WARN: Failed to set properties for node {nid}")
     with open(edge_csv, 'r') as f:
         reader = DictReader(f, delimiter='\t')
         for edge_props in reader: 
@@ -24,11 +24,17 @@ def cpg_graph(node_csv: Path, edge_csv: Path) -> _Graph:
             e_type = str(edge_props.get("type", None))
             if e_type is None: e_type = str(edge_props.get("type:str"))
             edge_id = (f_nid, t_nid, e_type)
+            if not storage.contains_node(edge_id[0]): 
+                storage.add_node(edge_id[0])
+                print(f"WARN: node {edge_id[0]} does not exists")
+            if not storage.contains_node(edge_id[1]): 
+                storage.add_node(edge_id[1])
+                print(f"WARN: node {edge_id[1]} does not exists")
             if not storage.add_edge(edge_id): 
-                print(f"Edge {f_nid} -> {t_nid} already exists in the graph")
+                print(f"WARN: Edge {f_nid} -> {t_nid} already exists in the graph")
             if not storage.set_edge_props(edge_id, edge_props): 
-                print(f"Failed to set properties for edge {edge_id}")
-    return _Graph(storage)
+                print(f"WARN: Failed to set properties for edge {edge_id}")
+        return _Graph(storage)
 
 
 __all__ = ['cpg_graph', 'AbcGraphQuerier', 'AbcNodeQuerier', 'AbcEdgeQuerier', 'Storage']

cpg2py/cpg/edge.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 from typing import Optional, Tuple
-from enum import Enum
 from ..abc import AbcGraphQuerier, AbcEdgeQuerier
 
 class _Edge(AbcEdgeQuerier): 

{cpg2py-1.0.2.dist-info → cpg2py-1.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cpg2py
-Version: 1.0.2
+Version: 1.0.4
 Summary: A graph-based data structure designed for querying CSV files in Joern format in Python
 Home-page: https://github.com/YichaoXu/cpg2py
 Author: Yichao Xu

{cpg2py-1.0.2.dist-info → cpg2py-1.0.4.dist-info}/RECORD

@@ -1,15 +1,15 @@
-cpg2py/__init__.py,sha256=bjd1EjYmNa0N8DW4tSQg-YpzzkqgtBVR2FrgDZReY10,1557
+cpg2py/__init__.py,sha256=4GXaMrMxlqWKpjrwAZlSwBCG-9_osMeChuFS-WRqtKg,1918
 cpg2py/abc/__init__.py,sha256=HgDXsJkGcPQvr6ac3hMrUU9TuQibMaP7-oXbXLs_iLI,207
 cpg2py/abc/edge.py,sha256=zLlRebDKT2qK5XOJq23_UUCESgGsvgalbXdx_uUcKks,1240
 cpg2py/abc/graph.py,sha256=DbeHN6qsNaqcqL9cUquJWC16BihDxy1MEhyuL-qVMBI,3902
 cpg2py/abc/node.py,sha256=E2EQv_KisEPuslFaglZZvSBm-VY5LYCFBOFY1yiPzDY,844
 cpg2py/abc/storage.py,sha256=BF82Vs_7FxGYSPiM_6JwQVzmaqMzGy2r-WSk8pQQclY,5976
 cpg2py/cpg/__init__.py,sha256=fO59Yd7OISyxdjdZDJ5zFM41r4cYKawOsvpqV4gWrGM,48
-cpg2py/cpg/edge.py,sha256=_ERU_lS4_5AxlOiuX73JvTZBSr9o8ae0q-kWwO82580,1029
+cpg2py/cpg/edge.py,sha256=brG7cQl7tjihbUCBYyjNUnMLsKIif-XQc_TFdGz8ZYo,1007
 cpg2py/cpg/graph.py,sha256=n4EjAhhjzl0XRJBwlAmK5AcSrECiqhjA6dXt2Ucf7IM,3448
 cpg2py/cpg/node.py,sha256=-2xl8c-eSbe4Kv4xPAEf6POlCYOV4j0voxJAKDZj3Cc,2037
-cpg2py-1.0.2.dist-info/LICENSE,sha256=vTjbt7iL1hUilI8E87FoQerEDa9nbpeip26iA6bguHI,1066
-cpg2py-1.0.2.dist-info/METADATA,sha256=dCiQ4H2zcFC9AfFVOsSAkzFJDsKccGwcuyGYCnj9LRs,7077
-cpg2py-1.0.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-cpg2py-1.0.2.dist-info/top_level.txt,sha256=xDY8faKh5Rczvsqb5Jt9Sq-Y7EOImh7jh-m1oVTnH5k,7
-cpg2py-1.0.2.dist-info/RECORD,,
+cpg2py-1.0.4.dist-info/LICENSE,sha256=vTjbt7iL1hUilI8E87FoQerEDa9nbpeip26iA6bguHI,1066
+cpg2py-1.0.4.dist-info/METADATA,sha256=Xhx-JFz1RECxW-aLxPhfy4elJgFoaTjxxiXR28YD-c8,7077
+cpg2py-1.0.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+cpg2py-1.0.4.dist-info/top_level.txt,sha256=xDY8faKh5Rczvsqb5Jt9Sq-Y7EOImh7jh-m1oVTnH5k,7
+cpg2py-1.0.4.dist-info/RECORD,,