Merge pull request #54 from angel-one/readmeUpdate

Readme update

Author: rajinsha-s

README.md

@@ -11,6 +11,18 @@ Use the package manager [pip](https://pip.pypa.io/en/stable/) to install smartap
 pip install -r requirements_dev.txt       # for downloading the other required packages
 ```
 
+Download the following packages
+```bash
+pip install pyotp
+pip install logzero
+pip install websocket-client    
+```
+For Downloading pycryptodome package
+```bash
+pip uninstall pycrypto
+pip install pycryptodome    
+```
+
 ## Usage
 
 ```python
@@ -123,56 +135,54 @@ else:
     ```
 
     ## Getting started with SmartAPI Websocket's
-
-    ```python
     ####### Websocket V2 sample code #######
 
     from SmartApi.smartWebSocketV2 import SmartWebSocketV2
     from logzero import logger
 
-    AUTH_TOKEN = "Your Auth_Token"
-    API_KEY = "Your Api_Key"
-    CLIENT_CODE = "Your Client Code"
-    FEED_TOKEN = "Your Feed_Token"
+    AUTH_TOKEN = "authToken"
+    API_KEY = "api_key"
+    CLIENT_CODE = "client code"
+    FEED_TOKEN = "feedToken"
     correlation_id = "abc123"
     action = 1
     mode = 1
+
     token_list = [
         {
             "exchangeType": 1,
             "tokens": ["26009"]
         }
     ]
-    #retry_strategy=0 for simple retry mechanism
-    sws = SmartWebSocketV2(AUTH_TOKEN, API_KEY, CLIENT_CODE, FEED_TOKEN,max_retry_attempt=2, retry_strategy=0, retry_delay=10, retry_duration=30)
+    token_list1 = [
+        {
+            "action": 0,
+            "exchangeType": 1,
+            "tokens": ["26009"]
+        }
+    ]
 
-    #retry_strategy=1 for exponential retry mechanism
-    # sws = SmartWebSocketV2(AUTH_TOKEN, API_KEY, CLIENT_CODE, FEED_TOKEN,max_retry_attempt=3, retry_strategy=1, retry_delay=10,retry_multiplier=2, retry_duration=30)
+    sws = SmartWebSocketV2(AUTH_TOKEN, API_KEY, CLIENT_CODE, FEED_TOKEN)
 
     def on_data(wsapp, message):
         logger.info("Ticks: {}".format(message))
         # close_connection()
 
-    def on_control_message(wsapp, message):
-        logger.info(f"Control Message: {message}")
-
     def on_open(wsapp):
         logger.info("on open")
-        some_error_condition = False
-        if some_error_condition:
-            error_message = "Simulated error"
-            if hasattr(wsapp, 'on_error'):
-                wsapp.on_error("Custom Error Type", error_message)
-        else:
-            sws.subscribe(correlation_id, mode, token_list)
-            # sws.unsubscribe(correlation_id, mode, token_list1)
+        sws.subscribe(correlation_id, mode, token_list)
+        # sws.unsubscribe(correlation_id, mode, token_list1)
+
 
     def on_error(wsapp, error):
         logger.error(error)
 
+
     def on_close(wsapp):
         logger.info("Close")
 
+
+
     def close_connection():
         sws.close_connection()
 
@@ -182,7 +192,6 @@ else:
     sws.on_data = on_data
     sws.on_error = on_error
     sws.on_close = on_close
-    sws.on_control_message = on_control_message
 
     sws.connect()
     ####### Websocket V2 sample code ENDS Here #######

SmartApi/smartConnect.py

@@ -17,9 +17,9 @@
 
 class SmartConnect(object):
     #_rootUrl = "https://openapisuat.angelbroking.com"
-    _rootUrl="https://apiconnect.angelbroking.com" #prod endpoint
+    _rootUrl="https://apiconnect.angelone.in" #prod endpoint
     #_login_url ="https://smartapi.angelbroking.com/login"
-    _login_url="https://smartapi.angelbroking.com/publisher-login" #prod endpoint
+    _login_url="https://smartapi.angelone.in/publisher-login" #prod endpoint
     _default_timeout = 7  # In seconds
 
     _routes = {

setup.py

@@ -12,7 +12,7 @@
 
 setup(
     name="smartapi-python",
-    version="1.4.8",
+    version="1.5.0",
     author="ab-smartapi",
     author_email="smartapi.sdk@gmail.com",
     description="Angel Broking openApi integration",