From f0412861b892dcac1a53b41891e4569c088eddb5 Mon Sep 17 00:00:00 2001
From: Tomasz Trojanowski <tomasz.trojanowski@grapeup.com>
Date: Fri, 7 Jun 2024 08:14:00 +0200
Subject: [PATCH] feat: added changes to dockerfile and requirements

---
 Dockerfile                      | 46 ++++++++++++++++++---------------
 covalent_ui/webapp/package.json |  2 +-
 requirements.txt                | 22 +++++++++++++---
 3 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e1562bf5a..910f265bd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,7 +24,7 @@ ARG COVALENT_SOURCE=local
 # Options are sdk,server
 ARG COVALENT_INSTALL_TYPE=server
 # Must include a compatible version of Python
-ARG COVALENT_BASE_IMAGE=docker.io/python:3.8-slim-bullseye
+ARG COVALENT_BASE_IMAGE=docker.io/python:3.10-slim-bullseye
 
 ###################
 # Covalent Options
@@ -77,16 +77,16 @@ ARG COVALENT_LOGDIR
 ARG COVALENT_CACHE_DIR
 
 ENV PYTHONHASHSEED=random \
-    PYTHONUNBUFFERED=1 \
-    DEBIAN_FRONTEND=noninteractive \
-    BUILDROOT=/build \
-    INSTALLROOT=${COVALENT_ROOT} \
-    USER=covalent \
-    COVALENT_ROOT=${COVALENT_ROOT} \
-    COVALENT_CONFIG_DIR=${COVALENT_CONFIG_DIR} \
-    COVALENT_PLUGINS_DIR=${COVALENT_PLUGINS_DIR} \
-    COVALENT_LOGDIR=${COVALENT_LOGDIR} \
-    COVALENT_CACHE_DIR=${COVALENT_CACHE_DIR}
+  PYTHONUNBUFFERED=1 \
+  DEBIAN_FRONTEND=noninteractive \
+  BUILDROOT=/build \
+  INSTALLROOT=${COVALENT_ROOT} \
+  USER=covalent \
+  COVALENT_ROOT=${COVALENT_ROOT} \
+  COVALENT_CONFIG_DIR=${COVALENT_CONFIG_DIR} \
+  COVALENT_PLUGINS_DIR=${COVALENT_PLUGINS_DIR} \
+  COVALENT_LOGDIR=${COVALENT_LOGDIR} \
+  COVALENT_CACHE_DIR=${COVALENT_CACHE_DIR}
 
 USER root
 
@@ -280,7 +280,7 @@ EOL
 WORKDIR $INSTALLROOT
 USER $USER
 ENV PATH=$INSTALLROOT/.venv/bin:$PATH \
-    COVALENT_DISABLE_DASK=${COVALENT_DISABLE_DASK}
+  COVALENT_DISABLE_DASK=${COVALENT_DISABLE_DASK}
 
 ENTRYPOINT [ "python" ]
 
@@ -313,18 +313,22 @@ RUN <<EOL
   chown -R ${USER}:${USER} ${COVALENT_DATA_DIR}
 EOL
 
+RUN <<EOL
+  pip install --upgrade pip
+EOL
+
 USER $USER
 
 ENV COVALENT_SVC_PORT=${COVALENT_SVC_PORT} \
-    COVALENT_DATABASE_DIR=${COVALENT_DATABASE_DIR} \
-    COVALENT_DATABASE_URL=${COVALENT_DATABASE_URL} \
-    COVALENT_DATA_DIR=${COVALENT_DATA_DIR} \
-    COVALENT_DEBUG_MODE=${COVALENT_DEBUG_MODE} \
-    COVALENT_NUM_WORKERS=${COVALENT_NUM_WORKERS} \
-    COVALENT_THREADS_PER_WORKER=${COVALENT_THREADS_PER_WORKER} \
-    COVALENT_MEM_PER_WORKER=${COVALENT_MEM_PER_WORKER} \
-    COVALENT_DISABLE_DASK=${COVALENT_DISABLE_DASK} \
-    COVALENT_SERVER_IFACE_ANY=1
+  COVALENT_DATABASE_DIR=${COVALENT_DATABASE_DIR} \
+  COVALENT_DATABASE_URL=${COVALENT_DATABASE_URL} \
+  COVALENT_DATA_DIR=${COVALENT_DATA_DIR} \
+  COVALENT_DEBUG_MODE=${COVALENT_DEBUG_MODE} \
+  COVALENT_NUM_WORKERS=${COVALENT_NUM_WORKERS} \
+  COVALENT_THREADS_PER_WORKER=${COVALENT_THREADS_PER_WORKER} \
+  COVALENT_MEM_PER_WORKER=${COVALENT_MEM_PER_WORKER} \
+  COVALENT_DISABLE_DASK=${COVALENT_DISABLE_DASK} \
+  COVALENT_SERVER_IFACE_ANY=1
 
 EXPOSE ${COVALENT_SVC_PORT}
 
diff --git a/covalent_ui/webapp/package.json b/covalent_ui/webapp/package.json
index 988689bb9..5de037c9d 100644
--- a/covalent_ui/webapp/package.json
+++ b/covalent_ui/webapp/package.json
@@ -42,7 +42,7 @@
   },
   "scripts": {
     "start": "react-scripts start",
-    "build": "react-scripts build",
+    "build": "NODE_OPTIONS=--openssl-legacy-provider react-scripts build",
     "build-demo": "REACT_APP_DEMO=true BUILD_PATH=build-demo react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
diff --git a/requirements.txt b/requirements.txt
index 886884819..36adbcc16 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,6 @@ boto3>=1.26.110
 click>=8.1.3
 cloudpickle>=2.0.0
 dask[distributed]>=2022.6.0
-fastapi>=0.100.0
 filelock>=3.12.2
 furl>=2.1.3
 lmdbm>=0.0.5
@@ -15,16 +14,33 @@ networkx>=2.8.6
 orjson>=3.8.10
 pennylane>=0.31.1,<0.33.0
 psutil>=5.9.0
-pydantic>=2.1.1
 python-multipart>=0.0.6
 python-socketio>=5.7.1
 requests>=2.24.0
 rich>=12.0.0,<=13.3.5
 simplejson>=3.17.6
-sqlalchemy>=1.4.37,<2.0.0
 sqlalchemy_utils>=0.38.3
 toml>=0.10.2
 typing-extensions>=4.8.0
 uvicorn[standard]==0.18.3
 watchdog>=2.2.1
 werkzeug>=2.0.3
+psycopg2-binary>=2.9.9
+pydantic>=2.5.3
+uuid>=1.30
+datetime>=5.4
+py-automapper>=1.2.3
+sqlalchemy>=1.4.51
+alembic
+sqlalchemy-stubs>=0.4
+pandas==2.1.4
+openpyxl
+dask==2024.1.0
+langchain>=0.2.0
+langchain-openai>=0.1.7
+langchain-community>=0.2.0 
+transformers>=4.41.0
+boto3>=1.34.64
+matplotlib>=3.9.0
+seaborn>=0.13.2
+scikit-learn
\ No newline at end of file