Further fixing

Dockerfile

@@ -2,22 +2,25 @@ FROM python:3.7-slim as builder
 
 RUN apt update && \
     apt install --no-install-recommends -y build-essential gcc
-COPY requirements_personal.txt /req.txt
+
+COPY requirements.txt /requirements.txt
 
 RUN python -m pip install --upgrade pip && \
-    pip install --no-cache-dir --no-warn-script-location --user -r req.txt && \
+    pip install --no-cache-dir --no-warn-script-location --user -r requirements.txt && \
     pip install --no-cache-dir --no-warn-script-location --user typing-extensions -U
 
 # Stage 2: Runtime
 FROM nvidia/cuda:11.0.3-cudnn8-runtime
+ENV GRADIO_SERVER_NAME=0.0.0.0
+ENV TZ=America/New_York
 
-RUN rm /etc/apt/sources.list.d/cuda.list
-RUN rm /etc/apt/sources.list.d/nvidia-ml.list
+RUN rm /etc/apt/sources.list.d/cuda.list && \
+    rm /etc/apt/sources.list.d/nvidia-ml.list
 
-ENV TZ=America/New_York
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN apt update && \
+    apt remove -y python3 python
     apt install --no-install-recommends -y build-essential software-properties-common libgl1-mesa-glx && \
     add-apt-repository -y ppa:deadsnakes/ppa && \
     apt install --no-install-recommends -y python3.7 python3.7-distutils && \
@@ -29,5 +32,5 @@ COPY app.py app.py
 
 # RUN ln -s /usr/local/cuda/lib64/libcusolver.so.11 /usr/local/cuda/lib64/libcusolver.so.10
 
-CMD ["python3", "app.py"]
+CMD ["python3", "-u", "app.py"]
 EXPOSE 7860

Dockerfile.bkup

@@ -1,18 +0,0 @@
-FROM continuumio/miniconda3
-EXPOSE 7860
-
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends libgl1-mesa-glx && \
-    apt-get install -y --no-install-recommends libglib2.0-0 && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV GRADIO_SERVER_NAME=0.0.0.0
-WORKDIR /workspace
-
-ADD environment.yaml /workspace/environment.yaml
-RUN conda env update -n base --file environment.yaml && \
-    pip install typing-extensions -U
-
-ADD app.py /workspace/
-CMD [ "python" , "/workspace/app.py" ]

app.py

@@ -2,7 +2,7 @@ from fawkes.protection import Fawkes
 import gradio as gr
 import os
 
-def predict(level, img):
+def predict(img, level):
   # print(img)
   fwks = Fawkes("extractor_2", '0', 1, mode=level)
   fwks.run_protection([img], format='jpeg')
@@ -10,6 +10,6 @@ def predict(level, img):
   print(os.listdir('/tmp'))
   return splt[0] + "_cloaked.jpeg"
 
-gr.Interface(fn=predict, inputs=[gr.components.Dropdown(["low", "mid", "high"], label="Protection Level"),
-                                 gr.components.Image(type='filepath')],
-                                 outputs=gr.components.Image(type="pil")).launch(show_error=True, server_name="0.0.0.0")
+gr.Interface(fn=predict, inputs=[gr.components.Image(type='filepath'),
+                                 gr.components.Radio(["low", "mid", "high"], label="Protection Level")],
+                                 outputs=gr.components.Image(type="pil"), allow_flagging="never").launch(show_error=True, quiet=False)

environment.yaml

