Merge branch 'main' into extend_default_min_transfers_to_all_networks

cowprotocol · Jan 7, 2025 · 0dce228 · 0dce228
2 parents df32bc5 + 2bbd634
commit 0dce228
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/queries/orderbook/order_data.sql b/queries/orderbook/order_data.sql
@@ -133,7 +133,7 @@ price_data as (
         on tdp.auction_id = ap_protocol.auction_id and tdp.surplus_token = ap_protocol.token
 ),
 
-trade_data_processed_with_prices as (
+trade_data_processed_with_prices as materialized (
     select --noqa: ST06
         tdp.auction_id,
         tdp.solver,

diff --git a/src/data_sync/common.py b/src/data_sync/common.py
@@ -78,6 +78,10 @@ def compute_block_and_month_range(  # pylint: disable=too-many-locals
     current_month = (
         f"{current_month_end_datetime.year}_{current_month_end_datetime.month}"
     )
+    ## in case the month is 1-9, we add a "0" prefix, so that we have a fixed-length representation
+    ## e.g., 2024-12, 2024-01
+    if len(current_month) < 7:
+        current_month = current_month[:5] + "0" + current_month[5]
     months_list = [current_month]
     block_range = [(current_month_start_block, current_month_end_block)]
     if current_month_end_datetime.day == 1 or recompute_previous_month:
@@ -90,6 +94,8 @@ def compute_block_and_month_range(  # pylint: disable=too-many-locals
             previous_month = f"""{current_month_end_datetime.year}_
                 {current_month_end_datetime.month - 1}
             """
+            if len(previous_month) < 7:
+                previous_month = previous_month[:5] + "0" + previous_month[5]
             previous_month_start_datetime = datetime(
                 current_month_end_datetime.year,
                 current_month_end_datetime.month - 1,

diff --git a/src/fetch/orderbook.py b/src/fetch/orderbook.py
@@ -1,3 +1,4 @@
+# pylint: disable=duplicate-code
 """Basic client for connecting to postgres database with login credentials"""
 
 from __future__ import annotations
@@ -51,8 +52,16 @@ def pg_engine(db_env: OrderbookEnv) -> Engine:
         else:
             db_url = os.environ[f"{db_env}_DB_URL"]
 
-        db_string = f"postgresql+psycopg2://{db_url}"
-        return create_engine(db_string)
+        return create_engine(
+            f"postgresql+psycopg2://{db_url}",
+            pool_pre_ping=True,
+            connect_args={
+                "keepalives": 1,
+                "keepalives_idle": 30,
+                "keepalives_interval": 10,
+                "keepalives_count": 5,
+            },
+        )
 
     @classmethod
     def _read_query_for_env(