diff --git a/wpst_notebook_test/wpst_echo_test.ipynb b/wpst_notebook/wpst_echo_test.ipynb similarity index 93% rename from wpst_notebook_test/wpst_echo_test.ipynb rename to wpst_notebook/wpst_echo_test.ipynb index 0b4ec5a8aa71d5e58e1c06d7761caf7096c1c36a..58774f2b6946d5171f7dc16a0fb5cb6ef5039dc7 100644 --- a/wpst_notebook_test/wpst_echo_test.ipynb +++ b/wpst_notebook/wpst_echo_test.ipynb @@ -10,9 +10,7 @@ "\n", "In this test we're using echo algorythm for it's ease of use and to demonstrate the capabilities and functionality of copa backend API. \n", "\n", - "Please make sure you have *copa_backend_url* , *echo_cwl*, *client_id* and *url_token* set in /projects/.maap/maap.ini\n", - "\n", - "echo_cwl = https://s3public.oss.eu-west-0.prod-cloud-ocb.orange-business.com/cwl/echo-test/workflow.cwl" + "Please make sure you have *copa_backend_url* , *client_id* and *url_token* set in /projects/.maap/maap.ini\n" ] }, { @@ -32,15 +30,11 @@ "metadata": {}, "outputs": [], "source": [ + "import configparser\n", + "import os\n", "import requests\n", "import json\n", - "import sys\n", - "import os\n", - "import xml.etree.ElementTree as ET\n", - "import time\n", - "import sys\n", - "import configparser\n", - "import pandas as pd" + "import time" ] }, { @@ -82,7 +76,7 @@ "copa_backend_url = config['maap']['copa_backend_url']\n", "CLIENT_ID = config['maap']['client_id']\n", "url_token = config['maap']['url_token']\n", - "echo_cwl = config['maap']['echo_cwl']\n", + "echo_cwl = 'https://s3public.oss.eu-west-0.prod-cloud-ocb.orange-business.com/cwl/echo-test/workflow.cwl'\n", "\n", "#Location for tmp file for created process\n", "JobIdWD = '{}/TestJobID.csv'.format(os.path.abspath(os.getcwd()))\n", @@ -169,7 +163,7 @@ "process_already_deployed = None\n", "if process.content:\n", " for item in json.loads(process.content).get(\"processes\"):\n", - " if item.get('title')== 'wf-echo-test':\n", + " if item.get('title')== 'wf-echo-process':\n", " process_already_deployed = item.get('id')\n", "print(process_already_deployed)" ] @@ -312,23 +306,13 @@ "payload = {\n", " \"inputs\": [\n", " {\n", - " \"id\": \"input_reference\",\n", + " \"id\": \"input_file\",\n", " \"data\": \"https://earth-search.aws.element84.com/v0/collections/sentinel-s2-l2a-cogs/items/S2B_36RTT_20191205_0_L2A\",\n", " \"href\": \"\"\n", " },\n", " {\n", - " \"id\": \"s_expression\",\n", - " \"data\": \"(/ (- B05 B02) (+ B05 B02))\",\n", - " \"href\": \"\"\n", - " },\n", - " {\n", - " \"id\": \"cbn\",\n", - " \"data\": \"nbr\",\n", - " \"href\": \"\"\n", - " },\n", - " {\n", - " \"id\": \"s_light_mode\",\n", - " \"data\": \"True\",\n", + " \"id\": \"s_message\",\n", + " \"data\": \"Hello\",\n", " \"href\": \"\"\n", " },\n", " {\n", @@ -338,14 +322,14 @@ " },\n", " {\n", " \"id\": \"copy_dir_or_file\",\n", - " \"data\": \"dir\",\n", + " \"data\": \"file\",\n", " \"href\": \"\"\n", " },\n", " {\n", " \"id\": \"s3_destination\",\n", - " \"data\": \"maap-scientific-data/adu/test\",\n", + " \"data\": \"maap-scientific-data/shared/demo/echo-process-out\",\n", " \"href\": \"\"\n", - " },\n", + " }\n", " ],\n", " \"outputs\": [],\n", " \"mode\": \"ASYNC\",\n", diff --git a/wpst_notebook_test/wpst_s1tiling_test.ipynb b/wpst_notebook/wpst_s1tiling_test.ipynb similarity index 100% rename from wpst_notebook_test/wpst_s1tiling_test.ipynb rename to wpst_notebook/wpst_s1tiling_test.ipynb