From b4aae9321cd35f82dc8086d2e6d798a47529e72f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 14:17:29 +0100 Subject: [PATCH] [pre-commit.ci] pre-commit autoupdate (#176) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [pre-commit.ci] pre-commit autoupdate updates: - [github.com/psf/black: 23.12.1 → 24.1.1](https://github.com/psf/black/compare/23.12.1...24.1.1) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- ammico/display.py | 24 +++++++++++++++--------- ammico/multimodal_search.py | 12 ++++++------ ammico/text.py | 8 +++++--- 4 files changed, 27 insertions(+), 19 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0fa1614..e7aed59 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,7 @@ repos: - id: nbstripout files: ".ipynb" - repo: https://github.com/psf/black - rev: 23.12.1 + rev: 24.1.1 hooks: - id: black - repo: https://github.com/pycqa/flake8 diff --git a/ammico/display.py b/ammico/display.py index 4b289ae..ed150ab 100644 --- a/ammico/display.py +++ b/ammico/display.py @@ -479,12 +479,16 @@ class AnalysisExplorer: detector_class = identify_function( image_copy, analyse_text=analyse_text, - model_names=[settings_text_model_names] - if (settings_text_model_names is not None) - else None, - revision_numbers=[settings_text_revision_numbers] - if (settings_text_revision_numbers is not None) - else None, + model_names=( + [settings_text_model_names] + if (settings_text_model_names is not None) + else None + ), + revision_numbers=( + [settings_text_revision_numbers] + if (settings_text_revision_numbers is not None) + else None + ), ) elif detector_value == "EmotionDetector": detector_class = identify_function( @@ -502,9 +506,11 @@ class AnalysisExplorer: image_copy, analysis_type=setting_summary_analysis_type, model_type=setting_summary_model, - list_of_questions=[setting_summary_list_of_questions] - if (setting_summary_list_of_questions is not None) - else None, + list_of_questions=( + [setting_summary_list_of_questions] + if (setting_summary_list_of_questions is not None) + else None + ), ) else: detector_class = identify_function(image_copy) diff --git a/ammico/multimodal_search.py b/ammico/multimodal_search.py index 47649f9..ff85570 100644 --- a/ammico/multimodal_search.py +++ b/ammico/multimodal_search.py @@ -534,9 +534,9 @@ class MultimodalSearch(AnalysisMethod): self.subdict[image_keys[key]][ "rank " + list(search_query[q].values())[0] ] = places[q][key] - self.subdict[image_keys[key]][ - list(search_query[q].values())[0] - ] = similarity[key][q].item() + self.subdict[image_keys[key]][list(search_query[q].values())[0]] = ( + similarity[key][q].item() + ) else: self.subdict[image_keys[key]][ "rank " + list(search_query[q].values())[0] @@ -915,9 +915,9 @@ class MultimodalSearch(AnalysisMethod): avg_gradcams.append(local_avg_gradcams) itm_scores.append(local_itm_scores) itm_scores2.append(local_itm_scores2) - image_gradcam_with_itm[ - list(search_query[index_text_query].values())[0] - ] = localimage_gradcam_with_itm + image_gradcam_with_itm[list(search_query[index_text_query].values())[0]] = ( + localimage_gradcam_with_itm + ) del ( itm_model, vis_processor_itm, diff --git a/ammico/text.py b/ammico/text.py index d4279d0..7465d95 100644 --- a/ammico/text.py +++ b/ammico/text.py @@ -220,9 +220,11 @@ class TextDetector(AnalysisMethod): """Clean the text from unrecognized words and any numbers.""" templist = [] for token in self.doc: - templist.append( - token.text - ) if token.pos_ != "NUM" and token.has_vector else None + ( + templist.append(token.text) + if token.pos_ != "NUM" and token.has_vector + else None + ) self.subdict["text_clean"] = " ".join(templist).rstrip().lstrip() def text_summary(self):