Merge 'upstream/master' into jy-update-html-df-item-2.3

Author: jyaistMap

.github/workflows/DockerBuild.LambdaBaseImage.yaml

@@ -3,6 +3,23 @@ name: DockerBuild.LambdaImage
 on:
   # allow it to be run on-demand
   workflow_dispatch:
+    inputs:
+      version:
+        description: "Version of ArcGIS API for Python to install in the image"
+        type: string
+        default: "2.3.0"
+      python_version:
+        description: "Python version to base image on"
+        type: string
+        default: "3.11"
+      is_latest_release:
+        description: "Version of ArcGIS API for Python is Latest current release"
+        type: boolean
+        default: false
+      is_default_supported_python:
+        description: "Python version is default supported version (i.e. python used by Pro and Enterprise)"
+        type: boolean
+        default: false
 
 jobs:
   build-and-push:
@@ -31,10 +48,10 @@ jobs:
           images: |
             ghcr.io/esri/arcgis-python-api-lambda
           tags: |
-            type=raw,value=2.2.0,enable={{is_default_branch}}
-            type=raw,value=latest,enable={{is_default_branch}}
-            type=schedule,pattern={{date 'YY.MM'}},enable={{is_default_branch}}
-            type=sha,format=long
+            type=raw,value=${{ inputs.version }}-python${{ inputs.python_version }}
+            type=raw,value=${{ inputs.version }},enable=${{ inputs.is_default_supported_python && github.ref_name == github.event.repository.default_branch }}
+            type=raw,value=latest,enable=${{ inputs.is_latest_release && inputs.is_default_supported_python && github.ref_name == github.event.repository.default_branch }}
+            type=schedule,pattern={{date 'YY.MM'}},enable=${{ inputs.is_latest_release && inputs.is_default_supported_python && github.ref_name == github.event.repository.default_branch }}
 
       - id: docker_build
         name: Build image and push to GitHub Container Registry
@@ -43,6 +60,9 @@ jobs:
           # relative path to the place where source code with Dockerfile is located
           context: .
           file: ./docker/LambdaBaseImage.Dockerfile
+          build-args: |
+            python_version=${{ inputs.python_version }}
+            arcgis_version=${{ inputs.version }}
           tags: ${{ steps.meta.outputs.tags }}
           provenance: false
           platforms: linux/amd64

docker/LambdaBaseImage.Dockerfile

@@ -1,6 +1,6 @@
-ARG PYTHON_VERSION=3.9
-# lambda python image, defaults to python 3.9
-FROM public.ecr.aws/lambda/python:${PYTHON_VERSION}
+ARG python_version=3.11
+# lambda python image, defaults to python 3.11
+FROM public.ecr.aws/lambda/python:${python_version}
 
 # set metadata
 LABEL org.opencontainers.image.authors="[email protected]"
@@ -9,10 +9,11 @@ LABEL org.opencontainers.image.licenses=Apache
 LABEL org.opencontainers.image.source=https://github.com/esri/arcgis-python-api
 
 # install dependencies, then clean yum cache
-RUN yum -y install gcc krb5-devel krb5-server krb5-libs && yum clean all && rm -rf /var/cache/yum
+RUN yum -y install gcc gcc-c++ krb5-devel krb5-server krb5-libs && yum clean all && rm -rf /var/cache/yum
 # install arcgis
-ARG ARCGIS_PYTHON_VERSION=2.2.0
-RUN  pip3 install arcgis==${ARCGIS_PYTHON_VERSION} --target "${LAMBDA_TASK_ROOT}"
+ARG arcgis_version="2.3.0"
+# adding .* ensures the latest patch version is installed
+RUN  pip3 install "arcgis==${arcgis_version}.*" --target "${LAMBDA_TASK_ROOT}" && rm -rf /root/.cache/pip
 # set entrypoint to app.py handler method
 # (note that app.py is missing from this base image)
 CMD [ "app.handler" ]

guide/01-getting-started/install-and-set-up.ipynb

