rest api

Author: traderpedroso

.flake8

@@ -0,0 +1,2 @@
+[flake8]
+max-line-length = 100

.gitignore

@@ -6,4 +6,6 @@ dist/
 __pycache__
 .DS_Store
 fix.ipynb
-examples
+examples/test
+.app.py
+.env

README.md

@@ -5,30 +5,35 @@
 
 # Python Ctrader Fix API
 
-### ToDo
+`ejtraderCT` is a Python library to access the Ctrader trading platform's FIX API.
+
+## Features
 
-- [ ] Account Information "not possible fix limitation"
 - [x] Market Position buy and sell
-- [x] Peding orders limit and stop 
+- [x] Pending orders limit and stop 
 - [x] Partial close
 - [x] Stop loss & Take profit
 - [x] Modify Orders 
 - [x] Modify position 
-- [x] real time bid & ask
+- [x] Real-time bid & ask
+- [x] Check connection status
+- [ ] Rest API server (in development)
+- [ ] Webhook for Tradingviewer (in development)
+
+## Prerequisites
 
+The library has been tested on Python 3.7 to 3.9.
 
 ## Installation
-#### Tested on python 3.7 to 3.9
-```
-pip install ejtraderCT -U
-```
-#### Or install from source
 
-```
-git clone https://github.com/ejtraderLabs/ejtraderCT
-cd ejtraderCT
-python setup.py install
+To install the latest version of `ejtraderCT`, you can use pip:
 
+```shell
+pip install ejtraderCT -U
+```
+Or if you want to install from source, you can use:
+```shell
+pip install git+https://github.com/ejtraderLabs/ejtraderCT.git
 ```
 
 ## Accessing the Ctrader FIX API
@@ -70,13 +75,16 @@ password="12345678" # - The password you configured
 api = Ctrader(server,account,password)
 
 ```
-
-##### To disconnect and logout from the account
+##### Check the connection status
+```python
+api.isconnected()
+```
+##### Logout 
 ```python
 api.logout()
 ```
 
-### Real-time quote
+#### Real-time quote
 
 ##### Subscribe to symbols
 ```python
@@ -244,11 +252,16 @@ price = "limit or stop entry price"
 api.orderModify(id, stoploss, takeprofit, price)
 
 ```
-## Contributors:
+## Contributing
 
