dao-scripts 1.4.3__tar.gz → 1.4.5__tar.gz

{dao_scripts-1.4.3 → dao_scripts-1.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dao-scripts
-Version: 1.4.3
+Version: 1.4.5
 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.3 → dao_scripts-1.4.5}/dao_scripts.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dao-scripts
-Version: 1.4.3
+Version: 1.4.5
 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.3 → dao_scripts-1.4.5}/src/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.3'
-__version_tuple__ = version_tuple = (1, 4, 3)
+__version__ = version = '1.4.5'
+__version_tuple__ = version_tuple = (1, 4, 5)

{dao_scripts-1.4.3 → dao_scripts-1.4.5}/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.3 → dao_scripts-1.4.5}/src/common/thegraph.py

@@ -189,7 +189,7 @@ 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}")
         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()

{dao_scripts-1.4.3 → dao_scripts-1.4.5}/src/main.py

@@ -99,7 +99,7 @@ def lock_and_run(args: Namespace):
             copied_dw = False
 
             try:
-                ignore = shutil.ignore_patterns('.lock*', 'logs/*')
+                ignore = shutil.ignore_patterns('*.lock', 'logs', '.running')
 
                 # We want to copy the dw, so we open it as readers
                 p_lock.touch(exist_ok=True)
@@ -134,7 +134,11 @@ def lock_and_run(args: Namespace):
                 # Copying back the dw
                 logger.info(f"<<< Copying back the datawarehouse from {tmp_dw} to {datawarehouse}")
                 with pl.Lock(p_lock, 'w', timeout=10):
-                    shutil.copytree(tmp_dw, datawarehouse, dirs_exist_ok=True, ignore=ignore)
+                    def verbose_copy(src, dst):
+                        logger.debug(f'Copying {src} to {Path(dst).absolute()}')
+                        return shutil.copy2(src, dst)
+                
+                    shutil.copytree(tmp_dw, datawarehouse, dirs_exist_ok=True, ignore=ignore, copy_function=verbose_copy)
                 
                 copied_dw = True
             finally:

{dao_scripts-1.4.3 → dao_scripts-1.4.5}/.github/workflows/update-datasets.yml

@@ -21,6 +21,9 @@ jobs:
         if_no_artifact_found: warn
     - name: Obtain datawarehouse
       run: dao-scripts --skip-token-balances
+      env:
+        DAOA_THE_GRAPH_API_KEY: ${{ secrets.DAOA_THE_GRAPH_API_KEY }}
+        DAOA_CC_API_KEY: ${{ secrets.DAOA_CC_API_KEY }}
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
@@ -45,9 +48,6 @@ jobs:
         python-version: '3.12'
     - name: Install dao-scripts
       run: pip install 'dao-scripts[upload]>=1.1.14'
-      env:
-        DAOA_THE_GRAPH_API_KEY: ${{ secrets.DAOA_THE_GRAPH_API_KEY }}
-        DAOA_CC_API_KEY: ${{ secrets.DAOA_CC_API_KEY }}
     - name: Patch Zenodo client (provisional)
       run: |
         FILE="$(python -c "from zenodo_client import api; print(api.__file__)")"