Merge branch 'master' into TT-543-face-gone

Author: rok-povsic

package.json

@@ -27,6 +27,7 @@
  "acorn": "^7.1.0",
  "axios-mock-adapter": "^1.16.0",
  "babel-eslint": "^10.0.1",
+ "eslint": "^4.12.1",
  "babelify": "^10.0.0",
  "del": "^2.0.2",
  "envify": "^3.4.0",

src/index.js

@@ -13,7 +13,6 @@ module.exports = global.Clarifai = {
  COLOR_MODEL: 'eeed0b6733a644cea07cf4c60f87ebb7',
  CLUSTER_MODEL: 'cccbe437d6e54e2bb911c6aa292fb072',
  FACE_DETECT_MODEL: 'a403429f2ddf4b49b307e318f00e528b',
- FOCUS_MODEL: 'c2cf7cecd8a6427da375b9f35fcd2381',
  LOGO_MODEL: 'c443119bf2ed4da98487520d01a0b1e3',
  DEMOGRAPHICS_MODEL: 'c0c0ac362b03416da06ab3fa36fb58e3',
  GENERAL_EMBED_MODEL: 'bbb5f41425b8468d9b7a554ff10f8581',

tests/unit/search-models-unit-tests.js

@@ -84,31 +84,27 @@ describe('Unit Tests - Model Search', () => {
  "description": "Ok",
  "req_id": "300ceac8704748a592da50d77ad44253"
  },
- "models": [
- {
- "id": "@modelID",
- "name": "color",
- "created_at":
- "2016-05-11T18:05:45.924367Z",
- "app_id": "main",
- "output_info": {
- "message": "Show output_info with: GET /models/{model_id}/output_info",
- "type": "color",
- "type_ext": "color"
- },
- "model_version": {
- "id": "@modelVersionID",
- "created_at": "2016-07-13T01:19:12.147644Z",
- "status": {
- "code": 21100,
- "description": "Model is trained and ready"
- },
- "active_concept_count": 140,
- "worker_id": "1fbfdd7213a04628a387730b57b5baeb"
- },
- "display_name": "Color"
- }
- ]
+
+ "models": [{
+ "id": "@modelID",
+ "name": "color",
+ "created_at": "2017-03-06T22:57:00.660603Z",
+ "app_id": "main",
+ "output_info": {
+ "message": "Show output_info with: GET /models/{model_id}/output_info",
+ "type": "blur",
+ "type_ext": "color"
+ },
+ "model_version": {
+ "id": "@modelVersionID",
+ "created_at": "2017-03-06T22:57:00.684652Z",
+ "status": {
+ "code": 21100,
+ "description": "Model trained successfully"
+ }
+ },
+ "display_name": "Color"
+ }]
 }
  `));