megadetector 5.0.13__py3-none-any.whl → 5.0.15__py3-none-any.whl

megadetector/utils/path_utils.py

@@ -733,9 +733,13 @@ def _get_file_size(filename,verbose=False):
     return (filename,size)
 
     
-def parallel_get_file_sizes(filenames, max_workers=16, 
-                        use_threads=True, verbose=False,
-                        recursive=True):
+def parallel_get_file_sizes(filenames, 
+                            max_workers=16, 
+                            use_threads=True, 
+                            verbose=False,
+                            recursive=True, 
+                            convert_slashes=True,
+                            return_relative_paths=False):
     """
     Returns a dictionary mapping every file in [filenames] to the corresponding file size,
     or None for errors.  If [filenames] is a folder, will enumerate the folder (optionally recursively).
@@ -748,6 +752,9 @@ def parallel_get_file_sizes(filenames, max_workers=16,
             parallel copying; ignored if max_workers <= 1
         verbose (bool, optional): enable additionald debug output
         recursive (bool, optional): enumerate recursively, only relevant if [filenames] is a folder.
+        convert_slashes (bool, optional): convert backslashes to forward slashes
+        return_relative_paths (bool, optional): return relative paths; only relevant if [filenames]
+            is a folder.
         
     Returns:
         dict: dictionary mapping filenames to file sizes in bytes
@@ -755,20 +762,45 @@ def parallel_get_file_sizes(filenames, max_workers=16,
 
     n_workers = min(max_workers,len(filenames))
     
+    folder_name = None
+    
+    if verbose:
+        print('Enumerating files')
+        
     if isinstance(filenames,str) and os.path.isdir(filenames):
+        
+        folder_name = filenames
+        
+        # Enumerate absolute paths here, we'll convert to relative later if requested
         filenames = recursive_file_list(filenames,recursive=recursive,return_relative_paths=False)
+
+    if verbose:
+        print('Creating worker pool')
     
     if use_threads:
+        pool_string = 'thread'
         pool = ThreadPool(n_workers)
     else:
+        pool_string = 'process'
         pool = Pool(n_workers)
 
-    resize_results = list(tqdm(pool.imap(
+    if verbose:
+        print('Created a {} pool of {} workers'.format(
+            pool_string,n_workers))
+        
+    # This returns (filename,size) tuples
+    get_size_results = list(tqdm(pool.imap(
         partial(_get_file_size,verbose=verbose),filenames), total=len(filenames)))
     
     to_return = {}
-    for r in resize_results:
-        to_return[r[0]] = r[1]
+    for r in get_size_results:
+        fn = r[0]
+        if return_relative_paths and (folder_name is not None):
+            fn = os.path.relpath(fn,folder_name)
+        if convert_slashes:
+            fn = fn.replace('\\','/')
+        size = r[1]
+        to_return[fn] = size
 
     return to_return
 

megadetector/utils/process_utils.py

@@ -60,7 +60,8 @@ def execute(cmd,encoding=None,errors=None,env=None,verbose=False):
 
 
 def execute_and_print(cmd,print_output=True,encoding=None,errors=None,
-                      env=None,verbose=False,catch_exceptions=True):
+                      env=None,verbose=False,catch_exceptions=True,
+                      echo_command=False):
     """
     Run [cmd] (a single string) in a shell, capturing and printing output.  Returns
     a dictionary with fields "status" and "output".
