dao-scripts 1.4.3__py3-none-any.whl → 1.4.5__py3-none-any.whl

dao_analyzer/cache_scripts/_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_analyzer/cache_scripts/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_analyzer/cache_scripts/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_analyzer/cache_scripts/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.dist-info → dao_scripts-1.4.5.dist-info}/METADATA

@@ -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.dist-info → dao_scripts-1.4.5.dist-info}/RECORD

@@ -1,12 +1,12 @@
-dao_scripts-1.4.3-py3.12-nspkg.pth,sha256=_0DzrHlnOxaQL5l1mMdHT1BtXZwXuB6MitMF5phpOhk,497
+dao_scripts-1.4.5-py3.12-nspkg.pth,sha256=_0DzrHlnOxaQL5l1mMdHT1BtXZwXuB6MitMF5phpOhk,497
 dao_analyzer/cache_scripts/__init__.py,sha256=Urg-J2hvyzGcgE2Z-ba71XpcHi1YlPZgex86OFSd_0A,116
 dao_analyzer/cache_scripts/__main__.py,sha256=aNVhgUXjB4rzTefrX3d6dKeLOX3G_Ezs82pI8QCpwx0,61
-dao_analyzer/cache_scripts/_version.py,sha256=cUUlK35wR7qLNaS4SMOrkRP_HG0nSHq0YEIezhPHr3c,411
+dao_analyzer/cache_scripts/_version.py,sha256=HhvBOPJ1g3k0gtuZ-SLO8_784kPPejMh80IxITX8Cvc,411
 dao_analyzer/cache_scripts/argparser.py,sha256=uOBVdRxmgR8H0dZMu2AQyvro6WvkZFKUrf7vJ6Mvw48,3574
 dao_analyzer/cache_scripts/config.py,sha256=6Ooh-SpTtNCHcl2sE637-XMCCCNZBmATJRyD_eguWr0,2180
 dao_analyzer/cache_scripts/endpoints.json,sha256=JLkXgE7P7ZXpAsorIq0jCVCoPoK4_YeyfTgCmtPdo14,1278
 dao_analyzer/cache_scripts/logging.py,sha256=9sAqZUk_Qnmlf9Ko60C4O__Ve7Tj4xefzQ7cV07aQ70,3196
-dao_analyzer/cache_scripts/main.py,sha256=7N92n6KBQXjnlEGLV_f7_PBHEI7UzR47yPLcUkh2j5w,5751
+dao_analyzer/cache_scripts/main.py,sha256=ZgNPI5szAFh-dVa6JEa2uw0eMZ_IWtCZX3yqF7jBJmw,5989
 dao_analyzer/cache_scripts/metadata.py,sha256=oZ5xLkWClt1YxBAvbsDhciZkyHJ1Vcuic7guFy2ks6w,4211
 dao_analyzer/cache_scripts/aragon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dao_analyzer/cache_scripts/aragon/dao_names.json,sha256=ASDOJYTsgHELJ7g1z9NccVROYYxsHQaLy9V-vrfr_Ec,7412
@@ -14,19 +14,19 @@ dao_analyzer/cache_scripts/aragon/runner.py,sha256=RQX9KkOm268vrY_jgMHT_Rthkrncb
 dao_analyzer/cache_scripts/common/__init__.py,sha256=R_rWbKcp-Htw_Y_gt83Y6_N9KQC5kAHyMqb0Dk25HkU,342
 dao_analyzer/cache_scripts/common/api_requester.py,sha256=objbyqKVVEfNFmffds3BC2Nc3Bjk6Gip-9EUGScm7JY,8145
 dao_analyzer/cache_scripts/common/blockscout.py,sha256=8-Xz7yhG8jtZsWBA2Ik3T3xqzDB0Bw89-EI8vcIB8Yk,5041
-dao_analyzer/cache_scripts/common/common.py,sha256=rOtOpvAxmRnmkGnxsaxlzvmXS05wk_cB_qn9xFSKsXE,10874
+dao_analyzer/cache_scripts/common/common.py,sha256=Vj_UHqcCQRiKBwCV1skVTZoDl-eGOtclI8ps28BrD6A,10910
 dao_analyzer/cache_scripts/common/cryptocompare.py,sha256=jaHdJ-X_AXEUdVRMVtyK6xwHNJdhTs2Ps44QMD0iuIY,2203
-dao_analyzer/cache_scripts/common/thegraph.py,sha256=iiAfpM3791o4iIzHwF_n7GYBn5G7oAV5t624jMA2rCI,6850
+dao_analyzer/cache_scripts/common/thegraph.py,sha256=Q2932YDKXXgN6_03PyIwABCGYD-IfKVY6OOx5RxWlGU,6883
 dao_analyzer/cache_scripts/daohaus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dao_analyzer/cache_scripts/daohaus/runner.py,sha256=nQ7YN_Fbfx0KsHkq47hShwTS82jbo285x60Z-31vj8M,7549
 dao_analyzer/cache_scripts/daostack/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dao_analyzer/cache_scripts/daostack/runner.py,sha256=emjzhZzGMTRGHKljll_lX-uMsGwaIsZBSi4jV1Lsh8Y,10144
 dao_analyzer/cache_scripts/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dao_analyzer/cache_scripts/utils/uploadDataWarehouse.py,sha256=ID5AQxfDMKkatiZnRQRWeRm5ztQhbLutMqPveWMuzOM,4614
-dao_scripts-1.4.3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-dao_scripts-1.4.3.dist-info/METADATA,sha256=iShmlWTPvtn5OvaP5bqcEXZk3HySTjOvY621mHrR4ew,8193
-dao_scripts-1.4.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-dao_scripts-1.4.3.dist-info/entry_points.txt,sha256=dHhgA8pcQ2YbIlMuqPPSh7fiQkfHE8ioFPUcbBvXWDc,207
-dao_scripts-1.4.3.dist-info/namespace_packages.txt,sha256=gbsNupMgtHQXOyBinbeLMo06f278s8My_9N-CrZh3Bk,13
-dao_scripts-1.4.3.dist-info/top_level.txt,sha256=gbsNupMgtHQXOyBinbeLMo06f278s8My_9N-CrZh3Bk,13
-dao_scripts-1.4.3.dist-info/RECORD,,
+dao_scripts-1.4.5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+dao_scripts-1.4.5.dist-info/METADATA,sha256=8qzsNOrJEzwm_2QAxm0-I9nvdY4TEY0GPkOO0Us3KYc,8193
+dao_scripts-1.4.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+dao_scripts-1.4.5.dist-info/entry_points.txt,sha256=dHhgA8pcQ2YbIlMuqPPSh7fiQkfHE8ioFPUcbBvXWDc,207
+dao_scripts-1.4.5.dist-info/namespace_packages.txt,sha256=gbsNupMgtHQXOyBinbeLMo06f278s8My_9N-CrZh3Bk,13
+dao_scripts-1.4.5.dist-info/top_level.txt,sha256=gbsNupMgtHQXOyBinbeLMo06f278s8My_9N-CrZh3Bk,13
+dao_scripts-1.4.5.dist-info/RECORD,,