Merge pull request #32 from TigerGraph-DevLabs/feature/tigergraph_api

feat: run RESTful APIs directly within TigerGraphX instead of using pyTigerGraph

Author: xuanleilin

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ---
 
+## 0.2.2
+- feat: run RESTful APIs directly within TigerGraphX instead of using pyTigerGraph
+
 ## 0.2.1
 - feat: add simple GraphRAG
 - fix: correct the image link

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tigergraphx"
-version = "0.2.1"
+version = "0.2.2"
 description = "TigerGraphX is a high-level Python library offering a unified, Python-native interface for graph databases, advanced analytics, and GraphRAG workflows. Combining the simplicity of NetworkX with the advanced capabilities of TigerGraph, including tgCloud, it empowers Python developers to harness the power of graphs without the need to learn query languages like Cypher or GSQL."
 authors = ["Xuanlei Lin <[email protected]>"]
 license = "MIT"
@@ -23,7 +23,6 @@ pydantic-settings = "^2.6.1"
 pyyaml = "^6.0.2"
 
 # Database and Storage
-pytigergraph = "^1.8.1"
 nano-vectordb = "^0.0.4.3"
 
 # Large Language Model (LLM) Utilities

pyproject.toml

@@ -169,6 +169,9 @@ def test_add_node_without_type(self):
         ):
             self.G.add_node("D")
 
+    def test_remove_node(self):
+        assert self.G.remove_node("User_A", "User")
+
     def test_has_nodes(self):
         # Test node existence
         assert self.G.has_node("User_A", "User")

tests/integration/core/graph_test.py

@@ -50,17 +50,20 @@ def add_nodes_and_edges(self):
         self.setup_graph()
 
         # Adding nodes and edges
+        self.G.upsert(
+            data=[
+                {
+                    "id": "Entity_1",
+                    "entity_type": "Person",
+                    "description": "Desc1",
+                    "source_id": "Source1",
+                    "emb_description": [-0.01773, -0.01019, -0.01657],
+                },
+            ],
+            node_type="Entity",
+        )
         self.G.add_nodes_from(
             [
-                (
-                    "Entity_1",
-                    {
-                        "entity_type": "Person",
-                        "description": "Desc1",
-                        "source_id": "Source1",
-                        "emb_description": [-0.01773, -0.01019, -0.01657],
-                    },
-                ),
                 (
                     "Entity_2",
                     {

tests/integration/core/tigervector_test.py

@@ -8,11 +8,11 @@
 class TestDataManager:
     @pytest.fixture(autouse=True)
     def setup(self):
-        self.mock_connection = MagicMock()
-        self.mock_connection.gsql = MagicMock()
+        self.mock_tigergraph_api = MagicMock()
+        self.mock_tigergraph_api.gsql = MagicMock()
 
         mock_context = MagicMock()
-        mock_context.connection = self.mock_connection  # Use the mocked connection
+        mock_context.tigergraph_api = self.mock_tigergraph_api
         mock_context.graph_schema = GraphSchema(
             graph_name="MyGraph", nodes={}, edges={}
         )
@@ -21,7 +21,7 @@ def setup(self):
     def test_load_data_success(self):
         loading_job_config = LoadingJobConfig(loading_job_name="test_job", files=[])
         # Mock the gsql return value to simulate a successful load process
-        self.mock_connection.gsql.return_value = (
+        self.mock_tigergraph_api.gsql.return_value = (
             "Using graph 'MyGraph'...\n"
             "Successfully created loading jobs:\n"
             "LOAD SUCCESSFUL for loading jobid\n"
@@ -30,12 +30,12 @@ def test_load_data_success(self):
         self.data_manager.load_data(loading_job_config)
 
         # Assert the gsql method was called once
-        self.mock_connection.gsql.assert_called_once()
+        self.mock_tigergraph_api.gsql.assert_called_once()
 
     def test_load_data_failure(self):
         loading_job_config = LoadingJobConfig(loading_job_name="test_job", files=[])
         # Mock the gsql return value for failure
-        self.mock_connection.gsql.return_value = "LOAD FAILED"
+        self.mock_tigergraph_api.gsql.return_value = "LOAD FAILED"
 
         # Assert that RuntimeError is raised on failure
         with pytest.raises(RuntimeError):