civics-cdf-validator 1.52.dev5__tar.gz → 1.52.dev6__tar.gz

{civics_cdf_validator-1.52.dev5/civics_cdf_validator.egg-info → civics_cdf_validator-1.52.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: civics_cdf_validator
-Version: 1.52.dev5
+Version: 1.52.dev6
 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.52.dev5 → civics_cdf_validator-1.52.dev6/civics_cdf_validator.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: civics_cdf_validator
-Version: 1.52.dev5
+Version: 1.52.dev6
 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.52.dev5 → civics_cdf_validator-1.52.dev6}/rules.py

@@ -118,9 +118,29 @@ def _has_government_body(element):
   return bool(governmental_body or government_body)
 
 
-def get_external_id_values(element, value_type, return_elements=False):
-  """Helper to gather all Values of external ids for a given type."""
-  external_ids = element.findall(".//ExternalIdentifier")
+def get_external_id_values(
+    element, value_type, return_elements=False, search_subelements=True
+):
+  """Helper to gather all Values of external ids for a given type.
+
+  If search_subelements is True, will search all subelements, if False, will
+  only search child elements.
+
+  Args:
+    element: element to be processed
+    value_type: external id value type
+    return_elements: Boolean if True return elements, if False return values.
+    search_subelements: Boolean to instruct the function to recursively search
+      subelements.
+
+  Returns:
+    A list of external id values or external identifier elements
+  """
+  external_ids = []
+  if search_subelements:
+    external_ids = element.findall(".//ExternalIdentifier")
+  else:
+    external_ids = element.findall("ExternalIdentifiers/ExternalIdentifier")
   values = []
   for extern_id in external_ids:
     id_type = extern_id.find("Type")
@@ -1608,26 +1628,23 @@ class UniqueStableID(base.TreeRule):
   Add an error message if stable id is not unique
   """
 
-  _TOP_LEVEL_ENTITIES = frozenset(
-      ["Party", "GpUnit", "Office", "Person", "Candidate", "Contest"]
-  )
-
   def check(self):
     error_log = []
     stable_obj_dict = dict()
     for _, element in etree.iterwalk(self.election_tree, events=("end",)):
-      if "Election" not in element.tag:
-        if element.tag in self._TOP_LEVEL_ENTITIES:
-          if "objectId" in element.attrib:
-            object_id = element.get("objectId")
-            stable_ids = get_external_id_values(element, "stable")
-            for stable_id in stable_ids:
-              if stable_id in stable_obj_dict.keys():
-                stable_obj_dict.get(stable_id).append(object_id)
-              else:
-                object_id_list = []
-                object_id_list.append(object_id)
-                stable_obj_dict[stable_id] = object_id_list
+      stable_ids = get_external_id_values(
+          element, "stable", search_subelements=False
+      )
+      if not stable_ids:
+        continue
+      elem_id = self._get_object_id_or_name(element)
+      for stable_id in stable_ids:
+        if stable_id in stable_obj_dict.keys():
+          stable_obj_dict.get(stable_id).append(elem_id)
+        else:
+          elem_id_list = []
+          elem_id_list.append(elem_id)
+          stable_obj_dict[stable_id] = elem_id_list
     for k, v in stable_obj_dict.items():
       if len(v) > 1:
         error_message = (
@@ -1637,6 +1654,15 @@ class UniqueStableID(base.TreeRule):
     if error_log:
       raise loggers.ElectionError(error_log)
 
+  def _get_object_id_or_name(self, element):
+    if "objectId" in element.attrib:
+      return element.get("objectId")
+    names_by_language = get_language_to_text_map(element.find("Name"))
+    if "en" in names_by_language:
+      return names_by_language["en"][0]
+    for names in names_by_language.values():
+      return names[0]
+
 
 class MissingStableIds(base.BaseRule):
   """Check that each NIST object in the feed have a stable Id.

{civics_cdf_validator-1.52.dev5 → civics_cdf_validator-1.52.dev6}/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.52.dev5'
+__version__ = '1.52.dev6'