civics-cdf-validator 1.52.dev5__py3-none-any.whl → 1.53__py3-none-any.whl

civics_cdf_validator/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/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.53'

{civics_cdf_validator-1.52.dev5.dist-info → civics_cdf_validator-1.53.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: civics_cdf_validator
-Version: 1.52.dev5
+Version: 1.53
 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.53.dist-info/RECORD

@@ -0,0 +1,15 @@
+civics_cdf_validator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+civics_cdf_validator/base.py,sha256=5zntjAdAA-bdwYOOStFgUle9LGX_ccelS--thMhUG9A,16954
+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=hgqv23VXT9ULdQPZyVhpETZIADxCAaNm0Pntv9OZXQ8,165601
+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=bfUj9c5TbEisoS1bLYVa1gFNUROEk2zqnuLGPVDfoQU,183
+civics_cdf_validator-1.53.dist-info/licenses/LICENSE-2.0.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+civics_cdf_validator-1.53.dist-info/METADATA,sha256=HOlyWI9aHO282KaX0WwoCrLFrAKXHwDIwNbxL1qjLuQ,1003
+civics_cdf_validator-1.53.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+civics_cdf_validator-1.53.dist-info/entry_points.txt,sha256=QibgvtMOocwDi7fQ1emgMJ2lIlI41sW0__KIQdnVn90,77
+civics_cdf_validator-1.53.dist-info/top_level.txt,sha256=PYT5Eclxbop5o6DJIcgs4IeU6Ds5jqyftjoFbgkkJYo,21
+civics_cdf_validator-1.53.dist-info/RECORD,,

civics_cdf_validator-1.52.dev5.dist-info/RECORD

@@ -1,15 +0,0 @@
-civics_cdf_validator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-civics_cdf_validator/base.py,sha256=5zntjAdAA-bdwYOOStFgUle9LGX_ccelS--thMhUG9A,16954
-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=5A4q8CKeKmYYIK7KvjTQ9hN-F1A8RUY6fd_CB_OCn54,164869
-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=zGZfykrA4a3AI2f--8fdnTV_gvJ1dYrr_tfIq1AKcwA,188
-civics_cdf_validator-1.52.dev5.dist-info/licenses/LICENSE-2.0.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-civics_cdf_validator-1.52.dev5.dist-info/METADATA,sha256=Gub889J6BJZDtPiiZzqdjRHL5lHNovA9my6W0biH9Ng,1008
-civics_cdf_validator-1.52.dev5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-civics_cdf_validator-1.52.dev5.dist-info/entry_points.txt,sha256=QibgvtMOocwDi7fQ1emgMJ2lIlI41sW0__KIQdnVn90,77
-civics_cdf_validator-1.52.dev5.dist-info/top_level.txt,sha256=PYT5Eclxbop5o6DJIcgs4IeU6Ds5jqyftjoFbgkkJYo,21
-civics_cdf_validator-1.52.dev5.dist-info/RECORD,,