@@ -1,123 +0,0 @@
-name: gradio
-channels:
-  - nvidia
-  - conda-forge
-  - defaults
-dependencies:
-  - _libgcc_mutex=0.1=main
-  - _openmp_mutex=5.1=1_gnu
-  - ca-certificates=2022.9.24=ha878542_0
-  - certifi=2022.9.24=pyhd8ed1ab_0
-  - cudatoolkit=11.0.221=h6bb024c_0
-  - cudnn=8.0.4=cuda11.0_0
-  - libedit=3.1.20210910=h7f8727e_0
-  - libffi=3.2.1=hf484d3e_1007
-  - libgcc-ng=11.2.0=h1234567_1
-  - libgomp=11.2.0=h1234567_1
-  - libstdcxx-ng=11.2.0=h1234567_1
-  - ncurses=6.3=h5eee18b_3
-  - openssl=1.1.1o=h166bdaf_0
-  - pip=22.2.2=py38h06a4308_0
-  - python=3.8.0=h0371630_2
-  - readline=7.0=h7b6447c_5
-  - setuptools=63.4.1=py38h06a4308_0
-  - sqlite=3.33.0=h62c20be_0
-  - tk=8.6.12=h1ccaba5_0
-  - wheel=0.37.1=pyhd3eb1b0_0
-  - xz=5.2.6=h5eee18b_0
-  - zlib=1.2.12=h5eee18b_3
-  - pip:
-    - absl-py==0.15.0
-    - aiohttp==3.8.3
-    - aiosignal==1.2.0
-    - analytics-python==1.4.0
-    - anyio==3.6.1
-    - astunparse==1.6.3
-    - async-timeout==4.0.2
-    - attrs==22.1.0
-    - backoff==1.10.0
-    - bcrypt==4.0.1
-    - bleach==5.0.1
-    - cachetools==5.2.0
-    - cffi==1.15.1
-    - charset-normalizer==2.1.1
-    - click==8.1.3
-    - contourpy==1.0.5
-    - cryptography==38.0.1
-    - cycler==0.11.0
-    - fastapi==0.76.0
-    - fawkes==1.0.4
-    - ffmpy==0.3.0
-    - flatbuffers==1.12
-    - fonttools==4.37.4
-    - frozenlist==1.3.1
-    - fsspec==2022.8.2
-    - gast==0.3.3
-    - google-auth==2.12.0
-    - google-auth-oauthlib==0.4.6
-    - google-pasta==0.2.0
-    - gradio==3.0.20
-    - grpcio==1.32.0
-    - h11==0.14.0
-    - h5py==2.10.0
-    - idna==3.4
-    - importlib-metadata==5.0.0
-    - jinja2==3.1.2
-    - keras==2.4.3
-    - keras-preprocessing==1.1.2
-    - kiwisolver==1.4.4
-    - linkify-it-py==1.0.3
-    - markdown==3.4.1
-    - markdown-it-py==2.1.0
-    - markupsafe==2.1.1
-    - matplotlib==3.6.1
-    - mdit-py-plugins==0.3.1
-    - mdurl==0.1.2
-    - monotonic==1.6
-    - mtcnn==0.1.1
-    - multidict==6.0.2
-    - numpy==1.19.5
-    - oauthlib==3.2.1
-    - opencv-python==4.6.0.66
-    - opt-einsum==3.3.0
-    - orjson==3.8.0
-    - packaging==21.3
-    - pandas==1.4.4
-    - paramiko==2.11.0
-    - pillow==9.2.0
-    - protobuf==3.19.6
-    - pyasn1==0.4.8
-    - pyasn1-modules==0.2.8
-    - pycparser==2.21
-    - pycryptodome==3.15.0
-    - pydantic==1.9.2
-    - pydub==0.25.1
-    - pynacl==1.5.0
-    - pyparsing==3.0.9
-    - python-dateutil==2.8.2
-    - python-multipart==0.0.5
-    - pytz==2022.4
-    - pyyaml==6.0
-    - requests==2.28.1
-    - requests-oauthlib==1.3.1
-    - rsa==4.9
-    - scipy==1.9.2
-    - six==1.15.0
-    - sniffio==1.3.0
-    - starlette==0.18.0
-    - tensorboard==2.10.1
-    - tensorboard-data-server==0.6.1
-    - tensorboard-plugin-wit==1.8.1
-    - tensorflow==2.4.1
-    - tensorflow-estimator==2.4.0
-    - termcolor==1.1.0
-    - typing-extensions
-    - uc-micro-py==1.0.1
-    - urllib3==1.26.12
-    - uvicorn==0.18.3
-    - webencodings==0.5.1
-    - werkzeug==2.2.2
-    - wrapt==1.12.1
-    - yarl==1.8.1
-    - zipp==3.9.0
-prefix: /opt/conda/envs/gradio

requirements.txt

@@ -1,95 +1,2 @@
-absl-py==0.15.0
-aiohttp==3.8.3
-aiosignal==1.3.1
-analytics-python==1.4.0
-anyio==3.6.2
-astunparse==1.6.3
-async-timeout==4.0.2
-asynctest==0.13.0
-attrs==22.1.0
-backoff==1.10.0
-bcrypt==4.0.1
-bleach==5.0.1
-cachetools==5.2.0
-certifi==2022.9.24
-cffi==1.15.1
-charset-normalizer==2.1.1
-click==8.1.3
-cryptography==38.0.3
-cycler==0.11.0
-fastapi==0.76.0
-fawkes==1.0.4
-ffmpy==0.3.0
-flatbuffers==1.12
-fonttools==4.38.0
-frozenlist==1.3.3
-fsspec==2022.10.0
-gast==0.3.3
-google-auth==2.14.1
-google-auth-oauthlib==0.4.6
-google-pasta==0.2.0
-gradio==3.0.20
-grpcio==1.32.0
-h11==0.14.0
-h5py==2.10.0
-idna==3.4
-importlib-metadata==5.0.0
-Jinja2==3.1.2
-Keras==2.4.3
-Keras-Preprocessing==1.1.2
-kiwisolver==1.4.4
-linkify-it-py==1.0.3
-Markdown==3.4.1
-markdown-it-py==2.1.0
-MarkupSafe==2.1.1
-matplotlib==3.5.3
-mdit-py-plugins==0.3.1
-mdurl==0.1.2
-monotonic==1.6
-mtcnn==0.1.1
-multidict==6.0.2
-numpy==1.19.5
-oauthlib==3.2.2
-opencv-python==4.6.0.66
-opt-einsum==3.3.0
-orjson==3.8.1
-packaging==21.3
-pandas==1.3.5
-paramiko==2.12.0
-Pillow==9.3.0
-pkg_resources==0.0.0
-protobuf==3.20.3
-pyasn1==0.4.8
-pyasn1-modules==0.2.8
-pycparser==2.21
-pycryptodome==3.15.0
-pydantic==1.9.2
-pydub==0.25.1
-PyNaCl==1.5.0
-pyparsing==3.0.9
-python-dateutil==2.8.2
-python-multipart==0.0.5
-pytz==2022.6
-PyYAML==6.0
-requests==2.28.1
-requests-oauthlib==1.3.1
-rsa==4.9
-scipy==1.7.3
-six==1.15.0
-sniffio==1.3.0
-starlette==0.18.0
-tensorboard==2.11.0
-tensorboard-data-server==0.6.1
-tensorboard-plugin-wit==1.8.1
-tensorflow==2.4.1
-tensorflow-estimator==2.4.0
-termcolor==1.1.0
-typing_extensions==4.4.0
-uc-micro-py==1.0.1
-urllib3==1.26.12
-uvicorn==0.19.0
-webencodings==0.5.1
-Werkzeug==2.2.2
-wrapt==1.12.1
-yarl==1.8.1
-zipp==3.10.0
+gradio==3.21.0
+fawkes==1.0.4

requirements_personal.txt

@@ -1,2 +0,0 @@
-gradio==3.14.0
-fawkes==1.0.4