sysstra 0.1.2.0__tar.gz → 0.1.2.2__tar.gz

{sysstra-0.1.2.0 → sysstra-0.1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sysstra
-Version: 0.1.2.0
+Version: 0.1.2.2
 Summary: Official Python Library for Sysstra Algo Trading
 Home-page: https://github.com/sysstra/sysstra
 Author: Anurag Singh Kushwah

{sysstra-0.1.2.0 → sysstra-0.1.2.2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="sysstra",
-    version="0.1.2.0",
+    version="0.1.2.2",
     description="Official Python Library for Sysstra Algo Trading",
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",

{sysstra-0.1.2.0 → sysstra-0.1.2.2}/sysstra/orders/backtest.py

@@ -33,10 +33,10 @@ def place_bt_order(rdb_cursor, order_candle,  position_type, quantity, transacti
             order_dict["expiry"] = order_candle["expiry"]
             order_dict["option_type"] = option_type
             order_dict["strike_price"] = strike_price
-        else:
-            order_dict["expiry"] = ""
-            order_dict["option_type"] = ""
-            order_dict["strike_price"] = ""
+        # else:
+        #     order_dict["expiry"] = ""
+        #     order_dict["option_type"] = ""
+        #     order_dict["strike_price"] = ""
 
         order_dict["day"] = order_candle["date"].strftime("%A")
 

{sysstra-0.1.2.0 → sysstra-0.1.2.2}/sysstra/utils.py

@@ -5,8 +5,10 @@ import itertools
 import traceback as tb
 import requests
 from custom_indicators import *
+import pandas_ta as ta
 from sysstra import orders_url
 
+
 def change_granularity(data_df, granularity):
     """ Function to Change Granularity for Provided Dataframe """
     try:
@@ -1357,13 +1359,23 @@ def calculate_brokerage(buy_price, sell_price, quantity, broker="zerodha", marke
             gst = round(total_charges * gst, 2)
 
             # Calculating Total tax and Charges
-            total_charges = round(
-                (brokerage + sebi_charges + exchange_charges + stt + clearing_charge + stamp_duty + gst), 2)
+            total_charges = round((brokerage + sebi_charges + exchange_charges + stt + clearing_charge + stamp_duty + gst), 2)
 
             # Calculating Net PnL
             net_pl = ((sell_price - buy_price) * quantity) - total_charges
 
             return total_charges, net_pl
+
+        elif broker == "coindcx":
+            brokerage = 0.5
+            buy_turnover = buy_price * quantity
+            sell_turnover = sell_price * quantity
+            buy_charges = round(buy_turnover * brokerage/100, 2)
+            sell_charges = round(sell_turnover * brokerage/100, 2)
+            total_charges = buy_charges + sell_charges
+            net_pl = ((sell_price - buy_price) * quantity) - total_charges
+            return total_charges, net_pl
+
     except Exception as e:
         print("Exception in calculating brokerage : {}".format(e))
         pass

{sysstra-0.1.2.0 → sysstra-0.1.2.2}/sysstra.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sysstra
-Version: 0.1.2.0
+Version: 0.1.2.2
 Summary: Official Python Library for Sysstra Algo Trading
 Home-page: https://github.com/sysstra/sysstra
 Author: Anurag Singh Kushwah