rel profit first version

v2realbot/common/PrescribedTradeModel.py

@@ -6,6 +6,7 @@ from uuid import UUID
 class TradeStatus(str, Enum):
     READY = "ready"
     ACTIVATED = "activated"
+    CLOSED = "closed"
     #FINISHED = "finished"
 
 class TradeDirection(str, Enum):
@@ -28,4 +29,6 @@ class Trade(BaseModel):
     stoploss_value: Optional[float] = None
     profit: Optional[float] = 0
     profit_sum: Optional[float] = 0
+    rel_profit: Optional[float] = 0
+    rel_profit_cum: Optional[float] = 0
     

v2realbot/common/db.py

@@ -79,7 +79,7 @@ def row_to_runarchiveview(row: dict) -> RunArchiveView:
         trade_count=int(row['trade_count']),
         end_positions=int(row['end_positions']),
         end_positions_avgp=float(row['end_positions_avgp']),
-        metrics=json.loads(row['metrics']),
+        metrics=json.loads(row['metrics']) if row['metrics'] else None
     )
 
 #prevede dict radku zpatky na objekt vcetme retypizace

v2realbot/common/model.py

@@ -191,6 +191,8 @@ class TradeUpdate(BaseModel):
     pos_avg_price: Optional[float]
     profit: Optional[float]
     profit_sum: Optional[float]
+    rel_profit: Optional[float]
+    rel_profit_cum: Optional[float]
     signal_name: Optional[str]