updating weekly data

active_traders.parquet

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a40a529b880958bd7abd4f60a43d0be0b6541bea28c2e437d1587c6b7337d51c
-size 79528
+oid sha256:17f8bbf1586d566663fa7547d579f8f679ac7abc9249e71bcb01e0b205bb288b
+size 78414

all_trades_profitability.parquet.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8407d663989a9ae9b00a93ee63de23523750c7a93002373985deeed06250979f
-size 10040781
+oid sha256:693d4199ee220e2adac3ea474f7513004cd7786d0510cf12c4ff77f1623967af
+size 10385468

closed_markets_div.parquet

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2281a6ba1ce453b14a0bf1b307372647b9bda9e3177f3360a01e3fe218a7a034
-size 74999
+oid sha256:ab8705abf8d0a22589012ab72d31e7f3a53cb5e98a4fa26ec0275db315ceb6ad
+size 79341

daily_info.parquet

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e68f54006dbf71cabc71975bb67166a7ee796f0782dd75b9284ef1cb209c1f09
-size 1502516
+oid sha256:b9772ee2493d8fdbe89ec3ba43a15cfa5856e92991c9f3e174f6c128d2a053cf
+size 2290925

error_by_markets.parquet

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3130e944015fc63063ddbf8a9d526527a942122849abadcc246de0429151ca96
-size 12512
+oid sha256:bd12409cd7b9dd33ab7dfd18e41442e3ad685f1f5ac81f1de4a2138989ad5bb6
+size 12397

invalid_trades.parquet

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:793d6fc3fc2dec6385fadc95c385bef6798fba707d862ea322a28ff2a1b5f144
-size 769642
+oid sha256:bcadecf13096eb0ad9f17560d688ac04e467fb9dbe4d97df3fb77718839a8f8e
+size 769721

retention_activity.parquet

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bf4e97cb2e122c36862a0990aed08ade1d4b1e12fdfe755a25c4fdb166bfaee0
+size 11862944

retention_activity.parquet.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d7de12457418b4d1db7e0d2bb250f109c78b8c2f67e2d6bae4573a25a0499e9
-size 6630005
+oid sha256:7a5b907c7fe0f87db720b8d3f29ca67fe07b685bfa6299c2e42eb99bcd3bcf56
+size 7213628

scripts/cloud_storage.py

@@ -3,13 +3,14 @@ from minio.error import S3Error
 import os
 import argparse
 
-from utils import HIST_DIR
+from utils import HIST_DIR, ROOT_DIR
 
 MINIO_ENDPOINT = "minio.autonolas.tech"
 ACCESS_KEY = os.environ.get("CLOUD_ACCESS_KEY", None)
 SECRET_KEY = os.environ.get("CLOUD_SECRET_KEY", None)
 BUCKET_NAME = "weekly-stats"
 FOLDER_NAME = "historical_data"
+MAY_FOLDER = "may2024"
 
 
 def initialize_client():
@@ -23,10 +24,15 @@ def initialize_client():
     return client
 
 
-def upload_file(client, filename: str, file_path: str) -> bool:
+def upload_file(
+    client, filename: str, file_path: str, extra_folder: str = None
+) -> bool:
     """Upload a file to the bucket"""
     try:
-        OBJECT_NAME = FOLDER_NAME + "/" + filename
+        if extra_folder is not None:
+            OBJECT_NAME = FOLDER_NAME + "/" + extra_folder + "/" + filename
+        else:
+            OBJECT_NAME = FOLDER_NAME + "/" + filename
         print(
             f"filename={filename}, object_name={OBJECT_NAME} and file_path={file_path}"
         )
@@ -40,21 +46,22 @@ def upload_file(client, filename: str, file_path: str) -> bool:
         return False
 
 
-def download_file(client, filename: str, file_path: str):
+def download_file(client, filename: str):
     """Download the file back"""
     try:
         OBJECT_NAME = FOLDER_NAME + "/" + filename
+        file_path = filename
         client.fget_object(BUCKET_NAME, OBJECT_NAME, "downloaded_" + file_path)
         print(f"File '{OBJECT_NAME}' downloaded as 'downloaded_{file_path}'.")
     except S3Error as err:
         print(f"Error downloading file: {err}")
 
 
