update gear inventory

Author: ShengkaiXu

evaluation_function/evaluation.py

@@ -120,6 +120,15 @@
             "- big gear: {biggear}\n"
             "Good. No obvious gear mismatch was detected."
         ),
+        "contact_consistency_fail": (
+            "Detected gears:\n"
+            "- driving gear: {driving_gear}\n"
+            "- small gear: {smallgear}\n"
+            "- big gear: {biggear}\n"
+            "The detected gears and contact regions are not consistent enough for reliable checking. "
+            "Please make sure only the intended gears are visible, that meshing areas can be seen clearly, "
+            "and then retake the photo."
+        ),
         "mismatch_fail": (
             "Detected gears:\n"
             "- driving gear: {driving_gear}\n"
@@ -258,7 +267,6 @@ def keep(e: Dict[str, Any]) -> bool:
 
         if task == "precheck":
             return code in {
-                "E_PRECHECK_COUNT_RULE_FAIL",
                 "E_PRECHECK_BIG_SMALL_INCONSISTENT",
                 "E_NO_GEARS",
             }
@@ -290,6 +298,7 @@ def keep(e: Dict[str, Any]) -> bool:
             return code in {
                 "E_NO_GEARS",
                 "E_MESH_MISMATCH",
+                "E_GEAR_CONTACT_INCONSISTENT",
             }
 
         if task == "mesh_ratio":
@@ -712,6 +721,13 @@ def _build_student_message(
                 biggear=biggear,
             )
 
+        if "E_GEAR_CONTACT_INCONSISTENT" in codes:
+            return False, MESSAGE_POLICY["gear_inventory"]["contact_consistency_fail"].format(
+                driving_gear=driving_gear,
+                smallgear=smallgear,
+                biggear=biggear,
+            )
+
         if task_has_error:
             return False, MESSAGE_POLICY["gear_inventory"]["fail"].format(
                 driving_gear=driving_gear,

evaluation_function/yolo_pipeline.py

@@ -719,27 +719,6 @@ def evaluate_precheck_consistency(
     errs: List[Dict[str, str]] = []
 
     counts = get_gear_counts(gears)
-    total_contact = len(mesh_boxes) + len(mismesh_boxes)
-    gear_count = len(gears)
-
-    expected_contact, ok = expected_contact_boxes_from_gear_count(gear_count)
-
-    if (not ok) or (expected_contact is None):
-        errs.append({
-            "code": "E_PRECHECK_COUNT_RULE_FAIL",
-            "message": (
-                f"Precheck failed: detected gear_count={gear_count}, which does not fit "
-                f"the expected contact rule."
-            ),
-        })
-    elif total_contact != expected_contact:
-        errs.append({
-            "code": "E_PRECHECK_COUNT_RULE_FAIL",
-            "message": (
-                f"Precheck failed: mesh+mismesh={total_contact}, expected={expected_contact} "
-                f"for gear_count={gear_count}."
-            ),
-        })
 
     if counts["biggear"] != counts["smallgear"]:
         errs.append({
@@ -847,6 +826,7 @@ def evaluate_parts_inventory(
 # =========================
 def evaluate_gear_inventory_step(
     gears: List[Dict[str, Any]],
+    mesh_boxes: List[Tuple[float, float, float, float]],
     mismesh_boxes: List[Tuple[float, float, float, float]],
 ) -> Tuple[List[Dict[str, str]], Dict[str, int]]:
     errs: List[Dict[str, str]] = []
@@ -859,6 +839,18 @@ def evaluate_gear_inventory_step(
         })
         return errs, counts
 
+    total_contact = len(mesh_boxes) + len(mismesh_boxes)
+    gear_count = len(gears)
+    expected_contact, ok = expected_contact_boxes_from_gear_count(gear_count)
+    if (not ok) or (expected_contact is None) or (total_contact != expected_contact):
+        errs.append({
+            "code": "E_GEAR_CONTACT_INCONSISTENT",
+            "message": (
+                f"Gear inventory consistency check failed: mesh+mismesh={total_contact}, "
+                f"expected={expected_contact} for gear_count={gear_count}."
+            ),
+        })
+
     if len(mismesh_boxes) > 0:
         errs.append({
             "code": "E_MESH_MISMATCH",
@@ -2286,6 +2278,7 @@ def _need_shafts() -> bool:
     if task == TASK_GEAR_INV:
         errors, counts = evaluate_gear_inventory_step(
             gears=gears,
+            mesh_boxes=mesh_boxes,
             mismesh_boxes=mismesh_boxes,
         )