Merge branch 'v13_modulequote'

Author: Wasin Waeosri

README.md

@@ -1,5 +1,10 @@
-#Introduction
-This is an example project that shows how to implement TRKD REST Client with python
+# TRKD HTTP JSON with Python Example
+## Overview
+The [Thomson Reuters Knowledge Direct (TRKD) API](https://developers.thomsonreuters.com/thomson-reuters-knowledge-direct-trkd) integrates into your website, trading platform, company intranet/extranet, advisory portal and mobile applications to provide up-to-date financial market data, news and analytics and powerful investment tools.
+
+TRKD offers a wide range of Thomson Reuters' information and services delivered in a request-response scenario via web services using today's industry standard protocols (SOAP/XML and REST/JSON). Connectivity can be via HTTP and HTTPS, over the Internet or Delivery Direct.Level 2. All data are snapshot (non-streaming) data.
+
+This is an example project that shows how to implement TRKD HTTP JSON Client with python. This project contains the following example scripts for each TRKD services
 - trkd_authen.py: An example application that shows how to authenticate with TRKD service
 - trkd_quote.py: An example application that shows how to subscribe (all fields and specific fields) the Quote data from TRKD service
 - trkd_newsheadline.py: An example application that shows how to subscribe the News Headline data from TRKD service
@@ -11,20 +16,20 @@ This is an example project that shows how to implement TRKD REST Client with pyt
 - docs\TRKD_REST_with_Python.docx: A document that describes the trkd_authen.py and trkd_quote.py applications 
 
 
-#prerequisite
+## Prerequisite
 The following softwares are required to use this script
-- Python 2.7.10
+- Python 2.7.10 or above
 - The [requests](http://docs.python-requests.org/en/master/) library 
 
-The script does not support Python 3!
+The scripts are based on Python 2 but you can modify it to run with Python 3 (see "Optional - How to run with Python 3" section).
 
-#how to run the script
+## How to run the script
 Run the script via the command line (or shell)
 ```
 $>python <application>.py
 ```
 
-#Optional - How to install requests
+## Optional - How to install requests
 The best way is to get the pip package management tool 
 1. export <Python_folder>\Scripts to your OS PATH environment
 2. call pip command to install requests
@@ -36,7 +41,18 @@ The best way is to get the pip package management tool
 	export https_proxy="http://<proxy.server>:<port>"
 	$>pip install requests
 	```
-#Releae Note
+## Optional - How to run with Python 3
+You can modify the scripts to run with Python 3 (with requests library installed) by just change the code from "**raw_input()**" to "**input()**" as the following example
+	- Python 2
+	```
+	username = raw_input('Please input username: ')
+	```
+	- Python 3
+	```
+	username = input('Please input username: ')
+	```
+
+## Release Note
 - Version 1: 6 Sep 2016
     - trkd_authen.py
 	- trkd_quote.py
@@ -53,4 +69,10 @@ The best way is to get the pip package management tool
 - version 1.0.4: 28 Oct 2016
 	- docs\TRKD_REST_with_Python.docx
 	- revise some code
+- version 1.0.5: 27 Apr 2017
+	- revies README.md to support markdown
+- version 1.0.6: 3 May 2017
+	- revies README.md
+	- modify trkd_authen.py
+	- modify trkd_quote.py
 

trkd_authen.py

@@ -7,46 +7,49 @@
 Please see the Thomson Reuters Knowledge Direct product page at http://customers.thomsonreuters.com 
 for additional information regarding the TRKD API.'''
 
-
-import os
 import sys
-import requests
 import json
 import getpass
+import requests
+
 
-##Get username, password and applicationid
-username = raw_input('Please input username: ')
-##use getpass.getpass to hide user inputted password
-password = getpass.getpass(prompt='Please input password: ')
-appid = raw_input('Please input appid: ')
-
-print '############### Sending Authentication request message to TRKD ###############'
-
-##create authentication request URL, message and header
-authenMsg = {'CreateServiceToken_Request_1': { 'ApplicationID':appid, 'Username':username,'Password':password }}
-authenURL = 'https://api.trkd.thomsonreuters.com/api/TokenManagement/TokenManagement.svc/REST/Anonymous/TokenManagement_1/CreateServiceToken_1'
-headers = {'content-type': 'application/json;charset=utf-8'}
-
-try:
-    ##send request
-    result = requests.post(authenURL, data = json.dumps(authenMsg), headers=headers)
-    if result.status_code == 200:
-        print 'Request success'
-        print 'response status %s'%(result.status_code)
-        ##get Token
-        token = result.json()['CreateServiceToken_Response_1']['Token']
-        print 'Token: %s'%(token)
-        ##get expiraion
-        expire = result.json()['CreateServiceToken_Response_1']['Expiration']
-        print 'Exipre: %s'%(expire)
-    elif result.status_code == 500:
-        print 'Request fail'
-        print 'response status %s'%(result.status_code)
-        print 'Error: %s'%(result.json())
-except requests.exceptions.RequestException as e:
-    print 'Exception!!!'
-    print e
-    sys.exit(1)
+if __name__ == '__main__':
+    ## Get username, password and applicationid
+    username = raw_input('Please input username: ')
+    ## use getpass.getpass to hide user inputted password
+    password = getpass.getpass(prompt='Please input password: ')
+    appid = raw_input('Please input appid: ')
+    print('############### Sending Authentication request message to TRKD ###############')
+
+    ##create authentication request URL, message and header
+    authenMsg = {'CreateServiceToken_Request_1': { 'ApplicationID':appid, 'Username':username,'Password':password }}
+    authenURL = 'https://api.trkd.thomsonreuters.com/api/TokenManagement/TokenManagement.svc/REST/Anonymous/TokenManagement_1/CreateServiceToken_1'
+    headers = {'content-type': 'application/json;charset=utf-8'}
+
+    try:
+        ## send request
+        result = requests.post(authenURL, data = json.dumps(authenMsg), headers=headers)
+        ## request success
+        if result.status_code == 200:
+            print('Request success')
+            print('response status %s'%(result.status_code))
+            ##get Token
+            token = result.json()['CreateServiceToken_Response_1']['Token']
+            print('Token: %s'%(token))
+            ##get expiraion
+            expire = result.json()['CreateServiceToken_Response_1']['Expiration']
+            print('Expire: %s'%(expire))
+        ## handle error
+        else:
+            print('Request fail')
+            print('response status %s'%(result.status_code))
+            if result.status_code == 500: ## if username or password or appid is wrong
+                print('Error: %s'%(result.json()))
+            result.raise_for_status()
+    except requests.exceptions.RequestException as e:
+        print('Exception!!!')
+        print(e)
+        sys.exit(1)
 
 
 

trkd_quote.py

@@ -21,13 +21,13 @@ def doSendRequest(url, requestMsg, headers):
         ##send request
         result = requests.post(url, data=json.dumps(requestMsg), headers=headers)
         if result.status_code == 500:
-            print 'Request fail'
-            print 'response status %s' % result.status_code
-            print 'Error: %s' % result.json()
+            print('Request fail')
+            print('response status %s' % result.status_code)
+            print('Error: %s' % result.json())
             sys.exit(1)
     except requests.exceptions.RequestException, e:
-        print 'Exception!!!'
-        print e
+        print('Exception!!!')
+        print(e)
         sys.exit(1)
     return result
 
@@ -39,11 +39,11 @@ def CreateAuthorization(username, password, appid):
     authenMsg = {'CreateServiceToken_Request_1': { 'ApplicationID':appid, 'Username':username,'Password':password }}
     authenURL = 'https://api.trkd.thomsonreuters.com/api/TokenManagement/TokenManagement.svc/REST/Anonymous/TokenManagement_1/CreateServiceToken_1'
     headers = {'content-type': 'application/json;charset=utf-8'}
-    print '############### Sending Authentication request message to TRKD ###############'
+    print('############### Sending Authentication request message to TRKD ###############')
     authenResult = doSendRequest(authenURL, authenMsg, headers)
     if authenResult is not None and authenResult.status_code == 200:
-        print 'Authen success'
-        print 'response status %s'%(authenResult.status_code)
+        print('Authen success')
+        print('response status %s'%(authenResult.status_code))
         ##get Token
         token = authenResult.json()['CreateServiceToken_Response_1']['Token']
 
@@ -77,26 +77,27 @@ def RetrieveQuotes(token, appid):
     quoteURL = 'https://api.trkd.thomsonreuters.com/api/Quotes/Quotes.svc/REST/Quotes_1/RetrieveItem_3'
     headers = {'content-type': 'application/json;charset=utf-8' ,'X-Trkd-Auth-ApplicationID': appid, 'X-Trkd-Auth-Token' : token}
 
-    print '############### Sending Quote request message to TRKD ###############'
+    print('############### Sending Quote request message to TRKD ###############')
     quoteResult = doSendRequest(quoteURL, quoteRequestMsg,headers)
     if quoteResult is not None and quoteResult.status_code == 200:
         print 'Quote response message: '
         print quoteResult.json()
 
 
 ## ------------------------------------------ Main App ------------------------------------------ ##
-##Get username, password and applicationid
-username = raw_input('Please input username: ')
-##use getpass.getpass to hide user inputted password
-password = getpass.getpass(prompt='Please input password: ')
-appid = raw_input('Please input appid: ')
-
-
-token = CreateAuthorization(username,password,appid)
-print 'Token = %s'%(token)
-## if authentiacation success, continue subscribing Quote
-if token is not None:
-    RetrieveQuotes(token,appid)
+
+if __name__ == '__main__':
+    ## Get username, password and applicationid
+    username = raw_input('Please input username: ')
+    ## use getpass.getpass to hide user inputted password
+    password = getpass.getpass(prompt='Please input password: ')
+    appid = raw_input('Please input appid: ')
+
+    token = CreateAuthorization(username,password,appid)
+    print('Token = %s'%(token))
+    ## if authentiacation success, continue subscribing Quote
+    if token is not None:
+        RetrieveQuotes(token,appid)