-def load_historical_file(client, filename: str) -> bool:
+def load_historical_file(client, filename: str, extra_folder: str = None) -> bool:
     """Function to load one file into the cloud storage"""
     file_path = filename
     file_path = HIST_DIR / filename
-    return upload_file(client, filename, file_path)
+    return upload_file(client, filename, file_path, extra_folder)
 
 
 def upload_historical_file(filename: str):
@@ -90,4 +97,9 @@ if __name__ == "__main__":
 
     client = initialize_client()
     # load_historical_file(client, filename)
-    process_historical_files(client)
+    # process_historical_files(client)
+    # checking files at the cloud storage
+    files = ["data_delivers_06_05_2024.csv", "data_tools_06_05_2024.csv"]
+    for old_file in files:
+        # download_file(client=client, filename=tools_file)
+        load_historical_file(client=client, filename=old_file, extra_folder=MAY_FOLDER)

scripts/pull_data.py

@@ -23,7 +23,7 @@ from get_mech_info import (
 )
 from update_tools_accuracy import compute_tools_accuracy
 from cleaning_old_info import clean_old_data_from_parquet_files
-from web3_utils import updating_timestamps
+from web3_utils import get_timestamp_two_weeks_ago
 from manage_space_files import move_files
 from cloud_storage import upload_historical_file
 from tools_metrics import compute_tools_based_datasets
@@ -89,23 +89,24 @@ def save_historical_data():
 def only_new_weekly_analysis():
     """Run weekly analysis for the FPMMS project."""
     # Run markets ETL
-    logging.info("Running markets ETL")
-    mkt_etl(MARKETS_FILENAME)
-    logging.info("Markets ETL completed")
-
-    # Mech events ETL
-    logging.info("Generating the mech json files")
-    # get only new data
-    latest_timestamp = get_mech_events_since_last_run(logger)
-    if latest_timestamp == None:
-        print("Error while getting the mech events")
-        return
-    logging.info(f"Finished generating the mech json files from {latest_timestamp}")
+    # logging.info("Running markets ETL")
+    # mkt_etl(MARKETS_FILENAME)
+    # logging.info("Markets ETL completed")
+
+    # # Mech events ETL
+    # logging.info("Generating the mech json files")
+    # # get only new data
+    # latest_timestamp = get_mech_events_since_last_run(logger)
+    # if latest_timestamp == None:
+    #     print("Error while getting the mech events")
+    #     return
+    # logging.info(f"Finished generating the mech json files from {latest_timestamp}")
 
     # FpmmTrades ETL
+    trades_timestamp = get_timestamp_two_weeks_ago()
     fpmmTrades_etl(
         trades_filename="new_fpmmTrades.parquet",
-        from_timestamp=int(latest_timestamp.timestamp()),
+        from_timestamp=int(trades_timestamp.timestamp()),
     )
     # merge with previous file
     print("Merging with previous fpmmTrades file")
@@ -134,7 +135,7 @@ def only_new_weekly_analysis():
 
     save_historical_data()
     try:
-        clean_old_data_from_parquet_files("2024-11-30")
+        clean_old_data_from_parquet_files("2024-12-02")
     except Exception as e:
         print("Error cleaning the oldest information from parquet files")
         print(f"reason = {e}")

scripts/web3_utils.py

@@ -5,7 +5,7 @@ import time
 import requests
 from functools import partial
 from string import Template
-from datetime import datetime
+from datetime import datetime, timedelta
 from concurrent.futures import ThreadPoolExecutor
 from collections import defaultdict
 from tqdm import tqdm
@@ -67,6 +67,16 @@ def update_block_request_map(block_request_id_map: dict) -> None:
         pickle.dump(block_request_id_map, handle, protocol=pickle.HIGHEST_PROTOCOL)
 
 
+def get_timestamp_two_weeks_ago() -> int:
+    two_weeks_ago = datetime.now() - timedelta(weeks=2)
+    two_weeks_ago_date = two_weeks_ago.strftime("%Y-%m-%d")
+    print(f"Timestamp of two weeks ago = {two_weeks_ago_date}")
+    # Convert the date string to a pandas Timestamp object with UTC timezone
+    return pd.Timestamp(datetime.strptime(two_weeks_ago_date, "%Y-%m-%d")).tz_localize(
+        "UTC"
+    )
+
+
 def reduce_window(contract_instance, event, from_block, batch_size, latest_block):
     """Dynamically reduce the batch size window."""
     keep_fraction = 1 - REDUCE_FACTOR

