Merge pull request #600 from zimaexe/feat/fix_migrations

fixed migrations

Author: djeck1432

apps/data_handler/Dockerfile

@@ -1,17 +1,17 @@
 FROM python:3.11
 
-WORKDIR /code
+WORKDIR /app
 
-COPY data_handler/poetry.lock data_handler/pyproject.toml /code/
-COPY data_handler/entrypoint.sh /code/entrypoint.sh
+COPY data_handler/poetry.lock data_handler/pyproject.toml /app/
+COPY data_handler/entrypoint.sh /app/entrypoint.sh
 
 RUN curl -sSL https://install.python-poetry.org | POETRY_HOME=/usr/local/ POETRY_VERSION=1.8.3 python3 -\
     && poetry config virtualenvs.create false \
     && poetry install --no-dev
 
 # 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
+COPY shared /app/shared
+COPY data_handler /app/data_handler
 
-ENTRYPOINT ["bash", "/code/entrypoint.sh"]
+ENTRYPOINT ["bash", "/app/data_handler/entrypoint.sh"]

apps/data_handler/db/models/vesu.py

@@ -1,7 +1,6 @@
 from sqlalchemy import BigInteger, Column, String
 from sqlalchemy.ext.declarative import declarative_base
-
-Base = declarative_base()
+from data_handler.db.models.base import Base
 
 
 class VesuPosition(Base):

apps/data_handler/handlers/loan_states/vesu/events.py

@@ -4,6 +4,7 @@
 calculate collateral and debt values, and determine health factors for users.
 """
 
+from datetime import datetime
 from decimal import Decimal
 
 from sqlalchemy import select
@@ -29,7 +30,7 @@ def __init__(self):
         """Initialize Starknet client and storage."""
         self.client = StarknetClient()
         self.db_connector = DBConnector()
-        self.session = self.db_connector.Session()
+        self.session = self.db_connector.Session
         self._cache = {}
         self.last_processed_block = 654244  # First VESU event block
 
@@ -47,9 +48,9 @@ async def _get_token_decimals(self, token_address: int) -> Decimal:
             decimals = result[0]
             return Decimal(10) ** Decimal(decimals)
         return Decimal("Inf")
-    
+
     async def save_health_ratio_level(
-        self, session, timestamp, user_id, value, protocol_id
+        self, timestamp, user_id, value, protocol_id
     ):
         """Save a HealthRatioLevel record to the DB."""
         record = HealthRatioLevel(
@@ -58,19 +59,19 @@ async def save_health_ratio_level(
             value=value,
             protocol_id=protocol_id,
         )
-        session.add(record)
-        await session.commit()
-        await session.refresh(record)
+        self.session.add(record)
+        self.session.commit()
+        self.session.refresh(record)
         return record
 
-    async def calculate_health_factor(self, user_address: int, session=None) -> dict[str, Decimal]:
+    async def calculate_health_factor(self, user_address: int) -> dict[str, Decimal]:
         """
         Calculate health factors for all positions of a user.
 
         :param user_address: User address in int format
         :return: Dictionary with pool IDs (in hex) as keys and health factors as values
         """
-        result = await self.session.execute(
+        result = self.session.execute(
             select(VesuPosition).where(VesuPosition.user == str(user_address))
         )
         positions = result.scalars().all()
@@ -144,13 +145,12 @@ async def calculate_health_factor(self, user_address: int, session=None) -> dict
 
             results[hex(pool_id)] = health_factor
 
-            if session is not None:
-                await self.save_health_ratio_level(
-                    session=session,
-                    timestamp=pos.get("block_number", 0),
+            await self.save_health_ratio_level(
+                    # session=self.session,
+                    timestamp=datetime.now().timestamp(),
                     user_id=str(user_address),
                     value=health_factor,
-                    protocol_id=pool_id,
+                    protocol_id="Vesu",
                 )
 
         return results
@@ -395,4 +395,4 @@ async def update_positions_data(self) -> None:
 
             self.last_processed_block = max(self.last_processed_block, block_number)
 
-        await self.session.commit()
+        self.session.commit()

apps/data_handler/migrations/versions/227cd0abde09_new_tables_vesu_support.py

@@ -0,0 +1,42 @@
+"""new tables, vesu support
+
+Revision ID: 227cd0abde09
+Revises: 0003f938152d
+Create Date: 2025-06-09 20:49:57.071381
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '227cd0abde09'
+down_revision: Union[str, None] = '0003f938152d'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('vesu_positions',
+    sa.Column('id', sa.BigInteger(), autoincrement=True, nullable=False),
+    sa.Column('user', sa.String(), nullable=True),
+    sa.Column('pool_id', sa.String(), nullable=True),
+    sa.Column('collateral_asset', sa.String(), nullable=True),
+    sa.Column('debt_asset', sa.String(), nullable=True),
+    sa.Column('block_number', sa.BigInteger(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_vesu_positions_pool_id'), 'vesu_positions', ['pool_id'], unique=False)
+    op.create_index(op.f('ix_vesu_positions_user'), 'vesu_positions', ['user'], unique=False)
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f('ix_vesu_positions_user'), table_name='vesu_positions')
+    op.drop_index(op.f('ix_vesu_positions_pool_id'), table_name='vesu_positions')
+    op.drop_table('vesu_positions')
+    # ### end Alembic commands ###