Sourcery Starbot ⭐ refactored buts101/Detectron by SourceryAI · Pull Request #1 · buts101/Detectron

SourceryAI · 2022-05-27T13:41:47Z

Thanks for starring sourcery-ai/sourcery ✨ 🌟 ✨

Here's your pull request refactoring your most popular Python repo.

If you want Sourcery to refactor all your Python repos and incoming pull requests install our bot.

Review changes via command line

To manually merge these changes, make sure you're on the master branch, then run:

git fetch https://github.com/sourcery-ai-bot/Detectron master
git merge --ff-only FETCH_HEAD
git reset HEAD^

SourceryAI

Due to GitHub API limits, only the first 60 comments can be shown.

SourceryAI · 2022-05-27T13:41:50Z

lib/core/rpn_generator.py

-    binary = os.path.join(binary_dir, 'test_net' + binary_ext)
-    assert os.path.exists(binary), 'Binary \'{}\' not found'.format(binary)
+    binary = os.path.join(binary_dir, f'test_net{binary_ext}')
+    assert os.path.exists(binary), f"Binary '{binary}' not found"


Function multi_gpu_generate_rpn_on_dataset refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

Replace call to format with f-string. (use-fstring-for-formatting)

SourceryAI · 2022-05-27T13:41:51Z

lib/core/rpn_generator.py

        dict(boxes=boxes, scores=scores, ids=ids, cfg=cfg_yaml), rpn_file
    )
-    logger.info('Wrote RPN proposals to {}'.format(os.path.abspath(rpn_file)))
+    logger.info(f'Wrote RPN proposals to {os.path.abspath(rpn_file)}')


Function generate_rpn_on_range refactored with the following changes:

Replace call to format with f-string. (use-fstring-for-formatting)

SourceryAI · 2022-05-27T13:41:51Z

lib/core/rpn_generator.py

-            core.ScopedName('rpn_rois_fpn' + str(l))
+            core.ScopedName(f'rpn_rois_fpn{str(l)}')
            for l in range(k_min, k_max + 1)
        ]
+
        score_names = [
-            core.ScopedName('rpn_roi_probs_fpn' + str(l))
+            core.ScopedName(f'rpn_roi_probs_fpn{str(l)}')
            for l in range(k_min, k_max + 1)
        ]
+


Function im_proposals refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

SourceryAI · 2022-05-27T13:41:51Z

lib/core/rpn_generator.py

-    im_size_min = np.min(im_shape[0:2])
-    im_size_max = np.max(im_shape[0:2])
-
-    processed_ims = []
+    im_size_min = np.min(im_shape[:2])
+    im_size_max = np.max(im_shape[:2])


Function _get_image_blob refactored with the following changes:

Merge append into list declaration (merge-list-append)

Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (remove-redundant-slice-index)

Move assignment closer to its usage within a block (move-assign-in-block)

SourceryAI · 2022-05-27T13:41:51Z

lib/core/test.py

-    if not cfg.MODEL.FASTER_RCNN:
-        box_proposals_hf = box_utils.flip_boxes(box_proposals, im_width)
-    else:
-        box_proposals_hf = None
+    box_proposals_hf = (
+        None
+        if cfg.MODEL.FASTER_RCNN
+        else box_utils.flip_boxes(box_proposals, im_width)
+    )


Function im_detect_bbox_hflip refactored with the following changes:

Swap if/else branches of if expression to remove negation (swap-if-expression)

Replace if statement with if expression (assign-if-exp)

SourceryAI · 2022-05-27T13:41:52Z

lib/datasets/dummy_datasets.py

        'scissors', 'teddy bear', 'hair drier', 'toothbrush'
    ]
-    ds.classes = {i: name for i, name in enumerate(classes)}
+    ds.classes = dict(enumerate(classes))


Function get_coco_dataset refactored with the following changes:

Replace identity comprehension with call to collection constructor (identity-comprehension)

SourceryAI · 2022-05-27T13:41:53Z

lib/datasets/json_dataset.py

-        assert name in DATASETS.keys(), \
-            'Unknown dataset name: {}'.format(name)
-        assert os.path.exists(DATASETS[name][IM_DIR]), \
-            'Image directory \'{}\' not found'.format(DATASETS[name][IM_DIR])
-        assert os.path.exists(DATASETS[name][ANN_FN]), \
-            'Annotation file \'{}\' not found'.format(DATASETS[name][ANN_FN])
-        logger.debug('Creating: {}'.format(name))
+        assert name in DATASETS.keys(), f'Unknown dataset name: {name}'
+        assert os.path.exists(
+            DATASETS[name][IM_DIR]
+        ), f"Image directory '{DATASETS[name][IM_DIR]}' not found"
+
+        assert os.path.exists(
+            DATASETS[name][ANN_FN]
+        ), f"Annotation file '{DATASETS[name][ANN_FN]}' not found"
+
+        logger.debug(f'Creating: {name}')


