Merge branch 'update_rkd_endpoint'

1. Update RKD API rebrand information
2. Update API endpoint from api.trkd.thomsonreuters.com to api.rkd.refinitiv.com
3. Update API endpoint from streaming.trkd.thomsonreuters.com to streaming.rkd.refinitiv.com
4. Fix all typo errors

Author: wasin-waeosri

.gitignore

@@ -12,4 +12,6 @@ interday_result4.txt
 notebook/test/
 notebook/.ipynb_checkpoints
 */.ipynb_checkpoints/*
-trkd_websocketexample.py
+trkd_websocketexample.py
+ERT_in_Cloud/
+docs_tr/

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright 2018 Refinitiv
+Copyright 2020 Refinitiv
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

README.md

@@ -1,43 +1,42 @@
-# TRKD HTTP JSON with Python Example
+# RKD HTTP JSON with Python Example
 ## Overview
-The [Refnitiv Knowledge Direct (TRKD) API](https://developers.refinitiv.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.
+The [Refinitiv Knowledge Direct (RKD) API](https://developers.refinitiv.com/thomson-reuters-knowledge-direct-trkd) (formerly known as TRKD API) 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 Refinitiv' 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. All data are snapshot (non-streaming) data.
+RKD offers a wide range of Refinitiv' 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. All data are snapshot (non-streaming) data.
 
-This is an example project that shows how to implement TRKD HTTP JSON client and TRKD Streaming client with Python programming lanugage. The project example are in both console and Jupyter Notebook applications.
+This is an example project that shows how to implement RKD HTTP JSON client and RKD Streaming client with Python programming language. The project example are in both console and Jupyter Notebook applications.
 
-*Note:* The Jupyter Notebook example does not contain all the same TRKD services service as console examples yet. [TBD]
+*Note:* The Jupyter Notebook example does not contain all the same RKD services service as console examples yet. [TBD]
 
 ## Application Files
-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
-- trkd_newsstory.py: An example application that shows how to subscribe the News Story data from TRKD service
-- trkd_intraday.py: An example application that shows how to subscribe the Intraday Time-series data from TRKD service
-- trkd_interday.py: An example application that shows how to subscribe the Interday Time-series data from TRKD service
-- trkd_onlinereport.py: An example application that shows how to subscribe the Online Report data from TRKD service
-- trkd_chart.py: An example application that shows how to subscribe and download the Chart image data from TRKD service
-- trkd_wsstreaming.py: An example application that show how to subscribe the Quote data from TRKD Streming service via a WebSocket connection
+This project contains the following example scripts for each RKD services
+- trkd_authen.py: An example application that shows how to authenticate with RKD service
+- trkd_quote.py: An example application that shows how to subscribe (all fields and specific fields) the Quote data from RKD service
+- trkd_newsheadline.py: An example application that shows how to subscribe the News Headline data from RKD service
+- trkd_newsstory.py: An example application that shows how to subscribe the News Story data from RKD service
+- trkd_intraday.py: An example application that shows how to subscribe the Intraday Time-series data from RKD service
+- trkd_interday.py: An example application that shows how to subscribe the Interday Time-series data from RKD service
+- trkd_onlinereport.py: An example application that shows how to subscribe the Online Report data from RKD service
+- trkd_chart.py: An example application that shows how to subscribe and download the Chart image data from RKD service
+- trkd_wsstreaming.py: An example application that show how to subscribe the Quote data from RKD Streaming service via a WebSocket connection
 - notebook folder:
-	- *notebook/trkd_authentication.ipynb*: A Jupyter Notebook TRKD Authentication service example
-	- *notebook/trkd_timeseries_interday.ipynb*: A Jupyter Notebook TRKD Time-Series Interday service example
-	- *notebook/trkd_timeseries_intraday.ipynb*: A Jupyter Notebook TRKD Time-Series Intraday service example
+	- *notebook/trkd_authentication.ipynb*: A Jupyter Notebook RKD Authentication service example
+	- *notebook/trkd_timeseries_interday.ipynb*: A Jupyter Notebook RKD Time-Series Interday service example
+	- *notebook/trkd_timeseries_intraday.ipynb*: A Jupyter Notebook RKD Time-Series Intraday service example
 - requestments.txt: A requirement file contains a list of required libraries for HTTP JSON and WebSocket connections. 
-- docs\TRKD_REST_with_Python.docx: A document that describes the trkd_authen.py and trkd_quote.py applications
 
-All source code and scripts are provided under the Apache 2.0 license. Thye are provided AS IS with no warranty or guarantee of fit for purpose. See the project's LICENSE.md for details. 
+All source code and scripts are provided under the Apache 2.0 license. They are provided AS IS with no warranty or guarantee of fit for purpose. See the project's LICENSE.md for details. 
 
 ## Prerequisite
 The following softwares are required to use this script
-- TRKD API credentials. Please reach out to your Refinitiv sales associate to acquire TRKD access credentials.
-- Python 3 
+- RKD API credentials. Please reach out to your Refinitiv sales associate to acquire RKD access credentials.
+- [Python 3](https://www.python.org/).
 - The [requests](http://docs.python-requests.org/en/master/) library
 - The [websocket-client](https://pypi.org/project/websocket-client/) library (*version 0.49 or greater*, for trkd_wsstreaming.py application only)
 - The [python-dateutil](https://pypi.org/project/python-dateutil/) library (for trkd_wsstreaming.py application only)
 - The [classic Jupyter Notebook](https://jupyter.org/) runtime (for the Notebook example application)
 
-All scripts support Python 3 and not compatible with Python 2.
+All scripts support Python 3 only and not compatible with Python 2.
 
 *Note:* 
 - You can install Jupyter Notebook on your local machine and then test the example on the machine. The alternate choice is a free Jupyter Notebook on cloud environment such as [Azure Notebook](https://notebooks.azure.com/) provided by Microsoft. You can find more details from [this tutorial](https://docs.microsoft.com/en-us/azure/notebooks/tutorial-create-run-jupyter-notebook). If you are not familiar with Jupyter Notebook, the following [tutorial](https://www.datacamp.com/community/tutorials/tutorial-jupyter-notebook) created by DataCamp may help.
@@ -53,15 +52,15 @@ The best way is via the pip package management tool
 1. export <Python_folder>\Scripts to your OS PATH environment
 2. call pip command to install requests
 	```
-	$>pip install -r requestments.txt
+	$>pip install -r requirements.txt
 	```
 3. If you are behind proxy, set the proxy first
 	```
 	export https_proxy="http://<proxy.server>:<port>"
-	$>pip install -r requestments.txt
+	$>pip install -r requirements.txt
 	```
 
-*Note*: If you aim to use only TRKD HTTP JSON services, you can just install requests library via a ```pip install requests``` command.
+*Note*: If you aim to use only RKD HTTP JSON services, you can just install requests library via a ```pip install requests``` command.
 
 ## Optional - How to install libraries for notebook examples
 Please follow the [classic Jupyter Notebook installation guide](https://jupyter.org/install) page.
@@ -76,13 +75,10 @@ You may consider the strategic [Refinitiv Data Platform (RDP)](https://developer
 
 Please see [RDP API Overview page](https://developers.refinitiv.com/refinitiv-data-platform/refinitiv-data-platform-apis) for more detail.
 
-As part of RDP, [Elektron Real Time in Cloud (ERT in Cloud)](https://developers.thomsonreuters.com/elektron/websocket-api/quick-start?content=45253&type=quick_start) gives you access to best in class Real Time market data delivered in the cloud.  ERT in Cloud is a new delivery mechanism for RDP, using the AWS (Amazon Web Services) cloud. Once a connection to RDP is established using ERT in Cloud, data can be retrieved using [Elektron WebSocket API](https://developers.thomsonreuters.com/websocket-api) (the same as TRKD Streaming Service).
+As part of RDP, [Elektron Real Time in Cloud (ERT in Cloud)](https://developers.thomsonreuters.com/elektron/websocket-api/quick-start?content=45253&type=quick_start) gives you access to best in class Real Time market data delivered in the cloud.  ERT in Cloud is a new delivery mechanism for RDP, using the AWS (Amazon Web Services) cloud. Once a connection to RDP is established using ERT in Cloud, data can be retrieved using [Elektron WebSocket API](https://developers.thomsonreuters.com/websocket-api) (the same as RKD Streaming Service).
 
 Key benefit of the strategic RDP and ERT in Cloud platform are the Cloud Delivery. The Platform is based on [Amazon AWS](https://aws.amazon.com/), the world class leading Cloud Provider for developers. The RDP and ERT in Cloud support output for multiple cloud vendors such as AWS, Azure, GCS, etc. for cloud-native or on-premise integration. The ERT in Cloud servers are hosted in multiple location world-wide which lets the application choose the closest server based on their region for full potential. 
 
-Please refer to [Elektron WebSocket API Quick Start - Connecting to Elektron Real Time in Cloud](https://developers.refinitiv.com/elektron/websocket-api/quick-start?content=45253&type=quick_start) page and [How to migrate the WebSocket application from TRKD Streaming service to Elektron Real Time in Cloud](https://developers.refinitiv.com/article/how-migrate-websocket-application-trkd-streaming-service-elektron-real-time-cloud) article for more detail.
-
-
 ## References
 For further details, please check out the following resources:
 * [Refinitiv Knowledge Direct API page](https://developers.refinitiv.com/thomson-reuters-knowledge-direct-trkd) on the [Refinitiv Developers Community](https://developers.refinitiv.com/) web site.
@@ -109,9 +105,9 @@ For further details, please check out the following resources:
 	- docs\TRKD_REST_with_Python.docx.
 	- revise some code.
 - version 1.0.5: 27 Apr 2017
-	- revies README.md to support markdown.
+	- revise README.md to support markdown.
 - version 1.0.6: 3 May 2017
-	- revies README.md.
+	- revise README.md.
 	- modify trkd_authen.py.
 	- modify trkd_quote.py.
 - version 1.0.7: 9 May 2017
@@ -139,3 +135,6 @@ For further details, please check out the following resources:
 	- Update TRKD Interday and Intraday services operations.
 - version 1.5.3: May 2020
 	- Update RDP and ERT in Cloud information.
+- version 1.5.4: June 2020
+	- Update API name and information.
+	- Fix all typo errors

docs/TRKD_REST_with_Python.docx

@@ -4,19 +4,19 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "# TRKD HTTP JSON with Python Example: Authentication\n",
+    "# RKD HTTP JSON with Python Example: Authentication\n",
     "\n",
     "## Overview\n",
-    "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.\n",
+    "The [Refinitiv Knowledge Direct (RKD) API](https://developers.refinitiv.com/thomson-reuters-knowledge-direct-trkd) (formerly known as TRKD API)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.\n",
     "\n",
-    "TRKD offers a wide range of Refinitiv' 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. All data are snapshot (non-streaming) data.\n",
+    "RKD offers a wide range of Refinitiv' 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. All data are snapshot (non-streaming) data.\n",
     "\n",
-    "This is an example project that shows how to implement TRKD HTTP JSON client with Python programming lanugage in Jupyter Notebook.\n",
+    "This is an example project that shows how to implement RKD HTTP JSON client with Python programming lanugage in Jupyter Notebook.\n",
     "\n",
-    "### TRKD JSON application implementation process\n",
-    "The JSON application requires the following steps to consume data from TRKD API services\n",
-    "1. Authentication with TRKD Authentication service to get an authen token\n",
-    "2. Send a request message with the required input information and authen token to the interested TRKD service"
+    "### RKD JSON application implementation process\n",
+    "The JSON application requires the following steps to consume data from RKD API services\n",
+    "1. Authentication with RKD Authentication service to get an authen token\n",
+    "2. Send a request message with the required input information and authen token to the interested RKD service"
    ]
   },
   {
@@ -74,11 +74,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# Input your TRKD credentials here\n",
+    "# Input your RKD credentials here\n",
     "\n",
-    "username = \"\"\n",
-    "password = \"\"\n",
-    "appid = \"\""
+    "username = ''\n",
+    "password = ''\n",
+    "appid = ''"
    ]
   },
   {
@@ -97,18 +97,18 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "#### TRKD Service Token Detail\n",
-    "##### TRKD Service Token URL and Header\n",
+    "#### RKD Service Token Detail\n",
+    "##### RKD Service Token URL and Header\n",
     "\n",
-    "The URL enponint for the TRKD Service Token is following:\n",
-    "[https://api.trkd.thomsonreuters.com/api/TokenManagement/TokenManagement.svc/REST/Anonymous/TokenManagement_1/CreateServiceToken_1](https://api.trkd.thomsonreuters.com/api/TokenManagement/TokenManagement.svc/REST/Anonymous/TokenManagement_1/CreateServiceToken_1)\n",
+    "The URL enponint for the RKD Service Token is following:\n",
+    "[https://api.rkd.refinitiv.com/api/TokenManagement/TokenManagement.svc/REST/Anonymous/TokenManagement_1/CreateServiceToken_1](https://api.rkd.refinitiv.com/api/TokenManagement/TokenManagement.svc/REST/Anonymous/TokenManagement_1/CreateServiceToken_1)\n",
     "\n",
     "Header: \n",
     "- Content-type = application/json;charset=utf-8\n",
     "Method:\n",
     "- Post\n",
     "\n",
-    "##### TRKD Service TOKEN Request Message\n",
+    "##### RKD Service TOKEN Request Message\n",
     "\n",
     "The CreateServiceToken_1 operation requires the following information to perform authentication\n",
     "- ApplicationID\n",
@@ -145,21 +145,21 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# TRKD Authentication Post Request message\n",
+    "# RKD Authentication Post Request message\n",
     "\n",
     "authenMsg = {'CreateServiceToken_Request_1': {'ApplicationID': appid, 'Username': username, 'Password': password}}"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [],
    "source": [
-    "# TRKD Authentication Service URL\n",
+    "# RKD Authentication Service URL\n",
     "\n",
     "authenURL = (\n",
-    "    'https://api.trkd.thomsonreuters.com/api/'\n",
+    "    'https://api.rkd.refinitiv.com/api/'\n",
     "    'TokenManagement/TokenManagement.svc/REST/'\n",
     "    'Anonymous/TokenManagement_1/CreateServiceToken_1'\n",
     ")"
@@ -171,7 +171,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# TRKD Authentication Request headers\n",
+    "# RKD Authentication Request headers\n",
     "\n",
     "authen_headers = {'content-type': 'application/json;charset=utf-8'}"
    ]
@@ -182,7 +182,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "print('############### Sending Authentication request message to TRKD ###############')"
+    "print('############### Sending Authentication request message to RKD ###############')"
    ]
   },
   {
@@ -230,7 +230,7 @@
    "metadata": {},
    "source": [
     "## Conclusion\n",
-    "All TRKD HTTP JSON applications require authenticaiton to access TRKD data. The application needs to request for Service Token from TRKD server, then keeps a response Service Token for later use in other request message header."
+    "All RKD HTTP JSON applications require authenticaiton to access RKD data. The application needs to request for Service Token from RKD server, then keeps a response Service Token for later use in other request message header."
    ]
   },
   {
@@ -239,12 +239,12 @@
    "source": [
     "## References\n",
     "For further details, please check out the following resources:\n",
-    "* [Thomson Reuters Knowledge Direct API page](https://developers.refinitiv.com/thomson-reuters-knowledge-direct-trkd) on the [Refinitiv Developer Community](https://developers.thomsonreuters.com/) web site.\n",
-    "* [Thomson Reuters Knowledge Direct API Catalog](https://www.trkd.thomsonreuters.com/SupportSite/RequestBuilder/requestbuilder.aspx) web site.\n",
-    "* TRKD Article: [How to implement TRKD JSON application with Python chapter 1: the basic](https://developers.refinitiv.com/article/how-implement-trkd-json-application-python-chapter-1-basic)\n",
-    "* [TRKD Tutorial](https://developers.refinitiv.com/thomson-reuters-knowledge-direct-trkd/thomson-reuters-knowledge-direct-api-trkd-api/learning).\n",
+    "* [Refinitiv Knowledge Direct API page](https://developers.refinitiv.com/thomson-reuters-knowledge-direct-trkd) on the [Refinitiv Developer Community](https://developers.refinitiv.com) web site.\n",
+    "* [Refinitiv Knowledge Direct API Catalog](https://www.trkd.thomsonreuters.com/SupportSite/RequestBuilder/requestbuilder.aspx) web site.\n",
+    "* RKD Article: [How to implement RKD JSON application with Python chapter 1: the basic](https://developers.refinitiv.com/article/how-implement-trkd-json-application-python-chapter-1-basic)\n",
+    "* [RKD Tutorial](https://developers.refinitiv.com/thomson-reuters-knowledge-direct-trkd/thomson-reuters-knowledge-direct-api-trkd-api/learning).\n",
     "\n",
-    "For any question related to this tutorial or TRKD API, please use the Developer Community [Q&A Forum](https://community.developers.refinitiv.com/spaces/51/view.html)."
+    "For any question related to this tutorial or RKD API, please use the Developer Community [Q&A Forum](https://community.developers.refinitiv.com/spaces/51/view.html)."
    ]
   },
   {
@@ -271,7 +271,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.3"
+   "version": "3.7.6"
   }
  },
  "nbformat": 4,