Refactor topology tests and update type hints to UUID.

Updated e2e topology tests for improved node and edge selection logic. Refactored service ID and dependency parameters in type hints from `int` to `UUID | str` for consistency and clarity across various modules.

Author: VladimirFilonov

keep/api/models/db/topology.py

@@ -317,7 +317,7 @@ class TopologyServiceDependencyUpdateRequestDto(
 
 
 class DeleteServicesRequest(BaseModel, extra="ignore"):
-    service_ids: List[int]
+    service_ids: List[UUID | str]
 
 
 class TopologyServiceYAML(TopologyServiceCreateRequestDTO, extra="ignore"):

keep/api/routes/topology.py

@@ -425,7 +425,7 @@ def update_dependency(
     "/dependency/{dependency_id}", description="Deleting a dependency manually"
 )
 def delete_dependency(
-    dependency_id: int,
+    dependency_id: UUID | str,
     authenticated_entity: AuthenticatedEntity = Depends(
         IdentityManagerFactory.get_auth_verifier(["write:topology"])
     ),

keep/topologies/topologies_service.py

@@ -100,7 +100,7 @@ def get_service_application_ids_dict(
 
 
 def validate_non_manual_exists(
-    service_ids: list[int], session: Session, tenant_id: str
+    service_ids: list[UUID | str], session: Session, tenant_id: str
 ) -> bool:
     non_manual_exists = session.query(
         exists()
@@ -677,7 +677,7 @@ def update_dependency(
             session.close()
 
     @staticmethod
-    def delete_dependency(dependency_id: int, session: Session, tenant_id: str):
+    def delete_dependency(dependency_id: UUID | str, session: Session, tenant_id: str):
         try:
             db_dependency: TopologyServiceDependency = (
                 TopologiesService.get_dependency_by_id(

tests/e2e_tests/test_topology.py

@@ -75,36 +75,33 @@ def test_topology_manual(browser: Page, setup_page_logging, failure_artifacts):
     for _ in range(5):
         zoom_out_button.click()
 
+    node_1 = browser.locator("div.react-flow__node-service").filter(has_text="SERVICE_ID_1")
+    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")
+
     # Connect nodes by dragging source to target handles
-    source_handle = browser.locator("div[data-id='1-1-right-source']")
-    target_handle_2 = browser.locator("div[data-id='1-2-left-target']")
-    target_handle_3 = browser.locator("div[data-id='1-3-left-target']")
+    source_handle = 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.drag_to(target_handle_2)
     source_handle.drag_to(target_handle_3)
 
     browser.wait_for_timeout(1000)
 
     # Validate edge connection
-    edge_1_to_2 = browser.locator(
-        "g.react-flow__edge[aria-label='Edge from 1 to 2']"
-    )
+    edge_1_to_2 = browser.locator("g.react-flow__edge").first
     expect(edge_1_to_2).to_have_count(1)
-    edge_1_to_3 = browser.locator(
-        "g.react-flow__edge[aria-label='Edge from 1 to 3']"
-    )
+    edge_1_to_3 = browser.locator("g.react-flow__edge").last
     expect(edge_1_to_3).to_have_count(1)
 
     # Delete edge
     edge_end = edge_1_to_2.locator("circle.react-flow__edgeupdater-target")
     edge_end.drag_to(browser.locator("body"), force=True)
-    expect(
-        browser.locator("g.react-flow__edge[aria-label='Edge from 1 to 2']")
-    ).to_have_count(0)
 
     # Ensure remaining edges are intact
     expect(
-        browser.locator("g.react-flow__edge[aria-label='Edge from 1 to 3']")
+        browser.locator("g.react-flow__edge")
     ).to_have_count(1)
     browser.wait_for_timeout(2000)
 
@@ -120,7 +117,7 @@ def test_topology_manual(browser: Page, setup_page_logging, failure_artifacts):
         browser.locator("div.react-flow__node").filter(has_text="SERVICE_ID_1")
     ).to_have_count(0)
     expect(
-        browser.locator("g.react-flow__edge[aria-label='Edge from 1 to 3']")
+        browser.locator("g.react-flow__edge")
     ).to_have_count(0)
 
     # Update node name and verify the change