From 0bc112a85697ce5318708839ba388618d7cf1b8f Mon Sep 17 00:00:00 2001 From: Jacobe2169 Date: Fri, 26 Jan 2024 13:47:20 +0100 Subject: [PATCH] lint to black 24 --- backend/gn_modulator/imports/mixins/log.py | 4 +- .../gn_modulator/imports/mixins/process.py | 44 ++++++++++--------- .../3920371728d8_gn_modulator_import_init.py | 1 + .../versions/5c1ec86a67ab_import_mapping.py | 1 + .../823729f24bac_import_relation_1_n.py | 1 + ...0a6e3_gn_modulator_permission_available.py | 1 + .../d3f266c7b1b6_init_gn_modulator.py | 1 + backend/gn_modulator/query/filters.py | 1 + backend/gn_modulator/query/getattr.py | 8 ++-- backend/gn_modulator/schema/auto.py | 5 +-- backend/gn_modulator/schema/base.py | 22 ++++++---- backend/gn_modulator/schema/config/grammar.py | 16 +++---- backend/gn_modulator/schema/doc.py | 8 ++-- backend/gn_modulator/schema/features/base.py | 8 ++-- backend/gn_modulator/schema/serializers.py | 10 ++--- backend/gn_modulator/schema/validation.py | 1 + backend/gn_modulator/tests/test_repository.py | 2 +- backend/gn_modulator/utils/commons.py | 1 - .../0f6b908cbe5e_concept_usage_objectif.py | 1 + ...9b8b_m_sipaf_actor_required_id_organism.py | 1 + ...8f989f1_ajout_commentaire_passage_faune.py | 1 + .../90f6e5531f7c_diagnostic_m_sipaf.py | 1 + .../b7eb2e900bf1_remove_objectifs_taxons.py | 1 + .../c11d028e1b42_typo_nomenclature.py | 1 + ...cd6fbb28c_add_pf_unique_uuid_constraint.py | 1 + .../ea2da3785c06_unrequire_code_pf.py | 1 + ..._log_history_t_passage_faune_m_sipaf.py.py | 1 + 27 files changed, 84 insertions(+), 60 deletions(-) diff --git a/backend/gn_modulator/imports/mixins/log.py b/backend/gn_modulator/imports/mixins/log.py index 9ead487b..b3bd536f 100644 --- a/backend/gn_modulator/imports/mixins/log.py +++ b/backend/gn_modulator/imports/mixins/log.py @@ -27,9 +27,7 @@ def pretty_errors_txt(self): key_txt = ( f"'{relation_key}.{key}' : " if key and relation_key - else f"'{key}' : " - if key - else "" + else f"'{key}' : " if key else "" ) txt = f"- {key_txt}{error['error_msg']}\n" for info in error.get("error_infos", []): diff --git a/backend/gn_modulator/imports/mixins/process.py b/backend/gn_modulator/imports/mixins/process.py index bca4ac03..9184a09c 100644 --- a/backend/gn_modulator/imports/mixins/process.py +++ b/backend/gn_modulator/imports/mixins/process.py @@ -64,25 +64,27 @@ def sql_process_import_view(self, from_table, dest_table, relation_key=None): columns = ( [relation_key] if relation_key and self.Model().is_relation_n_n(relation_key) - else list( - filter( - lambda x: ( - self.Model().is_column(x) - and x.startswith(f"{relation_key}.") - and not x == self.Model().pk_field_name() - ), - from_table_columns, + else ( + list( + filter( + lambda x: ( + self.Model().is_column(x) + and x.startswith(f"{relation_key}.") + and not x == self.Model().pk_field_name() + ), + from_table_columns, + ) ) - ) - if relation_key and self.Model().is_relation_1_n(relation_key) - else list( - filter( - lambda x: ( - self.Model().is_column(x) - and "." not in x - and not x == self.Model().pk_field_name() - ), - from_table_columns, + if relation_key and self.Model().is_relation_1_n(relation_key) + else list( + filter( + lambda x: ( + self.Model().is_column(x) + and "." not in x + and not x == self.Model().pk_field_name() + ), + from_table_columns, + ) ) ) ) @@ -271,9 +273,9 @@ def resolve_key( v_join += v_join_inter # clarifier link oin - link_joins[ - k_unique - ] = f"{alias_join}_{index_unique}.{SchemaMethods(rel_schema_code).Model().pk_field_name()}" + link_joins[k_unique] = ( + f"{alias_join}_{index_unique}.{SchemaMethods(rel_schema_code).Model().pk_field_name()}" + ) # conditions de jointures v_join_on = [] diff --git a/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py b/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py index bc5d6624..1d59133f 100644 --- a/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py +++ b/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py @@ -5,6 +5,7 @@ Create Date: 2023-03-03 14:31:35.339631 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/gn_modulator/migrations/versions/5c1ec86a67ab_import_mapping.py b/backend/gn_modulator/migrations/versions/5c1ec86a67ab_import_mapping.py index 8a506ccd..5f67f7a7 100644 --- a/backend/gn_modulator/migrations/versions/5c1ec86a67ab_import_mapping.py +++ b/backend/gn_modulator/migrations/versions/5c1ec86a67ab_import_mapping.py @@ -5,6 +5,7 @@ Create Date: 2023-12-15 14:20:55.639520 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/gn_modulator/migrations/versions/823729f24bac_import_relation_1_n.py b/backend/gn_modulator/migrations/versions/823729f24bac_import_relation_1_n.py index edcbda2e..0c40f33d 100644 --- a/backend/gn_modulator/migrations/versions/823729f24bac_import_relation_1_n.py +++ b/backend/gn_modulator/migrations/versions/823729f24bac_import_relation_1_n.py @@ -5,6 +5,7 @@ Create Date: 2023-10-09 15:55:41.769219 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/gn_modulator/migrations/versions/b78eaab0a6e3_gn_modulator_permission_available.py b/backend/gn_modulator/migrations/versions/b78eaab0a6e3_gn_modulator_permission_available.py index 27272c7d..1509bd71 100644 --- a/backend/gn_modulator/migrations/versions/b78eaab0a6e3_gn_modulator_permission_available.py +++ b/backend/gn_modulator/migrations/versions/b78eaab0a6e3_gn_modulator_permission_available.py @@ -5,6 +5,7 @@ Create Date: 2023-06-20 15:19:21.097194 """ + from alembic import op import sqlalchemy as sa from gn_modulator import MODULE_CODE diff --git a/backend/gn_modulator/migrations/versions/d3f266c7b1b6_init_gn_modulator.py b/backend/gn_modulator/migrations/versions/d3f266c7b1b6_init_gn_modulator.py index 97e7948f..95a330b6 100644 --- a/backend/gn_modulator/migrations/versions/d3f266c7b1b6_init_gn_modulator.py +++ b/backend/gn_modulator/migrations/versions/d3f266c7b1b6_init_gn_modulator.py @@ -4,6 +4,7 @@ Revises: Create Date: 2021-09-15 11:49:24.512562 """ + from alembic import op from sqlalchemy.sql import text import pkg_resources diff --git a/backend/gn_modulator/query/filters.py b/backend/gn_modulator/query/filters.py index 9e766c75..8ffa72c5 100644 --- a/backend/gn_modulator/query/filters.py +++ b/backend/gn_modulator/query/filters.py @@ -1,6 +1,7 @@ """ repositories - filters """ + import unidecode import sqlalchemy as sa from geonature.utils.env import db diff --git a/backend/gn_modulator/query/getattr.py b/backend/gn_modulator/query/getattr.py index 33c26d15..69a120a8 100644 --- a/backend/gn_modulator/query/getattr.py +++ b/backend/gn_modulator/query/getattr.py @@ -54,9 +54,11 @@ def getModelAttr(Model, query, field_name, only_fields="", index=0, condition=No current_Model = ( get_query_cache(query, current_relation_cache_key)["relation_alias"] if query is not None and current_relation_cache_key - else Model.relation_Model(current_relation_cache_key) - if current_relation_cache_key - else Model + else ( + Model.relation_Model(current_relation_cache_key) + if current_relation_cache_key + else Model + ) ) res = {"val": getattr(current_Model, current_field)} diff --git a/backend/gn_modulator/schema/auto.py b/backend/gn_modulator/schema/auto.py index 904948eb..7c16a3ca 100644 --- a/backend/gn_modulator/schema/auto.py +++ b/backend/gn_modulator/schema/auto.py @@ -1,6 +1,7 @@ """ AutoSchemas """ + from sqlalchemy.inspection import inspect from sqlalchemy.orm.properties import ColumnProperty from geonature.utils.env import db @@ -148,9 +149,7 @@ def process_relation_auto(self, relation_key, relation, Model, properties): "relation_type": ( "n-1" if relation.direction.name == "MANYTOONE" - else "1-n" - if relation.direction.name == "ONETOMANY" - else "n-n" + else "1-n" if relation.direction.name == "ONETOMANY" else "n-n" ), "schema_code": schema_code, # "title": relation_key, diff --git a/backend/gn_modulator/schema/base.py b/backend/gn_modulator/schema/base.py index 0b4ef0ff..68cb24ef 100644 --- a/backend/gn_modulator/schema/base.py +++ b/backend/gn_modulator/schema/base.py @@ -225,11 +225,15 @@ def relation_type(self, relation_def): relation_type = ( "n-1" if relation_def.get("local_key") and not relation_def.get("foreign_key") - else "1-n" - if relation_def.get("foreign_key") and not relation_def.get("local_key") - else "n-n" - if relation_def.get("foreign_key") and relation_def.get("local_key") - else None + else ( + "1-n" + if relation_def.get("foreign_key") and not relation_def.get("local_key") + else ( + "n-n" + if relation_def.get("foreign_key") and relation_def.get("local_key") + else None + ) + ) ) if relation_type is None: @@ -290,9 +294,11 @@ def remove_field(self, field_name, schema): def process_csv_keys(self, keys): return [ - self.property(key.split(".")[0]).get("title", key) - if self.has_property(key.split(".")[0]) - else key + ( + self.property(key.split(".")[0]).get("title", key) + if self.has_property(key.split(".")[0]) + else key + ) for key in keys ] diff --git a/backend/gn_modulator/schema/config/grammar.py b/backend/gn_modulator/schema/config/grammar.py index 0b8ab3ae..1ddc2811 100644 --- a/backend/gn_modulator/schema/config/grammar.py +++ b/backend/gn_modulator/schema/config/grammar.py @@ -48,9 +48,11 @@ def new(self, object_definition={}): return ( "nouvelle" if self.genre(object_definition) == "F" - else "nouvel" - if self.is_first_letter_vowel(self.label(object_definition)) - else "nouveau" + else ( + "nouvel" + if self.is_first_letter_vowel(self.label(object_definition)) + else "nouveau" + ) ) def news(self, object_definition={}): @@ -90,9 +92,7 @@ def article_def(self, object_definition={}): return ( "l'" if self.is_first_letter_vowel(self.label(object_definition)) - else "la " - if self.genre(object_definition) == "F" - else "le " + else "la " if self.genre(object_definition) == "F" else "le " ) def article_undef(self, object_definition={}): @@ -111,9 +111,7 @@ def preposition(self, object_definition={}, check_voyel=True): return ( "de l'" if self.is_first_letter_vowel(self.label(object_definition)) and check_voyel - else "de la " - if self.genre(object_definition) == "F" - else "du " + else "de la " if self.genre(object_definition) == "F" else "du " ) def le_label(self, object_definition={}): diff --git a/backend/gn_modulator/schema/doc.py b/backend/gn_modulator/schema/doc.py index 8e95c95e..14249420 100644 --- a/backend/gn_modulator/schema/doc.py +++ b/backend/gn_modulator/schema/doc.py @@ -36,9 +36,11 @@ def doc_import_key(self, key, unique=False, relation_key=None): type = ( "clé simple" if property_def.get("schema_code") - else "liste de clés séparées par une virgule" - if property_def.get("relation_type") == "n-n" - else property_def["type"] + else ( + "liste de clés séparées par une virgule" + if property_def.get("relation_type") == "n-n" + else property_def["type"] + ) ) column_default = self.property(key).get("default") or ( diff --git a/backend/gn_modulator/schema/features/base.py b/backend/gn_modulator/schema/features/base.py index d186ac2e..660bf384 100644 --- a/backend/gn_modulator/schema/features/base.py +++ b/backend/gn_modulator/schema/features/base.py @@ -128,9 +128,11 @@ def get_data_item(cls, data_item, file_path=None): items = ( data_item["items"] if "items" in data_item - else cls.get_data_items_from_file(Path(file_path).parent / data_item["file"]) - if "file" in data_item - else [] + else ( + cls.get_data_items_from_file(Path(file_path).parent / data_item["file"]) + if "file" in data_item + else [] + ) ) if data_item.get("keys"): diff --git a/backend/gn_modulator/schema/serializers.py b/backend/gn_modulator/schema/serializers.py index 07dd8691..8ccdc67a 100644 --- a/backend/gn_modulator/schema/serializers.py +++ b/backend/gn_modulator/schema/serializers.py @@ -103,11 +103,11 @@ def opposite_relation_def(self, relation_def): "relation_type": ( "n-1" if relation_def["relation_type"] == "1-n" - else "1-n" - if relation_def["relation_type"] == "n-1" - else "1-1" - if relation_def["relation_type"] == "1-1" - else "n-n" + else ( + "1-n" + if relation_def["relation_type"] == "n-1" + else "1-1" if relation_def["relation_type"] == "1-1" else "n-n" + ) ), "schema_code": self.schema_code(), "title": self.attr("meta.label"), diff --git a/backend/gn_modulator/schema/validation.py b/backend/gn_modulator/schema/validation.py index d1fde428..aa9d0790 100644 --- a/backend/gn_modulator/schema/validation.py +++ b/backend/gn_modulator/schema/validation.py @@ -1,5 +1,6 @@ """ """ + import jsonschema import copy from gn_modulator.utils.cache import get_global_cache, set_global_cache diff --git a/backend/gn_modulator/tests/test_repository.py b/backend/gn_modulator/tests/test_repository.py index d28324c3..54fced52 100644 --- a/backend/gn_modulator/tests/test_repository.py +++ b/backend/gn_modulator/tests/test_repository.py @@ -144,7 +144,7 @@ def test_repo_pf_rel(self, passages_faune_with_diagnostic, users): # "date_requalification_ouvrage", # "digitiser.nom_complet", "actors.organisme.nom_organisme", - "linears.additional_data.largeur" + "linears.additional_data.largeur", # "actors.nomenclature_type_actor.label_fr", # "label_infrastructures", # "linears.additional_data.largeur", diff --git a/backend/gn_modulator/utils/commons.py b/backend/gn_modulator/utils/commons.py index 3c323b3f..f1a2f12f 100644 --- a/backend/gn_modulator/utils/commons.py +++ b/backend/gn_modulator/utils/commons.py @@ -2,7 +2,6 @@ utils, patch, etc... """ - import unicodedata import sys from importlib import import_module diff --git a/contrib/m_sipaf/backend/m_sipaf/migrations/versions/0f6b908cbe5e_concept_usage_objectif.py b/contrib/m_sipaf/backend/m_sipaf/migrations/versions/0f6b908cbe5e_concept_usage_objectif.py index 8ffadd3d..b9b844f0 100644 --- a/contrib/m_sipaf/backend/m_sipaf/migrations/versions/0f6b908cbe5e_concept_usage_objectif.py +++ b/contrib/m_sipaf/backend/m_sipaf/migrations/versions/0f6b908cbe5e_concept_usage_objectif.py @@ -5,6 +5,7 @@ Create Date: 2023-08-04 16:05:35.209204 """ + from alembic import op import sqlalchemy as sa import pkg_resources diff --git a/contrib/m_sipaf/backend/m_sipaf/migrations/versions/2c85080e9b8b_m_sipaf_actor_required_id_organism.py b/contrib/m_sipaf/backend/m_sipaf/migrations/versions/2c85080e9b8b_m_sipaf_actor_required_id_organism.py index bd3c419e..9fc2a519 100644 --- a/contrib/m_sipaf/backend/m_sipaf/migrations/versions/2c85080e9b8b_m_sipaf_actor_required_id_organism.py +++ b/contrib/m_sipaf/backend/m_sipaf/migrations/versions/2c85080e9b8b_m_sipaf_actor_required_id_organism.py @@ -5,6 +5,7 @@ Create Date: 2023-10-19 14:02:45.162974 """ + from alembic import op import sqlalchemy as sa diff --git a/contrib/m_sipaf/backend/m_sipaf/migrations/versions/7664e8f989f1_ajout_commentaire_passage_faune.py b/contrib/m_sipaf/backend/m_sipaf/migrations/versions/7664e8f989f1_ajout_commentaire_passage_faune.py index 0ddd93a7..2a83d5fe 100644 --- a/contrib/m_sipaf/backend/m_sipaf/migrations/versions/7664e8f989f1_ajout_commentaire_passage_faune.py +++ b/contrib/m_sipaf/backend/m_sipaf/migrations/versions/7664e8f989f1_ajout_commentaire_passage_faune.py @@ -5,6 +5,7 @@ Create Date: 2024-01-09 18:22:22.097781 """ + from alembic import op import sqlalchemy as sa diff --git a/contrib/m_sipaf/backend/m_sipaf/migrations/versions/90f6e5531f7c_diagnostic_m_sipaf.py b/contrib/m_sipaf/backend/m_sipaf/migrations/versions/90f6e5531f7c_diagnostic_m_sipaf.py index d356ebc5..c3d7fdfa 100644 --- a/contrib/m_sipaf/backend/m_sipaf/migrations/versions/90f6e5531f7c_diagnostic_m_sipaf.py +++ b/contrib/m_sipaf/backend/m_sipaf/migrations/versions/90f6e5531f7c_diagnostic_m_sipaf.py @@ -5,6 +5,7 @@ Create Date: 2023-03-21 22:36:24.415201 """ + from alembic import op import sqlalchemy as sa import pkg_resources diff --git a/contrib/m_sipaf/backend/m_sipaf/migrations/versions/b7eb2e900bf1_remove_objectifs_taxons.py b/contrib/m_sipaf/backend/m_sipaf/migrations/versions/b7eb2e900bf1_remove_objectifs_taxons.py index 33cf1695..923c5bf1 100644 --- a/contrib/m_sipaf/backend/m_sipaf/migrations/versions/b7eb2e900bf1_remove_objectifs_taxons.py +++ b/contrib/m_sipaf/backend/m_sipaf/migrations/versions/b7eb2e900bf1_remove_objectifs_taxons.py @@ -5,6 +5,7 @@ Create Date: 2023-11-14 16:50:11.560175 """ + from alembic import op import sqlalchemy as sa diff --git a/contrib/m_sipaf/backend/m_sipaf/migrations/versions/c11d028e1b42_typo_nomenclature.py b/contrib/m_sipaf/backend/m_sipaf/migrations/versions/c11d028e1b42_typo_nomenclature.py index 4eee8ce2..015e53b7 100644 --- a/contrib/m_sipaf/backend/m_sipaf/migrations/versions/c11d028e1b42_typo_nomenclature.py +++ b/contrib/m_sipaf/backend/m_sipaf/migrations/versions/c11d028e1b42_typo_nomenclature.py @@ -5,6 +5,7 @@ Create Date: 2024-01-09 20:29:26.613697 """ + from alembic import op import sqlalchemy as sa diff --git a/contrib/m_sipaf/backend/m_sipaf/migrations/versions/cc1cd6fbb28c_add_pf_unique_uuid_constraint.py b/contrib/m_sipaf/backend/m_sipaf/migrations/versions/cc1cd6fbb28c_add_pf_unique_uuid_constraint.py index e3342bfd..62a9a927 100644 --- a/contrib/m_sipaf/backend/m_sipaf/migrations/versions/cc1cd6fbb28c_add_pf_unique_uuid_constraint.py +++ b/contrib/m_sipaf/backend/m_sipaf/migrations/versions/cc1cd6fbb28c_add_pf_unique_uuid_constraint.py @@ -5,6 +5,7 @@ Create Date: 2023-10-12 11:38:15.137738 """ + from alembic import op import sqlalchemy as sa diff --git a/contrib/m_sipaf/backend/m_sipaf/migrations/versions/ea2da3785c06_unrequire_code_pf.py b/contrib/m_sipaf/backend/m_sipaf/migrations/versions/ea2da3785c06_unrequire_code_pf.py index 6db5e55a..e435e923 100644 --- a/contrib/m_sipaf/backend/m_sipaf/migrations/versions/ea2da3785c06_unrequire_code_pf.py +++ b/contrib/m_sipaf/backend/m_sipaf/migrations/versions/ea2da3785c06_unrequire_code_pf.py @@ -5,6 +5,7 @@ Create Date: 2023-06-27 16:18:12.462599 """ + from alembic import op import sqlalchemy as sa diff --git a/contrib/m_sipaf/backend/m_sipaf/migrations/versions/ec6ebeb214b1_log_history_t_passage_faune_m_sipaf.py.py b/contrib/m_sipaf/backend/m_sipaf/migrations/versions/ec6ebeb214b1_log_history_t_passage_faune_m_sipaf.py.py index 3cb6284b..136baf90 100644 --- a/contrib/m_sipaf/backend/m_sipaf/migrations/versions/ec6ebeb214b1_log_history_t_passage_faune_m_sipaf.py.py +++ b/contrib/m_sipaf/backend/m_sipaf/migrations/versions/ec6ebeb214b1_log_history_t_passage_faune_m_sipaf.py.py @@ -5,6 +5,7 @@ Create Date: 2023-03-08 18:21:26.724733 """ + from alembic import op import sqlalchemy as sa