elastichash and python update

Author: nik-ko

README.md

@@ -17,6 +17,12 @@ https://uni-marburg.de/ntzdY
 
 ![Demo](images/demo.png)
 
+## Install
+
+If you don't need the whole system but only the Elasticsearch index please use [elastichash](https://github.com/nik-ko/elastichash/) package:
+
+`pip install elastichash`
+
 ## Usage
 
 Perform image similarity search on ~7M images of the OpenImages dataset.

dh/app/util.py

@@ -19,7 +19,7 @@ def get_hashcode_str(floatarr):
     :param floatarr: np.array
     :return: string
     """
-    code = (floatarr > 0).astype(np.int)
+    code = (floatarr > 0).astype(int)
     s = "".join(map(str, code))
     return s
 

dh/docker-compose.yaml

@@ -13,7 +13,7 @@ services:
       - TF_SERVING_HOST=tf-serving
       - TF_SERVING_PORT=8501
       - TF_MODELNAME=${TF_MODELNAME}
-      - GUNICORN_WORKERS=4
+      - GUNICORN_WORKERS=5
       - IMG_WIDTH=300
       - IMG_HEIGHT=300
 
@@ -48,7 +48,8 @@ services:
 
   elasticsearch:
     container_name: dh_elasticsearch
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.6.2
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.10.4 # 7.17.13 #8.10.4
+    # First upgrade to 7.17, see https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-upgrade.html
     restart: always
     environment:
       - "ES_JAVA_OPTS=-Xms768m -Xmx768m"

dh/docker/Dockerfile

@@ -1,7 +1,8 @@
-FROM python:3.7.3-slim
+FROM python:3.10
 RUN apt update && apt install -y wget
 RUN python -m pip install --upgrade --force-reinstall pip
 COPY app/requirements.txt .
+RUN python -m pip install -U --force-reinstall pip
 RUN pip3 install --no-cache-dir -r requirements.txt
 RUN rm requirements.txt
 RUN rm -rf ~/.cache ~/.local

experiments/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7.3-slim
+FROM python:3.10
 RUN apt update && apt install -y wget libpq-dev python-dev build-essential gcc
 RUN pip install --upgrade pip
 RUN pip3 install \
@@ -19,4 +19,4 @@ RUN rm -rf ~/.cache ~/.local
 
 EXPOSE 8888
 
-CMD ["jupyter", "lab", "--allow-root", "--ip",  "0.0.0.0"]
+CMD ["jupyter", "lab", "--allow-root", "--ip",  "0.0.0.0"]