dao-scripts 1.4.4__tar.gz → 1.4.6__tar.gz

{dao_scripts-1.4.4 → dao_scripts-1.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dao-scripts
-Version: 1.4.4
+Version: 1.4.6
 Summary: "A tool to download data to monitor DAO activity"
 Home-page: https://github.com/Grasia/dao-scripts
 Author: David Davó

{dao_scripts-1.4.4 → dao_scripts-1.4.6}/dao_scripts.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dao-scripts
-Version: 1.4.4
+Version: 1.4.6
 Summary: "A tool to download data to monitor DAO activity"
 Home-page: https://github.com/Grasia/dao-scripts
 Author: David Davó

{dao_scripts-1.4.4 → dao_scripts-1.4.6}/src/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.4'
-__version_tuple__ = version_tuple = (1, 4, 4)
+__version__ = version = '1.4.6'
+__version_tuple__ = version_tuple = (1, 4, 6)

{dao_scripts-1.4.4 → dao_scripts-1.4.6}/src/common/common.py

@@ -266,7 +266,7 @@ class NetworkRunner(Runner, ABC):
                                 prev_block=None if force else metadata[c.collectorid].block,
                                 until_date=until_date,
                             )
-                            print(f"Using block {blocks[c.network].id} for {c.network} (ts: {blocks[c.network].timestamp.isoformat()})")
+                            print(f"Using block number {blocks[c.network].number} ({blocks[c.network].id}) for {c.network} (ts: {blocks[c.network].timestamp.isoformat()})")
 
                         print(f"Running collector {c.long_name} ({c.network})")
                         olderBlock = blocks[c.network] < metadata[c.collectorid].block

{dao_scripts-1.4.4 → dao_scripts-1.4.6}/src/common/thegraph.py

@@ -147,7 +147,7 @@ class TheGraphCollector(NetworkCollector, UpdatableCollector, ABC):
 
         return no_errors
 
-    def check_subgraph_health(self) -> bool:
+    def check_subgraph_health(self, check_deployment: bool = True) -> bool:
         ds = self.schema
         q = ds.Query._meta().select(
             ds._Meta_.deployment,
@@ -167,6 +167,9 @@ class TheGraphCollector(NetworkCollector, UpdatableCollector, ABC):
         
         # TODO: Save the block info to use it later in run
         self._indexer_block = Block(r['block'])
+
+        if not check_deployment:
+            return True
         
         return self.check_deployment_health(r['deployment'])
 
@@ -188,8 +191,9 @@ class TheGraphCollector(NetworkCollector, UpdatableCollector, ABC):
 
     def run(self, force=False, block: Optional[Block] = None, prev_block: Optional[Block] = None):
         self.logger.info(f"Running The Graph collector with block: {block}, prev_block: {prev_block}")
+        assert self.check_subgraph_health(check_deployment=False) # Just update the _indexer_block
         if block and self._indexer_block:
-            assert self._indexer_block >= block, "Block number is not indexed yet"
+            assert self._indexer_block >= block, f"Block number {block} is not indexed yet ({self._indexer_block})"
         
         if block is None:
             block = Block()