diff options
27 files changed, 46 insertions, 43 deletions
@@ -7,10 +7,14 @@ FaceQuery.me, mozilla, nytimes - miniconda / python3.6 - mysql - nvm, node +- redis +- nginx ``` +conda create -n megapixels python=3.6 conda install pytorch torchvision -c pytorch conda install faiss-cpu -c pytorch +conda install tensorflow pip install numpy Pillow pip install dlib pip install requests simplejson click pdfminer.six @@ -18,6 +22,7 @@ pip install urllib3 flask flask_sqlalchemy mysql-connector pip install pymediainfo tqdm opencv-python imutils pip install scikit-image python-dotenv imagehash scikit-learn colorlog pip install celery keras tensorflow +pip install python.app # OSX only! sudo apt-get install libmysqlclient-dev @@ -43,5 +48,13 @@ python cli_faiss.py sync_metadata python cli_faiss.py build_faiss python cli_faiss.py build_db python cli_site.py build +``` + +## Running the site + +``` python cli_flask.py run +python `which celery` worker -A app.server.tasks --loglevel=info -E +redis-server /usr/local/etc/redis.conf +npm run watch ``` diff --git a/megapixels/app/server/tasks/demo.py b/megapixels/app/server/tasks/demo.py index c27b08b5..f7db9034 100644 --- a/megapixels/app/server/tasks/demo.py +++ b/megapixels/app/server/tasks/demo.py @@ -67,14 +67,13 @@ def demo_task(self, uuid_name, fn): step('Loading image') self.update_state(state='PROCESSING', meta=meta) - # os.path.join('/user_content/', fn) - # ------------------------------------------------- # init here # load image im = cv.imread(fn) im_resized = im_utils.resize(im, width=opt_size[0], height=opt_size[1]) + os.remove(fn) # ---------------------------------------------------------------------------- # detect face diff --git a/site/assets/css/css.css b/site/assets/css/css.css index eed1ff48..8239cfc7 100644 --- a/site/assets/css/css.css +++ b/site/assets/css/css.css @@ -134,8 +134,8 @@ h1 { } h2 { color: #ddd; - font-weight: 300; - font-size: 18pt; + font-weight: 400; + font-size: 28pt; margin: 20px 0 10px; padding: 0; transition: color 0.2s cubic-bezier(0,0,1,1); @@ -147,6 +147,13 @@ h3 { font-weight: 500; transition: color 0.2s cubic-bezier(0,0,1,1); } +h4 { + margin: 0 0 10px 0; + padding: 0; + font-size: 11pt; + font-weight: 500; + transition: color 0.2s cubic-bezier(0,0,1,1); +} .content h3 a { color: #888; text-decoration: none; @@ -156,7 +163,7 @@ h3 { text-decoration: underline; } -th, .gray, h3 { +th, .gray, h3, h4 { font-family: 'Roboto Mono', monospace; font-weight: 400; text-transform: uppercase; @@ -220,7 +227,9 @@ p { .right-sidebar { float: right; width: 200px; - margin-left: 40px; + margin-left: 20px; + padding-left: 20px; + border-left: 1px solid #444; } .right-sidebar .meta { flex-direction: column; @@ -433,6 +442,7 @@ section.fullwidth .image { color: #fff; } .intro .under { + font-size: 12px; color: #888; } .intro .under a { diff --git a/site/public/about/credits/index.html b/site/public/about/credits/index.html index 025c0ffd..fecc6c7b 100644 --- a/site/public/about/credits/index.html +++ b/site/public/about/credits/index.html @@ -18,7 +18,6 @@ <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <span class='sub'>The Darkside of Datasets</span> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/about/disclaimer/index.html b/site/public/about/disclaimer/index.html index 1bfb8bfb..a108baa0 100644 --- a/site/public/about/disclaimer/index.html +++ b/site/public/about/disclaimer/index.html @@ -18,7 +18,6 @@ <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <span class='sub'>The Darkside of Datasets</span> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/about/index.html b/site/public/about/index.html index 025c0ffd..fecc6c7b 100644 --- a/site/public/about/index.html +++ b/site/public/about/index.html @@ -18,7 +18,6 @@ <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <span class='sub'>The Darkside of Datasets</span> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/about/press/index.html b/site/public/about/press/index.html index 5a4e198b..b9dd97c2 100644 --- a/site/public/about/press/index.html +++ b/site/public/about/press/index.html @@ -18,7 +18,6 @@ <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <span class='sub'>The Darkside of Datasets</span> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/about/privacy/index.html b/site/public/about/privacy/index.html index ab4f12b8..92a1b9a8 100644 --- a/site/public/about/privacy/index.html +++ b/site/public/about/privacy/index.html @@ -18,7 +18,6 @@ <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <span class='sub'>The Darkside of Datasets</span> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/about/terms/index.html b/site/public/about/terms/index.html index 72c1b670..fd17b4d9 100644 --- a/site/public/about/terms/index.html +++ b/site/public/about/terms/index.html @@ -18,7 +18,6 @@ <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <span class='sub'>The Darkside of Datasets</span> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/datasets/index.html b/site/public/datasets/index.html index 4d6f57b6..77c5ab2b 100644 --- a/site/public/datasets/index.html +++ b/site/public/datasets/index.html @@ -18,7 +18,6 @@ <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <span class='sub'>The Darkside of Datasets</span> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/datasets/lfw/index.html b/site/public/datasets/lfw/index.html index 0deeb6be..3f7dce60 100644 --- a/site/public/datasets/lfw/index.html +++ b/site/public/datasets/lfw/index.html @@ -18,7 +18,6 @@ <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <span class='sub'>The Darkside of Datasets</span> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/datasets/vgg_face2/index.html b/site/public/datasets/vgg_face2/index.html index 6e6c7ac1..b7ba5a4c 100644 --- a/site/public/datasets/vgg_face2/index.html +++ b/site/public/datasets/vgg_face2/index.html @@ -18,7 +18,6 @@ <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <span class='sub'>The Darkside of Datasets</span> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/index.html b/site/public/index.html index a684b921..b322b093 100644 --- a/site/public/index.html +++ b/site/public/index.html @@ -18,7 +18,6 @@ <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <span class='sub'>The Darkside of Datasets</span> </a> <div class='links'> <a href="/datasets/">Datasets</a> @@ -34,15 +33,16 @@ </div> <div class='intro'> <div class='headline'> - MegaPixels is an art project that explores the dark side of face recognition and the future of computer vision. + MegaPixels is an art project that explores the dark side of face recognition datasets and the future of computer vision. </div> <div class='buttons'> - <a href="/datasets/"><button class='important'>Explore Datasets</button></a><a href="/analyze/"><button class='normal'>Analyze Your Face</button></a> + <a href="/datasets/"><button class='important'>Find Your Face</button></a> + <a href="/analyze/"><button class='normal'>Analyze Your Face</button></a> </div> <div class='under'> - Made by Adam Harvey in partnership with Mozilla.<br/> + Made by Adam Harvey in collaboration with Jules Laplace, and in partnership with Mozilla.<br/> <a href='/about/'>Read more about MegaPixels</a> </div> </div> @@ -51,6 +51,7 @@ <section class='wide'> <h2>Facial Recognition Datasets</h2> <div class='right-sidebar'> + <h4>SUMMARY</h4> <div class='meta'> <div><div class='gray'>Found</div><div>275 datasets</div></div> <div><div class='gray'>Created between</div><div>1993-2018</div></div> diff --git a/site/public/info/index.html b/site/public/info/index.html index 0d7b2d2e..d3a7d549 100644 --- a/site/public/info/index.html +++ b/site/public/info/index.html @@ -18,7 +18,6 @@ <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <span class='sub'>The Darkside of Datasets</span> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/research/00_introduction/index.html b/site/public/research/00_introduction/index.html index edaf8206..b6cc8e4a 100644 --- a/site/public/research/00_introduction/index.html +++ b/site/public/research/00_introduction/index.html @@ -18,7 +18,6 @@ <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <span class='sub'>The Darkside of Datasets</span> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/research/01_from_1_to_100_pixels/index.html b/site/public/research/01_from_1_to_100_pixels/index.html index e24e5d9a..4446e1be 100644 --- a/site/public/research/01_from_1_to_100_pixels/index.html +++ b/site/public/research/01_from_1_to_100_pixels/index.html @@ -18,7 +18,6 @@ <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <span class='sub'>The Darkside of Datasets</span> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/research/index.html b/site/public/research/index.html index cfaa039b..56348040 100644 --- a/site/public/research/index.html +++ b/site/public/research/index.html @@ -18,7 +18,6 @@ <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <span class='sub'>The Darkside of Datasets</span> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/test/citations/index.html b/site/public/test/citations/index.html index 60860190..3567c92a 100644 --- a/site/public/test/citations/index.html +++ b/site/public/test/citations/index.html @@ -18,7 +18,6 @@ <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <span class='sub'>The Darkside of Datasets</span> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/test/csv/index.html b/site/public/test/csv/index.html index b9a0ba7b..7c04ffe1 100644 --- a/site/public/test/csv/index.html +++ b/site/public/test/csv/index.html @@ -18,7 +18,6 @@ <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <span class='sub'>The Darkside of Datasets</span> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/test/datasets/index.html b/site/public/test/datasets/index.html index e310bc48..494ceaae 100644 --- a/site/public/test/datasets/index.html +++ b/site/public/test/datasets/index.html @@ -18,7 +18,6 @@ <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <span class='sub'>The Darkside of Datasets</span> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/test/face_search/index.html b/site/public/test/face_search/index.html index 569b4d41..6e0a51ef 100644 --- a/site/public/test/face_search/index.html +++ b/site/public/test/face_search/index.html @@ -18,7 +18,6 @@ <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <span class='sub'>The Darkside of Datasets</span> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/test/gallery/index.html b/site/public/test/gallery/index.html index 14f10b7c..88e293a3 100644 --- a/site/public/test/gallery/index.html +++ b/site/public/test/gallery/index.html @@ -18,7 +18,6 @@ <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <span class='sub'>The Darkside of Datasets</span> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/test/index.html b/site/public/test/index.html index b4d16036..8c534e21 100644 --- a/site/public/test/index.html +++ b/site/public/test/index.html @@ -18,7 +18,6 @@ <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <span class='sub'>The Darkside of Datasets</span> </a> <div class='links'> <a href="/datasets/">Datasets</a> @@ -30,14 +29,14 @@ <section><h1>Megapixels UI Tests</h1> <ul> -<li><a href="/test/style">Style Guide</a></li> -<li><a href="/test/csv">CSV</a></li> -<li><a href="/test/datasets/">Dataset list</a></li> -<li><a href="/test/citations/">Citation list</a></li> -<li><a href="/test/map/">Citation map</a></li> -<li><a href="/test/face_search/">Face search</a></li> -<li><a href="/test/name_search/">Name search</a></li> -<li><a href="/test/gallery/">Modal image gallery</a></li> +<li><a href="/test/style/index.html">Style Guide</a></li> +<li><a href="/test/csv/index.html">CSV</a></li> +<li><a href="/test/datasets/index.html">Dataset list</a></li> +<li><a href="/test/citations/index.html">Citation list</a></li> +<li><a href="/test/map/index.html">Citation map</a></li> +<li><a href="/test/face_search/index.html">Face search</a></li> +<li><a href="/test/name_search/index.html">Name search</a></li> +<li><a href="/test/gallery/index.html">Modal image gallery</a></li> </ul> </section> diff --git a/site/public/test/map/index.html b/site/public/test/map/index.html index 206aef5a..c2710036 100644 --- a/site/public/test/map/index.html +++ b/site/public/test/map/index.html @@ -18,7 +18,6 @@ <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <span class='sub'>The Darkside of Datasets</span> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/test/name_search/index.html b/site/public/test/name_search/index.html index 1b6769c8..5564ca82 100644 --- a/site/public/test/name_search/index.html +++ b/site/public/test/name_search/index.html @@ -18,7 +18,6 @@ <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <span class='sub'>The Darkside of Datasets</span> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/templates/home.html b/site/templates/home.html index 61062f28..fc821731 100644 --- a/site/templates/home.html +++ b/site/templates/home.html @@ -7,15 +7,16 @@ </div> <div class='intro'> <div class='headline'> - MegaPixels is an art project that explores the dark side of face recognition and the future of computer vision. + MegaPixels is an art project that explores the dark side of face recognition datasets and the future of computer vision. </div> <div class='buttons'> - <a href="/datasets/"><button class='important'>Explore Datasets</button></a><a href="/analyze/"><button class='normal'>Analyze Your Face</button></a> + <a href="/datasets/"><button class='important'>Find Your Face</button></a> + <a href="/analyze/"><button class='normal'>Analyze Your Face</button></a> </div> <div class='under'> - Made by Adam Harvey in partnership with Mozilla.<br/> + Made by Adam Harvey in collaboration with Jules Laplace, and in partnership with Mozilla.<br/> <a href='/about/'>Read more about MegaPixels</a> </div> </div> @@ -24,6 +25,7 @@ <section class='wide'> <h2>Facial Recognition Datasets</h2> <div class='right-sidebar'> + <h4>SUMMARY</h4> <div class='meta'> <div><div class='gray'>Found</div><div>275 datasets</div></div> <div><div class='gray'>Created between</div><div>1993-2018</div></div> diff --git a/site/templates/layout.html b/site/templates/layout.html index b80c6363..adde3b5b 100644 --- a/site/templates/layout.html +++ b/site/templates/layout.html @@ -18,7 +18,6 @@ <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <span class='sub'>The Darkside of Datasets</span> </a> <div class='links'> <a href="/datasets/">Datasets</a> |