@@ -290,24 +290,24 @@
    "source": [
     "## Install in Google Colaboratory\n",
     "\n",
-    "[Google Colab](https://colab.research.google.com/) is a Google-hosted Jupyter notebook service that allows a user to access their notebooks from anywhere by storing them in [Google Drive](https://drive.google.com/). It requires no setup beyond creating a Google account, and provides free computing resources, including cloud-based GPUs. To learn more, refer to the [FAQ](https://research.google.com/colaboratory/faq.html) or [tutorial](https://colab.research.google.com/drive/16pBJQePbqkz3QFV54L4NIkOn1kwpuRrj).\n",
+    "[Google Colab](https://colab.research.google.com/) is a Google-hosted Jupyter notebook service that allows a user to access their notebooks from anywhere by storing them in [Google Drive](https://drive.google.com/). It requires no setup beyond creating a Google account, and provides free computing resources, including cloud-based GPUs. To learn more, refer to the [FAQ](https://research.google.com/colaboratory/faq.html) or [tutorial](https://colab.research.google.com/drive/16pBJQePbqkz3QFV54L4NIkOn1kwpuRrj). Colab is a very convenient platform for ArcGIS administration and management, as it allows a user to run scripts from wherever they have access to a Google account.\n",
     "\n",
-    "Google Colab runs in a cloud virtual machine that uses [Ubuntu](https://ubuntu.com), meaning that it can process bash commands in addition to Python logic. Any command with a `!` in front of it will be treated as if it were entered on the command line. This means that the ArcGIS API for Python can be installed with `pip`, provided that a small Colab-specific dependency detail is first taken care of.\n",
+    "Google Colab runs in a cloud virtual machine that uses [Ubuntu](https://ubuntu.com), meaning that it can process bash commands in addition to Python logic. Any command with a `!` in front of it will be treated as if it were entered on the command line. This means that the ArcGIS API for Python can be installed with `pip`.\n",
     "\n",
     "Follow the steps below to install:\n",
     "\n",
     "* If you have not already done so, register an account with Google and open a new Colab notebook.\n",
     "\n",
-    "* Add an empty code cell, and run `!sudo apt-get install libkrb5-dev`. This takes care of the dependency issue, allowing `pip` to complete an install of gssapi, which otherwise fails.\n",
-    "\n",
-    "* Add another cell and run `!pip install arcgis`.\n",
+    "* Add a cell and run `!pip install arcgis`.\n",
     "    - Note: if your account has already been working on a notebook (even a separate one), it may prompt you to restart your runtime in order for this to work. This well reset your environment variables without altering any of your code, allowing you to re-run these commands and install successfully.\n",
     "\n",
-    "* You can confirm the installation by running `!pip list`. The list should include arcgis along with all of the other packages found in a normal install.\n",
+    "* You can confirm the installation by running `!pip list`. The list should include arcgis along with all of the proper dependencies found in a normal arcgis install.\n",
+    "\n",
+    "* Run `import arcgis` to confirm that it works properly.\n",
     "\n",
-    "Currently, Google Colab is not readily compatible with the ArcGIS mapping widget. However, Colab is a very convenient platform for ArcGIS administration and management, as it allows a user to run scripts from wherever they have access to a Google account.\n",
+    "Currently, Google Colab is not readily compatible with the ArcGIS mapping widget, but may work with some functions that return iFrames, such as the `WebExperience.preview()` method. To enable these widgets (or any 3rd-party widget) in Colab, run `from google.colab import output` followed by `output.enable_custom_widget_manager()`. \n",
     "\n",
-    ">Note: At the time of writing this, this installation process works for the default version of Python that comes with Colab, 3.7.13. Functionality with other versions has not yet been confirmed."
+    ">Note: At the time of writing this, this installation process works for the default version of Python that comes with Colab, 3.10.12. This means that only ArcGIS 2.2.0 and higher can be installed, as prior versions are not compatible with Python 3.10+. Downgrading the Python version in Colab is possible, but may interfere with other dependencies needed to run ArcGIS."
    ]
   },
   {
@@ -564,7 +564,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -578,7 +578,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.11"
+   "version": "3.9.16"
   },
   "toc": {
    "base_numbering": 1,