uoguelph-ri · pwspania · Jan 23, 2019 · Jan 24, 2019 · Jan 25, 2019 · Jan 26, 2019
diff --git a/.dockerignore b/.dockerignore
@@ -1 +1,2 @@
-datasets/*
+datasets/*
+models/*
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,5 @@ __pycache__
 dist/*
 !dist/.gitkeep
 
-docs/.vuepress/dist/*
+docs/.vuepress/dist/*
+models/*.h5
diff --git a/.travis.yml b/.travis.yml
@@ -12,21 +12,19 @@ matrix:
         - TESTING=true
         - LOGIN_DISABLED=true
       before_script:
+        - pip install -r backend/requirements.txt
         - pip install pycocotools
         - docker run -d -p 27017:27017 mongo
         - docker ps -a
       script: pytest
-
-    - language: node_js
-      node_js:
-        - 8
-        - node
-      cache: npm
-      before_install:
-        - npm install -g npm@latest
-        - cd client
-      install:
-        - npm i
-      script: npm test
-
-
+    # - language: node_js
+    #   node_js:
+    #     - 8
+    #     - node
+    #   cache: npm
+    #   before_install:
+    #     - npm install -g npm@latest
+    #     - cd client
+    #   install:
+    #     - npm i
+    #   script: npm test
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,146 @@
+# Contributing to HTML5 Boilerplate
+
+Love [COCO Annotator](/jsbroks/coco-annotator) and want to get involved?
+Thanks! We're actively looking for folks interested in helping out and there 
+are plenty of ways you can help!
+
+Please take a moment to review this document in order to make the contribution
+process easy and effective for everyone involved.
+
+Following these guidelines helps to communicate that you respect the time of
+the developers managing and developing this open source project. In return,
+they should reciprocate that respect in addressing your issue or assessing
+patches and features.
+
+
+## Using the issue tracker
+
+The [issue tracker](/jsbroks/coco-annotator/issues) is
+the preferred channel for [bug reports](#bugs), [features requests](#features)
+and [submitting pull requests](#pull-requests), but please respect the following
+restrictions:
+
+* Please **do not** use the issue tracker for personal support requests (use
+  [Stack Overflow](https://stackoverflow.com/questions/tagged/coco-annotator)).
+
+* Please **do not** derail or troll issues. Keep the discussion on topic and
+  respect the opinions of others.
+
+<a name="bugs"></a>
+## Bug reports
+
+A bug is a _demonstrable problem_ that is caused by the code in the repository.
+Good bug reports are extremely helpful - thank you!
+
+Guidelines for bug reports:
+
+1. **Use the GitHub issue search** &mdash; check if the issue has already been
+   reported.
+
+2. **Check if the issue has been fixed** &mdash; try to reproduce it using the
+   latest `master` or development branch in the repository.
+
+3. **Isolate the problem** &mdash; ideally create a [reduced test
+   case](https://css-tricks.com/reduced-test-cases/) and a live example.
+
+A good bug report shouldn't leave others needing to chase you up for more
+information. Please try to be as detailed as possible in your report. What is
+your environment? What steps will reproduce the issue? What browser(s) and OS
+experience the problem? What would you expect to be the outcome? All these
+details will help people to fix any potential bugs.
+
+Example:
+
+> Short and descriptive example bug report title
+>
+> A summary of the issue and the browser/OS environment in which it occurs. If
+> suitable, include the steps required to reproduce the bug.
+>
+> 1. This is the first step
+> 2. This is the second step
+> 3. Further steps, etc.
+>
+> `<url>` - a link to the reduced test case
+>
+> Any other information you want to share that is relevant to the issue being
+> reported. This might include the lines of code that you have identified as
+> causing the bug, and potential solutions (and your opinions on their
+> merits).
+
+
+<a name="features"></a>
+## Feature requests
+
+Feature requests are welcome. But take a moment to find out whether your idea
+fits with the scope and aims of the project. It's up to *you* to make a strong
+case to convince the project's developers of the merits of this feature. Please
+provide as much detail and context as possible.
+
+
+<a name="pull-requests"></a>
+## Pull requests
+
+Good pull requests - patches, improvements, new features - are a fantastic
+help. They should remain focused in scope and avoid containing unrelated
+commits.
+
+**Please ask first** before embarking on any significant pull request (e.g.
+implementing features, refactoring code, porting to a different language),
+otherwise you risk spending a lot of time working on something that the
+project's developers might not want to merge into the project.
+
+Please adhere to the coding conventions used throughout a project (indentation,
+accurate comments, etc.) and any other requirements (such as test coverage).
+
+Adhering to the following process is the best way to get your work
+included in the project:
+
+1. [Fork](https://help.github.com/articles/fork-a-repo/) the project, clone your
+   fork, and configure the remotes:
+
+   ```bash
+   # Clone your fork of the repo into the current directory
+   git clone https://github.com/<your-username>/html5-boilerplate.git
+   # Navigate to the newly cloned directory
+   cd html5-boilerplate
+   # Assign the original repo to a remote called "upstream"
+   git remote add upstream https://github.com/h5bp/html5-boilerplate.git
+   ```
+
+2. If you cloned a while ago, get the latest changes from upstream:
+
+   ```bash
+   git checkout master
+   git pull upstream master
+   ```
+
+3. Create a new topic branch (off the main project development branch) to
+   contain your feature, change, or fix:
+
+   ```bash
+   git checkout -b <topic-branch-name>
+   ```
+
+4. Commit your changes in logical chunks. Please adhere to these [git commit
+   message guidelines](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
+   or your code is unlikely be merged into the main project. Use Git's
+   [interactive rebase](https://help.github.com/articles/about-git-rebase/)
+   feature to tidy up your commits before making them public.
+
+5. Locally merge (or rebase) the upstream development branch into your topic branch:
+
+   ```bash
+   git pull [--rebase] upstream master
+   ```
+
+6. Push your topic branch up to your fork:
+
+   ```bash
+   git push origin <topic-branch-name>
+   ```
+
+7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
+    with a clear title and description.
+
+**IMPORTANT**: By submitting a patch, you agree to allow the project
+owners to license your work under the terms of the [MIT License](LICENSE.txt).
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,30 @@
+FROM node:10 as build-stage
+
+WORKDIR /workspace/
+COPY ./client /workspace/client
+
+RUN npm install -g @vue/[email protected]
+RUN npm install -g @vue/[email protected]
+
+COPY ./client/package* /workspace/
+
+RUN npm install
+ENV NODE_PATH=/workspace/node_modules
+
+WORKDIR /workspace/client
+RUN npm run build
+
+FROM jsbroks/coco-annotator:python-env
+
+WORKDIR /workspace/
+COPY ./backend/ /workspace/
+COPY ./.git /workspace/.git
+RUN python set_path.py
+
+COPY --from=build-stage /workspace/client/dist /workspace/dist
+
+ENV FLASK_ENV=production
+ENV DEBUG=false
+
+EXPOSE 5000
+CMD gunicorn -c webserver/gunicorn_config.py webserver:app --no-sendfile --timeout 180
diff --git a/README.md b/README.md
@@ -3,67 +3,140 @@
 <p align="center">
   <a href="#features">Features</a> •
   <a href="https://github.com/jsbroks/coco-annotator/wiki">Wiki</a> •
-  <a href="https://github.com/jsbroks/coco-annotator/wiki/Getting-Started">Getting Stated</a> •
+  <a href="https://github.com/jsbroks/coco-annotator/wiki/Getting-Started">Getting Started</a> •
   <a href="https://github.com/jsbroks/coco-annotator/issues">Issues</a> •
   <a href="#license">License</a>
 </p>
 
-
 ---
 
+<p align="center">
+  <a href="/jsbroks/coco-annotator/stargazers">
+    <img src="https://img.shields.io/github/stars/jsbroks/coco-annotator.svg">
+  </a>
+  <a href="/jsbroks/coco-annotator/issues">
+    <img src="https://img.shields.io/github/issues/jsbroks/coco-annotator.svg">
+  </a>
+  <a href="https://tldrlegal.com/license/mit-license">
+    <img src="https://img.shields.io/github/license/mashape/apistatus.svg">
+  </a>
+  <a href="https://lgtm.com/projects/g/jsbroks/coco-annotator/context:javascript">
+    <img src="https://img.shields.io/lgtm/grade/javascript/g/jsbroks/coco-annotator.svg?label=code%20quality">
+  </a>
+  <a href="https://annotator.justinbrooks.ca/">
+    <img src="https://img.shields.io/badge/demo-online-green.svg">
+  </a>
+  <a href="https://travis-ci.org/jsbroks/coco-annotator">
+    <img src="https://travis-ci.org/jsbroks/coco-annotator.svg?branch=master">
+  </a>
+  <a href="https://hub.docker.com/r/jsbroks/coco-annotator">
+    <img src="https://img.shields.io/docker/pulls/jsbroks/coco-annotator.svg">
+  </a>
+</p>
+
+COCO Annotator is a web-based image annotation tool designed for versatility and efficiently label images to create training data for image localization and object detection. It provides many distinct features including the ability to label an image segment (or part of a segment), track object instances, labeling objects with disconnected visible parts, efficiently storing and export annotations in the well-known [COCO format](http://cocodataset.org/#format-data). The annotation process is delivered through an intuitive and customizable interface and provides many tools for creating accurate datasets.
 
-[![GitHub Stars](https://img.shields.io/github/stars/jsbroks/coco-annotator.svg)](https://github.com/jsbroks/coco-annotator/stargazers)
-[![GitHub Issues](https://img.shields.io/github/issues/jsbroks/coco-annotator.svg)](https://github.com/jsbroks/coco-annotator/issues) 
-![GitHub](https://img.shields.io/github/license/mashape/apistatus.svg)
-[![Code Quality](https://img.shields.io/lgtm/grade/javascript/g/jsbroks/coco-annotator.svg?label=code%20quality)](https://lgtm.com/projects/g/jsbroks/coco-annotator/context:javascript)
-[![Demo](https://img.shields.io/badge/demo-online-green.svg)](https://annotator.justinbrooks.ca/)
-[![Build Status](https://travis-ci.org/jsbroks/coco-annotator.svg?branch=master)](https://travis-ci.org/jsbroks/coco-annotator)
-[![Docker Pulls](https://img.shields.io/docker/pulls/jsbroks/coco-annotator.svg)](https://hub.docker.com/r/jsbroks/coco-annotator)
 
-COCO Annotator is a web-based image annotation tool designed for versatility and efficiently label images to create training data for image localization and object detection. It provides many distinct features including the ability to label an image segment (or part of a segment), track object instances, labeling objects with disconnected visible parts, efficiently storing and export annotations in the well-know [COCO format](http://cocodataset.org/#format-data). The annotation process is delivered though an intuitive and customizable interface and provides many tools for creating accurate datasets.
+<br />
+
+<p align="center">Join our growing <a href="https://discord.gg/4zP5Qkj">discord community</a> of ML practitioner</p>
+<p align="center">
+  <a href="https://discord.gg/4zP5Qkj">
+    <img src="https://discord.com/assets/e4923594e694a21542a489471ecffa50.svg" width="120">
+  </a>
+</p>
+
+<br />
+
+<p align="center"><a href="http://www.youtube.com/watch?feature=player_embedded&v=OMJRcjnMMok" target="_blank"><img src="https://img.youtube.com/vi/OMJRcjnMMok/maxresdefault.jpg" 
+alt="Image annotations using COCO Annotator" width="600" /></a></p>
+<p align="center"><i>Checkout the video for a basic guide on installing and using COCO Annotator.</i></p>
+
+<br />
 
 <p align="center"><img width="600" src="https://i.imgur.com/m4RmjCp.gif"></p>
 <p align="center"><i>Note: This video is from v0.1.0 and many new features have been added.</i></p>
 
+
+<br>
+
+<p align="center">If you enjoy my work please consider supporting me</p>
+<p align="center">
+  <a href="https://www.patreon.com/jsbroks">
+    <img src="https://c5.patreon.com/external/logo/[email protected]" width="120">
+  </a>
+</p>
+<br>
+
 # Features
 
 Several annotation tools are currently available, with most applications as a desktop installation. Once installed, users can manually define regions in an image and creating a textual description. Generally, objects can be marked by a bounding box, either directly, through a masking tool, or by marking points to define the containing area. _COCO Annotator_ allows users to annotate images using free-form curves or polygons and provides many additional features were other annotations tool fall short.
 
- - Directly export to COCO format
- - Segmentation of objects
- - Useful API endpoints to analyze data
- - Import datasets already annotated in COCO format
- - Annotated disconnected objects as a single instance
- - Labeling image segments with any number of labels simultaneously
- - Allow custom metadata for each instance or object
- - Magic wand/select tool
- - Generate datasets using google images
- - User authenication system
+- Directly export to COCO format
+- Segmentation of objects
+- Ability to add key points
+- Useful API endpoints to analyze data
+- Import datasets already annotated in COCO format
+- Annotate disconnect objects as a single instance
+- Labeling image segments with any number of labels simultaneously
+- Allow custom metadata for each instance or object
+- Advanced selection tools such as, [DEXTR](https://github.com/jsbroks/dextr-keras), [MaskRCNN](https://github.com/matterport/Mask_RCNN) and Magic Wand
+- Annotate images with semi-trained models
+- Generate datasets using google images
+- User authentication system
 
 For examples and more information check out the [wiki](https://github.com/jsbroks/coco-annotator/wiki).
 
 # Demo
 
-| Login Information |
-| ----------------- |
-| __Username:__ admin   |
-| __Password:__ password |
+| Login Information      |
+| ---------------------- |
+| **Username:** admin    |
+| **Password:** password |
 
 https://annotator.justinbrooks.ca/
 
 # Backers
 
-<p align="center"><a href="http://robotics.uoguelph.ca/"><img src="http://robotics.uoguelph.ca/images/banner.jpg"></p></a>
-<p  align="center">Backed by the <a href="http://robotics.uoguelph.ca/">The Robotics Institute @ Guelph</a> (<a href="https://github.com/uoguelph-ri">GitHub</a>)</p>
+If you enjoy the development of coco-annotator or are looking for an enterprise annotation tool, consider checking out DataTorch.
+
+<p align="center">
+  <a href="https://datatorch.io">
+    <img src="https://i.imgur.com/sOQ1s5F.png" width="250" />
+  </a>
+  <p align="center">
+    https://datatorch.io · <a href="mailto:[email protected]">[email protected]</a> · <i>Next generation of coco-annotator</i>
+   </p>
+</p>
 
 # Built With
 
 Thanks to all these wonderful libaries/frameworks:
- - [Flask](http://flask.pocoo.org/) - Python web microframework
- - [Vue](https://vuejs.org/) - Frontend javascript framework
- - [Axios](https://github.com/axios/axios) - Promise based HTTP client
- - [PaperJS](http://paperjs.org/) - Canvas editor library
- - [Bootstrap](https://getbootstrap.com/) - Frontend component library
+
+### Backend
+
+- [Flask](http://flask.pocoo.org/) - Python web microframework
+- [MongoDB](https://www.mongodb.com/) - Cross-platform document-oriented database
+- [MongoEngine](http://mongoengine.org/) - Python object data mapper for MongoDB
+
+### Frontend
+
+- [Vue](https://vuejs.org/) - JavaScript framework for building user interfaces
+- [Axios](https://github.com/axios/axios) - Promise based HTTP client
+- [PaperJS](http://paperjs.org/) - HTML canvas vector graphics library
+- [Bootstrap](https://getbootstrap.com/) - Frontend component library
 
 # License
+
 [MIT](https://tldrlegal.com/license/mit-license)
+
+# Citation
+
+```
+  @MISC{cocoannotator,
+    author = {Justin Brooks},
+    title = {{COCO Annotator}},
+    howpublished = "\url{https://github.com/jsbroks/coco-annotator/}",
+    year = {2019},
+  }
+```