-<!-- CONTRIBUTORS:START -->
-<!-- CONTRIBUTORS:END -->
+We welcome any contribution to `ejtraderCT`. Here are some ways to contribute:
+
+1. Report issues or suggest improvements by opening an [issue](https://github.com/ejtraderLabs/ejtraderCT/issues).
+2. Contribute with code to fix issues or add features via a [Pull Request](https://github.com/ejtraderLabs/ejtraderCT/pulls).
+
+Before submitting a pull request, please make sure your codes are well formatted and tested.
 
 ## Acknowledgements
 
 I would like to express my gratitude to [@HarukaMa](https://github.com/HarukaMa) for creating the initial project. Their work has been an invaluable starting point for my modifications and improvements.
+

app.py

@@ -0,0 +1,169 @@
+import os
+from typing import List
+from pydantic import BaseModel
+from fastapi import FastAPI
+from ejtraderCT import Ctrader
+
+
+app = FastAPI()
+api = None
+
+
+class LoginModel(BaseModel):
+    server: str
+    account: str
+    password: str
+
+
+class SymbolModel(BaseModel):
+    symbols: List[str]
+
+
+class OrderModel(BaseModel):
+    symbol: str
+    volume: float
+    stoploss: float
+    takeprofit: float
+    price: float = None
+
+
+class ModifyModel(BaseModel):
+    id: str
+    stoploss: float
+    takeprofit: float
+    price: float = None
+
+
+class IdModel(BaseModel):
+    id: str
+
+
+@app.post("/login")
+async def login():
+    global api
+    api = Ctrader(
+        os.getenv("HOST_NAME"), os.getenv("SENDER_COMPID"), os.getenv("PASSWORD")
+    )
+    if api.isconnected():
+        return {"message": "Logged in"}
+    else:
+        return {"error": "Check your credencials"}
+
+
+@app.get("/quote/{symbol}")
+async def quote(symbol: str = None):
+    if symbol:
+        quote = api.quote(symbol)
+    else:
+        quote = api.quote()
+    return quote
+
+
+@app.post("/buy")
+async def buy(order: OrderModel):
+    return {
+        "Position": api.buy(
+            order.symbol, order.volume, order.stoploss, order.takeprofit
+        )
+    }
+
+
+@app.post("/sell")
+async def sell(order: OrderModel):
+    return {
+        "Position": api.sell(
+            order.symbol, order.volume, order.stoploss, order.takeprofit
+        )
+    }
+
+
+@app.post("/buyLimit")
+async def buy_limit(order: OrderModel):
+    return {
+        "Order": api.buyLimit(
+            order.symbol, order.volume, order.stoploss, order.takeprofit, order.price
+        )
+    }
+
+
+@app.post("/sellLimit")
+async def sell_limit(order: OrderModel):
+    return {
+        "Order": api.sellLimit(
+            order.symbol, order.volume, order.stoploss, order.takeprofit, order.price
+        )
+    }
+
+
+@app.post("/buyStop")
+async def buy_stop(order: OrderModel):
+    return {
+        "Order": api.buyStop(
+            order.symbol, order.volume, order.stoploss, order.takeprofit, order.price
+        )
+    }
+
+
+@app.post("/sellStop")
+async def sell_stop(order: OrderModel):
+    return {
+        "Order": api.sellStop(
+            order.symbol, order.volume, order.stoploss, order.takeprofit, order.price
+        )
+    }
+
+
+@app.get("/positions")
+async def positions():
+    return api.positions()
+
+
+@app.get("/orders")
+async def orders():
+    return api.orders()
+
+
+@app.post("/orderCancelById")
+async def order_cancel_by_id(id_model: IdModel):
+    api.orderCancelById(id_model.id)
+    return {"message": "Order cancelled"}
+
+
+@app.post("/positionCloseById")
+async def position_close_by_id(id_model: IdModel):
+    api.positionCloseById(id_model.id)
+    return {"message": "Position closed"}
+
+
+@app.post("/cancel_all")
+async def cancel_all():
+    api.cancel_all()
+    return {"message": "All orders cancelled"}
+
+
+@app.post("/close_all")
+async def close_all():
+    api.close_all()
+    return {"message": "All positions closed"}
+
+
+@app.post("/positionModify")
+async def position_modify(modify: ModifyModel):
+    api.positionModify(modify.id, modify.stoploss, modify.takeprofit)
+    return {"message": "Position modified"}
+
+
+@app.post("/orderModify")
+async def order_modify(modify: ModifyModel):
+    api.orderModify(modify.id, modify.stoploss, modify.takeprofit, modify.price)
+    return {"message": "Order modified"}
+
+
+@app.post("/logout")
+async def logout():
+    return {"message": api.logout()}
+
+
+@app.post("/status")
+async def status():
+    return {"connected": api.isconnected()}

ejtraderCT/api/ctrader.py

@@ -356,7 +356,6 @@ def quote(self, symbol=None):
             return self.fix.spot_price_list[symbol]     
         return self.fix.spot_price_list
 
-
     def order_list_callback(self, data: dict, price_data: dict, client_id: str):
         orders = []
         for i, kv in enumerate(data.items()):
@@ -423,5 +422,14 @@ def cancel_all(self):
         self.fix.cancel_all()
 
     def logout(self):
-        self.fix.logout()
+        if self.isconnected():
+            self.fix.logout()
+            logout = "Logged out"
+        else:
+            logout = "Not logged in"
+        return logout
+    
+    
+    def isconnected(self):
+        return self.fix.logged