@@ -77,12 +78,17 @@ def execute_and_print(cmd,print_output=True,encoding=None,errors=None,
         errors (str, optional): error handling, see Popen() documentation
         env (dict, optional): environment variables, see Popen() documentation
         verbose (bool, optional): enable additional debug console output
-    
+        catch_exceptions (bool, optional): catch exceptions and include in the output, otherwise raise
+        echo_command (bool, optional): print the command before executing
+        
     Returns:
         dict: a dictionary with fields "status" (the process return code) and "output"
         (the content of stdout)    
     """
 
+    if echo_command:
+        print('Running command:\n{}\n'.format(cmd))
+        
     to_return = {'status':'unknown','output':''}
     output = []
     try:

megadetector/visualization/visualization_utils.py

@@ -1457,7 +1457,8 @@ def parallel_check_image_integrity(filenames,
                                    modes=None, 
                                    max_workers=16, 
                                    use_threads=True, 
-                                   recursive=True):
+                                   recursive=True,
+                                   verbose=False):
     """
     Check whether we can successfully load a list of images via OpenCV and/or PIL.
     
@@ -1470,6 +1471,7 @@ def parallel_check_image_integrity(filenames,
             parallelization
         recursive (bool, optional): if [filenames] is a folder, whether to search recursively for images.
             Ignored if [filenames] is a list.
+        verbose (bool, optional): enable additional debug output
             
     Returns:
         list: a list of dicts, each with a key called 'file' (the value of [filename]), one key for 
@@ -1480,9 +1482,12 @@ def parallel_check_image_integrity(filenames,
     n_workers = min(max_workers,len(filenames))
     
     if isinstance(filenames,str) and os.path.isdir(filenames):
+        if verbose:
+            print('Enumerating images in {}'.format(filenames))
         filenames = find_images(filenames,recursive=recursive,return_relative_paths=False)
     
-    print('Checking image integrity for {} filenames'.format(len(filenames)))
+    if verbose:
+        print('Checking image integrity for {} filenames'.format(len(filenames)))
     
     if n_workers <= 1:
         

megadetector/visualization/visualize_detector_output.py

@@ -174,7 +174,6 @@ def visualize_detector_output(detector_output_path,
         f'Confidence threshold {confidence_threshold} is invalid, must be in (0, 1).')
     
     if 'detection_categories' in detector_output:
-        print('Using custom label mapping')
         detector_label_map = detector_output['detection_categories']
     else:
         detector_label_map = DEFAULT_DETECTOR_LABEL_MAP

{megadetector-5.0.13.dist-info → megadetector-5.0.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: megadetector
-Version: 5.0.13
+Version: 5.0.15
 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.13.dist-info → megadetector-5.0.15.dist-info}/RECORD

@@ -63,7 +63,7 @@ megadetector/data_management/get_image_sizes.py,sha256=2b6arj4gvoN-9f61lC3t1zAFF
 megadetector/data_management/labelme_to_coco.py,sha256=8RUXALXbLpmS7UYUet4BAe9JVSDW7ojwDDpxYs072ZI,21231
 megadetector/data_management/labelme_to_yolo.py,sha256=dRePSOwU_jiCr0EakDQCz1Ct-ZHDxDglUk4HbM1LfWc,10034
 megadetector/data_management/ocr_tools.py,sha256=T9ClY3B-blnK3-UF1vpVdageknYsykm_6FAfqn0kliU,32529
-megadetector/data_management/read_exif.py,sha256=BgV5SMZbPUoBdh0Mxljwzat_zO7B4xiD1liddbGV8gE,27635
+megadetector/data_management/read_exif.py,sha256=-q0NqJ3VZSBovD_d6de-s3UR2NuKF6gSw2etfvVuRO4,27866
 megadetector/data_management/remap_coco_categories.py,sha256=xXWv0QhTjkUfc9RKtAZanK77HMSq_21mFg_34KFD6hw,2903
 megadetector/data_management/remove_exif.py,sha256=9YwMUliszhVzkkUcotpRKA-a3h5WdQF1taQ594Bgm60,1666
 megadetector/data_management/rename_images.py,sha256=AG3YIxXEYdGmK4G-rv0_XZIylPqOZpS6gfEkydF6oDg,6918
@@ -135,14 +135,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=2zKNjgqC3kxdFfyvQC3KTlpc9lf2iMzecHQBf--r_Tk,4438
 megadetector/detection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-megadetector/detection/process_video.py,sha256=5uyJdARkEHfpeL8ASE3XS72WjNGkMqj6GH63joWxMSs,35622
-megadetector/detection/pytorch_detector.py,sha256=gLhCTvBYa1X54cobxle-G9L5MlHDk0UUn353TEtmu4M,13557
-megadetector/detection/run_detector.py,sha256=CxwCqE-T5ioQ1kb5Tn4HvzBMK0gvJwaAOl8HfDTWiVY,29745
-megadetector/detection/run_detector_batch.py,sha256=MQ8cEVg92aTmysapPuj3JAr92HfnuopCHbDGoMZA7ko,52132
+megadetector/detection/process_video.py,sha256=xV24TWlQ0ImN21DCPkLs7y3oUOP7cjmyrFD0PFzzhsY,42713
+megadetector/detection/pytorch_detector.py,sha256=p70kAX5pqU4SO4GjYJmzbTPV4tKUp5WRapOs7vgSKes,13885
+megadetector/detection/run_detector.py,sha256=biXbeS8aNDlidilxjzhZ-p4_wr2ID-rpsRklbNEd7ME,30094
+megadetector/detection/run_detector_batch.py,sha256=nplmaxOcEe_vnS3VrUd49uZoCQNRmJQmbSMpi8uhh8k,57064
 megadetector/detection/run_inference_with_yolov5_val.py,sha256=u9i1ndwl_k0DsiAWYQcYrrrB9D9Wt56_k6iGTAetUaM,46786
 megadetector/detection/run_tiled_inference.py,sha256=vw0713eNuMiEOjHfweQl58zPHNxPOMdFWZ8bTDLhlMY,37883
-megadetector/detection/tf_detector.py,sha256=-Yr42X06HwGvYDflYbdBI8dND5ahBCzu-xXSfdWd6ag,7651
-megadetector/detection/video_utils.py,sha256=4dQGEVk7rJ7bOrCHobrAMVwb-xE-Nu0cYptxLxPSW7w,27245
+megadetector/detection/tf_detector.py,sha256=-vcBuYRRLKumUj6imcDYgCgClGji0a21uMjoUAtY3yw,8104
+megadetector/detection/video_utils.py,sha256=DNEW10EgWN5ZiJg9uRpxxfJLuBX9Ts2l0eJ66F9kmmw,32474
 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
@@ -151,7 +151,7 @@ megadetector/postprocessing/categorize_detections_by_size.py,sha256=YdapcvjA6Dz2
 megadetector/postprocessing/classification_postprocessing.py,sha256=8uvlA0Gc8nakM5IE5Pud7WZfmF5kEhcYvxgQXcI9kl0,30429
 megadetector/postprocessing/combine_api_outputs.py,sha256=xCJHEKca8YW-mupEr0yNNwwSBeL9NvcV1w3VtEzN4lk,8535
 megadetector/postprocessing/compare_batch_results.py,sha256=7O5c6-JsIDpuIGobks_R9j8MPuiZQRnEtNnJQsJqICM,38918
-megadetector/postprocessing/convert_output_format.py,sha256=IGCWoIJ1Z9RUI9yqpbL3t5KThDiElM3czmiTyXty72c,15002
+megadetector/postprocessing/convert_output_format.py,sha256=HwThfK76UPEAGa3KQbJ_tMKIrUvJ3JhKoQVWJt9dPBk,15447
 megadetector/postprocessing/load_api_results.py,sha256=FqcaiPMuqTojZOV3Jn14pJESpuwjWGbZtcvJuVXUaDM,6861
 megadetector/postprocessing/md_to_coco.py,sha256=t8zHN3QmwxuvcQKxLd_yMSjwncxy7YEoq2EGr0kwBDs,11049
 megadetector/postprocessing/md_to_labelme.py,sha256=hejMKVxaz_xdtsGDPTQkeWuis7gzT-VOrL2Qf8ym1x0,11703
@@ -180,9 +180,9 @@ megadetector/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 megadetector/utils/azure_utils.py,sha256=0BdnkG2hW-X0yFpsJqmBhOd2wysz_LvhuyImPJMVPJs,6271
 megadetector/utils/ct_utils.py,sha256=RTMc0UszYuW9QpMo-qetaWder1mFWIzkMLL2UM6PYdY,17960
 megadetector/utils/directory_listing.py,sha256=r4rg2xA4O9ZVxVtzPZzXIXa0DOEukAJMTTNcNSiQcuM,9668
-megadetector/utils/md_tests.py,sha256=sD6HW_E5hqNcj-rjDVKlcwzBOT8W0WAY9khG3ofpvQE,44322
-megadetector/utils/path_utils.py,sha256=E57sjmSzZ5FWd5aQvLiP7VvjVoyKa1S5yL0Oz-CdxRs,36049
-megadetector/utils/process_utils.py,sha256=pSReAq30XGit_uTy5a-YeQ9_DlYIGMreQZ_kRAcvnJc,5330
+megadetector/utils/md_tests.py,sha256=mtjxQ_dQYBgo8OOVta5JrPhuDMT1ZNh0S-OQXRocBEM,51236
+megadetector/utils/path_utils.py,sha256=Uj_aNvA_P0buq-3ebQLZz-6to8mNO5JyBhD7n1-pUoU,37149
+megadetector/utils/process_utils.py,sha256=2SdFVxqob-YUW2BTjUEavNuRH3jA4V05fbKMtrVSd3c,5635
 megadetector/utils/sas_blob_utils.py,sha256=k76EcMmJc_otrEHcfV2fxAC6fNhxU88FxM3ddSYrsKU,16917
 megadetector/utils/split_locations_into_train_val.py,sha256=jvaDu1xKB51L3Xq2nXQo0XtXRjNRf8RglBApl1g6gHo,10101
 megadetector/utils/string_utils.py,sha256=ZQapJodzvTDyQhjZgMoMl3-9bqnKAUlORpws8Db9AkA,2050
@@ -191,11 +191,11 @@ megadetector/utils/write_html_image_list.py,sha256=apzoWkgZWG-ybCT4k92PlS4-guN_s
 megadetector/visualization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 megadetector/visualization/plot_utils.py,sha256=lOfU3uPrcuHZagV_1SN8erT8PujIepocgw6KZ17Ej6c,10671
 megadetector/visualization/render_images_with_thumbnails.py,sha256=kgJYW8BsqRO4C7T3sqItdBuSkZ64I1vOtIWAsVG4XBI,10589
-megadetector/visualization/visualization_utils.py,sha256=BIb1uCDD6TlHLDM_2uA-4lzcVcdiFLeKu8kuY2fct6g,62150
+megadetector/visualization/visualization_utils.py,sha256=jWiXlLpmWh_CH2vApZURclOC7fdip1aKWQ66wuNabyA,62369
 megadetector/visualization/visualize_db.py,sha256=3FhOtn3GHvNsomwSpsSEzYe58lF9B4Ob3MEi_xplrdo,21256
-megadetector/visualization/visualize_detector_output.py,sha256=dFpQdLnbULO8wPGeN2z0muYNtHglUDsH-LeqdbYa6DY,17096
-megadetector-5.0.13.dist-info/LICENSE,sha256=RMa3qq-7Cyk7DdtqRj_bP1oInGFgjyHn9-PZ3PcrqIs,1100
-megadetector-5.0.13.dist-info/METADATA,sha256=F1YjjxKHnVp17PDYDGPDmFfntKjltACiD7dg8Kq1584,7893
-megadetector-5.0.13.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-megadetector-5.0.13.dist-info/top_level.txt,sha256=wf9DXa8EwiOSZ4G5IPjakSxBPxTDjhYYnqWRfR-zS4M,13
-megadetector-5.0.13.dist-info/RECORD,,
+megadetector/visualization/visualize_detector_output.py,sha256=LY8QgDWpWlXVLZJUskvT29CdkNvIlEsFTk4DC_lS6pk,17052
+megadetector-5.0.15.dist-info/LICENSE,sha256=RMa3qq-7Cyk7DdtqRj_bP1oInGFgjyHn9-PZ3PcrqIs,1100
+megadetector-5.0.15.dist-info/METADATA,sha256=E3ZvrTIEHvAVmogrd9wXYmYgvHBo9YsFmIb6-I9uEb0,7893
+megadetector-5.0.15.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+megadetector-5.0.15.dist-info/top_level.txt,sha256=wf9DXa8EwiOSZ4G5IPjakSxBPxTDjhYYnqWRfR-zS4M,13
+megadetector-5.0.15.dist-info/RECORD,,