civics-cdf-validator 1.49.dev11__py3-none-any.whl → 1.49.dev13__py3-none-any.whl

civics_cdf_validator/rules.py

@@ -96,8 +96,14 @@ _VALID_OFFICE_ROLE_COMBINATIONS = frozenset([
 ])
 
 
-def _is_executive_office(element):
-  office_roles = get_entity_info_for_value_type(element, "office-role")
+def _get_office_roles(element, is_post_office_split_feed=False):
+  if is_post_office_split_feed:
+    return [element.text for element in element.findall("OfficeRole")]
+  return get_entity_info_for_value_type(element, "office-role")
+
+
+def _is_executive_office(element, is_post_office_split_feed=False):
+  office_roles = _get_office_roles(element, is_post_office_split_feed)
   return not _EXECUTIVE_OFFICE_ROLES.isdisjoint(office_roles)
 
 
@@ -3454,11 +3460,21 @@ class PartySpanMultipleCountries(base.BaseRule):
 class NonExecutiveOfficeShouldHaveGovernmentBody(base.BaseRule):
   """Ensure non-executive Office elements have a government body defined."""
 
+  def __init__(self, election_tree, schema_tree, **kwargs):
+    self.is_post_office_split_feed = False
+    officeholder_tenure_collection_element = self.get_elements_by_class(
+        election_tree, "OfficeHolderTenureCollection"
+    )
+    if officeholder_tenure_collection_element:
+      self.is_post_office_split_feed = True
+
   def elements(self):
     return ["Office"]
 
   def check(self, element):
