Merge pull request #553 from mex-web/main

Main

Author: marketcalls

.sample.env

@@ -19,7 +19,13 @@ REDIRECT_URL = 'http://127.0.0.1:5000/<broker>/callback'  # Change if different
 
 # Valid Brokers Configuration
 
-VALID_BROKERS = 'fivepaisa,fivepaisaxts,aliceblue,angel,compositedge,dhan,dhan_sandbox,definedge,firstock,flattrade,fyers,groww,ibulls,iifl,indmoney,kotak,motilal,paytm,pocketful,shoonya,tradejini,upstox,wisdom,zebu,zerodha'
+VALID_BROKERS = 'mstock,fivepaisa,fivepaisaxts,aliceblue,angel,compositedge,dhan,dhan_sandbox,definedge,firstock,flattrade,fyers,groww,ibulls,iifl,indmoney,kotak,motilal,paytm,pocketful,shoonya,tradejini,upstox,wisdom,zebu,zerodha,mstock'
+
+# mstock Configuration
+# BROKER_API_KEY = 'YOUR_MSTOCK_API_KEY'
+# BROKER_USERNAME = 'YOUR_MSTOCK_CLIENT_ID'
+# BROKER_PIN = 'YOUR_MSTOCK_PIN'
+# BROKER_TOTP_CODE = 'YOUR_MSTOCK_TOTP'
 
 
 # Security Configuration

app.py

@@ -458,4 +458,4 @@ def run_catchup():
         url = f"http://{host_ip}:{port}"
         log_startup_banner(logger, "OpenAlgo is running!", url)
 
-    socketio.run(app, host=host_ip, port=port, debug=debug)
+    socketio.run(app, host=host_ip, port=port, debug=debug)

blueprints/brlogin.py

@@ -81,6 +81,16 @@ def broker_callback(broker,para=None):
             user_id = clientcode
             auth_token, feed_token, error_message = auth_function(clientcode, broker_pin, totp_code)
             forward_url = 'angel.html'
+
+    elif broker == 'mstock':
+        if request.method == 'GET':
+            return render_template('mstock.html')
+
+        elif request.method == 'POST':
+            totp_code = request.form.get('totp')
+            api_key = get_broker_api_key()
+            auth_token, feed_token, error_message = auth_function(api_key, totp_code)
+            forward_url = 'mstock.html'
 
     elif broker == 'aliceblue':
         if request.method == 'GET':

broker/mstock/__init__.py

@@ -0,0 +1,44 @@
+import httpx
+import json
+import os
+from utils.httpx_client import get_httpx_client
+
+def authenticate_broker(api_key, totp_code):
+    """
+    Authenticate with mstock and return the auth token.
+    """
+    try:
+        client = get_httpx_client()
+
+        # If TOTP is enabled, we can directly verify it without a prior login call
+        headers = {
+            'X-Mirae-Version': '1',
+            'Content-Type': 'application/x-www-form-urlencoded',
+        }
+        data = {
+            'api_key': api_key,
+            'totp': totp_code,
+        }
+
+        response = client.post(
+            'https://api.mstock.trade/openapi/typea/session/verifytotp',
+            headers=headers,
+            data=data
+        )
+
+        response.raise_for_status()
+        data_dict = response.json()
+
+        if data_dict.get("status") == "success" and "data" in data_dict:
+            auth_token = data_dict["data"].get("access_token")
+            # mstock does not provide a separate feed token in this response
+            feed_token = None
+            return auth_token, feed_token, None
+        else:
+            error_message = data_dict.get("message", "Authentication failed.")
+            return None, None, error_message
+
+    except httpx.HTTPStatusError as e:
+        return None, None, f"HTTP error occurred: {e.response.status_code} - {e.response.text}"
+    except Exception as e:
+        return None, None, str(e)

broker/mstock/api/__init__.py

@@ -0,0 +1,46 @@
+from utils.httpx_client import get_httpx_client
+from broker.mstock.mapping.order_data import transform_positions_data, transform_holdings_data
+
+def get_positions(auth_token):
+    api_key = os.getenv('BROKER_API_KEY')
+    """
+    Retrieves the user's positions.
+    """
+    headers = {
+        'X-Mirae-Version': '1',
+        'Authorization': f'token {api_key}:{auth_token}',
+    }
+    
+    try:
+        client = get_httpx_client()
+        response = client.get(
+            'https://api.mstock.trade/openapi/typea/portfolio/positions',
+            headers=headers,
+        )
+        response.raise_for_status()
+        positions = response.json()
+        return transform_positions_data(positions), None
+    except Exception as e:
+        return None, str(e)
+
+def get_holdings(auth_token):
+    api_key = os.getenv('BROKER_API_KEY')
+    """
+    Retrieves the user's holdings.
+    """
+    headers = {
+        'X-Mirae-Version': '1',
+        'Authorization': f'token {api_key}:{auth_token}',
+    }
+    
+    try:
+        client = get_httpx_client()
+        response = client.get(
+            'https://api.mstock.trade/openapi/typea/portfolio/holdings',
+            headers=headers,
+        )
+        response.raise_for_status()
+        holdings = response.json()
+        return transform_holdings_data(holdings), None
+    except Exception as e:
+        return None, str(e)

broker/mstock/api/auth_api.py

@@ -0,0 +1,67 @@
+import os
+import httpx
+from utils.httpx_client import get_httpx_client
+from utils.logging import get_logger
+from broker.mstock.database import master_contract_db
+
+logger = get_logger(__name__)
+
+def get_margin_data(auth_token):
+    """Fetch margin (fund) data from MStock API using Type A authentication."""
+    api_key = os.getenv('BROKER_API_KEY')
+
+    if not api_key:
+        logger.error("Missing environment variable: BROKER_API_KEY")
+        return {}
+
+    headers = {
+        'X-Mirae-Version': '1',
+        'Authorization': f'token {api_key}:{auth_token}',
+    }
+
+    try:
+        client = get_httpx_client()
+        response = client.get(
+            'https://api.mstock.trade/openapi/typea/user/fundsummary',
+            headers=headers,
+            timeout=10.0
+        )
+        response.raise_for_status()
+        margin_data = response.json()
+
+        if margin_data.get('status') == 'success' and margin_data.get('data'):
+            data = margin_data['data'][0]
+            key_mapping = {
+                "AVAILABLE_BALANCE": "availablecash",
+                "COLLATERALS": "collateral",
+                "REALISED_PROFITS": "m2mrealized",
+                "MTM_COMBINED": "m2munrealized",
+                "AMOUNT_UTILIZED": "utiliseddebits",
+            }
+
+            filtered_data = {}
+            for mstock_key, openalgo_key in key_mapping.items():
+                value = data.get(mstock_key)
+                if value in (None, "None", ""):
+                    value = 0
+                try:
+                    formatted_value = "{:.2f}".format(float(value))
+                except (ValueError, TypeError):
+                    formatted_value = "0.00"
+                filtered_data[openalgo_key] = formatted_value
+
+            logger.info(f"filteredMargin Data: {filtered_data}")
+            return filtered_data
+
+        logger.error(f"Margin API failed: {margin_data.get('message', 'No data')}")
+        return {}
+
+    except httpx.HTTPStatusError as e:
+        logger.error(f"HTTP Error while fetching margin data: {e}")
+        return {}
+    except httpx.RequestError as e:
+        logger.error(f"Network Error while fetching margin data: {e}")
+        return {}
+    except Exception as e:
+        logger.exception("Unexpected error while fetching margin data.")
+        return {}