Upload hts_validator.py

hts_validator.py

@@ -32,7 +32,7 @@ SCENARIO_SUMMARIES = {
     "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",
-    "S17": "Copper HTS but NO copper keyword - should apply copper tariffs + 99030125, no 99030133",
+    "S17": "Copper HTS but NO copper keyword - should apply copper tariffs + 99030133, no 99030125",
     "COPPER_OK": "Copper HTS + copper keyword - verify copper tariffs applied",
     "NONE": "No applicable scenario - entry does not match any validation rules",
 }
@@ -636,32 +636,32 @@ class HTSValidator:
                     unexpected_hts=[],
                     issue="; ".join(issues) if issues else "Correct - copper HTS + keyword"
                 )
-            else:
-                # S17: Copper HTS but NO copper keyword - apply copper tariffs + 99030125, no 99030133
-                expected = list(COPPER_CODES) + [MISMATCH_CODE]
-                issues = []
-
-                if not has_copper_tariff:
-                    issues.append("Missing copper tariff (99037801/02)")
-                if not has_mismatch:
-                    issues.append("Missing 99030125 - copper HTS without copper keyword")
-                if has_301:
-                    issues.append("Should NOT have 99030133 - no copper keyword in description")
-
-                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="S17",
-                    scenario_summary=SCENARIO_SUMMARIES["S17"],
-                    status=status,
-                    expected_hts=expected,
-                    missing_hts=(list(COPPER_CODES) if not has_copper_tariff else []) + ([MISMATCH_CODE] if not has_mismatch else []),
-                    unexpected_hts=[GENERAL_301_CODE] if has_301 else [],
-                    issue="; ".join(issues) if issues else "Correct - copper HTS without keyword, has copper tariffs + 99030125"
-                )
+            else:
+                # S17: Copper HTS but NO copper keyword - apply copper tariffs + 99030133, no 99030125
+                expected = list(COPPER_CODES) + [GENERAL_301_CODE]
+                issues = []
+
+                if not has_copper_tariff:
+                    issues.append("Missing copper tariff (99037801/02)")
+                if not has_301:
+                    issues.append("Missing 99030133 - copper HTS without copper keyword")
+                if has_mismatch:
+                    issues.append("Should NOT have 99030125 - no mismatch expected for copper HTS")
+
+                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="S17",
+                    scenario_summary=SCENARIO_SUMMARIES["S17"],
+                    status=status,
+                    expected_hts=expected,
+                    missing_hts=(list(COPPER_CODES) if not has_copper_tariff else []) + ([GENERAL_301_CODE] if not has_301 else []),
+                    unexpected_hts=[MISMATCH_CODE] if has_mismatch else [],
+                    issue="; ".join(issues) if issues else "Correct - copper HTS without keyword, has copper tariffs + 99030133"
+                )
 
         # S9: Copper keyword but NOT in copper list
         if has_copper_kw and not in_copper: