megadetector 5.0.18__py3-none-any.whl → 5.0.19__py3-none-any.whl

megadetector/data_management/cct_to_md.py

@@ -79,7 +79,7 @@ def cct_to_md(input_filename,output_filename=None):
     results = {}
     
     info = {}
-    info['format_version'] = "1.3"
+    info['format_version'] = '1.4'
     info['detector'] = 'cct_to_md'
     results['info'] = info
     results['detection_categories'] = category_id_to_name

megadetector/data_management/yolo_output_to_md_output.py

@@ -301,7 +301,7 @@ def yolo_json_output_to_md_output(yolo_json_file,
     
     d = {}
     d['images'] = output_images
-    d['info'] = {'format_version':1.3,'detector':detector_name}
+    d['info'] = {'format_version':'1.4','detector':detector_name}
     d['detection_categories'] = {}
         
     for cat_id in yolo_category_id_to_name:
@@ -411,7 +411,7 @@ def yolo_txt_output_to_md_output(input_results_folder,
         'info': {
             'detector': detector_string,
             'detector_metadata': {},
-            'format_version': '1.3'
+            'format_version': '1.4'
         },
         'detection_categories': {
             '1': 'animal',

megadetector/detection/process_video.py

@@ -578,6 +578,7 @@ def process_video_folder(options):
         video_results = md_results['results']
         
         for i_video,video_filename in enumerate(md_results['video_filenames']):
+            video_filename = video_filename.replace('\\','/')
             assert video_filename not in video_filename_to_fs
             video_filename_to_fs[video_filename] = md_results['frame_rates'][i_video]
         
@@ -621,9 +622,11 @@ def process_video_folder(options):
                                    frames_to_extract=options.frames_to_extract,
                                    allow_empty_videos=options.allow_empty_videos)
         
-        for i_video,video_filename in enumerate(video_filenames):
-            assert video_filename not in video_filename_to_fs
-            video_filename_to_fs[video_filename] = Fs[i_video]
+        for i_video,video_filename_abs in enumerate(video_filenames):
+            video_filename_relative = os.path.relpath(video_filename_abs,options.input_video_file)
+            video_filename_relative = video_filename_relative.replace('\\','/')
+            assert video_filename_relative not in video_filename_to_fs
+            video_filename_to_fs[video_filename_relative] = Fs[i_video]
                 
         print('Extracted frames for {} videos'.format(len(set(video_filenames))))
         image_file_names = list(itertools.chain.from_iterable(frame_filenames))

megadetector/detection/run_detector_batch.py

@@ -886,7 +886,7 @@ def write_results_to_file(results,
         
         info = { 
             'detection_completion_time': datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S'),
-            'format_version': '1.3' 
+            'format_version': '1.4' 
         }
         
         if detector_file is not None:

megadetector/detection/video_utils.py

@@ -781,7 +781,9 @@ class FrameToVideoOptions:
         self.non_video_behavior = 'error'
     
 
-def frame_results_to_video_results(input_file,output_file,options=None,
+def frame_results_to_video_results(input_file,
+                                   output_file,
+                                   options=None,
                                    video_filename_to_frame_rate=None):
     """
     Given an MD results file produced at the *frame* level, corresponding to a directory 

megadetector/postprocessing/validate_batch_results.py

@@ -0,0 +1,186 @@
+"""
+
+validate_batch_results.py
+
+Given a .json file containing MD results, validate that it's compliant with the format spec:
+
+https://lila.science/megadetector-output-format
+
+"""
+
+#%% Constants and imports
+
+import os
+import sys
+import json
+import argparse
+
+from megadetector.detection.video_utils import is_video_file
+from megadetector.utils.ct_utils import args_to_object
+
+typical_info_fields = ['detector','detection_completion_time',
+                       'classifier','classification_completion_time',
+                       'detection_metadata','classifier_metadata']
+required_keys = ['info','images','detection_categories']
+typical_keys = ['classification_categories']
+
+
+#%% Classes
+
+class ValidateBatchResultsOptions:
+    """
+    Options controlling the behavior of validate_bach_results()
+    """
+    
+    def __init__(self):
+        
+        #: Should we verify that images exist?  If this is True, and the .json
+        #: file contains relative paths, relative_path_base needs to be specified.
+        self.check_image_existence = False
+        
+        #: If check_image_existence is True, where do the images live?
+        #:
+        #: If None, assumes absolute paths.
+        self.relative_path_base = None
+    
+# ...class ValidateBatchResultsOptions
+
+
+
+#%% Main function
+
+def validate_batch_results(json_filename,options=None):
+    """
+    Verify that [json_filename] is a valid MD output file.  Currently errors on invalid files.
+    
+    Args: 
+        json_filename (str): the filename to validate
+        options (ValidateBatchResultsOptions, optionsl): all the parameters used to control this 
+            process, see ValidateBatchResultsOptions for details
+            
+    Returns:
+        bool: reserved; currently always errors or returns True.
+    """
+    
+    if options is None:
+        options = ValidateBatchResultsOptions()
+    
+    with open(json_filename,'r') as f:
+        d = json.load(f)
+    
+    ## Info validation
+    
+    assert 'info' in d
+    info = d['info']
+    
+    assert isinstance(info,dict)
+    assert 'format_version' in info 
+    format_version = float(info['format_version'])
+    assert format_version >= 1.3, 'This validator can only be used with format version 1.3 or later'
+            
+    print('Validating a .json results file with format version {}'.format(format_version))
+    
+    ## Category validation
+    
+    assert 'detection_categories' in d
+    for k in d['detection_categories'].keys():
+        # Categories should be string-formatted ints
+        assert isinstance(k,str)
+        _ = int(k)
+        assert isinstance(d['detection_categories'][k],str)
+        
+    if 'classification_categories' in d:
+        for k in d['classification_categories'].keys():
+            # Categories should be string-formatted ints
+            assert isinstance(k,str)
+            _ = int(k)
+            assert isinstance(d['classification_categories'][k],str)
+    
+    
+    ## Image validation
+    
+    assert 'images' in d
+    assert isinstance(d['images'],list)
+    
+    # im = d['images'][0]
+    for im in d['images']:
+        
+        assert isinstance(im,dict)
+        assert 'file' in im
+        
+        file = im['file']
+        
+        if options.check_image_existence:
+            if options.relative_path_base is None:
+                file_abs = file
+            else:
+                file_abs = os.path.join(options.relative_path_base,file)
+            assert os.path.isfile(file_abs), 'Cannot find file {}'.format(file_abs)
+            
+        if 'detections' not in im or im['detections'] is None:
+            assert 'failure' in im and isinstance(im['failure'],str)
+        else:
+            assert isinstance(im['detections'],list)
+            
+        if is_video_file(im['file']) and (format_version >= 1.4):
+            assert 'frame_rate' in im
+            if 'detections' in im and im['detections'] is not None:
+                for det in im['detections']:
+                    assert 'frame_number' in det
+            
+    # ...for each image
+        
+    
+    ## Checking on other keys
+    
+    for k in d.keys():
+        if k not in typical_keys and k not in required_keys:
+            print('Warning: non-standard key {} present at file level'.format(k))
+                  
+# ...def validate_batch_results(...)
+
+
+#%% Interactive driver(s)
+
+if False:
+
+    #%%
+    
+    options = ValidateBatchResultsOptions()
+    # json_filename = r'g:\temp\format.json'
+    # json_filename = r'g:\temp\test-videos\video_results.json'
+    json_filename = r'g:\temp\test-videos\image_results.json'
+    options.check_image_existence = True
+    options.relative_path_base = r'g:\temp\test-videos'
+    validate_batch_results(json_filename,options)
+    
+
+#%% Command-line driver
+
+def main():
+    
+    options = ValidateBatchResultsOptions()
+
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        'json_filename',
+        help='path to .json file containing MegaDetector results')
+    parser.add_argument(
+        '--check_image_existence', action='store_true',
+        help='check that all images referred to in the results file exist')
+    parser.add_argument(
+        '--relative_path_base', default=None,
+        help='if --check_image_existence is specified and paths are relative, use this as the base folder')
+    if len(sys.argv[1:]) == 0:
+        parser.print_help()
+        parser.exit()
+
+    args = parser.parse_args()
+    
+    args_to_object(args, options)    
+
+    validate_batch_results(args.json_filename,options)
+    
+    
+if __name__ == '__main__':
+    main()

megadetector/utils/md_tests.py

@@ -683,10 +683,16 @@ def run_python_tests(options):
     
     ## Verify results
     
+    # Verify format correctness
+    from megadetector.postprocessing.validate_batch_results import validate_batch_results 
+    validate_batch_results(inference_output_file)
+    
+    # Verify value correctness
     expected_results_file = get_expected_results_filename(is_gpu_available(verbose=False),
                                                           options=options)
     compare_results(inference_output_file,expected_results_file,options)
-        
+    
+    
     # Make note of this filename, we will use it again later
     inference_output_file_standard_inference = inference_output_file
     

{megadetector-5.0.18.dist-info → megadetector-5.0.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: megadetector
-Version: 5.0.18
+Version: 5.0.19
 Summary: MegaDetector is an AI model that helps conservation folks spend less time doing boring things with camera trap images.
 Author-email: Your friendly neighborhood MegaDetector team <cameratraps@lila.science>
 Maintainer-email: Your friendly neighborhood MegaDetector team <cameratraps@lila.science>

{megadetector-5.0.18.dist-info → megadetector-5.0.19.dist-info}/RECORD

@@ -54,7 +54,7 @@ megadetector/classification/efficientnet/utils.py,sha256=dzrDrQQcvINdJFbODmrHQMU
 megadetector/data_management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 megadetector/data_management/camtrap_dp_to_coco.py,sha256=WC5u5nK5BwXpV26_pGy6CppQryJMgsJ9NtDbGIRQqLg,8629
 megadetector/data_management/cct_json_utils.py,sha256=LuNbxU5EAslWanC08PTKzwzCUmesGnbbJhZ1e2dCgnI,15140
-megadetector/data_management/cct_to_md.py,sha256=BvQ24XlYhgMYFcsvo6btR1k1UsiPL1vBoxegooJbxdA,5070
+megadetector/data_management/cct_to_md.py,sha256=zgMU2_NjPs5nPGDKf0n1ouJdyiAsgR4Q9wj-Q9Y-c88,5070
 megadetector/data_management/cct_to_wi.py,sha256=hnFErIlBDmhZtBv21kDW14MSdHlUjwtCGn2vnG-cN34,9771
 megadetector/data_management/coco_to_labelme.py,sha256=Uql6f1TaMmKIZClCcqUB1bPxokdXgyAKsQm5pk5foKk,8986
 megadetector/data_management/coco_to_yolo.py,sha256=rTDOh3XdoOoo7HCSH7obT3xpQgiSykf71ba8uOXfnxc,28121
@@ -69,7 +69,7 @@ megadetector/data_management/remove_exif.py,sha256=vIWnJfw1i9JgyQKUDGEzzqkHro4nd
 megadetector/data_management/rename_images.py,sha256=AG3YIxXEYdGmK4G-rv0_XZIylPqOZpS6gfEkydF6oDg,6918
 megadetector/data_management/resize_coco_dataset.py,sha256=AaiV7efIcNnqsXsnQckmHq2G__7ZQHBV_jN6rhZfMjo,6810
 megadetector/data_management/wi_download_csv_to_coco.py,sha256=ilnJZhNZK-FGUR-AfUSWjIDUk9Gytgxw7IOK_N8WKLE,8350
-megadetector/data_management/yolo_output_to_md_output.py,sha256=VZtatLoryeh2pbh1fRAJe-ao7vtoNn6ACyRbAk-2Mlg,17561
+megadetector/data_management/yolo_output_to_md_output.py,sha256=1RUJSWiVa7CVVQ_CresOVXAD3Eb7oHjdgPg7fTX_Vwg,17563
 megadetector/data_management/yolo_to_coco.py,sha256=TzAagQ2ATbB_tn1oZxrHCWsrFGO_OhfZmi-3X45WdDU,26180
 megadetector/data_management/annotations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 megadetector/data_management/annotations/annotation_constants.py,sha256=1597MpAr_HdidIHoDFj4RgUO3K5e2Xm2bGafGeonR2k,953
@@ -136,14 +136,14 @@ megadetector/data_management/lila/get_lila_image_counts.py,sha256=UxXS5RDnSA_Wbx
 megadetector/data_management/lila/lila_common.py,sha256=IEnGoyRgcqbek1qJ1gFE83p1Pg_5kaMS-nQI25lRWIs,10132
 megadetector/data_management/lila/test_lila_metadata_urls.py,sha256=jqN7UID16fu78BK_2sygb4s9BBeVCpSZT3_oL2GYxxY,4438
 megadetector/detection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-megadetector/detection/process_video.py,sha256=yVjkm5SxHH-R5SazMQmF-XXRhrhPdE2z4X4bGkfeN-k,50019
+megadetector/detection/process_video.py,sha256=ugBpIPy7ogrbHSklIA7FTh5YqnTzDtfeN5z8JmrXJpc,50282
 megadetector/detection/pytorch_detector.py,sha256=StOnaspDBkMeePiTyq5ZEcFUDBEddq36nigHXbF-zAQ,14029
 megadetector/detection/run_detector.py,sha256=vEfq3jJTseD0sIM9MaIhbeEVqP6JoLXOC2cl8Dhehxs,30553
-megadetector/detection/run_detector_batch.py,sha256=d0fayCVXzKxa1tCiw6D8kmDqcwOAIuvrgw_Zfw0eRjE,57304
+megadetector/detection/run_detector_batch.py,sha256=P1sb922Vo_TD-ioGGkwt1FfXLyJFJms-MLGIcnmBtfg,57304
 megadetector/detection/run_inference_with_yolov5_val.py,sha256=yjNm130qntOyJ4jbetdt5xDHWnSmBXRydyxB2I56XjM,49099
 megadetector/detection/run_tiled_inference.py,sha256=vw0713eNuMiEOjHfweQl58zPHNxPOMdFWZ8bTDLhlMY,37883
 megadetector/detection/tf_detector.py,sha256=5V94a0gR6WmGPacKm59hl1eYEZI8cG04frF4EvHrmzU,8285
-megadetector/detection/video_utils.py,sha256=MzD8aUgdyAD9xK9w2fK0lvZtDhjpeHDkftvRXk3YJVA,41399
+megadetector/detection/video_utils.py,sha256=tMKl47sg7jtU07vBeobGvjVgXdHWpHrMOx3jRvJ3iLo,41471
 megadetector/detection/detector_training/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 megadetector/detection/detector_training/model_main_tf2.py,sha256=YwNsZ7hkIFaEuwKU0rHG_VyqiR_0E01BbdlD0Yx4Smo,4936
 megadetector/postprocessing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -163,6 +163,7 @@ megadetector/postprocessing/render_detection_confusion_matrix.py,sha256=_wsk4W0P
 megadetector/postprocessing/separate_detections_into_folders.py,sha256=k42gxnL8hbBiV0e2T-jmFrhxzIxnhi57Nx9cDSSL5s0,31218
 megadetector/postprocessing/subset_json_detector_output.py,sha256=PDgb6cnsFm9d4E7_sMVIguLIU7s79uFQa2CRCxAO0F4,27064
 megadetector/postprocessing/top_folders_to_bottom.py,sha256=Dqk-KZXiRlIYlmLZmk6aUapmaaLJUKOf8wK1kxt9W6A,6283
+megadetector/postprocessing/validate_batch_results.py,sha256=uFS-Iag7tZYMWJeDuIYwDhEdc8F_5BGKhV4V7y3SGVw,5551
 megadetector/postprocessing/repeat_detection_elimination/find_repeat_detections.py,sha256=e4Y9CyMyd-bLN3il8tu76vI0nVYHZlhZr6vcL0J4zQ0,9832
 megadetector/postprocessing/repeat_detection_elimination/remove_repeat_detections.py,sha256=tARPxuY0OyQgpKU2XqiQPko3f-hHnWuISB8ZlZgXwxI,2819
 megadetector/postprocessing/repeat_detection_elimination/repeat_detections_core.py,sha256=vEmWLSSv0_rxDwhjz_S9YaKZ_LM2tADTz2JYb_zUCnc,67923
@@ -181,7 +182,7 @@ megadetector/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 megadetector/utils/azure_utils.py,sha256=0BdnkG2hW-X0yFpsJqmBhOd2wysz_LvhuyImPJMVPJs,6271
 megadetector/utils/ct_utils.py,sha256=1LXAjnzeeFeQqp59cWn3Nxt5OQk3t2DfO5wQ30flA5E,19441
 megadetector/utils/directory_listing.py,sha256=r4rg2xA4O9ZVxVtzPZzXIXa0DOEukAJMTTNcNSiQcuM,9668
-megadetector/utils/md_tests.py,sha256=n_5PkeUComn8pbvN-sLS4XdNsNPnvz8jk6DhrCcm9PU,58225
+megadetector/utils/md_tests.py,sha256=qRotO_FCRQEs2jGm4aQCrfnktJws29O9iRzha_vjZ4Q,58435
 megadetector/utils/path_utils.py,sha256=o68jfPDaLj3NizipVCQEnmB5GfPHpMOLUmQWamYM4w0,37165
 megadetector/utils/process_utils.py,sha256=2SdFVxqob-YUW2BTjUEavNuRH3jA4V05fbKMtrVSd3c,5635
 megadetector/utils/sas_blob_utils.py,sha256=k76EcMmJc_otrEHcfV2fxAC6fNhxU88FxM3ddSYrsKU,16917
@@ -196,8 +197,8 @@ megadetector/visualization/render_images_with_thumbnails.py,sha256=kgJYW8BsqRO4C
 megadetector/visualization/visualization_utils.py,sha256=J53VsI8aQmzzBBeu-msm8c-qC6pm_HCMkMKYvnylqjo,63083
 megadetector/visualization/visualize_db.py,sha256=x9jScwG-3V-mZGy5cB1s85KWbiAIfvgVUcLqUplHxGA,22110
 megadetector/visualization/visualize_detector_output.py,sha256=LY8QgDWpWlXVLZJUskvT29CdkNvIlEsFTk4DC_lS6pk,17052
-megadetector-5.0.18.dist-info/LICENSE,sha256=RMa3qq-7Cyk7DdtqRj_bP1oInGFgjyHn9-PZ3PcrqIs,1100
-megadetector-5.0.18.dist-info/METADATA,sha256=utglc5y0-WOnPflCpNPA36mrZMtTN6KTLboBU3LvTaw,7464
-megadetector-5.0.18.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-megadetector-5.0.18.dist-info/top_level.txt,sha256=wf9DXa8EwiOSZ4G5IPjakSxBPxTDjhYYnqWRfR-zS4M,13
-megadetector-5.0.18.dist-info/RECORD,,
+megadetector-5.0.19.dist-info/LICENSE,sha256=RMa3qq-7Cyk7DdtqRj_bP1oInGFgjyHn9-PZ3PcrqIs,1100
+megadetector-5.0.19.dist-info/METADATA,sha256=fxnqQFFPLS8pROblOELOmej7ULwUYhV16VWcxuanq8k,7464
+megadetector-5.0.19.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+megadetector-5.0.19.dist-info/top_level.txt,sha256=wf9DXa8EwiOSZ4G5IPjakSxBPxTDjhYYnqWRfR-zS4M,13
+megadetector-5.0.19.dist-info/RECORD,,