From 1e85dbe562b00f61aaddb1559a23a3ae443cf4c4 Mon Sep 17 00:00:00 2001 From: Colin Maudry Date: Tue, 11 Nov 2025 07:47:00 +0100 Subject: [PATCH 1/5] =?UTF-8?q?Champ=20de=20recherche,=20r=C3=A9cup=20de?= =?UTF-8?q?=20donn=C3=A9es=20d=C3=A9di=C3=A9e=20#58?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/style.css | 19 +++++++++++++++++++ src/pages/recherche.py | 41 +++++++++++++++++++++++++++++++++++++++++ src/pages/tableau.py | 2 +- src/utils.py | 13 +++++++++++++ 4 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 src/pages/recherche.py diff --git a/src/assets/style.css b/src/assets/style.css index b007d9a..e754bcf 100644 --- a/src/assets/style.css +++ b/src/assets/style.css @@ -143,6 +143,25 @@ td[data-dash-column="objet"],td[data-dash-column="titulaire_nom"],td[data-dash-c margin: 0 0 20px 20px; } +/* Page de recherche */ + +#search { + margin: auto; + width: 450px; + font-size: 18px; + height: 30px; + display: block; +} + +.search_options { + margin: 16px auto; + width: 450px; +} + +.search_options input { + margin-right: 12px; +} + /* Menu de navigation */ .navbar { diff --git a/src/pages/recherche.py b/src/pages/recherche.py new file mode 100644 index 0000000..834dcd5 --- /dev/null +++ b/src/pages/recherche.py @@ -0,0 +1,41 @@ +from dash import Input, Output, callback, dcc, html, register_page + +from src.utils import meta_content + +name = "Recherche" + +register_page( + __name__, + path="/", + title=meta_content["title"], + name=name, + description=meta_content["description"], + image_url=meta_content["image_url"], + order=0, +) + +layout = html.Div( + className="container", + children=[ + dcc.Input( + id="search", + type="text", + placeholder="Nom d'acheteur, d'entreprise, mot de clé de marché...", + ), + html.Div( + className="search_options", + children=[dcc.RadioItems(options=["Acheteur(s)"])], + ), + html.Div(id="search_results"), + ], +) + + +@callback(Output("search_results", "children"), Input("search", "value")) +def search_results(query): + if len(query) >= 3: + # results = [] + # dff = dff.select("acheteur_id", "acheteur_nom") + return html.Div([]) + else: + return html.P("Tapez au moins 3 caractères") diff --git a/src/pages/tableau.py b/src/pages/tableau.py index 4b3d380..83bfffe 100644 --- a/src/pages/tableau.py +++ b/src/pages/tableau.py @@ -25,7 +25,7 @@ schema = df.collect_schema() name = "Tableau" register_page( __name__, - path="/", + path="/tableau", title=meta_content["title"], name=name, description=meta_content["description"], diff --git a/src/utils.py b/src/utils.py index 23ad4fe..fd8816a 100644 --- a/src/utils.py +++ b/src/utils.py @@ -208,6 +208,17 @@ def get_decp_data() -> pl.DataFrame: return lff.collect() +def get_org_data(dff: pl.DataFrame, org_type: str) -> pl.DataFrame: + lff = dff.lazy() + lff = lff.select( + cs.starts_with(org_type).exclude( + f"{org_type}_latitude", f"{org_type}_longitude" + ) + ) + lff = lff.unique(f"{org_type}_id") + return lff.collect() + + def get_departements() -> dict: with open("data/departements.json", "rb") as f: data = json.load(f) @@ -365,6 +376,8 @@ def get_data_schema() -> dict: df: pl.DataFrame = get_decp_data() +df_acheteurs = get_org_data(df, "acheteur") +df_titulaires = get_org_data(df, "titulaire") departements = get_departements() domain_name = ( "test.decp.info" if os.getenv("DEVELOPMENT").lower() == "true" else "decp.info" From e187cf33aaebf088dd778808ee003a379d0dea60 Mon Sep 17 00:00:00 2001 From: Colin Maudry Date: Tue, 11 Nov 2025 12:42:01 +0100 Subject: [PATCH 2/5] Recherche fonctinonelle acheteurs et titulaires #58 --- pyproject.toml | 3 +- src/pages/recherche.py | 57 +++++++++++++--- src/utils.py | 145 +++++++++++++++++++++++++++++++++-------- 3 files changed, 169 insertions(+), 36 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0030ed6..6d49cdb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,8 @@ dependencies = [ "xlsxwriter", "plotly[express]", "httpx", - "pandas" # utilisé pour la création de certains graphiques + "pandas", # utilisé pour la création de certains graphiques + "unidecode" ] [project.optional-dependencies] diff --git a/src/pages/recherche.py b/src/pages/recherche.py index 834dcd5..c6a7224 100644 --- a/src/pages/recherche.py +++ b/src/pages/recherche.py @@ -1,6 +1,12 @@ -from dash import Input, Output, callback, dcc, html, register_page +from dash import Input, Output, callback, dash_table, dcc, html, register_page -from src.utils import meta_content +from src.utils import ( + df_acheteurs, + df_titulaires, + meta_content, + search_org, + setup_table_columns, +) name = "Recherche" @@ -31,11 +37,44 @@ layout = html.Div( ) -@callback(Output("search_results", "children"), Input("search", "value")) -def search_results(query): - if len(query) >= 3: - # results = [] - # dff = dff.select("acheteur_id", "acheteur_nom") - return html.Div([]) +@callback( + Output("search_results", "children"), + Input("search", "value"), + prevent_initial_call=True, +) +def update_search_results(query): + if len(query) >= 1: + content = [] + + for org_type in ["acheteur", "titulaire"]: + if org_type == "acheteur": + dff = df_acheteurs + elif org_type == "titulaire": + dff = df_titulaires + else: + raise ValueError(f"{org_type} is not supported") + + # Search acheteurs and titulaires using the same function + results = search_org(dff, query, org_type=org_type) + count = results.height + + # Format output + columns, tooltip = setup_table_columns(results, hideable=False) + + org_content = [ + html.H3(f"{org_type.title()}s : {count}"), + dash_table.DataTable( + columns=columns, + data=results.to_dicts(), + page_size=5, + style_table={"overflowX": "auto"}, + markdown_options={"html": True}, + ) + if count > 0 + else html.P(f"Aucun {org_type} trouvé."), + ] + content.extend(org_content) + + return content else: - return html.P("Tapez au moins 3 caractères") + return html.P("Tapez au moins 1 caractère") diff --git a/src/utils.py b/src/utils.py index fd8816a..d2c7bc4 100644 --- a/src/utils.py +++ b/src/utils.py @@ -8,6 +8,7 @@ import polars.selectors as cs from httpx import get from polars import Schema from polars.exceptions import ComputeError +from unidecode import unidecode operators = [ ["s<", "<"], @@ -50,30 +51,47 @@ def add_resource_link(dff: pl.DataFrame) -> pl.DataFrame: return dff -def add_links(dff: pl.DataFrame): - dff = dff.with_columns( - pl.when(pl.col("titulaire_typeIdentifiant") == "SIRET") - .then( - '' - + pl.col("titulaire_id") - + "" - ) - .otherwise(pl.col("titulaire_id")) - .alias("titulaire_id") - ) - - for column, path in [("acheteur_id", "acheteurs"), ("uid", "marches")]: - dff = dff.with_columns( - ( - f'' - + pl.col(column) - + "" - ).alias(column) - ) +def add_links(dff: pl.DataFrame, target: str = "_blank"): + for col in ["uid", "acheteur_nom", "titulaire_nom", "acheteur_id", "titulaire_id"]: + if col in dff.columns: + if col.startswith("titulaire_"): + dff = dff.with_columns( + pl.when( + pl.Expr.or_( + pl.col("titulaire_typeIdentifiant").is_null(), + pl.col("titulaire_typeIdentifiant") == "SIRET", + ) + ) + .then( + '' + + pl.col(col) + + "" + ) + .otherwise(pl.col(col)) + .alias(col) + ) + if col.startswith("acheteur_"): + dff = dff.with_columns( + ( + '' + + pl.col(col) + + "" + ).alias(col) + ) + if col == "uid": + dff = dff.with_columns( + ( + '' + + pl.col("uid") + + "" + ).alias("uid") + ) return dff @@ -211,11 +229,12 @@ def get_decp_data() -> pl.DataFrame: def get_org_data(dff: pl.DataFrame, org_type: str) -> pl.DataFrame: lff = dff.lazy() lff = lff.select( + "uid", cs.starts_with(org_type).exclude( f"{org_type}_latitude", f"{org_type}_longitude" - ) + ), ) - lff = lff.unique(f"{org_type}_id") + lff = lff.group_by(cs.starts_with(org_type)).len("len_uid") return lff.collect() @@ -375,6 +394,80 @@ def get_data_schema() -> dict: return new_schema +def search_org(dff: pl.DataFrame, query: str, org_type: str) -> pl.DataFrame: + """ + Search in either 'acheteur' or 'titulaire' DataFrame. + + :param dff: Polars DataFrame with acheteur or titulaire columns + :param query: User search string + :param org_type: 'acheteur' or 'titulaire' + :return: Filtered DataFrame with 'matches' column + """ + if not query.strip(): + return dff.select(pl.lit(False).alias("matches")) + + # Normalize query + normalized_query = unidecode(query.strip()).upper() + tokens = [" " + t.strip() for t in normalized_query.split() if t.strip()] + print(tokens) + + # Define columns based on entity type + cols = [ + f"{org_type}_id", + f"{org_type}_nom", + f"{org_type}_departement_nom", + f"{org_type}_departement_code", + f"{org_type}_commune_nom", + ] + + # Concatenate all fields into one string per row + org_str = pl.concat_str(pl.lit(" "), pl.col(cols), separator=" ") + + # For each token, create a boolean column: True if token is found + token_matches = [] + for token in tokens: + token_match = org_str.str.contains(token).alias(f"token_{token}") + token_matches.append(token_match) + + # Count how many tokens match per row + match_score = pl.sum_horizontal(token_matches).alias("match_score") + + # For each token, create a boolean column: True if token is found + token_matches = [] + for token in tokens: + token_match = org_str.str.contains(token).alias(f"token_{token}") + token_matches.append(token_match) + + # Sélection des colonnes + if org_type == "acheteur": + dff = dff.select(cols + ["len_uid"]) + if org_type == "titulaire": + dff = dff.select(cols + ["len_uid", "titulaire_typeIdentifiant"]) + + # Apply and filter + dff = ( + dff.with_columns(token_matches + [match_score]) + .filter(pl.col("match_score") == len(tokens)) + .sort("len_uid", descending=True) + .drop([f"token_{token}" for token in tokens]) + ) + + # Format result + dff = add_links(dff, target="") + dff = dff.with_columns( + pl.concat_str( + pl.col(f"{org_type}_departement_nom"), + pl.lit(" ("), + pl.col(f"{org_type}_departement_code"), + pl.lit(")"), + ).alias("Département") + ) + + dff = dff.select(f"{org_type}_id", f"{org_type}_nom", "Département") + + return dff + + df: pl.DataFrame = get_decp_data() df_acheteurs = get_org_data(df, "acheteur") df_titulaires = get_org_data(df, "titulaire") From 8637915eb2ee3c5adb7c254165bb6f9391b0a676 Mon Sep 17 00:00:00 2001 From: Colin Maudry Date: Tue, 11 Nov 2025 12:50:58 +0100 Subject: [PATCH 3/5] Cleanup HTML --- src/pages/recherche.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pages/recherche.py b/src/pages/recherche.py index c6a7224..6789440 100644 --- a/src/pages/recherche.py +++ b/src/pages/recherche.py @@ -26,12 +26,12 @@ layout = html.Div( dcc.Input( id="search", type="text", - placeholder="Nom d'acheteur, d'entreprise, mot de clé de marché...", - ), - html.Div( - className="search_options", - children=[dcc.RadioItems(options=["Acheteur(s)"])], + placeholder="Nom d'acheteur, d'entreprise, SIREN...", ), + # html.Div( + # className="search_options", + # children=[dcc.RadioItems(options=["Acheteur(s)"])], + # ), html.Div(id="search_results"), ], ) @@ -77,4 +77,4 @@ def update_search_results(query): return content else: - return html.P("Tapez au moins 1 caractère") + return html.P("") From 459ca6a846e71221170954f0ac3a5ac5b1fa2cee Mon Sep 17 00:00:00 2001 From: Colin Maudry Date: Wed, 12 Nov 2025 14:54:12 +0100 Subject: [PATCH 4/5] =?UTF-8?q?R=C3=A9arrangements=20r=C3=A9sultats=20#58?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/style.css | 17 ++++++++++++----- src/pages/recherche.py | 40 ++++++++++++++++++++++++++++++++-------- src/utils.py | 13 +++++++------ 3 files changed, 51 insertions(+), 19 deletions(-) diff --git a/src/assets/style.css b/src/assets/style.css index e754bcf..7bde8b5 100644 --- a/src/assets/style.css +++ b/src/assets/style.css @@ -146,7 +146,7 @@ td[data-dash-column="objet"],td[data-dash-column="titulaire_nom"],td[data-dash-c /* Page de recherche */ #search { - margin: auto; + margin: 50px auto 0px auto; width: 450px; font-size: 18px; height: 30px; @@ -162,6 +162,16 @@ td[data-dash-column="objet"],td[data-dash-column="titulaire_nom"],td[data-dash-c margin-right: 12px; } +.results_acheteur { + grid-column: 1; + grid-row: 1; +} + +.results_titulaire { + grid-column: 2; + grid-row: 1; +} + /* Menu de navigation */ .navbar { @@ -191,7 +201,7 @@ summary > h3 { padding-top: 28px; } -/* Vue acheteur/titulaire */ +/* Vue acheteur/titulaire/recherche */ .wrapper { display: grid; grid-gap: 10px; @@ -199,9 +209,6 @@ summary > h3 { justify-content: space-between; } -.wrapper > div { -} - .org_title { grid-column: 1 / 3; grid-row: 1; diff --git a/src/pages/recherche.py b/src/pages/recherche.py index 6789440..e74a720 100644 --- a/src/pages/recherche.py +++ b/src/pages/recherche.py @@ -32,7 +32,7 @@ layout = html.Div( # className="search_options", # children=[dcc.RadioItems(options=["Acheteur(s)"])], # ), - html.Div(id="search_results"), + html.Div(id="search_results", className="wrapper"), ], ) @@ -62,13 +62,37 @@ def update_search_results(query): columns, tooltip = setup_table_columns(results, hideable=False) org_content = [ - html.H3(f"{org_type.title()}s : {count}"), - dash_table.DataTable( - columns=columns, - data=results.to_dicts(), - page_size=5, - style_table={"overflowX": "auto"}, - markdown_options={"html": True}, + html.Div( + className=f"results_{org_type}", + children=[ + html.H3(f"{org_type.title()}s : {count}"), + dash_table.DataTable( + columns=columns, + data=results.to_dicts(), + page_size=10, + # style_table={"overflowX": "auto"}, + markdown_options={"html": True}, + cell_selectable=False, + style_cell_conditional=[ + { + "if": {"column_id": "acheteur_nom"}, + "maxWidth": "250px", + "textAlign": "left", + "overflow": "hidden", + "lineHeight": "18px", + "whiteSpace": "normal", + }, + { + "if": {"column_id": "titulaire_nom"}, + "maxWidth": "250px", + "textAlign": "left", + "overflow": "hidden", + "lineHeight": "18px", + "whiteSpace": "normal", + }, + ], + ), + ], ) if count > 0 else html.P(f"Aucun {org_type} trouvé."), diff --git a/src/utils.py b/src/utils.py index d2c7bc4..9552df2 100644 --- a/src/utils.py +++ b/src/utils.py @@ -234,7 +234,7 @@ def get_org_data(dff: pl.DataFrame, org_type: str) -> pl.DataFrame: f"{org_type}_latitude", f"{org_type}_longitude" ), ) - lff = lff.group_by(cs.starts_with(org_type)).len("len_uid") + lff = lff.group_by(cs.starts_with(org_type)).len("Marchés") return lff.collect() @@ -406,10 +406,11 @@ def search_org(dff: pl.DataFrame, query: str, org_type: str) -> pl.DataFrame: if not query.strip(): return dff.select(pl.lit(False).alias("matches")) + sleep(0.2) + # Normalize query normalized_query = unidecode(query.strip()).upper() tokens = [" " + t.strip() for t in normalized_query.split() if t.strip()] - print(tokens) # Define columns based on entity type cols = [ @@ -440,15 +441,15 @@ def search_org(dff: pl.DataFrame, query: str, org_type: str) -> pl.DataFrame: # Sélection des colonnes if org_type == "acheteur": - dff = dff.select(cols + ["len_uid"]) + dff = dff.select(cols + ["Marchés"]) if org_type == "titulaire": - dff = dff.select(cols + ["len_uid", "titulaire_typeIdentifiant"]) + dff = dff.select(cols + ["Marchés", "titulaire_typeIdentifiant"]) # Apply and filter dff = ( dff.with_columns(token_matches + [match_score]) .filter(pl.col("match_score") == len(tokens)) - .sort("len_uid", descending=True) + .sort("Marchés", descending=True) .drop([f"token_{token}" for token in tokens]) ) @@ -463,7 +464,7 @@ def search_org(dff: pl.DataFrame, query: str, org_type: str) -> pl.DataFrame: ).alias("Département") ) - dff = dff.select(f"{org_type}_id", f"{org_type}_nom", "Département") + dff = dff.select(f"{org_type}_id", f"{org_type}_nom", "Département", "Marchés") return dff From bb6c0dec26352117016a01b7d63f4d1425b077ad Mon Sep 17 00:00:00 2001 From: Colin Maudry Date: Wed, 12 Nov 2025 14:55:38 +0100 Subject: [PATCH 5/5] Changelog #58 --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 14b32ba..6f1c86d 100644 --- a/README.md +++ b/README.md @@ -40,8 +40,9 @@ Ne pas oublier de mettre à jour les fichier .env. #### 2.2.0 () +- Moteur de recherche (acheteurs et titulaires) en page d'accueil ([#58](https://github.com/ColinMaudry/decp.info/issues/58)) - Top acheteurs / titulaires par montant attribué/remporté (([#55](https://github.com/ColinMaudry/decp.info/issues/55))) -- Moins de colonnes affichées par défaut ([#54](https://github.com/ColinMaudry/decp.info/issues/54)) +- Moins de colonnes affichées par défaut dans Tableau ([#54](https://github.com/ColinMaudry/decp.info/issues/54)) ##### 2.1.6 (15 octobre 2025)