megadetector 10.0.3__py3-none-any.whl → 10.0.4__py3-none-any.whl

megadetector/utils/ct_utils.py

@@ -16,6 +16,8 @@ import builtins
 import datetime
 import tempfile
 import shutil
+import platform
+import sys
 import uuid
 
 import jsonpickle
@@ -1053,6 +1055,57 @@ def make_test_folder(subfolder=None):
                             append_guid=True)
 
 
+#%% Environment utilities
+
+def is_sphinx_build():
+    """
+    Determine whether we are running in the context of our Sphinx build.
+
+    Returns:
+        bool: True if we're running a Sphinx build
+    """
+
+    is_sphinx = hasattr(builtins, '__sphinx_build__')
+    return is_sphinx
+
+
+def is_running_in_gha():
+    """
+    Determine whether we are running on a GitHub Actions runner.
+
+    Returns:
+        bool: True if we're running in a GHA runner
+    """
+
+    running_in_gha = False
+
+    if ('GITHUB_ACTIONS' in os.environ):
+        # Documentation is inconsistent on how this variable presents itself
+        if isinstance(os.environ['GITHUB_ACTIONS'],bool) and \
+            os.environ['GITHUB_ACTIONS']:
+            running_in_gha = True
+        elif isinstance(os.environ['GITHUB_ACTIONS'],str) and \
+            os.environ['GITHUB_ACTIONS'].lower() == ('true'):
+            running_in_gha = True
+
+    return running_in_gha
+
+
+def environment_is_wsl():
+    """
+    Determines whether we're running in WSL.
+
+    Returns:
+        True if we're running in WSL
+    """
+
+    if sys.platform not in ('linux','posix'):
+        return False
+    platform_string = ' '.join(platform.uname()).lower()
+    return 'microsoft' in platform_string and 'wsl' in platform_string
+
+
+
 #%% Tests
 
 def test_write_json():

megadetector/utils/md_tests.py

@@ -21,6 +21,7 @@ since much of what it tries to test is, e.g., imports.
 import os
 import json
 import glob
+import sys
 import tempfile
 import urllib
 import urllib.request
@@ -141,9 +142,6 @@ class MDTestOptions:
         #: Number of cores to use for multi-CPU inference tests
         self.n_cores_for_multiprocessing_tests = 2
 
-        #: Number of cores to use for multi-CPU video tests
-        self.n_cores_for_video_tests = 2
-
         #: Batch size to use when testing batches of size > 1
         self.alternative_batch_size = 3
 
@@ -1062,7 +1060,6 @@ def run_python_tests(options):
         video_options.input_video_file = os.path.join(options.scratch_dir,options.test_videos[0])
         video_options.output_json_file = os.path.join(options.scratch_dir,'single_video_output.json')
         video_options.frame_sample = 10
-        video_options.n_cores = options.n_cores_for_video_tests
         video_options.detector_options = copy(options.detector_options)
 
         _ = process_videos(video_options)
@@ -1086,7 +1083,6 @@ def run_python_tests(options):
         video_options.output_video_file = None
         video_options.recursive = True
         video_options.verbose = True
-        video_options.n_cores = options.n_cores_for_video_tests
         video_options.json_confidence_threshold = 0.05
         video_options.time_sample = 2
         video_options.detector_options = copy(options.detector_options)
@@ -1295,7 +1291,7 @@ def run_cli_tests(options):
 
         batch_string = ' --batch_size {}'.format(options.alternative_batch_size)
 
-        # I reduce the number of loader workers here to force batching to actually appen; with a small
+        # I reduce the number of loader workers here to force batching to actually append; with a small
         # number of images and a few that are intentionally corrupt, with the default number of loader
         # workers we end up with batches that are mostly just one image.
         cmd = base_cmd + ' --use_image_queue --preprocess_on_image_queue --loader_workers 2' + batch_string
@@ -1591,9 +1587,9 @@ def run_cli_tests(options):
 
         cmd += ' "{}" "{}"'.format(options.default_model,options.scratch_dir)
         cmd += ' --output_json_file "{}"'.format(video_inference_output_file)
-        cmd += ' --n_cores {}'.format(options.n_cores_for_video_tests)
         cmd += ' --frame_sample 4'
         cmd += ' --verbose'
+        cmd += ' --recursive'
         cmd += ' --detector_options {}'.format(dict_to_kvp_list(options.detector_options))
 
         cmd_results = execute_and_print(cmd)
@@ -1789,6 +1785,11 @@ def test_suite_entry_point():
     options.skip_localhost_downloads = True
     options.skip_import_tests = False
 
