colin/colibre
1
0
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects Releases 33 Activity

Merge branch 'feature/55_top10' into dev

Browse Source
This commit is contained in:
Colin Maudry
2025-11-10 13:33:42 +01:00
parent c6e096e42a bbb04a4487
commit 1848c881ac
6 changed files with 124 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+2 -1
View File
@@ -38,8 +38,9 @@ Ne pas oublier de mettre à jour les fichier .env.
## Notes de version
### 2.2.0 ()
#### 2.2.0 ()
- 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))
##### 2.1.6 (15 octobre 2025)
src/assets/style.css
+8 -2
View File
@@ -53,9 +53,10 @@ div.logo > a {
/* Réduire la taille du texte de la colonne Objet */
td[data-dash-column="objet"] {
/*
td[data-dash-column="objet"],td[data-dash-column="titulaire_nom"],td[data-dash-column="acheteur_nom"], {
font-size: 85%;
}
}*/
/* Couleur des en-têtes */
.dash-table-container
@@ -211,6 +212,11 @@ summary > h3 {
grid-row: 2;
}
.org_top {
grid-column: 1/3;
grid-row: 3;
}
/* Vue marché */
.marche_infos p {
src/callbacks.py
+64
View File
@@ -0,0 +1,64 @@
import polars as pl
from dash import dash_table, html
from utils import add_links_in_dict, format_montant, setup_table_columns
def get_top_org_table(data, org_type: str):
dff = pl.DataFrame(data)
if dff.height == 0:
return html.Div()
dff = dff.select(["uid", f"{org_type}_id", f"{org_type}_nom", "montant"])
dff_nb = dff.group_by(f"{org_type}_id", f"{org_type}_nom").agg(
pl.len().alias("Attributions"), pl.sum("montant").alias("montant")
)
dff_nb = dff_nb.sort(by="montant", descending=True)
dff_nb = dff_nb.cast(pl.String)
dff_nb = dff_nb.fill_null("")
dff_nb = format_montant(dff_nb, column="montant")
columns, tooltip = setup_table_columns(
dff_nb, hideable=False, exclude=[f"{org_type}_id"]
)
data = dff_nb.to_dicts()
data = add_links_in_dict(data, f"{org_type}")
print(dff_nb)
return dash_table.DataTable(
data=data,
markdown_options={"html": True},
page_action="native",
page_size=10,
columns=columns,
tooltip_header=tooltip,
style_cell_conditional=[
{
"if": {"column_id": "objet"},
"minWidth": "350px",
"textAlign": "left",
"overflow": "hidden",
"lineHeight": "14px",
"whiteSpace": "normal",
"fontSize": "85%",
},
{
"if": {"column_id": "acheteur_nom"},
"minWidth": "200px",
"textAlign": "left",
"overflow": "hidden",
"lineHeight": "16px",
# "fontSize": "85%",
"whiteSpace": "normal",
},
{
"if": {"column_id": "titulaire_nom"},
"minWidth": "200px",
"textAlign": "left",
"overflow": "hidden",
"lineHeight": "16px",
"whiteSpace": "normal",
# "fontSize": "85%",
},
],
)
src/pages/acheteur.py
+25 -6
View File
@@ -3,6 +3,7 @@ import datetime
import polars as pl
from dash import Input, Output, State, callback, dash_table, dcc, html, register_page
from src.callbacks import get_top_org_table
from src.figures import point_on_map
from src.utils import (
add_links_in_dict,
@@ -89,6 +90,13 @@ layout = [
],
),
html.Div(className="org_map", id="acheteur_map"),
html.Div(
className="org_top",
children=[
html.H3("Top titulaires"),
html.Div(className="marches_table", id="top10_titulaires"),
],
),
],
),
# récupérer les données de l'acheteur sur l'api annuaire
@@ -146,22 +154,22 @@ def update_acheteur_infos(url):
Input(component_id="acheteur_data", component_property="data"),
)
def update_acheteur_stats(data):
df = pl.DataFrame(data)
if df.height == 0:
df = pl.DataFrame(schema=df.collect_schema())
df_marches = df.unique("id")
dff = pl.DataFrame(data)
if dff.height == 0:
dff = pl.DataFrame(schema=df.collect_schema())
df_marches = dff.unique("id")
nb_marches = format_number(df_marches.height)
# somme_marches = format_number(int(df_marches.select(pl.sum("montant")).item()))
marches_attribues = [html.Strong(nb_marches), " marchés et accord-cadres attribués"]
# + ", pour un total de ", html.Strong(somme_marches + " €")]
del df_marches
nb_titulaires = df.unique("titulaire_id").height
nb_titulaires = dff.unique("titulaire_id").height
nb_titulaires = [
html.Strong(format_number(nb_titulaires)),
" titulaires (SIRET) différents",
]
del df
del dff
return marches_attribues, nb_titulaires
@@ -203,8 +211,11 @@ def get_acheteur_marches_data(url, acheteur_year: str) -> list[dict]:
)
def get_last_marches_table(data) -> html.Div:
dff = pl.DataFrame(data)
if dff.height == 0:
return html.Div(html.P("Aucun marché trouvé."))
dff = dff.cast(pl.String)
dff = dff.fill_null("")
print("1", dff.columns)
dff = format_montant(dff)
columns, tooltip = setup_table_columns(
dff,
@@ -252,6 +263,14 @@ def get_last_marches_table(data) -> html.Div:
return table
@callback(
Output(component_id="top10_titulaires", component_property="children"),
Input(component_id="acheteur_data", component_property="data"),
)
def get_top_titulaires(data):
return get_top_org_table(data, "titulaire")
@callback(
Output("download-acheteur-data", "data"),
Input("btn-download-acheteur-data", "n_clicks"),
src/pages/titulaire.py
+17 -1
View File
@@ -3,6 +3,7 @@ import datetime
import polars as pl
from dash import Input, Output, State, callback, dash_table, dcc, html, register_page
from src.callbacks import get_top_org_table
from src.figures import point_on_map
from src.utils import (
add_links_in_dict,
@@ -91,6 +92,13 @@ layout = [
],
),
html.Div(className="org_map", id="titulaire_map"),
html.Div(
className="org_top",
children=[
html.H3("Top acheteurs"),
html.Div(className="marches_table", id="top10_acheteurs"),
],
),
],
),
# récupérer les données de l'acheteur sur l'api annuaire
@@ -161,7 +169,7 @@ def update_titulaire_stats(data):
nb_acheteurs = dff.unique("acheteur_id").height
nb_acheteurs = [
html.Strong(format_number(nb_acheteurs)),
" titulaires (SIRET) différents",
" acheteurs (SIRET) différents",
]
del dff
@@ -266,6 +274,14 @@ def get_last_marches_table(data) -> html.Div:
return table
@callback(
Output(component_id="top10_acheteurs", component_property="children"),
Input(component_id="titulaire_data", component_property="data"),
)
def get_top_acheteurs(data):
return get_top_org_table(data, "acheteur")
@callback(
Output("download-titulaire-data", "data"),
Input("btn-download-titulaire-data", "n_clicks"),
src/utils.py
+6 -4
View File
@@ -77,13 +77,14 @@ def add_links(dff: pl.DataFrame):
return dff
def add_links_in_dict(data: list, org_type: str) -> list:
def add_links_in_dict(data: list[dict], org_type: str) -> list:
new_data = []
for marche in data:
org_id = marche[org_type + "_id"]
marche[org_type + "_nom"] = (
f'<a href="/{org_type}s/{org_id}">{marche[org_type + "_nom"]}</a>'
)
if marche.get("uid"):
marche["id"] = f'<a href="/marches/{marche["uid"]}">{marche["id"]}</a>'
marche["uid"] = f'<a href="/marches/{marche["uid"]}">{marche["uid"]}</a>'
new_data.append(marche)
@@ -124,7 +125,7 @@ def format_number(number) -> str:
return number
def format_montant(dff: pl.DataFrame) -> pl.DataFrame:
def format_montant(dff: pl.DataFrame, column: str = "montant") -> pl.DataFrame:
def format_function(expr, scale=None):
# https://stackoverflow.com/a/78636786
expr = expr.cast(pl.String)
@@ -143,7 +144,7 @@ def format_montant(dff: pl.DataFrame) -> pl.DataFrame:
frac: pl.Expr = (
pl.when(frac.is_not_null() & ~frac.is_in(["0"]))
.then("," + frac)
.then("," + frac.str.head(2))
.otherwise(pl.lit(""))
)
@@ -155,7 +156,8 @@ def format_montant(dff: pl.DataFrame) -> pl.DataFrame:
return montant
dff = dff.with_columns(pl.col("montant").pipe(format_function).alias("montant"))
print("3", dff.columns)
dff = dff.with_columns(pl.col(column).pipe(format_function).alias(column))
return dff