Merge pull request #118 from openstates/realtime-skip-bills-postimpor…

…t/OS-1432

Allow postimport hook to be skipped in os-update command

.gitignore

@@ -3,7 +3,6 @@
 *swp
 .cache
 .coverage
-.python-version
 .tox
 .venv/
 __pycache__

.python-version

@@ -0,0 +1 @@
+3.9.15

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 6.17.9 - October 26, 2023
+
+* allow postimport hook to be skipped in os-update command
+
 ## 6.17.8 - October 16, 2023
 
 * set application_name for better performance monitoring

openstates/importers/base.py

@@ -119,8 +119,9 @@ class BaseImporter:
     merge_related: typing.Dict[str, typing.List[str]] = {}
     cached_transformers: _TransformerMapping = {}
 
-    def __init__(self, jurisdiction_id: str) -> None:
+    def __init__(self, jurisdiction_id: str, do_postimport=True) -> None:
         self.jurisdiction_id = jurisdiction_id
+        self.do_postimport = do_postimport
         self.json_to_db_id: typing.Dict[str, _ID] = {}
         self.duplicates: typing.Dict[str, str] = {}
         self.pseudo_id_cache: typing.Dict[str, typing.Optional[_ID]] = {}
@@ -305,8 +306,8 @@ def import_data(
             record[what] += 1
 
         # all objects are loaded, a perfect time to do inter-object resolution and other tasks
-        if self.json_to_db_id:
-            # only do postimport step if there are some items of this type
+        if self.json_to_db_id and self.do_postimport:
+            # only do postimport step if requested by client code AND there are some items of this type
             # resolution of bills take a long time if not
             # and events & votes get deleted!
             self.postimport()

openstates/importers/bills.py

@@ -48,8 +48,8 @@ class BillImporter(BaseImporter):
     }
     preserve_order = {"actions"}
 
-    def __init__(self, jurisdiction_id: str):
-        super(BillImporter, self).__init__(jurisdiction_id)
+    def __init__(self, jurisdiction_id: str, do_postimport=True):
+        super(BillImporter, self).__init__(jurisdiction_id, do_postimport)
         self.org_importer = OrganizationImporter(jurisdiction_id)
 
     def get_object(self, bill: _JsonDict) -> Model:

openstates/importers/events.py

@@ -41,8 +41,9 @@ def __init__(
         self,
         jurisdiction_id: str,
         vote_event_importer: VoteEventImporter,
+        do_postimport=True,
     ):
-        super(EventImporter, self).__init__(jurisdiction_id)
+        super(EventImporter, self).__init__(jurisdiction_id, do_postimport)
         self.org_importer = OrganizationImporter(jurisdiction_id)
         self.vote_event_importer = vote_event_importer
 

openstates/importers/vote_events.py

@@ -17,8 +17,8 @@ class VoteEventImporter(BaseImporter):
         "sources": (VoteSource, "vote_event_id", {}),
     }
 
-    def __init__(self, jurisdiction_id: str, bill_importer: BillImporter):
-        super(VoteEventImporter, self).__init__(jurisdiction_id)
+    def __init__(self, jurisdiction_id: str, bill_importer: BillImporter, do_postimport=True):
+        super(VoteEventImporter, self).__init__(jurisdiction_id, do_postimport)
         self.org_importer = OrganizationImporter(jurisdiction_id)
         self.bill_importer = bill_importer
         self.seen_bill_ids: typing.Set[str] = set()

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openstates"
-version = "6.17.8"
+version = "6.17.9"
 description = "core infrastructure for the openstates project"
 authors = ["James Turk <[email protected]>"]
 license = "MIT"