+    if sys.platform == 'darwin':
+        print('Detected a Mac environment, widening tolerance')
+        options.max_coord_error = 0.05
+        options.max_conf_error = 0.05
+
     options = download_test_data(options)
 
     run_tests(options)

megadetector/utils/path_utils.py

@@ -36,6 +36,7 @@ from tqdm import tqdm
 from megadetector.utils.ct_utils import is_iterable
 from megadetector.utils.ct_utils import make_test_folder
 from megadetector.utils.ct_utils import sort_dictionary_by_value
+from megadetector.utils.ct_utils import environment_is_wsl
 
 # Should all be lower-case
 IMG_EXTENSIONS = ('.jpg', '.jpeg', '.gif', '.png', '.tif', '.tiff', '.bmp')
@@ -622,21 +623,7 @@ def is_executable(filename):
     return which(filename) is not None
 
 
-#%% Platform-independent way to open files in their associated application
-
-def environment_is_wsl():
-    """
-    Determines whether we're running in WSL.
-
-    Returns:
-        True if we're running in WSL.
-    """
-
-    if sys.platform not in ('linux','posix'):
-        return False
-    platform_string = ' '.join(platform.uname()).lower()
-    return 'microsoft' in platform_string and 'wsl' in platform_string
-
+#%% WSL utilities
 
 def wsl_path_to_windows_path(filename, failure_behavior='none'):
     r"""
@@ -731,6 +718,8 @@ def windows_path_to_wsl_path(filename, failure_behavior='none'):
 # ...def window_path_to_wsl_path(...)
 
 
+#%% Platform-independent file openers
+
 def open_file_in_chrome(filename):
     """
     Open a file in chrome, regardless of file type.  I typically use this to open

megadetector/visualization/visualization_utils.py

