csm-dashboard 0.3.6__py3-none-any.whl → 0.4.0__py3-none-any.whl

src/web/routes.py

@@ -1,7 +1,19 @@
 """API endpoints for the web interface."""
 
+import logging
+
 from fastapi import APIRouter, HTTPException, Query
 
+logger = logging.getLogger(__name__)
+
+from ..data.database import (
+    delete_operator,
+    get_saved_operators,
+    is_operator_saved,
+    save_operator,
+    update_operator_data,
+)
+from ..data.price import get_eth_price
 from ..services.operator_service import OperatorService
 
 router = APIRouter()
@@ -23,6 +35,7 @@ async def get_operator(
     - Add ?history=true to include all historical distribution frames
     - Add ?withdrawals=true to include withdrawal/claim history
     """
+    logger.info(f"Get operator: {identifier}, detailed={detailed}, history={history}, withdrawals={withdrawals}")
     service = OperatorService()
 
     # Determine if this is an ID or address
@@ -128,6 +141,8 @@ async def get_operator(
                     "duration_days": f.duration_days,
                     "validator_count": f.validator_count,
                     "apy": f.apy,
+                    "bond_apy": f.bond_apy,
+                    "net_apy": f.net_apy,
                 }
                 for f in rewards.apy.frames
             ]
@@ -240,7 +255,364 @@ async def get_operator_strikes(identifier: str):
     }
 
 
+@router.get("/saved-operators")
+async def list_saved_operators():
+    """Get all saved operators with their cached data."""
+    logger.info("Loading saved operators from database")
+    try:
+        operators = await get_saved_operators()
+        # Log what data each operator has
+        for op in operators:
+            op_id = op.get("operator_id", "?")
+            frames = len(op.get("apy", {}).get("frames", []))
+            withdrawals = len(op.get("withdrawals", []))
+            logger.info(f"  Operator {op_id}: {frames} frames, {withdrawals} withdrawals in cache")
+        logger.info(f"Loaded {len(operators)} saved operators")
+        return {"operators": operators}
+    except Exception as e:
+        logger.error(f"Error loading saved operators: {e}", exc_info=True)
+        return {"operators": [], "error": str(e)}
+
+
+@router.post("/operator/{identifier}/save")
+async def save_operator_endpoint(identifier: str):
+    """Save an operator to the follow list.
+
+    Fetches current operator data (including history and withdrawals) and stores it in the database.
+    """
+    logger.info(f"Saving operator: {identifier}")
+    service = OperatorService()
+
+    # Determine operator ID
+    if identifier.isdigit():
+        operator_id = int(identifier)
+    elif identifier.startswith("0x"):
+        operator_id = await service.onchain.find_operator_by_address(identifier)
+        if operator_id is None:
+            raise HTTPException(status_code=404, detail="Operator not found")
+    else:
+        raise HTTPException(status_code=400, detail="Invalid identifier format")
+
+    # Fetch current operator data with history and withdrawals
+    rewards = await service.get_operator_by_id(
+        operator_id,
+        include_validators=True,
+        include_history=True,
+        include_withdrawals=True,
+    )
+    if rewards is None:
+        raise HTTPException(status_code=404, detail="Operator not found")
+
+    # Build the data dict (same format as get_operator endpoint)
+    data = {
+        "operator_id": rewards.node_operator_id,
+        "manager_address": rewards.manager_address,
+        "reward_address": rewards.reward_address,
+        "curve_id": rewards.curve_id,
+        "operator_type": rewards.operator_type,
+        "rewards": {
+            "current_bond_eth": str(rewards.current_bond_eth),
+            "required_bond_eth": str(rewards.required_bond_eth),
+            "excess_bond_eth": str(rewards.excess_bond_eth),
+            "cumulative_rewards_shares": rewards.cumulative_rewards_shares,
+            "cumulative_rewards_eth": str(rewards.cumulative_rewards_eth),
+            "distributed_shares": rewards.distributed_shares,
+            "distributed_eth": str(rewards.distributed_eth),
+            "unclaimed_shares": rewards.unclaimed_shares,
+            "unclaimed_eth": str(rewards.unclaimed_eth),
+            "total_claimable_eth": str(rewards.total_claimable_eth),
+        },
+        "validators": {
+            "total": rewards.total_validators,
+            "active": rewards.active_validators,
+            "exited": rewards.exited_validators,
+        },
+    }
+
+    if rewards.validators_by_status:
+        data["validators"]["by_status"] = rewards.validators_by_status
+
+    if rewards.avg_effectiveness is not None:
+        data["performance"] = {
+            "avg_effectiveness": round(rewards.avg_effectiveness, 2),
+        }
+
+    if rewards.active_since:
+        data["active_since"] = rewards.active_since.isoformat()
+
+    if rewards.apy:
+        data["apy"] = {
+            "historical_reward_apy_28d": rewards.apy.historical_reward_apy_28d,
+            "historical_reward_apy_ltd": rewards.apy.historical_reward_apy_ltd,
+            "bond_apy": rewards.apy.bond_apy,
+            "net_apy_28d": rewards.apy.net_apy_28d,
+            "net_apy_ltd": rewards.apy.net_apy_ltd,
+            "next_distribution_date": rewards.apy.next_distribution_date,
+            "next_distribution_est_eth": rewards.apy.next_distribution_est_eth,
+            "lifetime_reward_apy": rewards.apy.lifetime_reward_apy,
+            "lifetime_bond_apy": rewards.apy.lifetime_bond_apy,
+            "lifetime_net_apy": rewards.apy.lifetime_net_apy,
+        }
+        # Include distribution history frames
+        if rewards.apy.frames:
+            data["apy"]["frames"] = [
+                {
+                    "frame_number": f.frame_number,
+                    "start_date": f.start_date,
+                    "end_date": f.end_date,
+                    "rewards_eth": f.rewards_eth,
+                    "rewards_shares": f.rewards_shares,
+                    "duration_days": f.duration_days,
+                    "validator_count": f.validator_count,
+                    "apy": f.apy,
+                    "bond_apy": f.bond_apy,
+                    "net_apy": f.net_apy,
+                }
+                for f in rewards.apy.frames
+            ]
+
+    if rewards.health:
+        data["health"] = {
+            "bond_healthy": rewards.health.bond_healthy,
+            "bond_deficit_eth": str(rewards.health.bond_deficit_eth),
+            "stuck_validators_count": rewards.health.stuck_validators_count,
+            "slashed_validators_count": rewards.health.slashed_validators_count,
+            "validators_at_risk_count": rewards.health.validators_at_risk_count,
+            "strikes": {
+                "total_validators_with_strikes": rewards.health.strikes.total_validators_with_strikes,
+                "validators_at_risk": rewards.health.strikes.validators_at_risk,
+                "validators_near_ejection": rewards.health.strikes.validators_near_ejection,
+                "total_strikes": rewards.health.strikes.total_strikes,
+                "max_strikes": rewards.health.strikes.max_strikes,
+                "strike_threshold": rewards.health.strikes.strike_threshold,
+            },
+            "has_issues": rewards.health.has_issues,
+        }
+
+    # Include withdrawal history
+    if rewards.withdrawals:
+        data["withdrawals"] = [
+            {
+                "block_number": w.block_number,
+                "timestamp": w.timestamp,
+                "shares": w.shares,
+                "eth_value": w.eth_value,
+                "tx_hash": w.tx_hash,
+                "withdrawal_type": w.withdrawal_type,
+                "request_id": w.request_id,
+                "status": w.status,
+                "claimed_eth": w.claimed_eth,
+                "claim_tx_hash": w.claim_tx_hash,
+                "claim_timestamp": w.claim_timestamp,
+            }
+            for w in rewards.withdrawals
+        ]
+
+    # Save to database
+    frames_count = len(data.get("apy", {}).get("frames", []))
+    withdrawals_count = len(data.get("withdrawals", []))
+    logger.info(f"Saving operator {operator_id}: {frames_count} frames, {withdrawals_count} withdrawals")
+    await save_operator(operator_id, data)
+
+    return {"status": "saved", "operator_id": operator_id}
+
+
+@router.delete("/operator/{identifier}/save")
+async def unsave_operator_endpoint(identifier: str):
+    """Remove an operator from the follow list."""
+    # Determine operator ID
+    if identifier.isdigit():
+        operator_id = int(identifier)
+    elif identifier.startswith("0x"):
+        service = OperatorService()
+        operator_id = await service.onchain.find_operator_by_address(identifier)
+        if operator_id is None:
+            raise HTTPException(status_code=404, detail="Operator not found")
+    else:
+        raise HTTPException(status_code=400, detail="Invalid identifier format")
+
+    deleted = await delete_operator(operator_id)
+    if not deleted:
+        raise HTTPException(status_code=404, detail="Operator not in saved list")
+
+    return {"status": "removed", "operator_id": operator_id}
+
+
+@router.get("/operator/{identifier}/saved")
+async def check_operator_saved(identifier: str):
+    """Check if an operator is in the saved list."""
+    if identifier.isdigit():
+        operator_id = int(identifier)
+    elif identifier.startswith("0x"):
+        service = OperatorService()
+        operator_id = await service.onchain.find_operator_by_address(identifier)
+        if operator_id is None:
+            return {"saved": False}
+    else:
+        raise HTTPException(status_code=400, detail="Invalid identifier format")
+
+    saved = await is_operator_saved(operator_id)
+    return {"saved": saved, "operator_id": operator_id}
+
+
+@router.post("/operator/{identifier}/refresh")
+async def refresh_operator_endpoint(identifier: str):
+    """Refresh the cached data for a saved operator.
+
+    Fetches fresh data (including history and withdrawals) from APIs and updates the database.
+    """
+    logger.info(f"Refreshing operator: {identifier}")
+    service = OperatorService()
+
+    # Determine operator ID
+    if identifier.isdigit():
+        operator_id = int(identifier)
+    elif identifier.startswith("0x"):
+        operator_id = await service.onchain.find_operator_by_address(identifier)
+        if operator_id is None:
+            raise HTTPException(status_code=404, detail="Operator not found")
+    else:
+        raise HTTPException(status_code=400, detail="Invalid identifier format")
+
+    # Check if operator is saved
+    if not await is_operator_saved(operator_id):
+        raise HTTPException(status_code=404, detail="Operator not in saved list")
+
+    # Fetch fresh data with history and withdrawals
+    rewards = await service.get_operator_by_id(
+        operator_id,
+        include_validators=True,
+        include_history=True,
+        include_withdrawals=True,
+    )
+    if rewards is None:
+        raise HTTPException(status_code=404, detail="Operator not found")
+
+    # Build the data dict
+    data = {
+        "operator_id": rewards.node_operator_id,
+        "manager_address": rewards.manager_address,
+        "reward_address": rewards.reward_address,
+        "curve_id": rewards.curve_id,
+        "operator_type": rewards.operator_type,
+        "rewards": {
+            "current_bond_eth": str(rewards.current_bond_eth),
+            "required_bond_eth": str(rewards.required_bond_eth),
+            "excess_bond_eth": str(rewards.excess_bond_eth),
+            "cumulative_rewards_shares": rewards.cumulative_rewards_shares,
+            "cumulative_rewards_eth": str(rewards.cumulative_rewards_eth),
+            "distributed_shares": rewards.distributed_shares,
+            "distributed_eth": str(rewards.distributed_eth),
+            "unclaimed_shares": rewards.unclaimed_shares,
+            "unclaimed_eth": str(rewards.unclaimed_eth),
+            "total_claimable_eth": str(rewards.total_claimable_eth),
+        },
+        "validators": {
+            "total": rewards.total_validators,
+            "active": rewards.active_validators,
+            "exited": rewards.exited_validators,
+        },
+    }
+
+    if rewards.validators_by_status:
+        data["validators"]["by_status"] = rewards.validators_by_status
+
+    if rewards.avg_effectiveness is not None:
+        data["performance"] = {
+            "avg_effectiveness": round(rewards.avg_effectiveness, 2),
+        }
+
+    if rewards.active_since:
+        data["active_since"] = rewards.active_since.isoformat()
+
+    if rewards.apy:
+        data["apy"] = {
+            "historical_reward_apy_28d": rewards.apy.historical_reward_apy_28d,
+            "historical_reward_apy_ltd": rewards.apy.historical_reward_apy_ltd,
+            "bond_apy": rewards.apy.bond_apy,
+            "net_apy_28d": rewards.apy.net_apy_28d,
+            "net_apy_ltd": rewards.apy.net_apy_ltd,
+            "next_distribution_date": rewards.apy.next_distribution_date,
+            "next_distribution_est_eth": rewards.apy.next_distribution_est_eth,
+            "lifetime_reward_apy": rewards.apy.lifetime_reward_apy,
+            "lifetime_bond_apy": rewards.apy.lifetime_bond_apy,
+            "lifetime_net_apy": rewards.apy.lifetime_net_apy,
+        }
+        # Include distribution history frames
+        if rewards.apy.frames:
+            data["apy"]["frames"] = [
+                {
+                    "frame_number": f.frame_number,
+                    "start_date": f.start_date,
+                    "end_date": f.end_date,
+                    "rewards_eth": f.rewards_eth,
+                    "rewards_shares": f.rewards_shares,
+                    "duration_days": f.duration_days,
+                    "validator_count": f.validator_count,
+                    "apy": f.apy,
+                    "bond_apy": f.bond_apy,
+                    "net_apy": f.net_apy,
+                }
+                for f in rewards.apy.frames
+            ]
+
+    if rewards.health:
+        data["health"] = {
+            "bond_healthy": rewards.health.bond_healthy,
+            "bond_deficit_eth": str(rewards.health.bond_deficit_eth),
+            "stuck_validators_count": rewards.health.stuck_validators_count,
+            "slashed_validators_count": rewards.health.slashed_validators_count,
+            "validators_at_risk_count": rewards.health.validators_at_risk_count,
+            "strikes": {
+                "total_validators_with_strikes": rewards.health.strikes.total_validators_with_strikes,
+                "validators_at_risk": rewards.health.strikes.validators_at_risk,
+                "validators_near_ejection": rewards.health.strikes.validators_near_ejection,
+                "total_strikes": rewards.health.strikes.total_strikes,
+                "max_strikes": rewards.health.strikes.max_strikes,
+                "strike_threshold": rewards.health.strikes.strike_threshold,
+            },
+            "has_issues": rewards.health.has_issues,
+        }
+
+    # Include withdrawal history
+    if rewards.withdrawals:
+        data["withdrawals"] = [
+            {
+                "block_number": w.block_number,
+                "timestamp": w.timestamp,
+                "shares": w.shares,
+                "eth_value": w.eth_value,
+                "tx_hash": w.tx_hash,
+                "withdrawal_type": w.withdrawal_type,
+                "request_id": w.request_id,
+                "status": w.status,
+                "claimed_eth": w.claimed_eth,
+                "claim_tx_hash": w.claim_tx_hash,
+                "claim_timestamp": w.claim_timestamp,
+            }
+            for w in rewards.withdrawals
+        ]
+
+    # Update in database
+    frames_count = len(data.get("apy", {}).get("frames", []))
+    withdrawals_count = len(data.get("withdrawals", []))
+    logger.info(f"Refreshing operator {operator_id}: {frames_count} frames, {withdrawals_count} withdrawals")
+    await update_operator_data(operator_id, data)
+
+    return {"status": "refreshed", "operator_id": operator_id, "data": data}
+
+
 @router.get("/health")
 async def health_check():
     """Health check endpoint."""
+    logger.debug("Health check called")
     return {"status": "healthy"}
+
+
+@router.get("/price/eth")
+async def get_eth_price_endpoint():
+    """Get current ETH price in USD from CoinGecko."""
+    price = await get_eth_price()
+    if price is None:
+        return {"price": None, "error": "Failed to fetch price"}
+    return {"price": price, "currency": "USD"}

csm_dashboard-0.3.6.dist-info/RECORD

@@ -1,33 +0,0 @@
-src/__init__.py,sha256=Bfqpjo9Q1XaV8DNqkf1sADzWg2ACpfZWSGLtahZE3iU,35
-src/main.py,sha256=tj7C09FVBGBVyjKYwmElpX5M92xfydDm8RJ6-MSFdMk,951
-src/abis/CSAccounting.json,sha256=-eBMqw3XqgMDzlVrG8mOrd7IYLf8nfsBIpjYqaKPYno,1281
-src/abis/CSFeeDistributor.json,sha256=unLBacJcCHq4xsmB4xOPlVXcOrxGWNf6KDmC3Ld5u-c,1517
-src/abis/CSModule.json,sha256=T6D6aInBoqVH3ZD6U6p3lrPa3t_ucA9V83IwE80kOuU,1687
-src/abis/WithdrawalQueueERC721.json,sha256=b25a5RQW5HGPH_KQcolecVToHTgYwqeikz0ZEZ9MGxU,1424
-src/abis/__init__.py,sha256=9HV2hKMGSoNAi8evsjzymTr4V4kowITNsX1-LPu6l98,20
-src/abis/stETH.json,sha256=ldxbIRrtt8ePVFewJ9Tnz4qUGFmuOXa41GN1t3tnWEg,1106
-src/cli/__init__.py,sha256=mgHAwomqzAhOHJnlWrWtCguhGzhDWlkCvkzKsfoFsds,35
-src/cli/commands.py,sha256=JNbn74H3nbwk5IT515OB4Muw-edCG9m7imub16geEyA,37506
-src/core/__init__.py,sha256=ZDHZojANK1ZFpn5lQROERTo97MYQFAxqA9APvs7ruEQ,57
-src/core/config.py,sha256=KYYlJv383RtHo_CpaCt2DM7yaTr3C267cY4T8_ZRiEc,1613
-src/core/contracts.py,sha256=u1KW0z-9V21Zpf7qxGBvRy2Ffdo4YfGusUdT4K_ggP4,582
-src/core/types.py,sha256=pirEDIR6csbGWWUH2s3RDCG2ce-oqgEvdsamAI-rurM,7807
-src/data/__init__.py,sha256=DItA8aEp8Lbr0uFlJVppMaTtVEEznoA1hkRpH-vfHhk,57
-src/data/beacon.py,sha256=jICauXdee4efYj8mj1GIoGsY5_uWmgHB57XhqkXvwS4,15439
-src/data/cache.py,sha256=w1iv4rM-FVgFlaSNYdQA3CfqyhZo9-gqbZwKmzKY0Ps,2134
-src/data/etherscan.py,sha256=JcO6H2dFFZFOV-qCaNhoJvyza2ymd2GhgmJo7vxvTPM,10938
-src/data/ipfs_logs.py,sha256=gXUTP9dmZ_e7gW6ouotJ1r_72ixq2q_32y2evYQf0DM,10709
-src/data/known_cids.py,sha256=onwTTNvAv4h0-3LZgLhqMlKzuNH2VhBqQGZ9fm8GyoE,1705
-src/data/lido_api.py,sha256=477-1vqlMAwLaisaa61T9AxJuSUV6W7NLg1cxvdmheY,4884
-src/data/onchain.py,sha256=2eLGAI0URz1JuNZi2JmLWN-h_UDfkDlbT30rXpoqbts,25252
-src/data/rewards_tree.py,sha256=a-MO14b4COjOvy59FPd0jaf1dkgidlqCQKAFDinwRJU,1894
-src/data/strikes.py,sha256=b68exKntZpzjiEBftiI3AcvEclHp7vg5lsOiG2a7Kzo,9046
-src/services/__init__.py,sha256=MC7blFLAMazErCWuyYXvS6sO3uZm1z_RUOtnlIK0kSo,38
-src/services/operator_service.py,sha256=xncq7Z3DDUcr8cohcehvL9nqaONRUPRuvjBliEGYNd8,29985
-src/web/__init__.py,sha256=iI2c5xxXmzsNxIetm0P2qE3uVsT-ClsMfzn620r5YTU,40
-src/web/app.py,sha256=AvNKmY6mNRDQaHQLDaLmf9LJxtcB0Mc-YG83XyJ7K9g,47944
-src/web/routes.py,sha256=UydCD7DMWBYv_lbQQjeHI82l8gLZkZ2lEy4OayPxNiU,10716
-csm_dashboard-0.3.6.dist-info/METADATA,sha256=7rgyMM56MfOPeTBY4M8TitFJOPMT70SuxqHMQhxGIwA,12552
-csm_dashboard-0.3.6.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-csm_dashboard-0.3.6.dist-info/entry_points.txt,sha256=P1Ul8ALIPBwDlVlXqTPuzJ64xxRpIJsYW8U73Tyjgtg,37
-csm_dashboard-0.3.6.dist-info/RECORD,,