Updates to readme and packages (#117)

Co-authored-by: Sagar Manohar <Sagar.Mohan.Manohar@ibm.com>

Author: code247

README.md

@@ -55,7 +55,7 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
 # PyTorch
 # persistent as it fails often
 RUN while ! pip list | grep torch ;\
-    do pip install torch ; done ;\
+    do pip --no-cache-dir install torch ; done ;\
     while ! pip list | grep torchvision ;\
     do pip install torchvision ; done
 
@@ -64,6 +64,7 @@ RUN curl -L https://downloads.rclone.org/rclone-current-linux-amd64.deb -o rclon
     && dpkg -i rclone.deb \
     && rm rclone.deb
 
+COPY requirements_common.txt requirements_common.txt
 COPY requirements.txt requirements.txt
 RUN pip3 install --upgrade pip six wheel &&\
     pip3 install --no-cache-dir -r requirements.txt &&\
@@ -89,4 +90,5 @@ ENV OW_EXECUTION_ENV=openwhisk/action-python-v3.6-ai
 ENV OW_COMPILER=/bin/compile
 # use utf-8
 ENV PYTHONIOENCODING=UTF-8
+
 ENTRYPOINT ["/bin/proxy"]

core/python36AiAction/Dockerfile

@@ -20,6 +20,7 @@ apply from: '../../gradle/docker.gradle'
 
 distDocker.dependsOn 'copyLib'
 distDocker.dependsOn 'copyBin'
+distDocker.dependsOn 'copyReqrCommon'
 distDocker.finalizedBy('cleanup')
 
 task copyLib(type: Copy) {
@@ -32,7 +33,13 @@ task copyBin(type: Copy) {
     into './bin'
 }
 
+task copyReqrCommon(type: Copy) {
+    from '../requirements_common.txt'
+    into './'
+}
+
 task cleanup(type: Delete) {
     delete 'bin'
     delete 'lib'
+    delete 'requirements_common.txt'
 }

core/python36AiAction/build.gradle

@@ -1,44 +1,32 @@
-# default available packages for python3action
-beautifulsoup4 == 4.8.2
-httplib2 == 0.17.0
-kafka_python == 1.4.7
-lxml == 4.5.0
-python-dateutil == 2.8.1
-requests == 2.22.0
-scrapy == 1.8.0
-simplejson == 3.17.0
-virtualenv == 16.7.9
-twisted == 19.10.0
-netifaces == 0.10.9
+# default packages available for action-python-v3.6-ai
+-r requirements_common.txt
 
 # package to sync from a variety of cloud blob storage
 python-rclone == 0.0.2
 
 # more ML/DL packages
-keras == 2.3.1
-opencv-contrib-python == 4.2.0.32
-Cython == 0.29.14
-tools == 0.1.9
-scikit-image == 0.16.2
-
-nltk == 3.4.5
-
-PyJWT == 1.7.1
+keras==2.6.0
+opencv-contrib-python==4.5.3.56
+Cython==0.29.24
+tools==0.1.9
+scikit-image==0.17.2
+nltk==3.6.2
 
 # packages for numerics
-numpy == 1.18.1
-scikit-learn == 0.22.1
-scipy == 1.4.1
-pandas == 1.0.1
+numpy==1.19.5
+scikit-learn==0.24.2
+scipy==1.5.4
+pandas==1.1.5
 
 # packages for image processing
-Pillow == 7.0.0
+Pillow==8.3.2
 
 # Etc
-pymongo == 3.10.1
-redis == 3.4.1
-pika == 1.1.0
-elasticsearch == 7.5.1
-cassandra-driver == 3.21.0
-etcd3 == 0.11.1
-twilio == 6.35.4
+PyJWT==1.7.1
+pymongo==3.12.0
+redis==3.5.3
+pika==1.2.0
+elasticsearch==7.14.1
+cassandra-driver==3.25.0
+etcd3==0.12.0
+twilio==6.63.2

core/python36AiAction/requirements.txt

@@ -39,14 +39,18 @@ FROM python:3.9-buster
 ARG GO_PROXY_BUILD_FROM=release
 
 # Install common modules for python
+COPY requirements_common.txt requirements_common.txt
 COPY requirements.txt requirements.txt
-RUN pip install --no-cache-dir -r requirements.txt
+RUN pip3 install --upgrade pip six wheel &&\
+    pip3 install --no-cache-dir -r requirements.txt
 
 RUN mkdir -p /action
 WORKDIR /
+
 COPY --from=builder_source /bin/proxy /bin/proxy_source
 COPY --from=builder_release /bin/proxy /bin/proxy_release
 RUN mv /bin/proxy_${GO_PROXY_BUILD_FROM} /bin/proxy
+
 ADD bin/compile /bin/compile
 ADD lib/launcher.py /lib/launcher.py
 

core/python39Action/Dockerfile

@@ -20,6 +20,7 @@ apply from: '../../gradle/docker.gradle'
 
 distDocker.dependsOn 'copyLib'
 distDocker.dependsOn 'copyBin'
+distDocker.dependsOn 'copyReqrCommon'
 distDocker.finalizedBy('cleanup')
 
 task copyLib(type: Copy) {
@@ -32,7 +33,13 @@ task copyBin(type: Copy) {
     into './bin'
 }
 
+task copyReqrCommon(type: Copy) {
+    from '../requirements_common.txt'
+    into './'
+}
+
 task cleanup(type: Delete) {
     delete 'bin'
     delete 'lib'
+    delete 'requirements_common.txt'
 }

core/python39Action/build.gradle

@@ -1,12 +1,2 @@
-# default available packages for action-python-v39
-beautifulsoup4 == 4.9.3
-httplib2 == 0.19.1
-kafka_python == 1.4.7
-lxml == 4.6.3
-python-dateutil == 2.8.1
-requests == 2.25.1
-scrapy == 1.8.0
-simplejson == 3.17.2
-virtualenv == 20.4.7
-twisted == 21.2.0
-netifaces == 0.11.0
+# default packages available for action-python-v3.9
+-r requirements_common.txt

core/python39Action/requirements.txt

@@ -39,14 +39,18 @@ FROM python:3.7-buster
 ARG GO_PROXY_BUILD_FROM=release
 
 # Install common modules for python
+COPY requirements_common.txt requirements_common.txt
 COPY requirements.txt requirements.txt
-RUN pip install --no-cache-dir -r requirements.txt
+RUN pip3 install --upgrade pip six wheel &&\
+    pip3 install --no-cache-dir -r requirements.txt
 
 RUN mkdir -p /action
 WORKDIR /
+
 COPY --from=builder_source /bin/proxy /bin/proxy_source
 COPY --from=builder_release /bin/proxy /bin/proxy_release
 RUN mv /bin/proxy_${GO_PROXY_BUILD_FROM} /bin/proxy
+
 ADD bin/compile /bin/compile
 ADD lib/launcher.py /lib/launcher.py
 

core/python3Action/Dockerfile

@@ -17,3 +17,15 @@
 
 ext.dockerImageName = 'action-python-v3.7'
 apply from: '../../gradle/docker.gradle'
+
+distDocker.dependsOn 'copyReqrCommon'
+distDocker.finalizedBy('cleanup')
+
+task copyReqrCommon(type: Copy) {
+    from '../requirements_common.txt'
+    into './'
+}
+
+task cleanup(type: Delete) {
+    delete 'requirements_common.txt'
+}

core/python3Action/build.gradle

@@ -1,11 +1,2 @@
-# default available packages for python3action
-beautifulsoup4 == 4.6.3
-httplib2 == 0.11.3
-kafka_python == 1.4.3
-lxml == 4.2.5
-python-dateutil == 2.7.3
-requests == 2.19.1
-scrapy == 1.5.1
-simplejson == 3.16.0
-virtualenv == 16.0.0
-twisted == 18.7.0
+# default packages available for action-python-v3.7
+-r requirements_common.txt