Refactorisation des fonctions utils

src/pages/a-propos.py

@@ -3,7 +3,7 @@ import os
 from dash import dcc, html, register_page
 
 from src.figures import get_sources_tables
-from src.old_utils import META_CONTENT
+from src.utils.seo import META_CONTENT
 
 NAME = "À propos"
 

src/pages/acheteur.py

@@ -24,16 +24,14 @@ from src.figures import (
     make_column_picker,
     point_on_map,
 )
-from src.old_utils import (
+from src.utils.data import DF_ACHETEURS, get_annuaire_data, get_departement_region
+from src.utils.frontend import get_button_properties
+from src.utils.seo import META_CONTENT
+from src.utils.table import (
     COLUMNS,
-    DF_ACHETEURS,
-    META_CONTENT,
     filter_table_data,
     format_number,
-    get_annuaire_data,
-    get_button_properties,
     get_default_hidden_columns,
-    get_departement_region,
     prepare_table_data,
     sort_table_data,
 )

src/pages/arbre/departement.py

@@ -1,7 +1,7 @@
 from dash import Input, Output, callback, dcc, html, register_page
 
 from src.db import get_cursor
-from src.old_utils import DEPARTEMENTS
+from src.utils.data import DEPARTEMENTS
 
 NAME = "Département"
 

src/pages/arbre/departements.py

@@ -1,6 +1,6 @@
 from dash import dcc, html, register_page
 
-from src.old_utils import DEPARTEMENTS
+from src.utils.data import DEPARTEMENTS
 
 NAME = "Départements"
 

src/pages/arbre/liste_marches_org.py

@@ -2,7 +2,7 @@ import polars as pl
 from dash import Input, Output, callback, dcc, html, register_page
 
 from src.db import get_cursor
-from src.old_utils import DF_ACHETEURS, DF_TITULAIRES
+from src.utils.data import DF_ACHETEURS, DF_TITULAIRES
 
 NAME = "Liste des marchés publics"
 

src/pages/marche.py

@@ -6,13 +6,9 @@ from dash import Input, Output, callback, dcc, html, register_page
 from polars import selectors as cs
 
 from src.db import query_marches
-from src.old_utils import (
-    DATA_SCHEMA,
-    META_CONTENT,
-    format_values,
-    make_org_jsonld,
-    unformat_montant,
-)
+from src.utils.data import DATA_SCHEMA
+from src.utils.seo import META_CONTENT, make_org_jsonld
+from src.utils.table import format_values, unformat_montant
 
 
 def get_title(uid: str = None) -> str:

src/pages/observatoire.py

@@ -30,18 +30,16 @@ from src.figures import (
     make_column_picker,
     make_donut,
 )
-from src.old_utils import (
-    COLUMNS,
+from src.utils import logger
+from src.utils.data import (
     DEPARTEMENTS,
     DF_ACHETEURS,
     DF_TITULAIRES,
-    META_CONTENT,
-    get_default_hidden_columns,
-    get_enum_values_as_dict,
-    logger,
     prepare_dashboard_data,
-    prepare_table_data,
 )
+from src.utils.frontend import get_enum_values_as_dict
+from src.utils.seo import META_CONTENT
+from src.utils.table import COLUMNS, get_default_hidden_columns, prepare_table_data
 
 NAME = "Observatoire"
 

src/pages/recherche.py

@@ -2,13 +2,10 @@ import dash_bootstrap_components as dbc
 from dash import Input, Output, State, callback, dcc, html, register_page
 
 from src.figures import DataTable
-from src.old_utils import (
-    DF_ACHETEURS,
-    DF_TITULAIRES,
-    META_CONTENT,
-    search_org,
-    setup_table_columns,
-)
+from src.utils.data import DF_ACHETEURS, DF_TITULAIRES
+from src.utils.search import search_org
+from src.utils.seo import META_CONTENT
+from src.utils.table import setup_table_columns
 
 NAME = "Recherche"
 

src/pages/tableau.py

@@ -21,13 +21,13 @@ from dash import (
 
 from src.db import query_marches, schema
 from src.figures import DataTable, make_column_picker
-from src.old_utils import (
+from src.utils import logger
+from src.utils.seo import META_CONTENT
+from src.utils.table import (
     COLUMNS,
-    META_CONTENT,
     filter_table_data,
     get_default_hidden_columns,
     invert_columns,
-    logger,
     prepare_table_data,
     sort_table_data,
 )

src/pages/titulaire.py

@@ -23,16 +23,14 @@ from src.figures import (
     make_column_picker,
     point_on_map,
 )
-from src.old_utils import (
+from src.utils.data import DF_TITULAIRES, get_annuaire_data, get_departement_region
+from src.utils.frontend import get_button_properties
+from src.utils.seo import META_CONTENT
+from src.utils.table import (
     COLUMNS,
-    DF_TITULAIRES,
-    META_CONTENT,
     filter_table_data,
     format_number,
-    get_annuaire_data,
-    get_button_properties,
     get_default_hidden_columns,
-    get_departement_region,
     prepare_table_data,
     sort_table_data,
 )