Foodwinepairing Build Optimization (#311)

* Added the print statement to check the execution flow.

* Changes for Food and Wine Pairing Module

* New Python Project for Food Wine Pairing - AI/ML

Added a service for Food Wine pairing.
Calling service from InventoryServiceOrderEventConsumer.
Service finds the suitable wines for the Food item and send the recommendedWines to user.

* Added sk-learn library and changed python to 3.7

* Given permission to sh files before commiting and deleted unnecessary files.

* added sh files of 777 permissions from Paul.

* install python 3.7 - Docker file updated

* install python using apt

* removed rm yum

* Added RUN each line to know the exact line errors

* removed sudo in Docker file and added apt-get update

* changed python3.7 to python.

* changed python version to initial one 3.6

* removed python-oci-sdk

* updated with python 3.7 workaround

* removed FROM oraclelinux:7-slim, added FROM ubuntu:18.04, to resolve apt issue

* set python 3.7 as defaukt

* fetched the latest code and updated foodwinepairing deployment yaml file

* returned no wines suggested

* initialized client with client builder

* added kubectl apply in deploy.sh

* changed hostname to localhost

* reverted url.

* cleared DB related stuffs in deployment yaml file

* cleared non-required configs from deployment yaml file

* added cx_oracle

* imported WineFoodPairings file in app.py

* added install pandas and numpy

* added nltk

* added matplotlib

* added ipython

* Assigned input to test food

* Fixed the issues which were there in 1st working version

* Added foodwinepairing-python in undeploy.sh

* Added the config for calling foodwinepairing service

* Added isSuggestiveSaleAIEnabled config in inventory-helidon deployment yaml

* corrected indentation of isSuggestiveSaleAIEnabled value

* added the same content from main branch to resolve conflicts

* added  foodwinepairing-python

* removed  foodwinepairing-python

* Added  foodwinepairing-python after resolving conflict

* removed the sysout statements

* removed foodwinepairing-python from grabdish/deploy.sh

* Stopwords and Tokenizers config kept only for English. Removed for other languages.

* Revert "Stopwords and Tokenizers config kept only for English. Removed for other languages."

This reverts commit 4b203c1.

* Removed the non-english stopwords and tokenizers which are used during model creation

* Optimized the food wine pairing build.

Using the oraclelinux:7-slim, python 3.6
Removed redundant software installtion like numpy(comes in gensim only)

Co-authored-by: prhirema <[email protected]>

Author: praveennhiremath

grabdish/deploy.sh

@@ -3,7 +3,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 #MS="frontend-helidon order-helidon supplier-helidon-se inventory-helidon inventory-springboot"
-MS="frontend-helidon order-helidon supplier-helidon-se inventory-helidon"
+MS="frontend-helidon order-helidon supplier-helidon-se inventory-helidon foodwinepairing-python"
 for s in $MS; do 
     echo ________________________________________
     echo "Deploying $s..."

grabdish/foodwinepairing-python/Dockerfile

@@ -1,44 +1,29 @@
-FROM ubuntu:18.04
+FROM oraclelinux:7-slim
 
 ARG release=19
 ARG update=9
 
+RUN  yum -y install oracle-release-el7 && \
+     yum-config-manager --enable ol7_oracle_instantclient && \
+     yum -y install oracle-instantclient${release}.${update}-basiclite && \
+     yum install -y oracle-epel-release-el7
+
 WORKDIR /app
 COPY foodwinepairing/requirements.txt .
 
-# Update apt packages
-RUN apt update
-RUN apt upgrade -y
-
-# Install python 3.7
-RUN apt install software-properties-common -y
-RUN add-apt-repository ppa:deadsnakes/ppa
-RUN apt install python3.7 -y
-
-# Make python 3.7 the default
-RUN echo "alias python=python3.7" >> ~/.bashrc
-RUN export PATH=${PATH}:/usr/bin/python3.7
-RUN /bin/bash -c "source ~/.bashrc"
-
-# Add 3.7 to the available alternatives
-RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.7 1
-
-# Set python3.7 as the default python
-RUN update-alternatives --set python /usr/bin/python3.7
-
-# Install pip
-RUN apt install python3-pip -y
-RUN python -m pip install --upgrade pip
+RUN yum install -y tar && \
+    yum install -y python36 && \
+    rm -rf /var/cache/yum && \
+    python3.6 -m pip install -U pip setuptools
 
 #wine-pairing dependencies
-RUN python -m pip install -U gensim
-RUN python -m pip install -U scikit-learn
-RUN python -m pip install -U pandas
-RUN python -m pip install -U numpy
-RUN python -m pip install -U nltk
-RUN python -m pip install -U matplotlib
-RUN python -m pip install -U ipython
-RUN python -m pip install -r requirements.txt
+RUN python3.6 -m pip install -U gensim && \
+	python3.6 -m pip install -U scikit-learn && \
+	python3.6 -m pip install -U pandas && \
+	python3.6 -m pip install -U nltk && \
+	python3.6 -m pip install -U matplotlib && \
+	python3.6 -m pip install -U ipython && \
+	python3.6 -m pip install -r requirements.txt
 
 #to locate if/where gunicorn is
 RUN find / -name "gunicorn"

workshops/dcms-oci/source.env

@@ -91,8 +91,8 @@ mkdir -p $DCMS_STATE_STORE $DCMS_STATE $DCMS_VAULT $DCMS_BACKGROUND_BUILDS $DCMS
 # Setup background build lists
 export LABS_WITH_BUILDS="Lab2 Lab3 Lab7"
 export LAB2_JAVA_BUILDS="frontend-helidon order-helidon supplier-helidon-se inventory-helidon"
-export LAB2_NON_JAVA_BUILDS=""
-#export LAB2_NON_JAVA_BUILDS="foodwinepairing-python"
+#export LAB2_NON_JAVA_BUILDS=""
+export LAB2_NON_JAVA_BUILDS="foodwinepairing-python"
 export LAB3_JAVA_BUILDS="inventory-helidon-se inventory-micronaut inventory-quarkus"
 export LAB3_NON_JAVA_BUILDS="inventory-python inventory-nodejs inventory-dotnet inventory-go inventory-plsql"
 export LAB7_JAVA_BUILDS="order-mongodb-kafka inventory-postgres-kafka"