Upload hts_validator.py

hts_validator.py

@@ -25,11 +25,13 @@ SCENARIO_SUMMARIES = {
     "S7": "Dual Steel+Aluminum HTS - matches keyword, apply corresponding 232, no 99030125",
     "S7a": "Dual Steel+Aluminum HTS + BOTH keywords - flag for manual review",
     "S8": "Dual Steel+Aluminum HTS + NO keywords - flag for manual review",
-    "S9": "Copper keyword but NOT copper HTS - potential misclassification",
+    "S9": "Copper keyword but NOT copper HTS - should apply 99030125, no 232 tariffs",
     "S11": "Dual Aluminum+Copper HTS + copper keyword - apply 99030133 + copper tariffs, no 99030125",
     "S12": "Dual Aluminum+Copper HTS + aluminum keyword - apply 99030133 + aluminum 232, no 99030125",
     "S13": "Zinc keyword - should ONLY apply 99030125, no 232 tariffs allowed",
     "S14": "Plastics keyword + metal HTS - override, should ONLY apply 99030125",
+    "S15": "Steel HTS + aluminum keyword - should apply 99030125, no 99030133 or 232 tariffs",
+    "S16": "Aluminum HTS + steel keyword - should apply 99030125, no 99030133 or 232 tariffs",
     "COPPER_OK": "Copper HTS + copper keyword - verify copper tariffs applied",
     "NONE": "No applicable scenario - entry does not match any validation rules",
 }
@@ -411,8 +413,35 @@ class HTSValidator:
 
         # Priority 3: Single list scenarios
 
-        # Steel scenarios (S1)
+        # Steel scenarios (S1, S15)
         if in_steel and not in_aluminum and not in_copper:
+            # S15: Steel HTS + aluminum keyword - mismatch, should apply 99030125
+            if has_aluminum_kw and not has_metal_kw:
+                expected = [MISMATCH_CODE]
+                issues = []
+
+                if not has_mismatch:
+                    issues.append("Missing 99030125")
+                if has_steel_232 or has_aluminum_232:
+                    issues.append("Should NOT have 232 tariffs - description says aluminum but HTS is steel")
+                if has_301:
+                    issues.append("Should NOT have 99030133 - description says aluminum but HTS is steel")
+
+                status = "PASS" if not issues else "FAIL"
+                return ValidationResult(
+                    entry_number=entry_number,
+                    description=description,
+                    primary_hts=primary_hts,
+                    additional_hts=additional_hts,
+                    scenario_id="S15",
+                    scenario_summary=SCENARIO_SUMMARIES["S15"],
+                    status=status,
+                    expected_hts=expected,
+                    missing_hts=[MISMATCH_CODE] if not has_mismatch else [],
+                    unexpected_hts=self._get_unexpected_232(additional_set) + ([GENERAL_301_CODE] if has_301 else []),
+                    issue="; ".join(issues) if issues else "Correct - steel HTS with aluminum keyword, has 99030125"
+                )
+
             if has_metal_kw:
                 # S1: Steel HTS + metal keyword + 232 tariff
                 if has_steel_232:
@@ -483,8 +512,35 @@ class HTSValidator:
                 issue="; ".join(issues) if issues else "Correct - metal keyword with non-steel HTS"
             )
 
-        # Aluminum scenarios (S4)
+        # Aluminum scenarios (S4, S16)
         if in_aluminum and not in_steel and not in_copper:
+            # S16: Aluminum HTS + steel keyword - mismatch, should apply 99030125
+            if has_metal_kw and not has_aluminum_kw:
+                expected = [MISMATCH_CODE]
+                issues = []
+
+                if not has_mismatch:
+                    issues.append("Missing 99030125")
+                if has_steel_232 or has_aluminum_232:
+                    issues.append("Should NOT have 232 tariffs - description says steel but HTS is aluminum")
+                if has_301:
+                    issues.append("Should NOT have 99030133 - description says steel but HTS is aluminum")
+
+                status = "PASS" if not issues else "FAIL"
+                return ValidationResult(
+                    entry_number=entry_number,
+                    description=description,
+                    primary_hts=primary_hts,
+                    additional_hts=additional_hts,
+                    scenario_id="S16",
+                    scenario_summary=SCENARIO_SUMMARIES["S16"],
+                    status=status,
+                    expected_hts=expected,
+                    missing_hts=[MISMATCH_CODE] if not has_mismatch else [],
+                    unexpected_hts=self._get_unexpected_232(additional_set) + ([GENERAL_301_CODE] if has_301 else []),
+                    issue="; ".join(issues) if issues else "Correct - aluminum HTS with steel keyword, has 99030125"
+                )
+
             if has_aluminum_kw:
                 # S4: Aluminum HTS + aluminum keyword + 232 tariff
                 if has_aluminum_232:
@@ -582,7 +638,17 @@ class HTSValidator:
 
         # S9: Copper keyword but NOT in copper list
         if has_copper_kw and not in_copper:
-            status = "FLAG"
+            expected = [MISMATCH_CODE]
+            issues = []
+
+            if not has_mismatch:
+                issues.append("Missing 99030125")
+            if has_steel_232 or has_aluminum_232 or has_copper_tariff:
+                issues.append("Should NOT have 232/copper tariffs - HTS not in copper list")
+            if has_301:
+                issues.append("Should NOT have 99030133 - HTS not in copper list")
+
+            status = "PASS" if not issues else "FAIL"
             return ValidationResult(
                 entry_number=entry_number,
                 description=description,
@@ -591,10 +657,10 @@ class HTSValidator:
                 scenario_id="S9",
                 scenario_summary=SCENARIO_SUMMARIES["S9"],
                 status=status,
-                expected_hts=[],
-                missing_hts=[],
-                unexpected_hts=[],
-                issue="Description mentions copper but HTS not in copper list - potential misclassification"
+                expected_hts=expected,
+                missing_hts=[MISMATCH_CODE] if not has_mismatch else [],
+                unexpected_hts=self._get_unexpected_232(additional_set) + ([GENERAL_301_CODE] if has_301 else []),
+                issue="; ".join(issues) if issues else "Correct - copper keyword with non-copper HTS"
             )
 
         # No applicable scenario