update dependencies and clear CVE's

Author: Sean Sullivan

Dockerfile

@@ -11,7 +11,7 @@ COPY elastic_datashader /build/elastic_datashader
 WORKDIR /build/elastic_datashader
 RUN poetry build
 
-FROM python:3.11 AS deployment
+FROM python:3.11-slim AS deployment
 LABEL maintainer="foss@spectric.com"
 RUN useradd -d /home/datashader datashader && \
     mkdir -p /home/datashader /opt/elastic_datashader/tms-cache && \
@@ -23,8 +23,8 @@ COPY --from=builder /build/dist/*.whl /home/datashader/tmp/
 ENV PATH="$PATH:/home/datashader/.local/bin"
 RUN pip install --upgrade pip && \
     pip install --no-cache-dir /home/datashader/tmp/*.whl && \
-    pip install gunicorn==20.1.0 && \
-    pip install uvicorn==0.22.0
+    pip install gunicorn==21.2.0 && \
+    pip install uvicorn==0.24.0
 
 COPY deployment/logging_config.yml /opt/elastic_datashader/
 COPY deployment/gunicorn_config.py /opt/elastic_datashader/

elastic_datashader/routers/tms.py

@@ -149,8 +149,8 @@ def cached_response(es, idx, x, y, z, params, parameter_hash) -> Optional[Respon
 
         try:
             es.update(  # pylint: disable=E1123
-                ".datashader_tiles",
-                tile_id(idx, x, y, z, parameter_hash),
+                index=".datashader_tiles",
+                id=tile_id(idx, x, y, z, parameter_hash),
                 body={"script" : {"source": "ctx._source.cache_hits++"}},
                 retry_on_conflict=5,
             )

elastic_datashader/tilegen.py

@@ -969,7 +969,7 @@ def generate_tile(idx, x, y, z, headers, params, tile_width_px=256, tile_height_
 
         # Create base search
         base_s = get_search_base(config.elastic_hosts, headers, params, idx)
-        base_s = base_s[0:0]
+        #base_s = base_s[0:0]
         # Now find out how many documents
         count_s = copy.copy(base_s)[0:0] # slice of array sets from/size since we are aggregating the data we don't need the hits
         count_s = count_s.filter("geo_bounding_box", **{geopoint_field: bb_dict})
@@ -1023,7 +1023,7 @@ def generate_tile(idx, x, y, z, headers, params, tile_width_px=256, tile_height_
         geotile_precision = min(max(current_zoom, current_zoom + agg_zooms), MAXIMUM_PERCISION)
 
         tile_s = copy.copy(base_s)
-        tile_s = tile_s.params(size=0, track_total_hits=False)
+        tile_s = tile_s.params(track_total_hits=False)
         tile_s = tile_s.filter(
             "geo_bounding_box", **{geopoint_field: bb_dict}
         )

pyproject.toml

@@ -21,9 +21,9 @@ elastic_datashader = "elastic_datashader.cli:main"
 
 [tool.poetry.dependencies]
 python = ">=3.10,<4"
-elasticsearch = "7.17.4"
-elasticsearch-dsl = "7.4.0"
-datashader = "0.15.2"
+elasticsearch = "8.11.1"
+elasticsearch-dsl = "8.11.0"
+datashader = "0.16.0"
 pandas = "^1.5.3"
 colorcet = "^3.0.1"
 mercantile = "1.2.1"
@@ -32,11 +32,11 @@ Pillow = "*"
 pynumeral = "*"
 arrow = "*"
 python-datemath = "*"
-numba = "0.57.0"
+numba = "0.57.1"
 numpy = "^1.23"
 PyYAML = "*"
 humanize = "*"
-uvicorn = {extras = ["standard"], version = "^0.18.2", optional = true}
+uvicorn = {extras = ["standard"], version = "0.24.0", optional = true}
 fastapi = "^0.96"
 georgio = "2023.156.924"
 jinja2 = "3.1.2"