Merge pull request #460 from krishnavelu/develop

Develop -> master for 2.0.2

Author: krishnavelu

README.md

@@ -29,7 +29,7 @@ pip --no-cache-dir install --upgrade alice_blue
 ## Getting started with API
 
 ### Overview
-There is only one class in the whole library: `AliceBlue`. The `login_and_get_sessioID()` static method is used to retrieve session ID from alice blue server. A session ID is valid for 24 hours.
+There is only one class in the whole library: `AliceBlue`. The `login_and_get_sessionID()` static method is used to retrieve session ID from alice blue server. A session ID is valid for 24 hours.
 With session ID, you can instantiate an AliceBlue object. Ideally you only need to create a session ID once every day. Once the session ID is created new, it'll be stored in a temporary location. Next time, the same session ID will be used.
 
 ### REST Documentation
@@ -47,22 +47,21 @@ logging.basicConfig(level=logging.DEBUG)
 
 ### Geting API Id and API secret
 api_secret is unique for each and every account. You need to enable api trading and get api_secret from alice blue.
-1. Please [contact](https://www.aliceblueonline.com/contact-us/) alice blue to get access to api.
-2. After you get a response from alice blue, login to [developer console](http://developers.aliceblueonline.com).
-3. Click on 'Create New App'.
-4. Enter 'App Name' as you like. Enter 'Redirect URL' and 'Post Back URL' as `https://ant.aliceblueonline.com/plugin/callback`.
-5. Click on 'Save'.
-6. Copy the 'App Code' and 'App Secret'. You will need these to generate a session ID.
+1. Login to [developer console](http://developers.aliceblueonline.com).
+1. Click on 'Create New App'.
+1. Enter 'App Name' as you like. Enter 'Redirect URL' and 'Post Back URL' as `https://ant.aliceblueonline.com/plugin/callback`.
+1. Click on 'Save'.
+1. Copy the 'App Code' and 'App Secret'. You will need these to generate a session ID.
 
 ### Getting an session ID
 1. Import alice_blue
 ```python
 from alice_blue import *
 ```
 
-2. Create `session_id` using `login_and_get_sessioID()` function  with your `username`, `password`, `2FA (2fa is now year of birth)`, `app_id` and `api_secret`.
+2. Create `session_id` using `login_and_get_sessionID()` function  with your `username`, `password`, `2FA (2fa is now year of birth)`, `app_id` and `api_secret`.
 ```python
-session_id = AliceBlue.login_and_get_sessioID(   username    = "username", 
+session_id = AliceBlue.login_and_get_sessionID(   username    = "username", 
                                                     password    = "password", 
                                                     twoFA       = "1993",
                                                     app_id      = "app_id",

alice_blue/alice_blue.py

@@ -165,12 +165,12 @@ def __init__(self, username, session_id, master_contracts_to_download = None):
         self.ws_thread = None
 
     @staticmethod
-    def login_and_get_sessioID(username, password, twoFA, app_id, api_secret):
+    def login_and_get_sessionID(username, password, twoFA, app_id, api_secret):
         """ Login and get Session ID """
         header = {"Content-Type" : "application/json"}
         try:
             dr = tempfile.gettempdir()
-            tmp_file = os.path.join(dr, "alice_blue_key_SP22017.json")
+            tmp_file = os.path.join(dr, f"alice_blue_key_{username}.json")
             if(os.path.isfile(tmp_file) == True):
                 d = {}
                 with open(tmp_file, 'r') as fo:
@@ -199,6 +199,7 @@ def login_and_get_sessioID(username, password, twoFA, app_id, api_secret):
 
         # Web Login
         checksum = CryptoJsAES.encrypt(password.encode(), encKey.encode())
+        checksum = checksum.decode("utf-8")
         data = {"userId" : username,
                 "userData" : checksum}
         r = requests.post(AliceBlue.__urls["webLogin"], json=data)

requirements.txt

@@ -1,4 +1,4 @@
-requests
+cryptography
 pytz
+requests
 websocket_client
-cryptography

setup.py

@@ -6,14 +6,14 @@
 setuptools.setup(
     name = 'alice_blue',
     packages=setuptools.find_packages(),
-    version = '2.0.1',
+    version = '2.0.2',
     include_package_data=True,
     description = 'Official Python library for Alice Blue APIs',
     long_description=long_description,
     long_description_content_type="text/markdown",  author = 'Krishna Velu',
     author_email = 'krishnajvelu@gmail.com',
     url = 'https://github.com/krishnavelu/alice_blue',
-    install_requires=['requests', 'websocket_client', 'bs4'],
+    install_requires=['cryptography', 'pytz', 'requests', 'websocket_client'],
     keywords = ['alice', 'alice-blue', 'python', 'sdk', 'trading', 'stock markets'],
     python_requires='>=3.6',
     classifiers=[