@@ -552,7 +552,7 @@ def render_detection_bounding_boxes(detections,
         custom_strings (list of str, optional): optional set of strings to append to detection labels, should
             have the same length as [detections].  Appended before any classification labels.
         box_sort_order (str, optional): sorting scheme for detection boxes, can be None, "confidence", or
-            "reverse_confidence".
+            "reverse_confidence".  "confidence" puts the highest-confidence boxes on top.
         verbose (bool, optional): enable additional debug output
     """
 

megadetector/visualization/visualize_detector_output.py

@@ -24,10 +24,13 @@ from megadetector.detection.run_detector import get_typical_confidence_threshold
 from megadetector.utils.ct_utils import get_max_conf
 from megadetector.utils import write_html_image_list
 from megadetector.utils.path_utils import path_is_abs
+from megadetector.utils.path_utils import open_file
 from megadetector.utils.wi_utils import load_md_or_speciesnet_file
 from megadetector.visualization import visualization_utils as vis_utils
 from megadetector.visualization.visualization_utils import blur_detections
 
+default_box_sort_order = 'confidence'
+
 
 #%% Constants
 
@@ -49,7 +52,7 @@ def _render_image(entry,
                   out_dir,
                   images_dir,
                   output_image_width,
-                  box_sort_order=None,
+                  box_sort_order=default_box_sort_order,
                   category_names_to_blur=None):
     """
     Internal function for rendering a single image.
@@ -153,7 +156,7 @@ def visualize_detector_output(detector_output_path,
                               parallelize_rendering=False,
                               parallelize_rendering_n_cores=10,
                               parallelize_rendering_with_threads=True,
-                              box_sort_order=None,
+                              box_sort_order=default_box_sort_order,
                               category_names_to_blur=None):
     """
     Draws bounding boxes on images given the output of a detector.
@@ -424,8 +427,7 @@ def main(): # noqa
         html_output_file=args.html_output_file,
         category_names_to_blur=category_names_to_blur)
 
-    if args.html_output_file is not None and args.open_html_output_file:
-        from megadetector.utils.path_utils import open_file
+    if (args.html_output_file is not None) and args.open_html_output_file:
         open_file(args.html_output_file)
 
 if __name__ == '__main__':

{megadetector-10.0.3.dist-info → megadetector-10.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: megadetector
-Version: 10.0.3
+Version: 10.0.4
 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-10.0.3.dist-info → megadetector-10.0.4.dist-info}/RECORD

@@ -30,6 +30,7 @@ megadetector/classification/efficientnet/__init__.py,sha256=e-jfknjzCc5a0CSW-TaZ
 megadetector/classification/efficientnet/model.py,sha256=o7m379-FVeHrioW1HSJ48fLUqH9MMlf4b1BwktL2EoQ,17120
 megadetector/classification/efficientnet/utils.py,sha256=76SQdh0zK7CFcwTW4kiechCGMHSftPT0tC1PtqNRLZI,24756
 megadetector/data_management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+megadetector/data_management/animl_to_md.py,sha256=Z6PDJxeM_5dMZJBM3j0mxDPW2_1bNkXx0M3_qq42_Ig,4416
 megadetector/data_management/camtrap_dp_to_coco.py,sha256=HoCGMzZTEvnudnAjbOr-mCizXHmc8mMNSUChy_Q9PkI,9673
 megadetector/data_management/cct_json_utils.py,sha256=iybRIlARCsId-yWiwRckNZhfmY5aFFfsiJbyaXCDr1E,19535
 megadetector/data_management/cct_to_md.py,sha256=e1fYevSz0m65n5H16uB6uwzNiXiwxjdB2ka5p68R4d0,5120
@@ -51,6 +52,7 @@ megadetector/data_management/speciesnet_to_md.py,sha256=kINd7PfWC1G-kawZH8YDigtB
 megadetector/data_management/wi_download_csv_to_coco.py,sha256=rhqWSEmDiXs1GbHavoNwdGSqk01-a-4xmz7z7x1Qjs4,7973
 megadetector/data_management/yolo_output_to_md_output.py,sha256=4wU31dHo8rSwge91m0bO0YAYrytvmxZH0YRHiRjRGa8,22509
 megadetector/data_management/yolo_to_coco.py,sha256=5fa7VAbRZQgWK-03DeyVhpj6qeIW6cT7v8B33rhsN3I,31003
+megadetector/data_management/zamba_to_md.py,sha256=f6hK0pdVY0FhN_7DqKhY5BswYps7fO-Hy5ojmRvntok,5314
 megadetector/data_management/annotations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 megadetector/data_management/annotations/annotation_constants.py,sha256=Fp_uaFQbMzhjMBcXOBUuTA9eOmenjPboMQojPQUaJjI,951
 megadetector/data_management/databases/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -70,20 +72,20 @@ megadetector/data_management/lila/lila_common.py,sha256=IRWs46TrxcjckLidDwXPmb5O
 megadetector/data_management/lila/test_lila_metadata_urls.py,sha256=ThU78Ks5V3rFyJSKStFcM5M2yTlhR_pgMTa6_KuF5Hs,5256
 megadetector/detection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 megadetector/detection/change_detection.py,sha256=Ne3GajbH_0KPBU8ruHp4Rkr0uKd5oKAMQ3CQTRKRHgQ,28659
-megadetector/detection/process_video.py,sha256=WQMhP6kjjsQIA_V0SMQ66yAyFatt34VPgEvLvaqolnc,17292
-megadetector/detection/pytorch_detector.py,sha256=Jczkwd47I8X-CtddvB7HvREYau0QNtzGAuOLVCWT9Pc,60407
+megadetector/detection/process_video.py,sha256=iE-TA42IhrVwl3ftZ12mgaWv5CuttsI5SsivxSzpRiY,17498
+megadetector/detection/pytorch_detector.py,sha256=ixU-2_AnCwEP33FaaqTZRoi1WxIUeM4x_ksbNT-tezA,59817
 megadetector/detection/run_detector.py,sha256=TTX29zxDN_O7ja61sOmMIVewUz3yRvKg1D1AAYhVEkc,46851
-megadetector/detection/run_detector_batch.py,sha256=j2wu6gQ593T6N1o4-KsT6mNaGQbc8Rr6NdGAA5rxYXE,88307
+megadetector/detection/run_detector_batch.py,sha256=aZgiywL6arrdQ_l3jzlHctlccqL537lwVStjhi1hIWw,89823
 megadetector/detection/run_inference_with_yolov5_val.py,sha256=A-AQuARVVy7oR9WtenCZwzvd5U3HQwihMr4Jkiv9U0g,53515
-megadetector/detection/run_md_and_speciesnet.py,sha256=WJqwu62j_XS1LUr1pak8eeKnJ8-OsX5Fy8644cmHC54,49646
+megadetector/detection/run_md_and_speciesnet.py,sha256=Dp_SpJZp0pX9jzFtxM6zPCyBNq49uyQpMDAdNDLVorM,50280
 megadetector/detection/run_tiled_inference.py,sha256=wrQkKIloHBO9v2i0nZ1_Tt75iFtVrnco3Y4FafoVxdw,39382
 megadetector/detection/tf_detector.py,sha256=3b2MiqgMw8KBDzHQliUSDXWrmKpa9iZnfe6EgYpMcYo,8398
-megadetector/detection/video_utils.py,sha256=YSWpyUO1XKEemsNNfnbRbZFkt69JhFSJki3Q3Symhqg,49628
+megadetector/detection/video_utils.py,sha256=JkCTK1-aNmLDHOEvlI1w5KS2ZssSdgzerLIUE8iX2_I,49785
 megadetector/postprocessing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 megadetector/postprocessing/add_max_conf.py,sha256=9MYtsH2mwkiaZb7Qcor5J_HskfAj7d9srp8G_Qldpk0,1722
 megadetector/postprocessing/categorize_detections_by_size.py,sha256=DpZpRNFlyeOfWuOc6ICuENgIWDCEtiErJ_frBZp9lYM,5382
 megadetector/postprocessing/classification_postprocessing.py,sha256=CaT0O1-Y3FcdW1tO147etsTQhMBDoMHZwtYZbdukpMI,59916
-megadetector/postprocessing/combine_batch_outputs.py,sha256=I7cVKoAi_Dr5a8TBZGp9hU1QmkaDHB5tIgN3oGOeUfk,8417
+megadetector/postprocessing/combine_batch_outputs.py,sha256=BEP8cVa0sMIPg7tkWQc_8vOEPnbmWjOsQdVJHe61uz8,8468
 megadetector/postprocessing/compare_batch_results.py,sha256=RDlKLwea76rOWiDneSJUj6P_oMBMnD2BY4inoxLqQiw,84258
 megadetector/postprocessing/convert_output_format.py,sha256=FiwKSiMyEeNVLLfjpQtx3CrMbchwNUaW2TgLmdXGFVo,14892
 megadetector/postprocessing/create_crop_folder.py,sha256=T37HnvBEakikXY3n3Bgk5boFo_0-Z5aKnkEWXv-Ki4s,23166
@@ -97,8 +99,8 @@ megadetector/postprocessing/merge_detections.py,sha256=hvb4TJ6u1PyWOVQai9wZk72li
 megadetector/postprocessing/postprocess_batch_results.py,sha256=iAoCLKgwfC_vlrUGNg9cI694nzohJLNvdT7R0FScfLI,84597
 megadetector/postprocessing/remap_detection_categories.py,sha256=BE6Ce-PGBEx1FyG3XwbYp2D5sh5xUlVf6fonaMuPMAg,7927
 megadetector/postprocessing/render_detection_confusion_matrix.py,sha256=oNvDTh5td5ynELNnhz4XaLP2HiwLuojkJlob15TpgcY,26365
-megadetector/postprocessing/separate_detections_into_folders.py,sha256=rRYvRblQFKYTV-dNt7e19Eco9eLTaGru_i9aOCGyEH0,32258
-megadetector/postprocessing/subset_json_detector_output.py,sha256=Quz6xxM1T0N6bb1zGVKMv5GHBECLwNtuu9Sb35bWPhI,32188
+megadetector/postprocessing/separate_detections_into_folders.py,sha256=Yvpkl_MsWbGoo4zvQHrXHkATRJaYdYligItfg9bvuV8,32262
+megadetector/postprocessing/subset_json_detector_output.py,sha256=FiP1sUYfIBqOiSwjkJ6qkj4hvlF7yJsF7-y9tmfSShc,32187
 megadetector/postprocessing/top_folders_to_bottom.py,sha256=zYrqMHjUZG8urh2CYphfs91ZQ620uqe-TL8jVYy8KVw,6049
 megadetector/postprocessing/validate_batch_results.py,sha256=9nr7LeKMdki9Y821ag2bZFQCxuq0OqINDH7cPXyVcY8,12059
 megadetector/postprocessing/repeat_detection_elimination/find_repeat_detections.py,sha256=XgVeyga8iSC01MAjXxb2rn-CgJTYHqC_gfxxEoSn4aw,9420
@@ -118,12 +120,12 @@ megadetector/taxonomy_mapping/validate_lila_category_mappings.py,sha256=sAKYreO1
 megadetector/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 megadetector/tests/test_nms_synthetic.py,sha256=oY6xmT1sLSSN7weQJ8TPTaZgAiSiZ6s43EffUhwLWIw,14707
 megadetector/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-megadetector/utils/ct_utils.py,sha256=i8CjVxQPM50WppFRgQGzXc6-itkfW0e7heB6r5IE_0w,58740
+megadetector/utils/ct_utils.py,sha256=7K5gRd_Q9DVtMxly5eW8BIgtcGHIwiTeNdyeiLYfN-A,60033
 megadetector/utils/directory_listing.py,sha256=CZBzwg0Fus1xuRAp3ycEBjViDdwwk4eKdGq06ZERLDg,6414
 megadetector/utils/extract_frames_from_video.py,sha256=vjSVgxtb5z2syHCVYWc2KdNUpc-O6yY8nkbj_wqsIvY,12255
 megadetector/utils/gpu_test.py,sha256=5zUfAVeSjH8I08eCqayFmMxL-0mix8SjJJTe5ORABvU,3544
-megadetector/utils/md_tests.py,sha256=MrwJam7sjqV12xzu_wRFJd6t_5oMg8TpN795N0i_gEw,80384
-megadetector/utils/path_utils.py,sha256=tUNnx2OzDm4ND5rEhIw60DS0dUfXqByk6JJ4DKNlibU,98982
+megadetector/utils/md_tests.py,sha256=Iup4KjyIpLUpZ4TzzwEyGK61rg6aH7NrEQsdQ-ov51I,80300
+megadetector/utils/path_utils.py,sha256=qU1jTBHYy11i5vOMslFEUjc1VBnxQHnDCPYkVzuUXms,98686
 megadetector/utils/process_utils.py,sha256=gQcpH9WYvGPUs0FhtJ5_Xvl6JsvoGz8_mnDQk0PbTRM,5673
 megadetector/utils/split_locations_into_train_val.py,sha256=fd_6pj1aWY6hybwaXvBn9kBcOHjI90U-OsTmEAGpeu8,10297
 megadetector/utils/string_utils.py,sha256=r2Maw3zbzk3EyaZcNkdqr96yP_8m4ey6v0WxlemEY9U,6155
@@ -133,12 +135,12 @@ megadetector/utils/write_html_image_list.py,sha256=6Tbe5wyUxoBYJgH9yVrxxKCeWF2BV
 megadetector/visualization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 megadetector/visualization/plot_utils.py,sha256=uDDlOhdaJ3V8sGj2kS9b0cgszKc8WCq2_ofl6TW_XUs,10727
 megadetector/visualization/render_images_with_thumbnails.py,sha256=-XX4PG4wnrFjFTIwd0sMxXxKMxPuu0SZ_TfK3dI1x8Y,8425
-megadetector/visualization/visualization_utils.py,sha256=_f8x6Tx5mWeGYpvTbkBDOGGaxenK-qPi2ba3ndOLQDk,75865
+megadetector/visualization/visualization_utils.py,sha256=E5uvysS3F1S_yiPFxZty3U2f6cjuE8zG6XWggYOu-5o,75921
 megadetector/visualization/visualize_db.py,sha256=8YDWSR0eMehXYdPtak9z8UUw35xV7hu-0eCuzgSLjWc,25558
-megadetector/visualization/visualize_detector_output.py,sha256=uMa5QzJEr72Z3NyPBYOTHS_hs-WtN4jFQDg6suBJZ_4,20217
+megadetector/visualization/visualize_detector_output.py,sha256=nrVpzjdm8OpuicRWbT7Dvob7lcaha0X26koBOmPaJYw,20286
 megadetector/visualization/visualize_video_output.py,sha256=WqG9lr9LWO5x3NW3WRKrC_DOvyftLu0VkXkmCIFtbik,20257
-megadetector-10.0.3.dist-info/licenses/LICENSE,sha256=RMa3qq-7Cyk7DdtqRj_bP1oInGFgjyHn9-PZ3PcrqIs,1100
-megadetector-10.0.3.dist-info/METADATA,sha256=mUoOYppfputCqFcprgWezSiulGDhC9KmgpJQKgRD0L8,6353
-megadetector-10.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-megadetector-10.0.3.dist-info/top_level.txt,sha256=wf9DXa8EwiOSZ4G5IPjakSxBPxTDjhYYnqWRfR-zS4M,13
-megadetector-10.0.3.dist-info/RECORD,,
+megadetector-10.0.4.dist-info/licenses/LICENSE,sha256=RMa3qq-7Cyk7DdtqRj_bP1oInGFgjyHn9-PZ3PcrqIs,1100
+megadetector-10.0.4.dist-info/METADATA,sha256=EzJOHeSHWnVFX6mWhnmC70BW8uIKtbIKUYKsUcSrXSQ,6353
+megadetector-10.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+megadetector-10.0.4.dist-info/top_level.txt,sha256=wf9DXa8EwiOSZ4G5IPjakSxBPxTDjhYYnqWRfR-zS4M,13
+megadetector-10.0.4.dist-info/RECORD,,