updated demo to v4 client

jpswinski · jpswinski · commit b741d0349f05 · 2023-09-30T15:30:00.000Z
diff --git a/demo/Makefile b/demo/Makefile
@@ -16,6 +16,7 @@ demo-docker: # make the python client demo docker image; needs VERSION
 	cp ../environment.yml $(DEMO_STAGE_DIR)
 	cp voila_demo.ipynb $(DEMO_STAGE_DIR)
 	cp docker/demo/* $(DEMO_STAGE_DIR)
+#	cp -R ../../sliderule $(DEMO_STAGE_DIR) # used to install local copy of client (only if necessary during development, see dockerfile for additional steps)
 	chmod +x $(DEMO_STAGE_DIR)/docker-entrypoint.sh
 	cd $(DEMO_STAGE_DIR) && docker build $(DOCKEROPTS) -t $(REPO)/demo-client:latest .
 	docker tag $(REPO)/demo-client:latest $(REPO)/demo-client:$(VERSION)
diff --git a/demo/docker/demo/Dockerfile b/demo/docker/demo/Dockerfile
@@ -12,23 +12,13 @@ RUN conda env create -f environment.yml
 SHELL ["conda", "run", "-n", "sliderule_env", "/bin/bash", "-c"]
 RUN conda install -c conda-forge voila
 
-# Install latest ipyleaflet
-RUN apt-get update && \
-  apt-get install -y --no-install-recommends \
-  build-essential \
-  && rm -rf /var/lib/apt/lists/*
-RUN conda install -c conda-forge -y yarn jupyter_packaging geopandas
-RUN cd /tmp && git clone https://github.com/jupyter-widgets/ipyleaflet.git
-RUN cd /tmp/ipyleaflet && \
-    pip install -e . && \
-    jupyter labextension develop . --overwrite
-RUN cd /tmp/ipyleaflet/js && \
-    yarn add webpack webpack-dev-server svg-url-loader --dev && \
-    yarn run build
-
 # Install Voila Demo
 COPY voila_demo.ipynb /voila_demo.ipynb
 
+# Local install of client (only if necessary)
+# COPY sliderule /sliderule
+# RUN cd /sliderule/clients/python && pip install .
+
 # Entry point
 COPY docker-entrypoint.sh /usr/local/etc/
 ENTRYPOINT ["/bin/bash"]
diff --git a/demo/voila_demo.ipynb b/demo/voila_demo.ipynb
@@ -252,9 +252,6 @@
     "    # set the url for the sliderule service\n",
     "    icesat2.init(url_textbox.value, loglevel=logging.ERROR, max_resources=1000)\n",
     "\n",
-    "    # sliderule asset and data release\n",
-    "    asset = SRwidgets.asset.value\n",
-    "\n",
     "    # build sliderule parameters using latest values from widget\n",
     "    atl06_parms = {\n",
     "        # surface type: 0-land, 1-ocean, 2-sea ice, 3-land ice, 4-inland water\n",
@@ -288,7 +285,7 @@
     "        atl06_parms[\"poly\"] = poly \n",
     "        # make the request to the SlideRule (ATL06-SR) endpoint\n",
     "        # and pass it the request parameters to request ATL06 Data\n",
-    "        elevations.append(icesat2.atl06p(atl06_parms, asset, callbacks={'eventrec': demo_logeventrec, 'exceptrec': demo_exceptrec}))\n",
+    "        elevations.append(icesat2.atl06p(atl06_parms, callbacks={'eventrec': demo_logeventrec, 'exceptrec': demo_exceptrec}))\n",
     "\n",
     "    # return concatenated set of results\n",
     "    gdf = geopandas.pd.concat(elevations)\n",
@@ -519,7 +516,7 @@
     "    }\n",
     "\n",
     "    # make call to sliderule\n",
-    "    rsps = icesat2.atl03sp(atl03_parms, asset)\n",
+    "    rsps = icesat2.atl03sp(atl03_parms)\n",
     "    \n",
     "    # return geodataframe\n",
     "    return rsps\n",
@@ -622,6 +619,13 @@
     "display.display(pc_output)\n",
     "display.display(show_code03_button, show_code03_output)"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
@@ -658,7 +662,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.6"
+   "version": "3.11.5"
   },
   "toc-showtags": false
  },
