DRAFT: notebooks updates

notebooks/HowTo-01_Import_and_Load_the_DR.ipynb

@@ -69,7 +69,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "#### List the version locally cashed (none for the moment)"
+    "#### List the versions locally cached (none for the moment)"
    ]
   },
   {
@@ -85,7 +85,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "#### Download a specified version of the data request content (if not locally cached)"
+    "#### Retrieve latest version of the data request content, which downloads if not locally cached"
    ]
   },
   {
@@ -96,15 +96,15 @@
    },
    "outputs": [],
    "source": [
-    "path_to_content_json = dc.retrieve('v1.1')\n",
+    "path_to_content_json = dc.retrieve('latest')\n",
     "print(path_to_content_json)"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "#### Download other versions of the data request content (if not locally cached)"
+    "#### Retrieve other versions of the data request content (again, they download if not already cached locally)"
    ]
   },
   {
@@ -113,7 +113,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "path_to_content_json = dc.retrieve('v1.0')\n",
+    "path_to_content_json = dc.retrieve('v1.2')\n",
     "print(path_to_content_json)"
    ]
   },
@@ -123,15 +123,15 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "path_to_content_json = dc.retrieve('v1.0alpha')\n",
+    "path_to_content_json = dc.retrieve('v1.1')\n",
     "print(path_to_content_json)"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "#### List the version locally cashed (now they are 3 !)"
+    "#### List the version locally cached (now they are 3 !)"
    ]
   },
   {
@@ -147,7 +147,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "#### Remove a useless cashed version"
+    "#### Remove a cached version"
    ]
   },
   {
@@ -156,7 +156,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "dc.delete(version='v1.0alpha')"
+    "dc.delete(version='v1.2.1')"
    ]
   },
   {
@@ -179,7 +179,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "_Note: returned `content` is a dictionnary of the loaded json containing everything that is in the DR content, i.e. the Big json exported from DR airtables_"
+    "_Note: returned `content` is a dictionary of the loaded json containing everything that is in the DR content, i.e. the big json file exported from DR airtables_"
    ]
   },
   {
@@ -196,7 +196,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "_Note: now the latest_version v1.2 is also cashed_"
+    "_Note: now the latest_version is also cached_"
    ]
   },
   {

notebooks/HowTo-03b_Find_Experiments_and_Variables_for_given_Opportunities.ipynb

@@ -39,7 +39,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "used_dreq_version = 'v1.2'\n",
+    "used_dreq_version = 'v1.2.1'\n",
     "dreq_content = dc.load(version=used_dreq_version)\n",
     "dreq_tables = dq.create_dreq_tables_for_request(content=dreq_content, dreq_version=used_dreq_version)\n",
     "path_to_content = dc._dreq_content_loaded['json_path']"
@@ -60,6 +60,7 @@
    "source": [
     "#- Or simply set use_opps = 'all' to support all opportunities\n",
     "used_opps = []\n",
+    "used_opps.append('Baseline Climate Variables for Earth System Modelling')\n",
     "used_opps.append(\"Energy System Impacts\")\n",
     "used_opps.append(\"Health Impacts\")"
    ]
@@ -96,7 +97,7 @@
     "#>>> issue: sounds like used_opps and priority_cutoff args are not taken into account\n",
     "expected_vars_per_expes = dq.get_requested_variables(content=dreq_tables, dreq_version=used_dreq_version,\n",
     "                                                     use_opps=used_opps, priority_cutoff=prio_cutoff, \n",
-    "                                                     verbose=False, check_core_variables=False)"
+    "                                                     verbose=False, check_core_variables=True)"
    ]
   },
   {

notebooks/HowTo-04b_View_Attributes_of_Variables.ipynb

@@ -39,7 +39,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "used_dreq_version = 'v1.2'\n",
+    "used_dreq_version = 'v1.2.1'\n",
     "dreq_content = dc.load(version=used_dreq_version)\n",
     "dreq_tables = dq.create_dreq_tables_for_request(content=dreq_content, dreq_version=used_dreq_version)\n",
     "path_to_content = dc._dreq_content_loaded['json_path']"
@@ -52,7 +52,8 @@
    "outputs": [],
    "source": [
     "#- Need to set an api version for writting results in json files\n",
-    "used_api_version = 'v1.2'"
+    "from data_request_api import version as used_api_version\n",
+    "print(used_api_version)"
    ]
   },
   {