handling the case where detector_options is supplied programmatically as None

Author: agentmorris

megadetector/detection/run_detector.py

@@ -98,6 +98,12 @@
     'v5a.0.0':'v5a.0.1',
     'v5b.0.0':'v5b.0.1',
 
+    'md1000-redwood':'v1000.0.0-redwood',
+    'md1000-cedar':'v1000.0.0-cedar',
+    'md1000-larch':'v1000.0.0-larch',
+    'md1000-sorrel':'v1000.0.0-sorrel',
+    'md1000-spruce':'v1000.0.0-spruce',
+
     'mdv1000-redwood':'v1000.0.0-redwood',
     'mdv1000-cedar':'v1000.0.0-cedar',
     'mdv1000-larch':'v1000.0.0-larch',
@@ -125,6 +131,7 @@
     'megadetector':'v5a.0.1',
 }
 
+# python -m http.server 8181
 model_url_base = 'http://localhost:8181/'
 assert model_url_base.endswith('/')
 

megadetector/detection/run_detector_batch.py

@@ -350,6 +350,9 @@ def run_detector_with_image_queue(image_files,
     if loader_workers <= 0:
         loader_workers = 1
 
+    if detector_options is None:
+        detector_options = {}
+
     q = multiprocessing.JoinableQueue(max_queue_size)
     return_queue = multiprocessing.Queue(1)
 
@@ -532,6 +535,9 @@ def process_images(im_files,
         elapsed = time.time() - start_time
         print('Loaded model (batch level) in {}'.format(humanfriendly.format_timespan(elapsed)))
 
+    if detector_options is None:
+        detector_options = {}
+
     if use_image_queue:
 
         run_detector_with_image_queue(im_files,
@@ -751,6 +757,9 @@ def load_and_run_detector_batch(model_file,
     if n_cores is None or n_cores <= 0:
         n_cores = 1
 
+    if detector_options is None:
+        detector_options = {}
+
     if confidence_threshold is None:
         confidence_threshold=run_detector.DEFAULT_OUTPUT_CONFIDENCE_THRESHOLD
 

megadetector/postprocessing/md_to_labelme.py

@@ -108,8 +108,13 @@ def get_labelme_dict_for_image(im,image_base_name=None,category_id_to_name=None,
 # ...def get_labelme_dict_for_image()
 
 
-def _write_output_for_image(im,image_base,extension_prefix,info,
-                            confidence_threshold,category_id_to_name,overwrite,
+def _write_output_for_image(im,
+                            image_base,
+                            extension_prefix,
+                            info,
+                            confidence_threshold,
+                            category_id_to_name,
+                            overwrite,
                             verbose=False):
 
     if 'failure' in im and im['failure'] is not None:
@@ -140,9 +145,14 @@ def _write_output_for_image(im,image_base,extension_prefix,info,
 
 
 
-def md_to_labelme(results_file,image_base,confidence_threshold=None,
-                  overwrite=False,extension_prefix='',n_workers=1,
-                  use_threads=False,bypass_image_size_read=False,
+def md_to_labelme(results_file,
+                  image_base,
+                  confidence_threshold=None,
+                  overwrite=False,
+                  extension_prefix='',
+                  n_workers=1,
+                  use_threads=False,
+                  bypass_image_size_read=False,
                   verbose=False):
     """
     For all the images in [results_file], write a .json file in labelme format alongside the
@@ -153,11 +163,12 @@ def md_to_labelme(results_file,image_base,confidence_threshold=None,
         image_base (str): folder of images; filenames in [results_file] should be relative to
             this folder
         confidence_threshold (float, optional): only detections at or above this confidence threshold
-            will be included in the output dict
+            will be included in the output dict.  If None, no threshold will be applied.
         overwrite (bool, optional): whether to overwrite existing output files; if this is False
             and the output file for an image exists, we'll skip that image
         extension_prefix (str, optional): if non-empty, "extension_prefix" will be inserted before the .json
-            extension
+            extension (typically used to generate multiple copies of labelme files representing different
+            MD thresholds)
         n_workers (int, optional): enables multiprocessing if > 1
         use_threads (bool, optional): if [n_workers] > 1, determines whether we parallelize via threads (True)
             or processes (False)

megadetector/utils/url_utils.py

@@ -472,7 +472,6 @@ class TestUrlUtils:
     Tests for url_utils.py
     """
 
-
     def set_up(self):
         """
         Create a temporary directory for testing.
@@ -708,9 +707,11 @@ def test_get_url_size_and_sizes(self):
         assert sizes_map[REDIRECT_DEST_URL] == size_dynamic
 
 
-def test_url_utils():
+def _test_url_utils():
     """
-    Runs all tests in the TestUrlUtils class.
+    Runs all tests in the TestUrlUtils class.  I generally disable this during testing
+    because it creates irritating nondeterminism, and this is neither a core module nor
+    a module that changes often.
     """
 
     test_instance = TestUrlUtils()