Update references to original URL and fix API script bugs (#1173)

* update urls in code

* update url in api scripts

* fix variable name in subset script generation

* fix csv saving in python API script

* fix file save in python subset script

config/oceannavigator-nginx

@@ -4,12 +4,12 @@ server {
     listen 80 default_server;
     server_name localhost ;
 
-    return 301 http://navigator.oceansdata.ca$request_uri;
+    return 301 https://oceannavigator.ca$request_uri;
 }
 
 server {
     listen 80;
-    server_name .navigator.oceansdata.ca ;
+    server_name .oceannavigator.ca ;
     charset     utf-8;
     client_max_body_size 75M;
 

data/netcdf_data.py

@@ -520,7 +520,7 @@ def regrid(
             )
             ds.description = "Converted " + dataset_name
             ds.history = "Created: " + str(datetime.datetime.now())
-            ds.source = "www.navigator.oceansdata.ca"
+            ds.source = "www.oceannavigator.ca"
 
             # Create the netcdf dimensions
             ds.createDimension("lat", GRID_RESOLUTION)
@@ -642,7 +642,7 @@ def regrid(
                 "%s%s.nc" % (working_dir, filename),
                 Path("%s%s.nc" % (working_dir, filename)).name,
             )
-            myzip.comment = b"Generated from www.navigator.oceansdata.ca"
+            myzip.comment = b"Generated from www.oceannavigator.ca"
             myzip.close()  # Must be called to actually create zip
             return working_dir, filename + ".zip"
 

oceannavigator/frontend/index.html

@@ -234,12 +234,12 @@ <h2>Identification of Data Sources</h2>
               generated by this application:
               <br />
               <span class="example-span">
-                (dataset name), https://navigator.oceansdata.ca, (year)
+                (dataset name), https://oceannavigator.ca, (year)
               </span>
               Example:
               <br />
               <span class="example-span">
-                GIOPS daily averages, https://navigator.oceansdata.ca, 2023
+                GIOPS daily averages, https://oceannavigator.ca, 2023
               </span>
               <br />
               If you would like further information about how to reference the

oceannavigator/frontend/src/components/InfoHelpWindow.jsx

@@ -471,7 +471,7 @@ function InfoHelpWindow(props) {
         url = `https://youtu.be/${selectedItem}`;
         break;
       case 5:
-        url = "https://navigator.oceansdata.ca/docs";
+        url = "https://oceannavigator.ca/docs";
         break;
     }
 

oceannavigator/frontend/src/components/SubsetPanel.jsx

@@ -82,7 +82,7 @@ function SubsetPanel(props) {
 
   const saveScript = (key) => {
     let query = {
-      outputFormat: outputFormat,
+      output_format: outputFormat,
       dataset_name: props.dataset.id,
       variables: outputVariables.join(),
       time: [outputStarttime, outputEndtime].join(),

plotting/scriptGenerator.py

@@ -51,8 +51,6 @@ def generateR(url, plot_type: str, script_Type: str) -> BytesIO:
         query = query.replace("true", "1")
     if "false" in query:
         query = query.replace("false", "0")
-    if "null" in query:
-        query = query.replace("null", "None")
 
     with open(f"plotting/templates/r_{script_Type}_template.txt", "r") as f:
         template = str(f.read())

plotting/templates/python_csv_template.txt

@@ -1,14 +1,6 @@
 import requests
 import os
-import shutil
-from urllib.request import urlopen
 from urllib.parse import urlencode
-from contextlib import closing
-try:
-   from PIL import Image
-except:
-   print("If you are on a Windows machine, please install PIL (imaging library) using 'python -m pip install Pillow' in the Anaconda Prompt")
-   exit()
 import json
 
 
@@ -18,20 +10,19 @@ def requestFile():
 
 
    # Assemble full request
-   base_url = "https://navigator.oceansdata.ca/api/v2.0/plot/{p}?"
+   base_url = "https://oceannavigator.ca/api/v2.0/plot/{p}?"
    url = base_url + urlencode({{"query": json.dumps(query)}}) + '&save=True&format=csv&size=10x7&dpi=144'
    print(url)
 
 
    # Save file and finish
    data_file = requests.get(url, stream=True)
-   dump = data_file.raw
    # change this if you want a different save location
    location = os.getcwd()
    fname = {f} + ".csv"
    with open(fname, "wb") as location:
       print('Saving File')
-      shutil.copyfileobj(dump, location)
+      location.write(data_file.content)
       print('Done')
 
 

plotting/templates/python_plot_template.txt

@@ -20,7 +20,7 @@ def requestFile():
 
 
    # Assemble full request
-   base_url = "https://navigator.oceansdata.ca/api/v2.0/plot/{p}?"
+   base_url = "https://oceannavigator.ca/api/v2.0/plot/{p}?"
    url = base_url + urlencode({{"query": json.dumps(query)}}) + "&format=png&size=10x7&dpi=" + str(dpi)
    print(url)
 

plotting/templates/python_subset_template.txt

@@ -1,8 +1,5 @@
 import requests
 import os
-import shutil
-from urllib.request import urlopen
-from contextlib import closing
 
 
 def requestFile():
@@ -11,7 +8,7 @@ def requestFile():
 
 
    # Assemble full request
-   base_url = "https://navigator.oceansdata.ca/api/v2.0/subset/?"
+   base_url = "https://oceannavigator.ca/api/v2.0/subset/"+query["dataset_name"]+"/"+query["variables"]+"?"
    url = base_url
    for key in query:
       url += f"&{{key}}={{query[key]}}"
@@ -25,7 +22,7 @@ def requestFile():
    location = os.getcwd()
    with open("script_output.nc", "wb") as location:
       print('Saving File')
-      shutil.copyfileobj(dump, location)
+      location.write(data_file.content)
       print('Done')
 
 

plotting/templates/r_csv_template.txt

@@ -7,7 +7,7 @@ dpi <- 144
 queryObj <- fromJSON(query)
 fname <- paste("ONAV_CSV_", queryObj["dataset"],"_", queryObj["variable"],".csv", sep="")
 gsub("[\r\n]", "", query)
-base_url <- "https://navigator.oceansdata.ca/api/v2.0/plot/{p}?"
+base_url <- "https://oceannavigator.ca/api/v2.0/plot/{p}?"
 url <- paste(base_url,"&query=",URLencode(query),"&save=True&format=csv&size=10x7&dpi=",toString(dpi), sep="")
 print(url)
 

plotting/templates/r_plot_template.txt

@@ -8,8 +8,8 @@ queryObj <- fromJSON(query)
 fname <- paste("ONAV_PLOT_", queryObj["dataset"],"_", queryObj["variable"],".png", sep="")
 
 gsub("[\r\n]", "", query)
-base_url <- "https://navigator.oceansdata.ca/api/v2.0/plot/{p}?"
-url <- paste(base_url,"&query=",URLencode(query),"&dpi=",toString(dpi), sep="")
+base_url <- "https://oceannavigator.ca/api/v2.0/plot/{p}?"
+url <- paste(base_url,"&query=",URLencode(query),"&save=True&format=png&size=10x7&dpi=",toString(dpi), sep="")
 print(url)
 
 

plotting/templates/r_subset_template.txt

@@ -1,6 +1,20 @@
 library(jsonlite)
 
-
 query <- '{q}'
 
-print("NOT IMPLEMENTED")
+queryObj <- fromJSON(query)
+fname <- "script_output.nc"
+
+base_url <- paste("https://oceannavigator.ca/api/v2.0/subset/", queryObj["dataset_name"], "/", queryObj["variables"], "?", sep="")
+url <- base_url
+
+for (key in names(queryObj))
+{{
+   url <- paste(url, "&", key, "=", queryObj[key], sep="")
+}}
+
+url  <- gsub(",[\r\n]", "", url)
+print(url)
+
+print(paste("Downloading file in location ",getwd(), " and exiting..."))
+download.file(url, fname, method="auto", mode="wb")

scripts/pregen_tiles.py

@@ -13,7 +13,7 @@
     required=True,
     help=(
         "Root URL to Navigator instance. Ex: "
-        + "https://navigator.oceansdata.ca or http://10.5.166.251:5000"
+        + "https://oceannavigator.ca or http://10.5.166.251:5000"
     ),
 )
 args = parser.parse_args()

scripts/profiling_scripts/api_profiling_driver.py

@@ -548,7 +548,7 @@ def run(self):
     the command line with flags specifying file locaitons and options as described in
     the example below:
 
-    python api_profiling_driver.py --url https://navigator.oceansdata.ca
+    python api_profiling_driver.py --url https://oceannavigator.ca
         --config api_profiling_config.json --id usr -a 1 -t 120
 
     where:
@@ -566,7 +566,7 @@ def run(self):
     """
 
     # default options
-    url = "https://navigator.oceansdata.ca"
+    url = "https://oceannavigator.ca"
     config = "scripts/profiling_scripts/api_profiling_config.json"
     csv_file = None
     prof_path = None

tests/disabled/test_datasetconfig.py

@@ -72,7 +72,7 @@ def test_required_datasets_have_cache_attribute(self):
 
     def test_all_urls_point_to_localhost(self):
 
-        prog = re.compile(r"^.*navigator.oceansdata.ca.*$")
+        prog = re.compile(r"^.*oceannavigator.ca.*$")
 
         for ds in self.datasetConfig:
             self.assertFalse(prog.match(self.datasetConfig[ds]["url"]))