fix small issues with docker

CarmineOptions · Nov 1, 2024 · 9d75cb5 · 9d75cb5
1 parent 196144a
commit 9d75cb5
Show file tree

Hide file tree

Showing 6 changed files with 4,239 additions and 42 deletions.
diff --git a/apps/data_handler/Dockerfile b/apps/data_handler/Dockerfile
@@ -12,5 +12,6 @@ RUN pip install poetry \
 # Adjust build context for folders out of Docker context
 # Assuming data_handler and shared are located in the root directory, set the context to root
 COPY shared /code/shared
+COPY data_handler /code/data_handler
 
 ENTRYPOINT ["bash", "/code/entrypoint.sh"]
diff --git a/apps/data_handler/celery_app/celery_conf.py b/apps/data_handler/celery_app/celery_conf.py
@@ -10,9 +10,9 @@
 # run_liquidable_debt_computation_for_hashstack_v0,; 
 # run_liquidable_debt_computation_for_hashstack_v1,; uniswap_v2_order_book,
 
-from data_handler.celery_app.tasks import (
-    run_liquidable_debt_computation_for_zklend, )
-from data_handler.celery_app.order_books_tasks import ekubo_order_book
+# from data_handler.celery_app.tasks import (
+#     run_liquidable_debt_computation_for_zklend, )
+# from data_handler.celery_app.order_books_tasks import ekubo_order_book
 import os
 
 from celery import Celery

diff --git a/apps/data_handler/celery_app/tasks.py b/apps/data_handler/celery_app/tasks.py
@@ -26,7 +26,7 @@
 from data_handler.db.crud import DBConnector
 from data_handler.db.models import OrderBookModel
 
-from .celery_conf import app
+from data_handler.celery_app.celery_conf import app
 
 connector = DBConnector()
 

diff --git a/apps/data_handler/db/crud.py b/apps/data_handler/db/crud.py
@@ -24,8 +24,8 @@
 )
 
 from data_handler.db.models.zklend_events import (
-    AccumulatorsSyncEventData,
-    LiquidationEventData,
+    AccumulatorsSyncEventModel,
+    LiquidationEventModel,
 )
 
 logger = logging.getLogger(__name__)
@@ -559,8 +559,8 @@ class ZkLendEventDBConnector(DBConnector):
     Provides CRUD operations specifically for ZkLend events, such as accumulator sync
     and liquidation events.
     Methods:
-    - create_accumulator_event: Creates an AccumulatorsSyncEventData record.
-    - create_liquidation_event: Creates a LiquidationEventData record.
+    - create_accumulator_event: Creates an AccumulatorsSyncEventModel record.
+    - create_liquidation_event: Creates a LiquidationEventModel record.
     - get_all_events: Retrieves events based on filtering criteria such as protocol_id,
     event_name, or block_number.
     """
@@ -569,7 +569,7 @@ def create_accumulator_event(
         self, protocol_id: str, event_name: str, block_number: int, event_data: dict
     ) -> None:
         """
-        Creates an AccumulatorsSyncEventData record in the database.
+        Creates an AccumulatorsSyncEventModel record in the database.
         :param protocol_id: The protocol ID for the event.
         :param event_name: The name of the event.
         :param block_number: The block number associated with the event.
@@ -578,7 +578,7 @@ def create_accumulator_event(
         """
         db = self.Session()
         try:
-            event = AccumulatorsSyncEventData(
+            event = AccumulatorsSyncEventModel(
                 protocol_id=protocol_id,
                 event_name=event_name,
                 block_number=block_number,
@@ -590,7 +590,7 @@ def create_accumulator_event(
             db.commit()
         except SQLAlchemyError as e:
             db.rollback()
-            logger.error(f"Error creating AccumulatorsSyncEventData: {e}")
+            logger.error(f"Error creating AccumulatorsSyncEventModel: {e}")
             raise e
         finally:
             db.close()
@@ -599,7 +599,7 @@ def create_liquidation_event(
         self, protocol_id: str, event_name: str, block_number: int, event_data: dict
     ) -> None:
         """
-        Creates a LiquidationEventData record in the database.
+        Creates a LiquidationEventModel record in the database.
         :param protocol_id: The protocol ID for the event.
         :param event_name: The name of the event.
         :param block_number: The block number associated with the event.
@@ -609,7 +609,7 @@ def create_liquidation_event(
         """
         db = self.Session()
         try:
-            event = LiquidationEventData(
+            event = LiquidationEventModel(
                 protocol_id=protocol_id,
                 event_name=event_name,
                 block_number=block_number,
@@ -625,7 +625,7 @@ def create_liquidation_event(
             db.commit()
         except SQLAlchemyError as e:
             db.rollback()
-            logger.error(f"Error creating LiquidationEventData: {e}")
+            logger.error(f"Error creating LiquidationEventModel: {e}")
             raise e
         finally:
             db.close()
@@ -661,8 +661,8 @@ def apply_filters(query):
                     query = query.filter_by(block_number=block_number)
                 return query
 
-            accumulator_query = apply_filters(db.query(AccumulatorsSyncEventData))
-            liquidation_query = apply_filters(db.query(LiquidationEventData))
+            accumulator_query = apply_filters(db.query(AccumulatorsSyncEventModel))
+            liquidation_query = apply_filters(db.query(LiquidationEventModel))
             combined_query = accumulator_query.union(liquidation_query)
             events = combined_query.all()
             return events