dao-scripts 1.3.1__tar.gz → 1.4.1__tar.gz

{dao_scripts-1.3.1 → dao_scripts-1.4.1}/.github/workflows/ci.yml

@@ -52,6 +52,10 @@ jobs:
       # IMPORTANT: this permission is mandatory for trusted publishing
       id-token: write
     steps:
+    - name: Skip Duplicate Actions
+      uses: fkirc/skip-duplicate-actions@v5
+      with:
+        concurrent_skipping: same_content_newer
     - name: Download built package
       uses: actions/download-artifact@v4
       with:

{dao_scripts-1.3.1 → dao_scripts-1.4.1}/.github/workflows/update-datasets.yml

@@ -52,7 +52,7 @@ jobs:
         sed -i 's/_prepare_new_version(new_deposition_data\["metadata"\]\["version"\])/_prepare_new_version(new_deposition_data["metadata"].get("version", ""))/g' "$FILE"
         sed -i 's/json=new_deposition_data/json={"metadata": new_deposition_data\["metadata"\]}/g' "$FILE"
     - name: Upload dataset
-      run: dao-utils-upload-dw ${{matrix.repo}}
+      run: dao-utils-upload-dw --debug ${{matrix.repo}}
       env:
         KAGGLE_USERNAME: ${{ secrets.KAGGLE_USERNAME }}
         KAGGLE_KEY: ${{ secrets.KAGGLE_KEY }}

{dao_scripts-1.3.1 → dao_scripts-1.4.1}/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 1.4.1 - 2024-06-03
+- Added debug logging to `dao-utils-upload-dw`
+
+## 1.4.0 - 2024-06-03
+- Fixed bug when process was killed
+- Updated endpoint network names
+
 ## 1.3.1 - 2024-05-27
 - Fixed bug with `--delete-force`
 

{dao_scripts-1.3.1 → dao_scripts-1.4.1}/PKG-INFO

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

{dao_scripts-1.3.1 → dao_scripts-1.4.1}/dao_scripts.egg-info/PKG-INFO

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

{dao_scripts-1.3.1 → dao_scripts-1.4.1}/src/_version.py

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

{dao_scripts-1.3.1 → dao_scripts-1.4.1}/src/endpoints.json

@@ -15,11 +15,11 @@
         "daostack": "Bnqq6ARphxg2rnAvjBrQGxCPNtDGiygv235GbRzZqwfb",
         "daohaus": "2GJY9uxsLQUCvgqSfy6QCLAJgM9P9kdxBUpwNcGs7nPR"
     },
-    "polygon": {
+    "matic": {
         "_blocks": "4mJTujCUWKLd4SPBYE1YXbamfNSNRMyphk8tHzczYWf9",
         "daohaus": "AkzZk4BsvfNRkRDtzz7Bc8TgktTJN4uv9tgfCehhE6fB"
     },
-    "arbitrum": {
+    "arbitrum-one": {
         "_blocks": "AyY1GDtmAyavGWsdoHQ4vNoBCVWSqfDwHa6jPu5KdHgP",
         "daohaus": "2c41cggebRCMzFiDqoqDwShZtz4xYucsFKbQnEiXUTzY"
     },

{dao_scripts-1.3.1 → dao_scripts-1.4.1}/src/main.py

@@ -83,12 +83,17 @@ def lock_and_run(args: Namespace):
         with pl.Lock(cs_lock, 'w', timeout=1) as lock, \
              tempfile.TemporaryDirectory(prefix="datawarehouse_") as tmp_dw_str:
 
+            running_link = datawarehouse / '.running'
+            if running_link.exists():
+                print("Program was killed, removing aux files")
+                running_link.unlink()
+
             # Writing pid and dir name to lock (debugging)
             tmp_dw = Path(tmp_dw_str)
             print(os.getpid(), file=lock)
             print(tmp_dw, file=lock)
             lock.flush()
-            (datawarehouse / '.running').symlink_to(tmp_dw)
+            running_link.symlink_to(tmp_dw)
 
             # Used to tell the loggers to use errors.log or the main logs
             copied_dw = False
@@ -135,7 +140,7 @@ def lock_and_run(args: Namespace):
             finally:
                 # Removing pid from lock
                 lock.truncate(0)
-                (datawarehouse / '.running').unlink()
+                running_link.unlink()
                 finish_logging(errors=not copied_dw)
     except pl.LockException:
         with open(cs_lock, 'r') as f:

{dao_scripts-1.3.1 → dao_scripts-1.4.1}/src/utils/uploadDataWarehouse.py

@@ -7,6 +7,7 @@ import shutil
 import json
 import requests
 from time import sleep
+import logging
 
 from tqdm import tqdm
 
@@ -122,11 +123,27 @@ def main():
         default=5,
         help="Zenodo is known to return 504 error, this program will try and upload it again",
     )
+    parser.add_argument(
+        '-D', '--debug',
+        action='store_true',
+        help='Enable debug logs',
+    )
 
     args = parser.parse_args() 
     if args.repos == 'all':
         args.repos = available_repos
 
+    if args.debug:
+        from http.client import HTTPConnection
+        
+        # https://requests.readthedocs.io/en/latest/api/#api-changes
+        HTTPConnection.debuglevel = 1
+        logging.basicConfig()
+        logging.getLogger().setLevel(logging.DEBUG)
+        requests_log = logging.getLogger('urllib3')
+        requests_log.setLevel(logging.DEBUG)
+        requests_log.propagate = True
+
     with tempfile.TemporaryDirectory() as tmpdir:
         tmpdir = Path(tmpdir)