megadetector 5.0.28__py3-none-any.whl → 5.0.29__py3-none-any.whl

megadetector/data_management/databases/add_width_and_height_to_db.py

@@ -12,11 +12,12 @@ TODO: this is a one-off script waiting to be cleaned up for more general use.
 
 import json
 from PIL import Image
+from megadetector.utils import ct_utils
 
 datafile = '/datadrive/snapshotserengeti/databases/snapshotserengeti.json'
 image_base = '/datadrive/snapshotserengeti/images/'
 
-def main():
+def main(): # noqa
 
     with open(datafile,'r') as f:
         data = json.load(f)
@@ -27,7 +28,7 @@ def main():
             im['height'] = im_h
             im['width'] = im_w
 
-    json.dump(data, open(datafile,'w'))
+    ct_utils.write_json(datafile, data, indent=None)
 
 if __name__ == '__main__':
     main()

megadetector/data_management/databases/combine_coco_camera_traps_files.py

@@ -10,7 +10,7 @@ writing the results to another .json file.
 - Checks compatibility in info structs, within reason.
 
 *Example command-line invocation*
-    
+
 combine_coco_camera_traps_files input1.json input2.json ... inputN.json output.json
 
 """
@@ -20,12 +20,13 @@ combine_coco_camera_traps_files input1.json input2.json ... inputN.json output.j
 import argparse
 import json
 import sys
+from megadetector.utils import ct_utils
 
 
 #%% Merge functions
 
-def combine_cct_files(input_files, 
-                      output_file=None, 
+def combine_cct_files(input_files,
+                      output_file=None,
                       require_uniqueness=True,
                       filename_prefixes=None):
     """
@@ -38,12 +39,12 @@ def combine_cct_files(input_files,
         require_uniqueness (bool, optional): whether to require that the images in
             each input_dict be unique
         filename_prefixes (dict, optional): dict mapping input filenames to strings
-            that should be prepended to image filenames from that source            
-    
+            that should be prepended to image filenames from that source
+
     Returns:
         dict: the merged COCO-formatted .json dict
     """
-    
+
     input_dicts = []
     print('Loading input files')
     for fn in input_files:
@@ -60,13 +61,12 @@ def combine_cct_files(input_files,
 
     print('Writing output')
     if output_file is not None:
-        with open(output_file, 'w') as f:
-            json.dump(merged_dict, f, indent=1)
+        ct_utils.write_json(output_file, merged_dict)
 
     return merged_dict
 
 
-def combine_cct_dictionaries(input_dicts, require_uniqueness=True):                                    
+def combine_cct_dictionaries(input_dicts, require_uniqueness=True):
     """
     Merges the list of COCO Camera Traps dictionaries [input_dicts].  See module header
     comment for details on merge rules.
@@ -76,18 +76,18 @@ def combine_cct_dictionaries(input_dicts, require_uniqueness=True):
         require_uniqueness: bool, whether to require that the images in
             each input_dict be unique
 
-    Returns: 
+    Returns:
         dict: the merged COCO-formatted .json dict
     """
-    
+
     filename_to_image = {}
     all_annotations = []
     info = None
-    
+
     category_name_to_id = {}
     category_name_to_id['empty'] = 0
     next_category_id = 1
-    
+
     known_fields = ['info', 'categories', 'annotations','images','filename_prefix']
 
     # i_input_dict = 0; input_dict = input_dicts[i_input_dict]
@@ -96,19 +96,19 @@ def combine_cct_dictionaries(input_dicts, require_uniqueness=True):
         filename_prefix = ''
         if ('filename_prefix' in input_dict.keys()):
             filename_prefix = input_dict['filename_prefix']
-        
+
         for k in input_dict.keys():
             if k not in known_fields:
                 raise ValueError(f'Unrecognized CCT field: {k}')
 
         # We will prepend an index to every ID to guarantee uniqueness
         index_string = 'ds' + str(i_input_dict).zfill(3) + '_'
-        
+
         old_cat_id_to_new_cat_id = {}
-        
+
         # Map detection categories from the original data set into the merged data set
         for original_category in input_dict['categories']:
-        
+
             original_cat_id = original_category['id']
             cat_name = original_category['name']
             if cat_name in category_name_to_id:
@@ -117,58 +117,58 @@ def combine_cct_dictionaries(input_dicts, require_uniqueness=True):
                 new_cat_id = next_category_id
                 next_category_id += 1
                 category_name_to_id[cat_name] = new_cat_id
-                
+
             if original_cat_id in old_cat_id_to_new_cat_id:
                 assert old_cat_id_to_new_cat_id[original_cat_id] == new_cat_id
             else:
                 old_cat_id_to_new_cat_id[original_cat_id] = new_cat_id
-            
+
         # ...for each category
-        
-        
+
+
         # Merge original image list into the merged data set
         for im in input_dict['images']:
-            
+
             if 'seq_id' in im:
                 im['seq_id'] = index_string + im['seq_id']
             if 'location' in im:
                 im['location'] = index_string + im['location']
-                
+
             im_file = filename_prefix + im['file_name']
             im['file_name'] = im_file
             if require_uniqueness:
-                assert im_file not in filename_to_image, f'Duplicate image: {im_file}'                
+                assert im_file not in filename_to_image, f'Duplicate image: {im_file}'
             else:
                 if im_file in filename_to_image:
                     print('Redundant image {}'.format(im_file))
-            
+
             # Create a unique ID
             im['id'] = index_string + im['id']
             filename_to_image[im_file] = im
 
         # ...for each image
-                  
-        
+
+
         # Same for annotations
         for ann in input_dict['annotations']:
-            
+
             ann['image_id'] = index_string + ann['image_id']
             ann['id'] = index_string + ann['id']
             assert ann['category_id'] in old_cat_id_to_new_cat_id
             ann['category_id'] = old_cat_id_to_new_cat_id[ann['category_id']]
-            
+
         # ...for each annotation
-        
+
         all_annotations.extend(input_dict['annotations'])
-        
+
         # Merge info dicts, don't check completion time fields
         if info is None:
-            import copy            
+            import copy
             info = copy.deepcopy(input_dict['info'])
             info['original_info'] = [input_dict['info']]
         else:
             info['original_info'].append(input_dict['info'])
-            
+
     # ...for each dictionary
 
     # Convert merged image dictionaries to a sorted list
@@ -176,12 +176,12 @@ def combine_cct_dictionaries(input_dicts, require_uniqueness=True):
 
     all_categories = [{'id':category_name_to_id[cat_name],'name':cat_name} for\
                       cat_name in category_name_to_id.keys()]
-    
+
     merged_dict = {'info': info,
                    'categories': all_categories,
                    'images': sorted_images,
                    'annotations': all_annotations}
-    
+
     return merged_dict
 
 # ...combine_cct_dictionaries(...)
@@ -189,8 +189,8 @@ def combine_cct_dictionaries(input_dicts, require_uniqueness=True):
 
 #%% Command-line driver
 
-def main():
-    
+def main(): # noqa
+
     parser = argparse.ArgumentParser()
     parser.add_argument(
         'input_paths', nargs='+',
@@ -202,7 +202,7 @@ def main():
     if len(sys.argv[1:]) == 0:
         parser.print_help()
         parser.exit()
-        
+
     args = parser.parse_args()
     combine_cct_files(args.input_paths, args.output_path)