-    if not _is_executive_office(element) and not _has_government_body(element):
+    if not _is_executive_office(
+        element, self.is_post_office_split_feed
+    ) and not _has_government_body(element):
       raise loggers.ElectionInfo.from_message(
           "Non-executive Office element is missing a government body.",
           [element],
@@ -3468,12 +3484,22 @@ class NonExecutiveOfficeShouldHaveGovernmentBody(base.BaseRule):
 class ExecutiveOfficeShouldNotHaveGovernmentBody(base.BaseRule):
   """Ensure executive Office elements do not have a government body defined."""
 
+  def __init__(self, election_tree, schema_tree, **kwargs):
+    self.is_post_office_split_feed = False
+    officeholder_tenure_collection_element = self.get_elements_by_class(
+        election_tree, "OfficeHolderTenureCollection"
+    )
+    if officeholder_tenure_collection_element:
+      self.is_post_office_split_feed = True
+
   def elements(self):
     return ["Office"]
 
   def check(self, element):
-    if _is_executive_office(element) and _has_government_body(element):
-      office_roles = get_entity_info_for_value_type(element, "office-role")
+    if _is_executive_office(
+        element, self.is_post_office_split_feed
+    ) and _has_government_body(element):
+      office_roles = _get_office_roles(element, self.is_post_office_split_feed)
       raise loggers.ElectionError.from_message(
           f"Executive Office element (roles: {','.join(office_roles)}) has a "
           "government body. Executive offices should not have government "
@@ -4156,34 +4182,32 @@ class ElectionEventDatesAreSequential(base.DateRule):
       raise loggers.ElectionError(self.error_log)
 
 
-class NoSourceDirPathBeforeInitialDeliveryDate(base.BaseRule):
-  """SourceDirPath should only be defined if one of the initial delivery dates is in the past."""
+class SourceDirPathMustBeSetAfterInitialDeliveryDate(base.BaseRule):
+  """SourceDirPath must be set if any InitialDeliveryDate is in the past."""
 
   def elements(self):
     return ["Feed"]
 
   def check(self, element):
-    if not element_has_text(element.find("SourceDirPath")):
+    if element_has_text(element.find("SourceDirPath")):
       return
     today = datetime.date.today()
     today_partial_date = base.PartialDate(
         year=today.year, month=today.month, day=today.day
     )
-    initial_deliveries = element.findall(".//InitialDeliveryDate")
-    if initial_deliveries:
-      for initial_delivery in initial_deliveries:
-        initial_delivery_date = (
-            base.PartialDate.init_partial_date(initial_delivery.text)
-            if element_has_text(initial_delivery)
-            else None
-        )
-        if initial_delivery_date and initial_delivery_date < today_partial_date:
-          return
-      raise loggers.ElectionWarning.from_message(
-          "SourceDirPath is defined but all initialDeliveryDate are in the"
-          " future.",
-          [element],
+    initial_deliveries = element.findall(".//InitialDeliveryDate") or []
+    for initial_delivery in initial_deliveries:
+      initial_delivery_date = (
+          base.PartialDate.init_partial_date(initial_delivery.text)
+          if element_has_text(initial_delivery)
+          else None
       )
+      if initial_delivery_date and initial_delivery_date < today_partial_date:
+        raise loggers.ElectionError.from_message(
+            "SourceDirPath is not set but an InitialDeliveryDate is in the "
+            f"past for feed {element.find('FeedId').text}.",
+            [element],
+        )
 
 
 class OfficeHolderSubFeedDatesAreSequential(base.DateRule):
@@ -4764,10 +4788,10 @@ METADATA_RULES = (
     FeedInactiveDateIsLatestDate,
     FeedInactiveDateSetForNonEvergreenFeed,
     FeedTypeHasValidFeedLongevity,
-    NoSourceDirPathBeforeInitialDeliveryDate,
     OfficeHolderSubFeedDatesAreSequential,
     OptionalAndEmpty,
     Schema,
+    SourceDirPathMustBeSetAfterInitialDeliveryDate,
     SourceDirPathsAreUnique,
     UniqueLabel,
     # go/keep-sorted end

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.49.dev11'
+__version__ = '1.49.dev13'

{civics_cdf_validator-1.49.dev11.dist-info → civics_cdf_validator-1.49.dev13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: civics_cdf_validator
-Version: 1.49.dev11
+Version: 1.49.dev13
 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.49.dev11.dist-info → civics_cdf_validator-1.49.dev13.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=LS6U9YWzu72V2Q0PwyE9xE03Ul392UAPRnrp2uRBMLA,6923
 civics_cdf_validator/office_utils.py,sha256=aFxcFQZF2oBn0gPXt_kv1LxHGvwzABScT8X5yaYtVLw,2705
-civics_cdf_validator/rules.py,sha256=Hn7qk3qLhidhQrb15iq1ZwN4XLJ4HVhY4VHBbNGY9u4,158898
+civics_cdf_validator/rules.py,sha256=Ucw1vURByvUoyMVdBUDnzggO15kExbnpsBZU0Wlg-EE,159895
 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=5WTRUaJiARj_r2UPhcMKa9SSvt8tRFJt6pCR0zFyGpc,189
-civics_cdf_validator-1.49.dev11.dist-info/licenses/LICENSE-2.0.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-civics_cdf_validator-1.49.dev11.dist-info/METADATA,sha256=9odJ6J0QGbWLOgkjRweufw1myU5Tg_CX3ts5z_zLbCI,1009
-civics_cdf_validator-1.49.dev11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-civics_cdf_validator-1.49.dev11.dist-info/entry_points.txt,sha256=QibgvtMOocwDi7fQ1emgMJ2lIlI41sW0__KIQdnVn90,77
-civics_cdf_validator-1.49.dev11.dist-info/top_level.txt,sha256=PYT5Eclxbop5o6DJIcgs4IeU6Ds5jqyftjoFbgkkJYo,21
-civics_cdf_validator-1.49.dev11.dist-info/RECORD,,
+civics_cdf_validator/version.py,sha256=VFMdAjvjwr34E1vqDkhcL8mmJWGxF_XUDagoSEfJ11Y,189
+civics_cdf_validator-1.49.dev13.dist-info/licenses/LICENSE-2.0.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+civics_cdf_validator-1.49.dev13.dist-info/METADATA,sha256=MBpl8nej6fgkR0c0jy0owtovKInrOYSLDPpp1k8viaw,1009
+civics_cdf_validator-1.49.dev13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+civics_cdf_validator-1.49.dev13.dist-info/entry_points.txt,sha256=QibgvtMOocwDi7fQ1emgMJ2lIlI41sW0__KIQdnVn90,77
+civics_cdf_validator-1.49.dev13.dist-info/top_level.txt,sha256=PYT5Eclxbop5o6DJIcgs4IeU6Ds5jqyftjoFbgkkJYo,21
+civics_cdf_validator-1.49.dev13.dist-info/RECORD,,