service_map.pkl

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f17ea5c4d6ed8fd8547d38aff00c70881631a68edd556cbdff6027551343b86
-size 169107
+oid sha256:a00b07411592ce1e05011a604365801a1558771868bdb2c80772a4d1a67b6dab
+size 170535

tools_accuracy.csv

@@ -1,13 +1,13 @@
 tool,tool_accuracy,total_requests,min,max
-claude-prediction-offline,56.51432053625838,90255,2024-11-30 00:59:05,2025-01-27 21:41:20
-claude-prediction-online,56.783485191652694,57839,2024-11-30 00:04:40,2025-01-28 00:21:00
-prediction-offline,58.671392936851774,152340,2024-11-30 01:23:50,2025-01-28 00:15:45
-prediction-offline-sme,49.74132356111231,27834,2024-11-30 04:05:40,2025-01-27 22:56:50
-prediction-online,51.21168923734854,5612,2024-11-30 04:02:25,2025-01-27 17:14:05
-prediction-online-sme,49.80252021816814,5317,2024-11-30 02:22:15,2025-01-27 17:13:05
-prediction-request-rag,49.48805460750853,1172,2024-11-30 11:15:45,2025-01-27 13:10:05
-prediction-request-rag-claude,51.45631067961165,1133,2024-11-30 10:33:25,2025-01-27 10:31:15
-prediction-request-reasoning,52.52582452988616,102422,2024-11-30 00:15:25,2025-01-27 17:25:25
-prediction-request-reasoning-claude,60.16877637130802,1185,2024-11-30 01:27:10,2025-01-27 16:37:40
-prediction-url-cot-claude,52.92607802874743,1948,2024-11-30 07:17:35,2025-01-27 22:55:20
-superforcaster,52.67537270310875,8653,2024-11-30 03:16:35,2025-01-27 23:25:40
+claude-prediction-offline,57.472294476382004,91498,2024-12-02 00:04:45,2025-02-02 02:10:00
+claude-prediction-online,57.80809753931797,58561,2024-12-02 00:04:35,2025-02-02 17:04:55
+prediction-offline,57.71920894368719,159129,2024-12-02 00:04:45,2025-02-02 01:59:20
+prediction-offline-sme,51.10462692788662,28788,2024-12-02 00:02:20,2025-02-02 01:01:20
+prediction-online,50.845346147001244,5619,2024-12-02 00:27:20,2025-02-01 17:43:20
+prediction-online-sme,49.12801484230055,5390,2024-12-02 00:10:10,2025-02-01 17:43:30
+prediction-request-rag,48.80546075085324,1172,2024-12-02 00:18:00,2025-02-01 10:59:45
+prediction-request-rag-claude,50.17513134851138,1142,2024-12-02 04:00:20,2025-02-01 16:49:45
+prediction-request-reasoning,52.38675812260929,107447,2024-12-02 00:16:10,2025-02-01 18:02:25
+prediction-request-reasoning-claude,61.13902847571189,1194,2024-12-02 00:37:15,2025-02-01 17:23:30
+prediction-url-cot-claude,53.905845835488876,1933,2024-12-02 01:06:10,2025-02-01 19:00:15
+superforcaster,53.4790811230718,9011,2024-12-02 00:37:00,2025-02-01 23:58:25

unknown_traders.parquet

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5e89e6b84b8dd5acdea90a875c8ba1ef35ac19b23bedede89e58bd7554a324e
-size 389594
+oid sha256:b38e5e6401c7f724e8fd425aa5e36da471d2f649ff7624c4f7410f2924e53b4a
+size 419033

weekly_mech_calls.parquet

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fbadcb75bcd86c811d0091b44b083f003f27b04b1d79f57c902d833874ab9a63
-size 53126
+oid sha256:f675b1980af3d10a0e10d284d7ef93ec0496946dc4ba67adf2622ed360a92875
+size 54025

winning_df.parquet

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:431c05dbfb97469626034fdb63c6dd369c530f425eeeec39a2fe981aeaaf7844
-size 12002
+oid sha256:cc6147e64c72f32e90cde223b232a3ea65ee9c7dde97395daeb9aa31a5ef4886
+size 11882