diff options
Diffstat (limited to 'server/models')
-rw-r--r-- | server/models/auth.py | 1 | ||||
-rw-r--r-- | server/models/bid.py | 5 | ||||
-rw-r--r-- | server/models/market.py | 7 |
3 files changed, 8 insertions, 5 deletions
diff --git a/server/models/auth.py b/server/models/auth.py index 0bf1d18..b20a84f 100644 --- a/server/models/auth.py +++ b/server/models/auth.py @@ -2,6 +2,7 @@ from sqlalchemy import Column, Integer, String from sqlalchemy.orm import relationship from db import Base + class User(Base): __tablename__ = "users" diff --git a/server/models/bid.py b/server/models/bid.py index e717011..121020d 100644 --- a/server/models/bid.py +++ b/server/models/bid.py @@ -2,14 +2,15 @@ from sqlalchemy import Column, Integer, Float, String, DateTime, ForeignKey from sqlalchemy.orm import relationship from db import Base + class Bid(Base): __tablename__ = "bids" id = Column(Integer, primary_key=True, index=True) timestamp = Column(DateTime, index=True, nullable=False) # Bid target time quantity = Column(Float, nullable=False) # MWh - price = Column(Float, nullable=False) # $/MWh - market = Column(String, nullable=False) # Market name: ISONE / MISO / NYISO for now + price = Column(Float, nullable=False) # $/MWh + market = Column(String, nullable=False) # Market name: ISONE / MISO / NYISO for now status = Column(String, default="Submitted") # Submitted / Success / Fail pnl = Column(Float, nullable=True) # Profit/loss value, nullable initially diff --git a/server/models/market.py b/server/models/market.py index 8606075..0127141 100644 --- a/server/models/market.py +++ b/server/models/market.py @@ -3,6 +3,7 @@ from pydantic import BaseModel from sqlalchemy import Column, Integer, String, Float, DateTime from db import Base + class MarketData(BaseModel): timestamp: datetime lmp: float @@ -10,7 +11,7 @@ class MarketData(BaseModel): congestion: float loss: float -# New DB model + class MarketDataDB(Base): __tablename__ = "market_data" @@ -20,5 +21,5 @@ class MarketDataDB(Base): energy = Column(Float) congestion = Column(Float) loss = Column(Float) - market = Column(String, index=True) # eg. "ISONE" - type = Column(String, index=True) # "REALTIME" or "DAYAHEAD" + market = Column(String, index=True) # eg. "ISONE" + type = Column(String, index=True) # "REALTIME" or "DAYAHEAD" |