Merge branch 'main' into fe-edge

Author: yilinxia

backend/app/main.py

@@ -282,7 +282,8 @@ def generate_graph_with_edges():
             "contributor_overlap_threshold": 2,
             "shared_organization_enabled": false,
             "common_stargazers_enabled": true,
-            "stargazer_overlap_threshold": 3
+            "stargazer_overlap_threshold": 3,
+            "strict_and_logic": true
         }
     }
     """
@@ -332,7 +333,7 @@ def generate_graph_with_edges():
             gexf_content = f.read()
 
         # Get comprehensive statistics
-        graph_stats = edge_generation_service.get_edge_statistics(G)
+        graph_stats = edge_generation_service.get_detailed_edge_statistics(G)
 
         return jsonify({
             "success": True,
@@ -402,6 +403,12 @@ def get_edge_generation_criteria():
             "type": "boolean",
             "default": False,
             "category": "Logic Control"
+        },
+        "strict_and_logic": {
+            "description": "Use strict AND logic to require ALL enabled criteria to be satisfied simultaneously",
+            "type": "boolean",
+            "default": False,
+            "category": "Logic Control"
         }
     }
 
@@ -517,7 +524,8 @@ def create_edges_on_graph():
             "shared_organization_enabled": false,
             "common_stargazers_enabled": true,
             "stargazer_threshold": 5,
-            "use_and_logic": false
+            "use_and_logic": false,
+            "strict_and_logic": true
         }
     }
     """
@@ -600,7 +608,7 @@ def create_edges_on_graph():
             updated_gexf_content = f.read()
 
         # Get statistics
-        graph_stats = edge_service.get_edge_statistics(G)
+        graph_stats = edge_service.get_detailed_edge_statistics(G)
 
         return jsonify({
             "success": True,