version b5 session related changes

Author: umernalla

Tutorials/2.Content/2.2-Pricing/TUT_2.2.05-Pricing-StreamingChain.ipynb

@@ -1,72 +1,21 @@
 # Refinitiv Data Platform Library for Python
-## Delivery - OMMItemStream - Market Price data via callback inside a Python Script
-
-#This demonstrates how to use the OMM Item Stream interface to request streaming Quote and Trade data
-#via a Script as opposed to running in a Jupyter Notebook
+# This demonstrates how to use the content pricing interface to request streaming Quote and Trade data
+# via a Script as opposed to running in a Jupyter Notebook
 
+# As these tutorial Notebooks are categorised into sub-folders and to avoid the need for multiple config files, we will use the
+# _RD_LIB_CONFIG_PATH_ environment variable to point to a single instance of the config file in the 
+# top-level ***Configuration*** folder.
+# Before proceeding, please **ensure you have entered your credentials** into the config file in the ***Configuration*** folder.
+import os
+os.environ["RD_LIB_CONFIG_PATH"] = "../../../Configuration"
 import refinitiv.data as rd
-from refinitiv.data._data.legacy import get_default_session, set_default_session
-from refinitiv.data.delivery import endpoint_request
 import datetime
 import json
 import time
-import logging.config
-import configparser as cp
 import asyncio
-import os
-from dotenv import load_dotenv
-
-# load credentials from a .env file (+ override any OS system env vars of the same name)
-load_dotenv(dotenv_path='c:/Refinitiv/.env',override=True)
-
-
-APP_KEY                     = os.environ['APP_KEY']       # 'YOUR APP_KEY'
-RDP_LOGIN                   = os.environ['RDP_LOGIN']     # 'YOUR REFINITIV DATA PLATFORM_LOGIN' e.g. 'GE-A-01234567-8-9101'
-RDP_PASSWORD                = os.environ['RDP_PASSWORD']  # 'YOUR REFINITIV DATA PLATFORM PASSWORD' (the long password)
-DEPLOYED_PLATFORM_HOST      = os.getenv('DEPLOYED_PLATFORM_HOST')       # YOUR DEPLOYED SERVER:PORT e.g. 'myADS:15000'
-DEPLOYED_PLATFORM_USER_NAME = os.getenv('DEPLOYED_PLATFORM_USER_NAME')  # YOUR DACS user name 
 
-
-# Some Global variables
-session=None # Our session
-
-# Run for 60 seconds
-exit_time = time.time() + 60 
-
-
-def open_session(session_type=None):
-    session = get_default_session()
-    if session is None:
-        if session_type == "desktop":
-            session = rd.session.desktop.Definition(APP_KEY).get_session()
-        elif session_type == "rdp":
-            session = rd.session.platform.Definition(
-                app_key=APP_KEY,
-                grant=rd.session.platform.GrantPassword(
-                    username=RDP_LOGIN,
-                    password=RDP_PASSWORD
-                )
-            ).get_session()
-        elif session_type == "deployed":
-            session = rd.session.platform.Definition(
-                app_key=APP_KEY,
-                deployed_platform_host = DEPLOYED_PLATFORM_HOST,
-                deployed_platform_username = DEPLOYED_PLATFORM_USER_NAME
-            ).get_session()
-
-    if session is None:
-        raise Exception(f"Wrong session_type: {session_type}. It must be ['desktop', 'rdp', 'deployed']")
-    else:
-        #session.set_log_level(logging.DEBUG)
-        session.set_log_level(logging.WARNING)
-        set_default_session(session)
-        session.open()
-        return session
-    
-def close_session():
-    session = get_default_session()
-    if session:
-        session.close()
+# Run the example for 30 seconds
+exit_time = time.time() + 30 
 
 # Callback function to display data or status events
 # Function to handle the intial Refresh for each item
@@ -88,7 +37,7 @@ def handle_status(streaming_prices, instrument_name, status):
 # Our main code section
 
 # Open a session using the helper functions in the above Credentials section