Function JsonDataset.__init__ refactored with the following changes:

Replace call to format with f-string. (use-fstring-for-formatting)

SourceryAI · 2022-05-27T13:41:53Z

lib/datasets/json_dataset.py

-        logger.info('Loading proposals from: {}'.format(proposal_file))
+        logger.info(f'Loading proposals from: {proposal_file}')


Function JsonDataset._add_proposals_from_file refactored with the following changes:

Replace call to format with f-string. (use-fstring-for-formatting)

SourceryAI · 2022-05-27T13:41:53Z

lib/datasets/json_dataset.py

-        x = kp[0::3]  # 0-indexed x coordinates
+        x = kp[::3]


Function JsonDataset._get_gt_keypoints refactored with the following changes:

Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (remove-redundant-slice-index)

This removes the following comments ( why? ):

# 0-indexed x coordinates

SourceryAI · 2022-05-27T13:41:53Z

lib/datasets/json_dataset_evaluator.py

-        output_dir, 'segmentations_' + json_dataset.name + '_results'
+        output_dir, f'segmentations_{json_dataset.name}_results'
    )
+
    if use_salt:
-        res_file += '_{}'.format(str(uuid.uuid4()))
+        res_file += f'_{str(uuid.uuid4())}'


Function evaluate_masks refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

Replace call to format with f-string. (use-fstring-for-formatting)

SourceryAI · 2022-05-27T13:41:57Z

lib/datasets/json_dataset_evaluator.py

-        'Writing segmentation results json to: {}'.format(
-            os.path.abspath(res_file)))
+        f'Writing segmentation results json to: {os.path.abspath(res_file)}'
+    )
+


Function _write_coco_segms_results_file refactored with the following changes:

Replace call to format with f-string. (use-fstring-for-formatting)

SourceryAI · 2022-05-27T13:41:57Z

lib/datasets/json_dataset_evaluator.py

-    logger.info('Wrote json eval results to: {}'.format(eval_file))
+    logger.info(f'Wrote json eval results to: {eval_file}')


Function _do_segmentation_eval refactored with the following changes:

Replace call to format with f-string. (use-fstring-for-formatting)

SourceryAI · 2022-05-27T13:41:57Z

lib/datasets/json_dataset_evaluator.py

-    res_file = os.path.join(
-        output_dir, 'bbox_' + json_dataset.name + '_results'
-    )
+    res_file = os.path.join(output_dir, f'bbox_{json_dataset.name}_results')
    if use_salt:
-        res_file += '_{}'.format(str(uuid.uuid4()))
+        res_file += f'_{str(uuid.uuid4())}'


Function evaluate_boxes refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

Replace call to format with f-string. (use-fstring-for-formatting)

SourceryAI · 2022-05-27T13:41:57Z

lib/datasets/json_dataset_evaluator.py

            json_dataset, all_boxes[cls_ind], cat_id))
-    logger.info(
-        'Writing bbox results json to: {}'.format(os.path.abspath(res_file)))
+    logger.info(f'Writing bbox results json to: {os.path.abspath(res_file)}')


Function _write_coco_bbox_results_file refactored with the following changes:

Replace call to format with f-string. (use-fstring-for-formatting)

SourceryAI · 2022-05-27T13:41:58Z

lib/datasets/json_dataset_evaluator.py

-    logger.info('Wrote json eval results to: {}'.format(eval_file))
+    logger.info(f'Wrote json eval results to: {eval_file}')


Function _do_detection_eval refactored with the following changes:

Replace call to format with f-string. (use-fstring-for-formatting)

SourceryAI · 2022-05-27T13:41:59Z

lib/datasets/task_evaluation.py

-        assert dataset in results, 'Dataset {} not in results'.format(dataset)
-        assert task in results[dataset], 'Task {} not in results'.format(task)
-        assert metric in results[dataset][task], \
-            'Metric {} not in results'.format(metric)
+        assert dataset in results, f'Dataset {dataset} not in results'
+        assert task in results[dataset], f'Task {task} not in results'
+        assert metric in results[dataset][task], f'Metric {metric} not in results'


Function check_expected_results refactored with the following changes:

Replace call to format with f-string. (use-fstring-for-formatting)

Use f-string instead of string concatenation (use-fstring-for-concatenation)

SourceryAI · 2022-05-27T13:41:59Z