Skip to content

Commit 4e771cd

Browse files
author
Wasin Waeosri
committed
Change log:
1. Update json print out to be formatter
1 parent 5f11139 commit 4e771cd

File tree

8 files changed

+98
-64
lines changed

8 files changed

+98
-64
lines changed

‎trkd_authen.py‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,39 +14,44 @@
1414

1515

1616
if __name__ == '__main__':
17-
## Get username, password and applicationid
17+
# Get username, password and applicationid
1818
username = input('Please input username: ')
19-
## use getpass.getpass to hide user inputted password
19+
# use getpass.getpass to hide user inputted password
2020
password = getpass.getpass(prompt='Please input password: ')
2121
appid = input('Please input appid: ')
2222
print('############### Sending Authentication request message to TRKD ###############')
2323

24-
##create authentication request URL, message and header
25-
authenMsg = {'CreateServiceToken_Request_1': { 'ApplicationID':appid, 'Username':username,'Password':password }}
24+
# create authentication request URL, message and header
25+
authenMsg = {'CreateServiceToken_Request_1': {
26+
'ApplicationID': appid, 'Username': username, 'Password': password}}
2627
authenURL = 'https://api.trkd.thomsonreuters.com/api/TokenManagement/TokenManagement.svc/REST/Anonymous/TokenManagement_1/CreateServiceToken_1'
2728
headers = {'content-type': 'application/json;charset=utf-8'}
2829

2930
try:
30-
## send request
31-
result = requests.post(authenURL, data = json.dumps(authenMsg), headers=headers)
32-
## request success
31+
# send request
32+
result = requests.post(
33+
authenURL, data=json.dumps(authenMsg), headers=headers)
34+
# request success
3335
if result.status_code == 200:
3436
print('Request success')
35-
print('response status %s'%(result.status_code))
36-
##get Token
37+
print('response status %s' % (result.status_code))
38+
# get Token
3739
token = result.json()['CreateServiceToken_Response_1']['Token']
38-
print('Token: %s'%(token))
39-
##get expiraion
40-
expire = result.json()['CreateServiceToken_Response_1']['Expiration']
41-
print('Expire: %s'%(expire))
42-
## handle error
40+
print('Token: %s' % (token))
41+
# get expiraion
42+
expire = result.json()[
43+
'CreateServiceToken_Response_1']['Expiration']
44+
print('Expire: %s' % (expire))
45+
# handle error
4346
else:
4447
print('Request fail')
45-
print('response status %s'%(result.status_code))
46-
if result.status_code == 500: ## if username or password or appid is wrong
47-
print('Error: %s'%(result.json()))
48+
print('response status %s' % (result.status_code))
49+
if result.status_code == 500: # if username or password or appid is wrong
50+
#print('Error: %s' % (result.json()))
51+
print('Error: %s' % (json.dumps(result.json(),
52+
sort_keys=True, indent=2, separators=(',', ':'))))
4853
result.raise_for_status()
4954
except requests.exceptions.RequestException as e:
5055
print('Exception!!!')
5156
print(e)
52-
sys.exit(1)
57+
sys.exit(1)

‎trkd_chart.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ def doSendRequest(url, requestMsg, headers):
2727
print('Request fail')
2828
print('response status %s'%(result.status_code))
2929
if result.status_code == 500: ## if username or password or appid is wrong
30-
print('Error: %s'%(result.json()))
30+
#print('Error: %s'%(result.json()))
31+
print('Error: %s' % (json.dumps(result.json(),sort_keys=True, indent=2, separators=(',', ':'))))
3132
result.raise_for_status()
3233
except requests.exceptions.RequestException as e:
3334
print('Exception!!!')

