From 745b1fdcb11a59bc506128a19f56eef38bc62544 Mon Sep 17 00:00:00 2001 From: Aksh Gupta Date: Tue, 30 Mar 2021 07:16:52 +0000 Subject: [PATCH] chore: refactor code quality issues --- .deepsource.toml | 10 ++++++++++ XSegEditor/XSegEditor.py | 2 +- core/cv2ex.py | 2 +- core/imagelib/warp.py | 2 +- core/joblib/SubprocessorBase.py | 2 +- core/leras/models/ModelBase.py | 3 +-- core/leras/ops/__init__.py | 3 +-- core/mplib/__init__.py | 8 ++++---- core/qtex/QSubprocessor.py | 2 +- facelib/FaceType.py | 2 +- facelib/S3FDExtractor.py | 2 +- merger/InteractiveMergerSubprocessor.py | 2 +- merger/MergerConfig.py | 8 ++++---- models/Model_Quick96/Model.py | 4 ++-- models/Model_SAEHD/Model.py | 2 +- 15 files changed, 31 insertions(+), 23 deletions(-) create mode 100644 .deepsource.toml diff --git a/.deepsource.toml b/.deepsource.toml new file mode 100644 index 0000000..5dee88c --- /dev/null +++ b/.deepsource.toml @@ -0,0 +1,10 @@ +version = 1 + +exclude_patterns = ["samplelib/**"] + +[[analyzers]] +name = "python" +enabled = true + + [analyzers.meta] + runtime_version = "3.x.x" \ No newline at end of file diff --git a/XSegEditor/XSegEditor.py b/XSegEditor/XSegEditor.py index c9cb6aa..ae72f1e 100644 --- a/XSegEditor/XSegEditor.py +++ b/XSegEditor/XSegEditor.py @@ -1206,7 +1206,7 @@ class MainWindow(QXMainWindow): self.image_paths_done = [] self.image_paths = image_paths self.image_paths_has_ie_polys = image_paths_has_ie_polys - self.set_has_ie_polys_count ( len([ 1 for x in self.image_paths_has_ie_polys if self.image_paths_has_ie_polys[x] == True]) ) + self.set_has_ie_polys_count ( len([ 1 for x in self.image_paths_has_ie_polys if self.image_paths_has_ie_polys[x] is True]) ) self.loading_frame.hide() self.loading_frame = None diff --git a/core/cv2ex.py b/core/cv2ex.py index aa5d73c..b3413c0 100644 --- a/core/cv2ex.py +++ b/core/cv2ex.py @@ -24,7 +24,7 @@ def cv2_imread(filename, flags=cv2.IMREAD_UNCHANGED, loader_func=None, verbose=T def cv2_imwrite(filename, img, *args): ret, buf = cv2.imencode( Path(filename).suffix, img, *args) - if ret == True: + if ret is True: try: with open(filename, "wb") as stream: stream.write( buf ) diff --git a/core/imagelib/warp.py b/core/imagelib/warp.py index ac4f324..9db3426 100644 --- a/core/imagelib/warp.py +++ b/core/imagelib/warp.py @@ -37,7 +37,7 @@ def gen_warp_params (w, flip, rotation_range=[-10,10], scale_range=[-0.5, 0.5], random_transform_mat = cv2.getRotationMatrix2D((w // 2, w // 2), rotation, scale) random_transform_mat[:, 2] += (tx*w, ty*w) - params = dict() + params = {} params['mapx'] = mapx params['mapy'] = mapy params['rmat'] = random_transform_mat diff --git a/core/joblib/SubprocessorBase.py b/core/joblib/SubprocessorBase.py index 17e7056..2f07da6 100644 --- a/core/joblib/SubprocessorBase.py +++ b/core/joblib/SubprocessorBase.py @@ -90,7 +90,7 @@ class Subprocessor(object): # disable pickling def __getstate__(self): - return dict() + return {} def __setstate__(self, d): self.__dict__.update(d) diff --git a/core/leras/models/ModelBase.py b/core/leras/models/ModelBase.py index cc558a4..6d0f5a5 100644 --- a/core/leras/models/ModelBase.py +++ b/core/leras/models/ModelBase.py @@ -22,8 +22,7 @@ class ModelBase(nn.Saveable): for subname in layer.keys(): sublayer = layer[subname] self._build_sub(sublayer, f"{name}_{subname}") - elif isinstance (layer, nn.LayerBase) or \ - isinstance (layer, ModelBase): + elif isinstance (layer, (nn.LayerBase, ModelBase)): if layer.name is None: layer.name = name diff --git a/core/leras/ops/__init__.py b/core/leras/ops/__init__.py index 500a22a..01fab6f 100644 --- a/core/leras/ops/__init__.py +++ b/core/leras/ops/__init__.py @@ -16,8 +16,7 @@ def batch_set_value(tuples): feed_dict = {} for x, value in tuples: - if isinstance(value, nn.tf.Operation) or \ - isinstance(value, nn.tf.Variable): + if isinstance(value, (nn.tf.Operation, nn.tf.Variable)): assign_ops.append(value) else: value = np.asarray(value, dtype=x.dtype.as_numpy_dtype) diff --git a/core/mplib/__init__.py b/core/mplib/__init__.py index a2c9f1f..40d8d62 100644 --- a/core/mplib/__init__.py +++ b/core/mplib/__init__.py @@ -48,7 +48,7 @@ class IndexHost(): # disable pickling def __getstate__(self): - return dict() + return {} def __setstate__(self, d): self.__dict__.update(d) @@ -137,7 +137,7 @@ class Index2DHost(): # disable pickling def __getstate__(self): - return dict() + return {} def __setstate__(self, d): self.__dict__.update(d) @@ -203,7 +203,7 @@ class ListHost(): # disable pickling def __getstate__(self): - return dict() + return {} def __setstate__(self, d): self.__dict__.update(d) @@ -278,7 +278,7 @@ class DictHost(): # disable pickling def __getstate__(self): - return dict() + return {} def __setstate__(self, d): self.__dict__.update(d) diff --git a/core/qtex/QSubprocessor.py b/core/qtex/QSubprocessor.py index 223f50c..a9a28c2 100644 --- a/core/qtex/QSubprocessor.py +++ b/core/qtex/QSubprocessor.py @@ -91,7 +91,7 @@ class QSubprocessor(object): # disable pickling def __getstate__(self): - return dict() + return {} def __setstate__(self, d): self.__dict__.update(d) diff --git a/facelib/FaceType.py b/facelib/FaceType.py index 745cff3..c0d98d0 100644 --- a/facelib/FaceType.py +++ b/facelib/FaceType.py @@ -34,4 +34,4 @@ to_string_dict = { FaceType.HALF : 'half_face', FaceType.MARK_ONLY :'mark_only', } -from_string_dict = { to_string_dict[x] : x for x in to_string_dict.keys() } \ No newline at end of file +from_string_dict = { to_string_dict[x] : x for x in to_string_dict } \ No newline at end of file diff --git a/facelib/S3FDExtractor.py b/facelib/S3FDExtractor.py index 0e743e3..4173955 100644 --- a/facelib/S3FDExtractor.py +++ b/facelib/S3FDExtractor.py @@ -246,7 +246,7 @@ class S3FDExtractor(object): return bboxlist def refine_nms(self, dets, thresh): - keep = list() + keep = [] if len(dets) == 0: return keep diff --git a/merger/InteractiveMergerSubprocessor.py b/merger/InteractiveMergerSubprocessor.py index 58db0c1..c1b6a73 100644 --- a/merger/InteractiveMergerSubprocessor.py +++ b/merger/InteractiveMergerSubprocessor.py @@ -531,7 +531,7 @@ class InteractiveMergerSubprocessor(Subprocessor): self.process_remain_frames = False return (self.is_interactive and self.is_interactive_quitting) or \ - (not self.is_interactive and self.process_remain_frames == False) + (not self.is_interactive and self.process_remain_frames is False) #override diff --git a/merger/MergerConfig.py b/merger/MergerConfig.py index 432bdf1..cb88231 100644 --- a/merger/MergerConfig.py +++ b/merger/MergerConfig.py @@ -33,7 +33,7 @@ class MergerConfig(object): #overridable def ask_settings(self): s = """Choose sharpen mode: \n""" - for key in self.sharpen_dict.keys(): + for key in self.sharpen_dict: s += f"""({key}) {self.sharpen_dict[key]}\n""" io.log_info(s) self.sharpen_mode = io.input_int ("", 0, valid_list=self.sharpen_dict.keys(), help_message="Enhance details by applying sharpen filter.") @@ -79,7 +79,7 @@ mode_dict = {0:'original', 5:'raw-rgb', 6:'raw-predict'} -mode_str_dict = { mode_dict[key] : key for key in mode_dict.keys() } +mode_str_dict = { mode_dict[key] : key for key in mode_dict } mask_mode_dict = {1:'dst', 2:'learned-prd', @@ -189,7 +189,7 @@ class MergerConfigMasked(MergerConfig): def ask_settings(self): s = """Choose mode: \n""" - for key in mode_dict.keys(): + for key in mode_dict: s += f"""({key}) {mode_dict[key]}\n""" io.log_info(s) mode = io.input_int ("", mode_str_dict.get(self.default_mode, 1) ) @@ -204,7 +204,7 @@ class MergerConfigMasked(MergerConfig): self.hist_match_threshold = np.clip ( io.input_int("Hist match threshold", 255, add_info="0..255"), 0, 255) s = """Choose mask mode: \n""" - for key in mask_mode_dict.keys(): + for key in mask_mode_dict: s += f"""({key}) {mask_mode_dict[key]}\n""" io.log_info(s) self.mask_mode = io.input_int ("", 1, valid_list=mask_mode_dict.keys() ) diff --git a/models/Model_Quick96/Model.py b/models/Model_Quick96/Model.py index 3c39e46..e363a8b 100644 --- a/models/Model_Quick96/Model.py +++ b/models/Model_Quick96/Model.py @@ -232,7 +232,7 @@ class QModel(ModelBase): self.set_training_data_generators ([ SampleGeneratorFace(training_data_src_path, debug=self.is_debug(), batch_size=self.get_batch_size(), - sample_process_options=SampleProcessor.Options(random_flip=True if self.pretrain else False), + sample_process_options=SampleProcessor.Options(random_flip=bool(self.pretrain)), output_sample_types = [ {'sample_type': SampleProcessor.SampleType.FACE_IMAGE,'warp':True, 'transform':True, 'channel_type' : SampleProcessor.ChannelType.BGR, 'face_type':self.face_type, 'data_format':nn.data_format, 'resolution': resolution}, {'sample_type': SampleProcessor.SampleType.FACE_IMAGE,'warp':False, 'transform':True, 'channel_type' : SampleProcessor.ChannelType.BGR, 'face_type':self.face_type, 'data_format':nn.data_format, 'resolution': resolution}, {'sample_type': SampleProcessor.SampleType.FACE_MASK, 'warp':False, 'transform':True, 'channel_type' : SampleProcessor.ChannelType.G, 'face_mask_type' : SampleProcessor.FaceMaskType.FULL_FACE, 'face_type':self.face_type, 'data_format':nn.data_format, 'resolution': resolution} @@ -240,7 +240,7 @@ class QModel(ModelBase): generators_count=src_generators_count ), SampleGeneratorFace(training_data_dst_path, debug=self.is_debug(), batch_size=self.get_batch_size(), - sample_process_options=SampleProcessor.Options(random_flip=True if self.pretrain else False), + sample_process_options=SampleProcessor.Options(random_flip=bool(self.pretrain)), output_sample_types = [ {'sample_type': SampleProcessor.SampleType.FACE_IMAGE,'warp':True, 'transform':True, 'channel_type' : SampleProcessor.ChannelType.BGR, 'face_type':self.face_type, 'data_format':nn.data_format, 'resolution': resolution}, {'sample_type': SampleProcessor.SampleType.FACE_IMAGE,'warp':False, 'transform':True, 'channel_type' : SampleProcessor.ChannelType.BGR, 'face_type':self.face_type, 'data_format':nn.data_format, 'resolution': resolution}, {'sample_type': SampleProcessor.SampleType.FACE_MASK, 'warp':False, 'transform':True, 'channel_type' : SampleProcessor.ChannelType.G, 'face_mask_type' : SampleProcessor.FaceMaskType.FULL_FACE, 'face_type':self.face_type, 'data_format':nn.data_format, 'resolution': resolution} diff --git a/models/Model_SAEHD/Model.py b/models/Model_SAEHD/Model.py index 79329ff..daec2b5 100644 --- a/models/Model_SAEHD/Model.py +++ b/models/Model_SAEHD/Model.py @@ -177,7 +177,7 @@ Examples: df, liae, df-d, df-ud, liae-ud, ... self.gan_model_changed = (default_gan_patch_size != self.options['gan_patch_size']) or (default_gan_dims != self.options['gan_dims']) - self.pretrain_just_disabled = (default_pretrain == True and self.options['pretrain'] == False) + self.pretrain_just_disabled = (default_pretrain is True and self.options['pretrain'] == False) #override def on_initialize(self):