Update topology tests and schema for improved reliability

Extended wait times and retries in e2e tests to ensure stability and better error handling. Refactored edge creation logic to use dynamic node IDs, improving flexibility and accuracy. Removed primary key from `id` in topology schema to align with database requirements.

Author: VladimirFilonov

keep/api/models/db/topology.py

@@ -51,7 +51,7 @@ class TopologyApplication(SQLModel, table=True):
 
 
 class TopologyService(SQLModel, table=True):
-    id: UUID = Field(default_factory=uuid4, primary_key=True)
+    id: UUID = Field(default_factory=uuid4)
     external_id: Optional[int]
     tenant_id: str = Field(sa_column=Column(ForeignKey("tenant.id")))
     source_provider_id: str = "unknown"

tests/e2e_tests/test_topology.py

@@ -24,7 +24,7 @@ def test_topology_manual(browser):
         # Open the Service Topology page
         browser.get_by_role("link", name="Service Topology").hover()
         browser.get_by_role("link", name="Service Topology").click()
-        browser.wait_for_timeout(2000)  # Added extra wait for page to fully load
+        browser.wait_for_timeout(5000)  # Added extra wait for page to fully load
 
         max_retries = 5
         retries = 0
@@ -33,9 +33,11 @@ def test_topology_manual(browser):
         while retries <= max_retries:
             try:
                 browser.get_by_role("button", name="Add Node", exact=True).click()
+                browser.wait_for_timeout(2000)
                 browser.get_by_placeholder("Enter service here...").fill("service_id_1")
                 break
             except Exception:
+                raise
                 if retries == max_retries:
                     raise
                 retries += 1
@@ -89,9 +91,7 @@ def test_topology_manual(browser):
         browser.wait_for_timeout(2000)
 
         # Improved edge connection with retries
-        def connect_nodes(source_selector, target_selector, edge_label, max_attempts=3):
-            source_handle = browser.locator(source_selector)
-            target_handle = browser.locator(target_selector)
+        def connect_nodes(source_handle, target_handle, edge_label, max_attempts=3):
 
             for attempt in range(max_attempts):
                 try:
@@ -151,14 +151,18 @@ def connect_nodes(source_selector, target_selector, edge_label, max_attempts=3):
         node_2 = browser.locator("div.react-flow__node-service").filter(has_text="SERVICE_ID_2")
         node_3 = browser.locator("div.react-flow__node-service").filter(has_text="SERVICE_ID_3")
 
+        node_1_id = node_1.get_attribute('data-id')
+        node_2_id = node_2.get_attribute('data-id')
+        node_3_id = node_3.get_attribute('data-id')
+
         # Connect nodes by dragging source to target handles
-        source_handle_1 = node_1.locator("div[data-handlepos='right']")
-        target_handle_2 = node_2.locator("div[data-handlepos='left']")
-        target_handle_3 = node_3.locator("div[data-handlepos='left']")
+        source_handle_1 = node_1.locator(f"div[data-id='1-{node_1_id}-right-source']")
+        target_handle_2 = node_2.locator(f"div[data-id='1-{node_2_id}-left-target']")
+        target_handle_3 = node_3.locator(f"div[data-id='1-{node_3_id}-left-target']")
 
         # Connect nodes with retry logic
         edge1_created = connect_nodes(
-            source_handle_1, target_handle_2, "Edge from 1 to 2"
+            source_handle_1, target_handle_2, f"Edge from {node_1_id} to {node_2_id}"
         )
         if not edge1_created:
             # Take diagnostic screenshots
@@ -167,7 +171,7 @@ def connect_nodes(source_selector, target_selector, edge_label, max_attempts=3):
             print("Failed to create edge from node 1 to node 2 after multiple attempts")
 
         edge2_created = connect_nodes(
-            source_handle_1, target_handle_3, "Edge from 1 to 3"
+            source_handle_1, target_handle_3, f"Edge from {node_1_id} to {node_3_id}"
         )
         if not edge2_created:
             # Take diagnostic screenshots
@@ -177,9 +181,9 @@ def connect_nodes(source_selector, target_selector, edge_label, max_attempts=3):
 
         # Validate edge connections with more flexible assertions
         browser.wait_for_timeout(2000)
-        edge_1_to_2 = browser.locator("g.react-flow__edge").first
+        edge_1_to_2 = browser.locator(f"g.react-flow__edge[aria-label='Edge from {node_1_id} to {node_2_id}']")
         expect(edge_1_to_2).to_have_count(1, timeout=10000)  # Increased timeout
-        edge_1_to_3 = browser.locator("g.react-flow__edge").last
+        edge_1_to_3 = browser.locator(f"g.react-flow__edge[aria-label='Edge from {node_1_id} to {node_3_id}']")
         expect(edge_1_to_3).to_have_count(1, timeout=10000)  # Increased timeout
 
         # Continue with rest of the test...
@@ -193,10 +197,26 @@ def connect_nodes(source_selector, target_selector, edge_label, max_attempts=3):
 
         # Ensure edge was deleted with retry
         for _ in range(5):
-            if browser.locator("g.react-flow__edge").count() == 1:
-                break
+            if (
+                    browser.locator(
+                        f"g.react-flow__edge[aria-label='Edge from {node_1_id} to {node_2_id}']"
+                    ).count()
+                    == 0
+            ):
+                if browser.locator("g.react-flow__edge").count() == 1:
+                    break
             browser.wait_for_timeout(1000)
 
+        expect(
+            browser.locator(f"g.react-flow__edge[aria-label='Edge {node_1_id} to {node_2_id}']")
+        ).to_have_count(0, timeout=5000)
+
+        # Ensure remaining edges are intact
+        expect(
+            browser.locator(f"g.react-flow__edge[aria-label='Edge from {node_1_id} to {node_3_id}']")
+        ).to_have_count(1, timeout=5000)
+        browser.wait_for_timeout(2000)
+
         # Delete a node and ensure related edges are removed
         node_to_delete = browser.locator("div.react-flow__node").filter(
             has_text="SERVICE_ID_1"
@@ -226,15 +246,15 @@ def connect_nodes(source_selector, target_selector, edge_label, max_attempts=3):
         for _ in range(5):
             if (
                 browser.locator(
-                    "g.react-flow__edge[aria-label='Edge from 1 to 3']"
+                    f"g.react-flow__edge[aria-label='Edge from {node_1_id} to {node_3_id}']"
                 ).count()
                 == 0
             ):
                 break
             browser.wait_for_timeout(1000)
 
         expect(
-            browser.locator("g.react-flow__edge")
+            browser.locator(f"g.react-flow__edge[aria-label='Edge from {node_1_id} to {node_3_id}']")
         ).to_have_count(0, timeout=5000)
 
         # Update node name and verify the change