‎trkd_interday.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ def doSendRequest(url, requestMsg, headers):
2626
print('Request fail')
2727
print('response status %s'%(result.status_code))
2828
if result.status_code == 500: ## if username or password or appid is wrong
29-
print('Error: %s'%(result.json()))
29+
#print('Error: %s'%(result.json()))
30+
print('Error: %s' % (json.dumps(result.json(),sort_keys=True, indent=2, separators=(',', ':'))))
3031
result.raise_for_status()
3132
except requests.exceptions.RequestException as e:
3233
print('Exception!!!')
@@ -83,7 +84,9 @@ def RetrieveInteraday(token, appid):
8384
interdayResult = doSendRequest(interdayURL, interdayRequestMsg, headers)
8485
if interdayResult and interdayResult.status_code == 200:
8586
print('Time Series Interday response message: ')
86-
print(interdayResult.json())
87+
#print(interdayResult.json())
88+
print(json.dumps(interdayResult.json(), sort_keys=True, indent=2, separators=(',', ':')))
89+
8790

8891

8992
## ------------------------------------------ Main App ------------------------------------------ ##

‎trkd_intraday.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ def doSendRequest(url, requestMsg, headers):
2929
print('Request fail')
3030
print('response status %s' % (result.status_code))
3131
if result.status_code == 500: # if username or password or appid is wrong
32-
print('Error: %s' % (result.json()))
32+
#print('Error: %s' % (result.json()))
33+
print('Error: %s' % (json.dumps(result.json(),
34+
sort_keys=True, indent=2, separators=(',', ':'))))
3335
result.raise_for_status()
3436
except requests.exceptions.RequestException as e:
3537
print('Exception!!!')
@@ -92,7 +94,9 @@ def RetrieveIntraday(token, appid):
9294
intradayResult = doSendRequest(intradayURL, intradayRequestMsg, headers)
9395
if intradayResult and intradayResult.status_code == 200:
9496
print('Time Series Intraday response message: ')
95-
print(intradayResult.json())
97+
# print(intradayResult.json())
98+
print(json.dumps(intradayResult.json(),
99+
sort_keys=True, indent=2, separators=(',', ':')))
96100

97101

98102
## ------------------------------------------ Main App ------------------------------------------ ##

‎trkd_newsheadline.py‎

Lines changed: 40 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,23 @@
1414
import getpass
1515

1616
# Send HTTP request for all services
17+
18+
1719
def doSendRequest(url, requestMsg, headers):
1820
result = None
1921
try:
20-
##send request
21-
result = requests.post(url, data=json.dumps(requestMsg), headers=headers)
22-
# print('outgoing message is %s'%(json.dumps(requestMsg)))
23-
## handle error
22+
# send request
23+
result = requests.post(
24+
url, data=json.dumps(requestMsg), headers=headers)
25+
# print('outgoing message is %s'%(json.dumps(requestMsg)))
26+
# handle error
2427
if result.status_code is not 200:
2528
print('Request fail')
26-
print('response status %s'%(result.status_code))
27-
if result.status_code == 500: ## if username or password or appid is wrong
28-
print('Error: %s'%(result.json()))
29+
print('response status %s' % (result.status_code))
30+
if result.status_code == 500: # if username or password or appid is wrong
31+
#print('Error: %s'%(result.json()))
32+
print('Error: %s' % (json.dumps(result.json(),
33+
sort_keys=True, indent=2, separators=(',', ':'))))
2934
result.raise_for_status()
3035
except requests.exceptions.RequestException as e:
3136
print('Exception!!!')
@@ -34,39 +39,43 @@ def doSendRequest(url, requestMsg, headers):
3439
return result
3540

3641

37-
## Perform authentication
42+
# Perform authentication
3843
def CreateAuthorization(username, password, appid):
3944
token = None
40-
##create authentication request URL, message and header
41-
authenMsg = {'CreateServiceToken_Request_1': { 'ApplicationID':appid, 'Username':username,'Password':password }}
45+
# create authentication request URL, message and header
46+
authenMsg = {'CreateServiceToken_Request_1': {
47+
'ApplicationID': appid, 'Username': username, 'Password': password}}
4248
authenURL = 'https://api.trkd.thomsonreuters.com/api/TokenManagement/TokenManagement.svc/REST/Anonymous/TokenManagement_1/CreateServiceToken_1'
4349
headers = {'content-type': 'application/json;charset=utf-8'}
4450
print('############### Sending Authentication request message to TRKD ###############')
4551
authenResult = doSendRequest(authenURL, authenMsg, headers)
4652
if authenResult and authenResult.status_code == 200:
4753
print('Authen success')
48-
print('response status %s'%(authenResult.status_code))
49-
##get Token
54+
print('response status %s' % (authenResult.status_code))
55+
# get Token
5056
token = authenResult.json()['CreateServiceToken_Response_1']['Token']
5157