-open_session('rdp')
+rd.open_session()
 
 # Define our Streaming Price object
 streams = rd.content.pricing.Definition(
@@ -114,4 +63,4 @@ def handle_status(streaming_prices, instrument_name, status):
     asyncio.get_event_loop().run_until_complete(asyncio.sleep(1))
 
 streams.close()
-close_session()
+rd.close_session()

Tutorials/2.Content/2.2-Pricing/TUT_2.2.06-Pricing-StreamingEvents.py

@@ -16,51 +16,49 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Import the library and load credentials\n",
+    "## Set the location of the configuration file\n",
+    "For ease of use, you can set various initialization parameters of the RD Library in the **_refinitiv-data.config.json_** configuration file - as described in the Quick Start -> Sessions example.\n",
     "\n",
-    "Credentials used by this and the other tutorials notebooks are stored in the **Configuration/credentials.ipynb** file.     \n",
+    "### One config file for the tutorials\n",
+    "As these tutorial Notebooks are categorised into sub-folders and to avoid the need for multiple config files, we will use the _RD_LIB_CONFIG_PATH_ environment variable to point to a single instance of the config file in the top-level ***Configuration*** folder.\n",
     "\n",
-    "You should have edited the **Configuration/credentials.ipynb** to set your credentials as part of the **Quick Start** step."
+    "Before proceeding, please **ensure you have entered your credentials** into the config file in the ***Configuration*** folder."
    ]
   },
   {
    "cell_type": "code",
    "execution_count": 1,
-   "metadata": {
-    "collapsed": false,
-    "jupyter": {
-     "outputs_hidden": false
-    },
-    "pycharm": {
-     "name": "#%%\n"
-    }
-   },
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import os\n",
+    "os.environ[\"RD_LIB_CONFIG_PATH\"] = \"../../../Configuration\""
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 2,
+   "metadata": {},
    "outputs": [],
    "source": [
     "from refinitiv.data.content import pricing\n",
+    "import refinitiv.data as rd\n",
     "from pandas import DataFrame\n",
-    "from IPython.display import display, clear_output\n",
-    "\n",
-    "%run ../../Configuration/credentials.ipynb"
+    "from IPython.display import display, clear_output"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Open the session of your choice\n",
+    "## Open the default session\n",
     "\n",
-    "Use our helper function in the Credentials notebook, **open_session(session_type)**, to create and open a session to connect to the \n",
-    "- Refinitiv Data Platform directly (session_type=\"rdp\") or via \n",
-    "- Eikon 4 or Refinitiv Workspace (session_type=\"desktop\") or via a \n",
-    "- local realtime infrastructure (session_type=\"deployed\").\n",
-    "\n",
-    "You can also set a default in the **credentials** notebook - which I have done, and so I don't need to specify a session_type:"
+    "To open the default session ensure you have a '*refinitiv-data.config.json*' in the ***Configuration*** directory, populated with your credentials and specified a 'default' session in the config file    \n"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 3,
    "metadata": {
     "collapsed": false,
     "jupyter": {
@@ -74,17 +72,16 @@
     {
      "data": {
       "text/plain": [
-       "<refinitiv.data.session._platform_session.Definition object at 0x2666dcd7790 {session_name='default-session'}>"
+       "<refinitiv.data.session.platform.Definition object at 0x173dd8b9520 {session_name='rdp'}>"
       ]
      },
-     "execution_count": 2,
+     "execution_count": 3,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
-    "# I have defined a default Session type in the Credentials notebook - so no need to specify it here\n",
-    "open_session()"
+    "rd.open_session()"
    ]
   },
   {
@@ -96,7 +93,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -134,7 +131,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [
     {
@@ -165,34 +162,34 @@
        "  <tbody>\n",
        "    <tr>\n",
        "      <th>EUR=</th>\n",
-       "      <td>1.1786</td>\n",
-       "      <td>1.179</td>\n",
+       "      <td>1.1294</td>\n",
+       "      <td>1.1297</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>GBP=</th>\n",
-       "      <td>1.3833</td>\n",
-       "      <td>1.3838</td>\n",
+       "      <td>1.3337</td>\n",
+       "      <td>1.334</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>JPY=</th>\n",
-       "      <td>110.04</td>\n",
-       "      <td>110.06</td>\n",
+       "      <td>113.87</td>\n",
+       "      <td>113.88</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>CAD=</th>\n",
-       "      <td>1.2655</td>\n",
-       "      <td>1.2659</td>\n",
+       "      <td>1.2761</td>\n",
+       "      <td>1.2765</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
        "</div>"
       ],
       "text/plain": [
        "         BID     ASK\n",
-       "EUR=  1.1786   1.179\n",
-       "GBP=  1.3833  1.3838\n",
-       "JPY=  110.04  110.06\n",
-       "CAD=  1.2655  1.2659"
+       "EUR=  1.1294  1.1297\n",
+       "GBP=  1.3337   1.334\n",
+       "JPY=  113.87  113.88\n",
+       "CAD=  1.2761  1.2765"
       ]
      },
      "metadata": {},
@@ -224,16 +221,16 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
-       "<StreamState.Closed: 1>"
+       "<OpenState.Closed: 3>"
       ]
      },
-     "execution_count": 5,
+     "execution_count": 6,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -251,11 +248,11 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [],
    "source": [
-    "close_session()"
+    "rd.close_session()"
    ]
   },
   {