app/settings.py

@@ -60,11 +60,11 @@ INSTALLED_APPS = [
 # Performance optimisations
 CACHES = {
     "default": {
-        "BACKEND": "django_redis.cache.RedisCache",
+        "BACKEND": "django.core.cache.backends.redis.RedisCache",
         "LOCATION": "unix:///var/run/socks/redis.sock",
         "OPTIONS": {
             "db": "10",
-            # "parser_class": "django_redis.cache.RedisCache",
+            "parser_class": "redis.connection.HiredisParser",
             "pool_class": "redis.BlockingConnectionPool",
         },
     }

core/__init__.py

@@ -1,4 +1,5 @@
 import os
+
 import stripe
 from django.conf import settings
 

core/lib/schemas/oanda_s.py

@@ -1,29 +1,29 @@
 from decimal import Decimal as D
 
 from pydantic import BaseModel
-from typing import Optional
+
 
 class PositionLong(BaseModel):
     units: str
-    averagePrice: Optional[str] = None
+    averagePrice: str | None
     pl: str
     resettablePL: str
     financing: str
     dividendAdjustment: str
     guaranteedExecutionFees: str
-    tradeIDs: Optional[list[str]] = []
+    tradeIDs: list[str] | None
     unrealizedPL: str
 
 
 class PositionShort(BaseModel):
     units: str
-    averagePrice: Optional[str] = None
+    averagePrice: str | None
     pl: str
     resettablePL: str
     financing: str
     dividendAdjustment: str
     guaranteedExecutionFees: str
-    tradeIDs: Optional[list[str]] = []
+    tradeIDs: list[str] | None
     unrealizedPL: str
 
 
@@ -306,7 +306,7 @@ class PositionDetailsNested(BaseModel):
     dividendAdjustment: str
     guaranteedExecutionFees: str
     unrealizedPL: str
-    marginUsed: Optional[str] = None
+    marginUsed: str | None
 
 
 class PositionDetails(BaseModel):
@@ -373,7 +373,7 @@ class Instrument(BaseModel):
     guaranteedStopLossOrderMode: str
     tags: list[InstrumentTag]
     financing: InstrumentFinancing
-    guaranteedStopLossOrderLevelRestriction: Optional[InstrumentGuaranteedRestriction] = None
+    guaranteedStopLossOrderLevelRestriction: InstrumentGuaranteedRestriction | None
 
 
 class AccountInstruments(BaseModel):
@@ -474,33 +474,33 @@ class Trade(BaseModel):
     quoteGuaranteedExecutionFee: str
     halfSpreadCost: str
     # takeProfitOrder: TakeProfitOrder | None
-    takeProfitOrder: Optional[dict] = None
+    takeProfitOrder: dict | None
-    stopLossOrder: Optional[dict] = None
+    stopLossOrder: dict | None
-    trailingStopLossOrder: Optional[dict] = None
+    trailingStopLossOrder: dict | None
 
 
 class SideCarOrder(BaseModel):
     id: str
     createTime: str
     state: str
-    price: Optional[str] = None
+    price: str | None
     timeInForce: str
-    gtdTime: Optional[str] = None
+    gtdTime: str | None
-    clientExtensions: Optional[dict] = None
+    clientExtensions: dict | None
     tradeID: str
-    clientTradeID: Optional[str] = None
+    clientTradeID: str | None
     type: str
-    time: Optional[str] = None
+    time: str | None
-    priceBound: Optional[str] = None
+    priceBound: str | None
-    positionFill: Optional[str] = None
+    positionFill: str | None
-    reason: Optional[str] = None
+    reason: str | None
-    orderFillTransactionID: Optional[str] = None
+    orderFillTransactionID: str | None
-    tradeOpenedID: Optional[str] = None
+    tradeOpenedID: str | None
-    tradeReducedID: Optional[str] = None
+    tradeReducedID: str | None
-    tradeClosedIDs: Optional[list[str]] = []
+    tradeClosedIDs: list[str] | None
-    cancellingTransactionID: Optional[str] = None
+    cancellingTransactionID: str | None
-    replacesOrderID: Optional[str] = None
+    replacesOrderID: str | None
-    replacedByOrderID: Optional[str] = None
+    replacedByOrderID: str | None
 
 
 class OpenTradesTrade(BaseModel):
@@ -517,10 +517,10 @@ class OpenTradesTrade(BaseModel):
     dividendAdjustment: str
     unrealizedPL: str
     marginUsed: str
-    takeProfitOrder: Optional[SideCarOrder] = None
+    takeProfitOrder: SideCarOrder | None
-    stopLossOrder: Optional[SideCarOrder] = None
+    stopLossOrder: SideCarOrder | None
-    trailingStopLossOrder: Optional[SideCarOrder] = None
+    trailingStopLossOrder: SideCarOrder | None
-    trailingStopValue: Optional[dict] = None
+    trailingStopValue: dict | None
 
 
 class OpenTrades(BaseModel):
@@ -578,13 +578,13 @@ class OrderTransaction(BaseModel):
     requestID: str
     time: str
     type: str
-    instrument: Optional[str] = None
+    instrument: str | None
-    units: Optional[str] = None
+    units: str | None
-    timeInForce: Optional[str] = None
+    timeInForce: str | None
-    positionFill: Optional[str] = None
+    positionFill: str | None
     reason: str
     longPositionCloseout: LongPositionCloseout | None
-    longOrderFillTransaction: Optional[dict] = None
+    longOrderFillTransaction: dict | None
 
 
 class OrderCreate(BaseModel):
@@ -677,12 +677,12 @@ class TradeDetailsTrade(BaseModel):
     state: str
     currentUnits: str
     realizedPL: str
-    closingTransactionIDs: Optional[list[str]] = []
+    closingTransactionIDs: list[str] | None
     financing: str
     dividendAdjustment: str
-    closeTime: Optional[str] = None
+    closeTime: str | None
-    averageClosePrice: Optional[str] = None
+    averageClosePrice: str | None
-    clientExtensions: Optional[ClientExtensions] = None
+    clientExtensions: ClientExtensions | None
 
 
 class TradeDetails(BaseModel):
@@ -733,10 +733,10 @@ TradeCloseSchema = {
 
 
 class TradeCRCDO(BaseModel):
-    takeProfitOrderCancelTransaction: Optional[OrderTransaction]
+    takeProfitOrderCancelTransaction: OrderTransaction
-    takeProfitOrderTransaction: Optional[OrderTransaction]
+    takeProfitOrderTransaction: OrderTransaction
-    stopLossOrderCancelTransaction: Optional[OrderTransaction]
+    stopLossOrderCancelTransaction: OrderTransaction
-    stopLossOrderTransaction: Optional[OrderTransaction]
+    stopLossOrderTransaction: OrderTransaction
     relatedTransactionIDs: list[str]
     lastTransactionID: str
 

requirements.txt

@@ -30,6 +30,4 @@ git+https://git.zm.is/XF/django-crud-mixins
 redis
 hiredis
 django-cachalot
-django_redis
-# Billing
 lago-python-client