5258
return token
5359

54-
## Perform News Headline request
60+
# Perform News Headline request
61+
62+
5563
def RetrieveNewsHeadline(token, appid):
56-
##construct news headline URL and header
64+
# construct news headline URL and header
5765
newsURL = 'https://api.trkd.thomsonreuters.com/api/News/News.svc/REST/News_1/RetrieveHeadlineML_1'
58-
headers = {'content-type': 'application/json;charset=utf-8' ,'X-Trkd-Auth-ApplicationID': appid, 'X-Trkd-Auth-Token' : token}
59-
##construct a news headline request message
66+
headers = {'content-type': 'application/json;charset=utf-8',
67+
'X-Trkd-Auth-ApplicationID': appid, 'X-Trkd-Auth-Token': token}
68+
# construct a news headline request message
6069
ricName = input('Please input Symbol: ')
6170
newsRequestMsg = {'RetrieveHeadlineML_Request_1': {
62-
'HeadlineMLRequest':{
63-
'MaxCount':10,
64-
'Filter':[
71+
'HeadlineMLRequest': {
72+
'MaxCount': 10,
73+
'Filter': [
6574
{
66-
'MetaDataConstraint':{
75+
'MetaDataConstraint': {
6776
'class': 'any',
6877
'Value': {
69-
'Text' : ricName
78+
'Text': ricName
7079
}
7180
}
7281
}
@@ -75,25 +84,25 @@ def RetrieveNewsHeadline(token, appid):
7584
}}
7685

7786
print('############### Sending News Headline request message to TRKD ###############')
78-
newsResult = doSendRequest(newsURL, newsRequestMsg,headers)
87+
newsResult = doSendRequest(newsURL, newsRequestMsg, headers)
7988
if newsResult and newsResult.status_code == 200:
8089
print('News Headline response message: ')
81-
print(newsResult.json())
82-
90+
# print(newsResult.json())
91+
print(json.dumps(newsResult.json(), sort_keys=True,
92+
indent=2, separators=(',', ':')))
8393

8494

8595
## ------------------------------------------ Main App ------------------------------------------ ##
86-
8796
if __name__ == '__main__':
88-
##Get username, password and applicationid
97+
# Get username, password and applicationid
8998
username = input('Please input username: ')
90-
##use getpass.getpass to hide user inputted password
99+
# use getpass.getpass to hide user inputted password
91100
password = getpass.getpass(prompt='Please input password: ')
92101
appid = input('Please input appid: ')
93102

94-
token = CreateAuthorization(username,password,appid)
95-
print('Token = %s'%(token))
103+
token = CreateAuthorization(username, password, appid)``
104+
print('Token = %s' % (token))
96105

97-
## if authentiacation success, continue subscribing News Headline
106+
# if authentiacation success, continue subscribing News Headline
98107
if token:
99-
RetrieveNewsHeadline(token,appid)
108+
RetrieveNewsHeadline(token, appid)

‎trkd_newsstory.py‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
import getpass
1515

1616
# Send HTTP request for all services
17+
18+
1719
def doSendRequest(url, requestMsg, headers):
1820
result = None
1921
try:
@@ -26,7 +28,9 @@ def doSendRequest(url, requestMsg, headers):
2628
print('Request fail')
2729
print('response status %s' % (result.status_code))
2830
if result.status_code == 500: # if username or password or appid is wrong
29-
print('Error: %s' % (result.json()))
31+
#print('Error: %s' % (result.json()))
32+
print('Error: %s' % (json.dumps(result.json(),
33+
sort_keys=True, indent=2, separators=(',', ':'))))
3034
result.raise_for_status()
3135
except requests.exceptions.RequestException as e:
3236
print('Exception!!!')
@@ -54,6 +58,8 @@ def CreateAuthorization(username, password, appid):
5458
return token
5559

5660
# Perform News Story request
61+
62+
5763
def RetrieveNewsStory(token, appid):
5864
# construct news story URL and header
5965
newsURL = 'http://api.trkd.thomsonreuters.com/api/News/News.svc/REST/News_1/RetrieveStoryML_1'
@@ -71,12 +77,12 @@ def RetrieveNewsStory(token, appid):
7177
newsResult = doSendRequest(newsURL, newsRequestMsg, headers)
7278
if newsResult and newsResult.status_code == 200:
7379
print('News Story response message: ')
74-
print(newsResult.json())
75-
80+
# print(newsResult.json())
81+
print(json.dumps(newsResult.json(), sort_keys=True,
82+
indent=2, separators=(',', ':')))
7683

7784

7885
## ------------------------------------------ Main App ------------------------------------------ ##
79-
8086
if __name__ == '__main__':
8187
# Get username, password and applicationid
8288
username = input('Please input username: ')

‎trkd_onlinereport.py‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
import getpass
1515

1616
# Send HTTP request for all services
17+
18+
1719
def doSendRequest(url, requestMsg, headers):
1820
result = None
1921
try:
@@ -26,7 +28,9 @@ def doSendRequest(url, requestMsg, headers):
2628
print('Request fail')
2729
print('response status %s' % (result.status_code))
2830
if result.status_code == 500: # if username or password or appid is wrong
29-
print('Error: %s' % (result.json()))
31+
#print('Error: %s' % (result.json()))
32+
print('Error: %s' % (json.dumps(result.json(),
33+
sort_keys=True, indent=2, separators=(',', ':'))))
3034
result.raise_for_status()
3135
except requests.exceptions.RequestException as e:
3236
print('Exception!!!')
@@ -73,12 +77,12 @@ def RetrieveOnlineReport(token, appid):
7377
onlinereportURL, onelinereportRequestMsg, headers)
7478
if onlinereportResult and onlinereportResult.status_code == 200:
7579
print('Online Report response message: ')
76-
print(onlinereportResult.json())
77-
80+
# print(onlinereportResult.json())
81+
print(json.dumps(onlinereportResult.json(), sort_keys=True,
82+
indent=2, separators=(',', ':')))
7883

7984

8085
## ------------------------------------------ Main App ------------------------------------------ ##
81-
8286
if __name__ == '__main__':
8387
# Get username, password and applicationid
8488
username = input('Please input username: ')

‎trkd_quote.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ def doSendRequest(url, requestMsg, headers):
2626
print('Request fail')
2727
print('response status %s'%(result.status_code))
2828
if result.status_code == 500: ## if username or password or appid is wrong
29-
print('Error: %s'%(result.json()))
29+
#print('Error: %s'%(result.json()))
30+
print('Error: %s' % (json.dumps(result.json(),sort_keys=True, indent=2, separators=(',', ':'))))
3031
result.raise_for_status()
3132
#if result.status_code == 500:
3233
#print('Request fail')
@@ -89,7 +90,8 @@ def RetrieveQuotes(token, appid):
8990
quoteResult = doSendRequest(quoteURL, quoteRequestMsg,headers)
9091
if quoteResult and quoteResult.status_code == 200:
9192
print('Quote response message: ')
92-
print(quoteResult.json())
93+
#print(quoteResult.json())
94+
print(json.dumps(quoteResult.json(), sort_keys=True,indent=2, separators=(',', ':')))
9395

9496

9597
## ------------------------------------------ Main App ------------------------------------------ ##

0 commit comments

Comments
 (0)