dao-scripts 1.5.0__tar.gz → 1.5.2__tar.gz

{dao_scripts-1.5.0 → dao_scripts-1.5.2}/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 1.5.1 - 2024-06-05
+- Multiple small bugfixes
+
 ## 1.5.0 - 2024-06-04
 - Avoid errors when no new data is available
 

{dao_scripts-1.5.0 → dao_scripts-1.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dao-scripts
-Version: 1.5.0
+Version: 1.5.2
 Summary: "A tool to download data to monitor DAO activity"
 Home-page: https://github.com/Grasia/dao-scripts
 Author: David Davó
@@ -35,7 +35,7 @@ Requires-Dist: requests-toolbelt>=0.9.1
 Requires-Dist: tenacity>=8.0.0
 Requires-Dist: tqdm>=4.62.3
 Provides-Extra: upload
-Requires-Dist: kaggle>=1.5.12; extra == "upload"
+Requires-Dist: kaggle<=1.6.15,>=1.5.12; extra == "upload"
 Requires-Dist: zenodo-client>=0.3.4; extra == "upload"
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"
@@ -181,10 +181,10 @@ daoa-cache-scripts --networks xdai
 >
 </div>
 
-DAO-Analyzer is created under the umbrella of multiple research projects: 
+DAO-Analyzer is developed under the umbrella of multiple research projects: 
 - Chain Community, funded by the Spanish Ministry of Science and Innovation ([RTI2018‐096820‐A‐I00](https://produccioncientifica.ucm.es/proyectos/48103/detalle)) and led by Javier Arroyo and Samer Hassan
 - P2P Models, funded by the European Research Council (ERC-2017-STG 625 grant no.: 75920), led by Samer Hassan.
-- DAOapplications, funded by the Spanish Ministry of Science and Innovation ([PID2021-127956OB-I00](https://produccioncientifica.ucm.es/proyectos/551171/detalle)) and led by Javier Arroyo, Samer Hassan and maria Cruz Valiente
+- DAOapplications, funded by the Spanish Ministry of Science and Innovation ([PID2021-127956OB-I00](https://produccioncientifica.ucm.es/proyectos/551171/detalle)) and led by Javier Arroyo and Samer Hassan
 
 ## Cite as
 

{dao_scripts-1.5.0 → dao_scripts-1.5.2}/README.md

@@ -132,10 +132,10 @@ daoa-cache-scripts --networks xdai
 >
 </div>
 
-DAO-Analyzer is created under the umbrella of multiple research projects: 
+DAO-Analyzer is developed under the umbrella of multiple research projects: 
 - Chain Community, funded by the Spanish Ministry of Science and Innovation ([RTI2018‐096820‐A‐I00](https://produccioncientifica.ucm.es/proyectos/48103/detalle)) and led by Javier Arroyo and Samer Hassan
 - P2P Models, funded by the European Research Council (ERC-2017-STG 625 grant no.: 75920), led by Samer Hassan.
-- DAOapplications, funded by the Spanish Ministry of Science and Innovation ([PID2021-127956OB-I00](https://produccioncientifica.ucm.es/proyectos/551171/detalle)) and led by Javier Arroyo, Samer Hassan and maria Cruz Valiente
+- DAOapplications, funded by the Spanish Ministry of Science and Innovation ([PID2021-127956OB-I00](https://produccioncientifica.ucm.es/proyectos/551171/detalle)) and led by Javier Arroyo and Samer Hassan
 
 ## Cite as
 

{dao_scripts-1.5.0 → dao_scripts-1.5.2}/dao_scripts.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dao-scripts
-Version: 1.5.0
+Version: 1.5.2
 Summary: "A tool to download data to monitor DAO activity"
 Home-page: https://github.com/Grasia/dao-scripts
 Author: David Davó
@@ -35,7 +35,7 @@ Requires-Dist: requests-toolbelt>=0.9.1
 Requires-Dist: tenacity>=8.0.0
 Requires-Dist: tqdm>=4.62.3
 Provides-Extra: upload
-Requires-Dist: kaggle>=1.5.12; extra == "upload"
+Requires-Dist: kaggle<=1.6.15,>=1.5.12; extra == "upload"
 Requires-Dist: zenodo-client>=0.3.4; extra == "upload"
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"
@@ -181,10 +181,10 @@ daoa-cache-scripts --networks xdai
 >
 </div>
 
-DAO-Analyzer is created under the umbrella of multiple research projects: 
+DAO-Analyzer is developed under the umbrella of multiple research projects: 
 - Chain Community, funded by the Spanish Ministry of Science and Innovation ([RTI2018‐096820‐A‐I00](https://produccioncientifica.ucm.es/proyectos/48103/detalle)) and led by Javier Arroyo and Samer Hassan
 - P2P Models, funded by the European Research Council (ERC-2017-STG 625 grant no.: 75920), led by Samer Hassan.
-- DAOapplications, funded by the Spanish Ministry of Science and Innovation ([PID2021-127956OB-I00](https://produccioncientifica.ucm.es/proyectos/551171/detalle)) and led by Javier Arroyo, Samer Hassan and maria Cruz Valiente
+- DAOapplications, funded by the Spanish Ministry of Science and Innovation ([PID2021-127956OB-I00](https://produccioncientifica.ucm.es/proyectos/551171/detalle)) and led by Javier Arroyo and Samer Hassan
 
 ## Cite as
 

{dao_scripts-1.5.0 → dao_scripts-1.5.2}/dao_scripts.egg-info/requires.txt

@@ -19,5 +19,5 @@ pandas-vet
 twine
 
 [upload]
-kaggle>=1.5.12
+kaggle<=1.6.15,>=1.5.12
 zenodo-client>=0.3.4

{dao_scripts-1.5.0 → dao_scripts-1.5.2}/setup.cfg

@@ -52,7 +52,7 @@ console_scripts =
 
 [options.extras_require]
 upload = 
-	kaggle >= 1.5.12
+	kaggle >= 1.5.12, <= 1.6.15
 	zenodo-client >= 0.3.4
 dev = 
 	build

{dao_scripts-1.5.0 → dao_scripts-1.5.2}/src/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.5.0'
-__version_tuple__ = version_tuple = (1, 5, 0)
+__version__ = version = '1.5.2'
+__version_tuple__ = version_tuple = (1, 5, 2)

{dao_scripts-1.5.0 → dao_scripts-1.5.2}/src/common/blockscout.py

@@ -44,7 +44,7 @@ class BlockscoutBallancesCollector(NetworkCollector):
     def endpoint(self) -> str:
         return ENDPOINTS[self.network]['blockscout']
 
-    def _get_from_address(self, addr: str, retry: int = 0, maxretries: int = 3, block: Union[int, Block, None] = None, ignore_errors=False) -> pd.DataFrame: # noqa: C901
+    def _get_from_address(self, addr: str, retry: int = 0, maxretries: int = 5, block: Union[int, Block, None] = None, ignore_errors=False) -> pd.DataFrame: # noqa: C901
         if retry >= maxretries:
             raise ValueError(f"Too many retries {retry}/{maxretries}")
 

{dao_scripts-1.5.0 → dao_scripts-1.5.2}/src/common/thegraph.py

@@ -117,7 +117,8 @@ class TheGraphCollector(NetworkCollector, UpdatableCollector, ABC):
         else:
             df = pd.DataFrame(columns=get_columns_from_query(self.query()))
 
-        assert set(df.columns) == set(get_columns_from_query(self.query()))
+        if (s1 := set(df.columns)) != (s2 := set(get_columns_from_query(self.query()))):
+            raise ValueError(f"Received columns are not the expected columns: {s1} != {s2}")
 
         # For compatibility reasons we change from . to snake case
         def dotsToSnakeCase(str: str) -> str:

{dao_scripts-1.5.0 → dao_scripts-1.5.2}/src/daohaus/runner.py

@@ -156,7 +156,7 @@ class TokenBalancesCollector(TheGraphCollector):
         def coalesce_bank_type(df: pd.DataFrame) -> pd.DataFrame:
             bank_idx = ['guildBank', 'memberBank', 'ecrowBank']
 
-            df['bank'] = df[bank_idx].idxmax(1)
+            df['bank'] = df[bank_idx].idxmax(1).astype(str)
             df['bank'] = df['bank'].str.lower()
             df['bank'] = df['bank'].str.replace('bank', '')
             df = df.drop(columns=bank_idx)

{dao_scripts-1.5.0 → dao_scripts-1.5.2}/src/metadata.py

@@ -25,7 +25,7 @@ class Block:
             self.number = int(init["number"]) if "number" in init else self.number
             self.id = init["id"] if "id" in init else self.id
 
-            if "timestamp" in init:
+            if init.get("timestamp", None):
                 if isinstance(init['timestamp'], int) or init["timestamp"].isdigit():
                     self.timestamp = datetime.fromtimestamp(int(init["timestamp"]))
                 else: