Merge into main (#76)

* Feature/update maap help tour (#61)

updated maap help jupyter extension to version 1.0.0

* Bugs/presigned url (#62)

Main fix for the presigned url bug was changing 'maapsec/environment' to 'jupyter-server-extension/getConfig'

There was another bug caused by a race condition that was causing users to not be able to get the presigned url about every 10th time. What fixed this bug is calling updateKeycloakToken upon the launch of the extension and also trying to call updateKeycloakToken again if getting the keycloak user information fails to get

I confirmed this bug was fixed by trying to get the presigned url 25 times and it worked

Successful build in vanilla here: https://repo.dit.maap-project.org/root/maap-workspaces/-/pipelines/3389

* Added memory extension (#59)

added changes from cluttered commit branch

* hysds base-image [skip ci] (#65)

* Feature/libmamba solver (#64)

* upgraded maap help jupyter extension version to 1.0.0

* reverted back changes

* changed r docker to use libmamba solver

* changed mamba install to conda

* converted all images use libmamba solver like R image

* added lang tz and debian frontend commands to vanilla docker image

* copied pangeo dockerfile into vanilla

* first line of packages back to vanilla versions

* updated package versions for vanilla to be same as pangeo

* updated isce2 package versions to match vanilla

* updating continuumio/miniconda3 for rgedi and making other 3 top lines consistent

* removed changes from rgedi

* Update stac_ipyleaflet to 0.3.5 for Pangeo (#66)

* Updated pinned version of stac_ipyleaflet to 0.3.5 for pangeo jupyter workspace.
* Added environment variables to Pangeo environment yml.
* Updated entrypoint bash script so the the base environment is activated before launching jupyter so that environment variables are accessible within jupyter.

---------

Co-authored-by: Alex <[email protected]>

* Remove hysds base_image [skip-ci] (#68)

* Bugs/quick fix libmamba (#69)

* removed libmamba sovler from conda env update

* added solver to environment.yml

* added conda libmamba solver version

* added back in solvers and pinned version for conda-libmamba-solver

* added back in space

* Bugs/presigned url (#70)

* changed dit url to test

* changed dit back and changed ops to be maap-ops-workspace instead of dataset

* Bugs/git tour link (#71)

* manual build for change to maap help

* updated npm version of maap help

* updated custom ext versions (#72)

* Feature/update maap py (#73)

upgraded all maap py versions to 3.1.2

* bumped jupyter server extension (#74)

* update server ext

* bumped server ext

* Bump maap-py to v3.1.3 (#75)

* Update Dockerfile

---------

Co-authored-by: Grace Llewellyn <[email protected]>
Co-authored-by: Anil Natha <[email protected]>
Co-authored-by: Alex <[email protected]>
Co-authored-by: Marjorie Lucas <[email protected]>
Co-authored-by: Sujen Shah <[email protected]>

base_images/isce2/docker/Dockerfile

@@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 # install maap-py library
 ENV MAAP_CONF='/maap-py/'
-RUN git clone --single-branch --branch v3.0.1 https://github.com/MAAP-Project/maap-py.git \
+RUN git clone --single-branch --branch v3.1.3 https://github.com/MAAP-Project/maap-py.git \
     && cd maap-py \
     && pip install -e .
 
@@ -31,7 +31,7 @@ WORKDIR /projects
 RUN sed -i -e 's/\/root/\/projects/g' /etc/passwd
 
 RUN conda install -y -c conda-forge pyOpenSSL=23.2.0 && \
-    conda install -y -n base conda-libmamba-solver && \
+    conda install -y -n base conda-libmamba-solver=23.7.0 && \
     conda config --set solver libmamba
 
 # need to uninstall jupyter_server_terminals as it conflicts with Jupyterlab 3.4.x. Doesn't seem to break anything

base_images/isce3/docker/Dockerfile

@@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 # install maap-py library
 ENV MAAP_CONF='/maap-py/'
-RUN git clone --single-branch --branch v3.0.1 https://github.com/MAAP-Project/maap-py.git \
+RUN git clone --single-branch --branch v3.1.3 https://github.com/MAAP-Project/maap-py.git \
     && cd maap-py \
     && pip install -e .
 
@@ -17,7 +17,7 @@ WORKDIR /projects
 RUN sed -i -e 's/\/root/\/projects/g' /etc/passwd
 
 RUN conda install -y -c conda-forge pyOpenSSL=23.2.0 && \
-    conda install -y -n base conda-libmamba-solver && \
+    conda install -y -n base conda-libmamba-solver=23.7.0 && \
     conda config --set solver libmamba
 
 RUN conda install -y --solver=libmamba -c conda-forge isce3=0.12.0 xarray=2023.4.2 \

base_images/pangeo/docker/Dockerfile

@@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 # install maap-py library
 ENV MAAP_CONF='/maap-py/'
-RUN git clone --single-branch --branch v3.0.1 https://github.com/MAAP-Project/maap-py.git \
+RUN git clone --single-branch --branch v3.1.3 https://github.com/MAAP-Project/maap-py.git \
     && cd maap-py \
     && pip install -e .
 
@@ -14,7 +14,7 @@ WORKDIR /projects
 RUN sed -i -e 's/\/root/\/projects/g' /etc/passwd
 
 RUN conda install -y -c conda-forge pyOpenSSL=23.2.0 && \
-    conda install -y -n base conda-libmamba-solver && \
+    conda install -y -n base conda-libmamba-solver=23.7.0 && \
     conda config --set solver libmamba
 
 RUN conda install -y --solver=libmamba -c conda-forge gdal=3.6.2 matplotlib=3.6.2 Cython=0.29.33 h5py=3.7.0 numba=0.56.4 \

base_images/r/docker/Dockerfile

@@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 # install maap-py library
 ENV MAAP_CONF='/maap-py/'
-RUN git clone --single-branch --branch v3.0.1 https://github.com/MAAP-Project/maap-py.git \
+RUN git clone --single-branch --branch v3.1.3 https://github.com/MAAP-Project/maap-py.git \
     && cd maap-py \
     && pip install -e .
 
@@ -17,7 +17,7 @@ WORKDIR /projects
 RUN sed -i -e 's/\/root/\/projects/g' /etc/passwd
 
 RUN conda install -y -c conda-forge pyOpenSSL=23.2.0 && \
-    conda install -y -n base conda-libmamba-solver && \
+    conda install -y -n base conda-libmamba-solver=23.7.0 && \
     conda config --set solver libmamba
 
 RUN conda install -y --solver=libmamba -c conda-forge r==4.2 r-rgdal==1.5_32 r-sf==1.0_7 r-irkernel==1.3.2 r-gridExtra==2.3 \

base_images/rgedi/docker/Dockerfile

@@ -2,7 +2,7 @@ FROM continuumio/miniconda3:4.12.0
 
 # install maap-py library
 ENV MAAP_CONF='/maap-py/'
-RUN git clone --single-branch --branch v3.0.1 https://github.com/MAAP-Project/maap-py.git \
+RUN git clone --single-branch --branch v3.1.3 https://github.com/MAAP-Project/maap-py.git \
     && cd maap-py \
     && pip install -e .
 
@@ -12,7 +12,7 @@ RUN sed -i -e 's/\/root/\/projects/g' /etc/passwd && echo "source activate r-wit
 RUN apt-get update && apt-get install -y libxt-dev && apt-get clean
 
 RUN conda install -y -c conda-forge pyOpenSSL=23.2.0 && \
-    conda install -y -n base conda-libmamba-solver && \
+    conda install -y -n base conda-libmamba-solver=23.7.0 && \
     conda config --set solver libmamba
 
 RUN conda install -y --solver=libmamba -c conda-forge nb_conda_kernels

base_images/vanilla/docker/Dockerfile

@@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 # install maap-py library
 ENV MAAP_CONF='/maap-py/'
-RUN git clone --single-branch --branch v3.0.1 https://github.com/MAAP-Project/maap-py.git \
+RUN git clone --single-branch --branch v3.1.3 https://github.com/MAAP-Project/maap-py.git \
     && cd maap-py \
     && pip install -e .
 
@@ -14,7 +14,7 @@ WORKDIR /projects
 RUN sed -i -e 's/\/root/\/projects/g' /etc/passwd
 
 RUN conda install -y -c conda-forge pyOpenSSL=23.2.0 && \
-    conda install -y -n base conda-libmamba-solver && \
+    conda install -y -n base conda-libmamba-solver=23.7.0 && \
     conda config --set solver libmamba
 
 RUN conda install -y --solver=libmamba -c conda-forge gdal=3.6.2 matplotlib=3.6.2 Cython=0.29.33 h5py=3.7.0 numba=0.56.4 \

jupyterlab3/docker/Dockerfile

@@ -51,18 +51,18 @@ RUN jupyter labextension disable @jupyterlab/apputils-extension:announcements
 ###############################
 # Custom Jupyter Extensions
 ###############################
-RUN jupyter labextension install @maap-jupyterlab/dps-jupyter-extension@0.4.6 --no-build
+RUN jupyter labextension install @maap-jupyterlab/dps-jupyter-extension@0.5.1 --no-build
 
 # PyPi package prepended with 'maap' so it more easily discoverable
-RUN pip install maap-jupyter-server-extension==1.1.1
+RUN pip install maap-jupyter-server-extension==1.2.2
 RUN jupyter server extension enable jupyter_server_extension
 
-RUN jupyter labextension install @maap-jupyterlab/algorithms_jupyter_extension@0.1.1 --no-build
+RUN jupyter labextension install @maap-jupyterlab/algorithms_jupyter_extension@0.2.0 --no-build
 RUN jupyter labextension install @maap-jupyterlab/[email protected] --no-build
 RUN jupyter labextension install @maap-jupyterlab/[email protected] --no-build
 RUN jupyter labextension install @maap-jupyterlab/[email protected] --no-build
 RUN jupyter labextension install @maap-jupyterlab/[email protected] --no-build
-RUN jupyter labextension install @maap-jupyterlab/[email protected].0 --no-build
+RUN jupyter labextension install @maap-jupyterlab/[email protected].1 --no-build
 RUN jupyter labextension install @maap-jupyterlab/[email protected] --no-build
 
 RUN jupyter lab build && \

jupyterlab3/environments.json

@@ -37,7 +37,7 @@
         "auth_server": "auth.maap-project.org",
         "mas_server": "mas.maap-project.org",
         "edsc_server": "ade.maap-project.org:30052",
-        "workspace_bucket": "maap-ops-dataset",
+        "workspace_bucket": "maap-ops-workspace",
         "default_host": false
     }
 ]