civics-cdf-validator 1.55.dev0__py3-none-any.whl → 1.55.dev2__py3-none-any.whl

civics_cdf_validator/rules.py

@@ -71,6 +71,15 @@ _INTERNATIONALIZED_TEXT_ELEMENTS = [
     "Title",
     # go/keep-sorted end
 ]
+_GPUNIT_TYPES_WITHOUT_OCD_IDS = frozenset([
+    "ballot-batch",
+    "ballot-style-area",
+    "combined-precinct",
+    "drop-box",
+    "polling-place",
+    "split-precinct",
+    "vote-center",
+])
 
 _EXECUTIVE_OFFICE_ROLES = frozenset([
     "head of state",
@@ -558,95 +567,53 @@ class ValidStableID(base.BaseRule):
       raise loggers.ElectionError(error_log)
 
 
-class ElectoralDistrictOcdId(base.BaseRule):
-  """GpUnit referred to by ElectoralDistrictId MUST have a valid OCD-ID."""
-
-  def __init__(self, election_tree, schema_tree, **kwargs):
-    super(ElectoralDistrictOcdId, self).__init__(
-        election_tree, schema_tree, **kwargs
-    )
-    self._all_gpunits = {}
-
-  def setup(self):
-    gp_units = self.election_tree.findall(".//GpUnit")
-    for gp_unit in gp_units:
-      if "objectId" not in gp_unit.attrib:
-        continue
-      self._all_gpunits[gp_unit.attrib["objectId"]] = gp_unit
+class GpUnitOcdId(base.BaseRule):
+  """All GpUnits MUST have a valid OCD ID."""
 
   def elements(self):
-    return ["ElectoralDistrictId"]
+    return ["GpUnit"]
 
   def check(self, element):
-    error_log = []
-    referenced_gpunit = self._all_gpunits.get(element.text)
-    if referenced_gpunit is None:
-      msg = (
-          "The ElectoralDistrictId element not refer to a GpUnit. Every "
-          "ElectoralDistrictId MUST reference a GpUnit"
+    # ReportingDevices are not expected to have OCD IDs.
+    if self.get_element_class(element) == "ReportingDevice":
+      return
+    type_element = element.find("Type")
+    if (
+        element_has_text(type_element)
+        and type_element.text in _GPUNIT_TYPES_WITHOUT_OCD_IDS
+    ):
+      return
+    ocd_ids = get_external_id_values(element, "ocd-id")
+    if not ocd_ids:
+      raise loggers.ElectionError.from_message(
+          f"The GpUnit {element.get('objectId')} does not have an ocd-id.",
+          [element],
+          [element.sourceline],
       )
-      error_log.append(loggers.LogEntry(msg, [element]))
-    else:
-      ocd_ids = get_external_id_values(referenced_gpunit, "ocd-id")
-      if not ocd_ids:
-        error_log.append(
-            loggers.LogEntry(
-                "The referenced GpUnit %s does not have an ocd-id"
-                % element.text,
-                [element],
-                [referenced_gpunit.sourceline],
-            )
+    for ocd_id in ocd_ids:
+      if not self.ocd_id_validator.is_valid_ocd_id(ocd_id):
+        raise loggers.ElectionError.from_message(
+            f"The GpUnit {element.get('objectId')} does not have a valid "
+            f"ocd-id: '{ocd_id}'.",
+            [element],
+            [element.sourceline],
         )
-      else:
-        for ocd_id in ocd_ids:
-          if not self.ocd_id_validator.is_valid_ocd_id(ocd_id):
-            error_log.append(
-                loggers.LogEntry(
-                    "The ElectoralDistrictId refers to GpUnit %s "
-                    "that does not have a valid OCD ID (%s)"
-                    % (element.text, ocd_id),
-                    [element],
-                    [referenced_gpunit.sourceline],
-                )
-            )
-    if error_log:
-      raise loggers.ElectionError(error_log)
 
 
-class GpUnitOcdId(base.BaseRule):
-  """Any GpUnit that is a geographic district SHOULD have a valid OCD-ID."""
-
-  districts = [
-      "borough",
-      "city",
-      "county",
-      "municipality",
-      "state",
-      "town",
-      "township",
-      "village",
-  ]
-  validate_ocd_file = True
+# TODO(b/337001513): Remove this once the new rule is rolled out everywhere and
+# no feeds have this in their disabled rules anymore.
+class ElectoralDistrictOcdId(base.BaseRule):
+  """All GpUnits MUST have a valid OCD ID."""
 
   def elements(self):
     return ["ReportingUnit"]
 
   def check(self, element):
-    gpunit_type = element.find("Type")
-    if gpunit_type is not None and gpunit_type.text in self.districts:
-      external_id_elements = get_external_id_values(
-          element, "ocd-id", return_elements=True
-      )
-      for extern_id in external_id_elements:
-        if not self.ocd_id_validator.is_valid_ocd_id(extern_id.text):
-          msg = "The OCD ID %s is not valid" % extern_id.text
-          raise loggers.ElectionWarning.from_message(
-              msg, [element], [extern_id.sourceline]
-          )
+    pass
 
 
 class DuplicatedGpUnitOcdId(base.BaseRule):
-  """2 GPUnits should not have same OCD-ID."""
+  """2 GpUnits should not have same OCD ID."""
 
   def elements(self):
     return ["GpUnitCollection"]
@@ -1389,6 +1356,14 @@ class ValidateDuplicateColors(base.TreeRule):
           element=party_contest, element_name="PartyIds"
       ):
         for party_id in party_ids_element.text.split():
+          if party_id not in party_color_mapping:
+            warning_log.append(
+                loggers.LogEntry(
+                    "Party (%s) in PartyContest should have an assigned color."
+                    % party_id
+                )
+            )
+            continue
           party_color = party_color_mapping[party_id][0]
           if party_color in contest_colors:
             contest_colors[party_color].append(party_color_mapping[party_id][1])

civics_cdf_validator/version.py

@@ -5,4 +5,4 @@ No dependencies should be added to this module.
 See https://packaging.python.org/guides/single-sourcing-package-version/
 """
 
-__version__ = '1.55.dev0'
+__version__ = '1.55.dev2'

{civics_cdf_validator-1.55.dev0.dist-info → civics_cdf_validator-1.55.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: civics_cdf_validator
-Version: 1.55.dev0
+Version: 1.55.dev2
 Summary: Checks if an election feed follows best practices
 Home-page: https://github.com/google/civics_cdf_validator
 Author: Google Civics

{civics_cdf_validator-1.55.dev0.dist-info → civics_cdf_validator-1.55.dev2.dist-info}/RECORD

@@ -3,13 +3,13 @@ civics_cdf_validator/base.py,sha256=5zntjAdAA-bdwYOOStFgUle9LGX_ccelS--thMhUG9A,
 civics_cdf_validator/gpunit_rules.py,sha256=Cg-qlOeVKTCQ5qUKYSxbVrrh3tdLt1X5Eg-7uyyR_SY,9487
 civics_cdf_validator/loggers.py,sha256=ZfWFd9yskcd2-qb83EPz7eqa1iGO8BRFMtDZeE1hofA,6921
 civics_cdf_validator/office_utils.py,sha256=aFxcFQZF2oBn0gPXt_kv1LxHGvwzABScT8X5yaYtVLw,2705
-civics_cdf_validator/rules.py,sha256=slArBGSKIborc-4ypcXciDoTP7J6EUnR-lUDe51KzBo,165531
+civics_cdf_validator/rules.py,sha256=mhFmup6AmLTQIxtVmzerBRehdSuACe5iWhIg4nnyaSw,164641
 civics_cdf_validator/stats.py,sha256=YNqv3Khkt_hJxCIunFBRSl23oXqu5gNjCmWMHFbAcSU,3819
 civics_cdf_validator/validator.py,sha256=2nwlFfQ9AmpTaO5n5ekaO845Rm0JPjNF-Il6FJW_50k,12678
-civics_cdf_validator/version.py,sha256=-IgVt3DdiIPmJwMEDsgoVLIV2l-oasljSz1qkfy7zX8,188
-civics_cdf_validator-1.55.dev0.dist-info/licenses/LICENSE-2.0.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-civics_cdf_validator-1.55.dev0.dist-info/METADATA,sha256=_EDKP4G-0A_zbayQm2sQDHthUAVUWyff7NRs_L5He2Q,1218
-civics_cdf_validator-1.55.dev0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-civics_cdf_validator-1.55.dev0.dist-info/entry_points.txt,sha256=QibgvtMOocwDi7fQ1emgMJ2lIlI41sW0__KIQdnVn90,77
-civics_cdf_validator-1.55.dev0.dist-info/top_level.txt,sha256=PYT5Eclxbop5o6DJIcgs4IeU6Ds5jqyftjoFbgkkJYo,21
-civics_cdf_validator-1.55.dev0.dist-info/RECORD,,
+civics_cdf_validator/version.py,sha256=2-E4n1DJTc6Z60MLFZw6USuaV3LOvCCi9bO-jkdvJjE,188
+civics_cdf_validator-1.55.dev2.dist-info/licenses/LICENSE-2.0.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+civics_cdf_validator-1.55.dev2.dist-info/METADATA,sha256=5bVzvldK7o-0z6UGGmO08_bwHj_ijs9C0TMw-Pq52Fg,1218
+civics_cdf_validator-1.55.dev2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+civics_cdf_validator-1.55.dev2.dist-info/entry_points.txt,sha256=QibgvtMOocwDi7fQ1emgMJ2lIlI41sW0__KIQdnVn90,77
+civics_cdf_validator-1.55.dev2.dist-info/top_level.txt,sha256=PYT5Eclxbop5o6DJIcgs4IeU6Ds5jqyftjoFbgkkJYo,21
+civics_cdf_validator-1.55.dev2.dist-info/RECORD,,