Merge pull request #432 from mraniki/dev

🐛 update capitalcom.py, main.py and example.py
mraniki · Apr 8, 2024 · 0005c1c · 0005c1c
2 parents 8f17f8a + 2100a87
commit 0005c1c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/cefi/handler/capitalcom.py b/cefi/handler/capitalcom.py
@@ -92,7 +92,7 @@ async def get_quote(self, instrument):
             quote = market["snapshot"]["offer"]
             logger.debug("Quote: {}", quote)
 
-            return quote
+            return float(quote)
         except Exception as e:
             logger.error("{} Error {}", self.name, e)
             return e
@@ -122,7 +122,7 @@ async def get_bid(self, instrument):
             quote = market["snapshot"]["bid"]
             logger.debug("Quote: {}", quote)
 
-            return quote
+            return float(quote)
         except Exception as e:
             logger.error("{} Error {}", self.name, e)
             return e
@@ -293,23 +293,22 @@ async def execute_order(self, order_params):
             logger.debug("stop price {}", stop_price)
             logger.debug("profit price {}", profit_price)
             order = self.client.place_the_position(
-                    direction=action,
-                    epic=instrument,
-                    size=amount,
-                    gsl=False,
-                    tsl=False,
-                    stop_level=stop_price,
-                    stop_distance=None,
-                    stop_amount=None,
-                    profit_level=profit_price,
-                    profit_distance=None,
-                    profit_amount=None,
-                )
-                # Check if the order response contains an errorCode
+                direction=action,
+                epic=instrument,
+                size=amount,
+                gsl=False,
+                tsl=False,
+                stop_level=stop_price,
+                stop_distance=None,
+                stop_amount=None,
+                profit_level=profit_price,
+                profit_distance=None,
+                profit_amount=None,
+            )
+
             if "errorCode" in order:
-                    # Handle the error, e.g., log it or return a specific message
-                    logger.error(f"Error placing order: {order['errorCode']}")
-                    return f"Error placing order: {order['errorCode']}"
+                logger.error(f"Error placing order: {order['errorCode']}")
+                return order["errorCode"]
 
             logger.debug("Order: {}", order)
             deal_reference = order["dealReference"]

diff --git a/cefi/main.py b/cefi/main.py
@@ -259,6 +259,7 @@ async def submit_order(self, order_params):
         for client in self.clients:
             try:
                 trade = await client.execute_order(order_params)
+                logger.debug("trade {}", trade)
                 order.append(trade)
             except Exception as e:
                 logger.error("submit_order - client {} error {}", client.name, e)

diff --git a/examples/example.py b/examples/example.py
@@ -29,10 +29,10 @@ async def main():
         # # EURUSD: -3.22
     order = {
         "action": "BUY",
-        "instrument": "BTCUSD",
-        "quantity": 200,
-        "take_profit": 10000,
-        "stop_loss": 100000,
+        "instrument": "EURUSD",
+        "quantity": 10,
+        "take_profit": 100,
+        "stop_loss": 1000,
         "comment": "test",
     }
     order = await cex.submit_order(order)