Merge pull request #41 from pliablepixels/master

sync and allow aliases

Author: pliablepixels

mlapiconfig.ini

@@ -280,13 +280,16 @@ ml_sequence= {
 			'disable_locks': '{{disable_locks}}',
 			'match_past_detections': '{{match_past_detections}}',
 			'past_det_max_diff_area': '5%',
-			'car_past_det_max_diff_area': '10%'
+			'car_past_det_max_diff_area': '10%',
+			#'ignore_past_detection_labels': ['dog', 'cat']
+			# when matching past detections, names in a group are treated the same
+			'aliases': [['car','bus','truck','boat'], ['broccoli', 'pottedplant']]
 
 		},
 		'object': {
 			'general':{
 				'pattern':'{{object_detection_pattern}}',
-				'same_model_sequence_strategy': 'most_unique' # also 'most', 'most_unique's
+				'same_model_sequence_strategy': 'most_unique', # also 'most', 'most_unique's
 			},
 			'sequence': [{
 				#First run on TPU with higher confidence

modules/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "2.2.22"
+__version__ = "2.2.23"
 VERSION=__version__

requirements.txt

@@ -11,6 +11,6 @@ flask ~= 1.1.2
 progressbar33
 scikit_learn
 face_recognition
-pyzm>=0.3.52
+pyzm>=0.3.53
 bjoern
 configupdater