diff --git a/src/pages/acheteur.py b/src/pages/acheteur.py index d51646b..e0e708a 100644 --- a/src/pages/acheteur.py +++ b/src/pages/acheteur.py @@ -426,7 +426,7 @@ def download_filtered_acheteur_data( if filter_query: track_search(filter_query, "ach download") - lff = filter_table_data(lff, filter_query, "ach download") + lff = filter_table_data(lff, filter_query) if len(sort_by) > 0: lff = sort_table_data(lff, sort_by) diff --git a/src/pages/tableau.py b/src/pages/tableau.py index 4c30ac3..63d9927 100644 --- a/src/pages/tableau.py +++ b/src/pages/tableau.py @@ -315,7 +315,7 @@ def update_table(href, page_current, page_size, filter_query, sort_by, data_time State("tableau_datatable", "hidden_columns"), prevent_initial_call=True, ) -def download_data(n_clicks, filter_query, sort_by, hidden_columns: list = None): +def download_data(n_clicks, filter_query, sort_by, hidden_columns: list | None = None): lff: pl.LazyFrame = query_marches().lazy() # Les colonnes masquées sont supprimées @@ -324,7 +324,7 @@ def download_data(n_clicks, filter_query, sort_by, hidden_columns: list = None): if filter_query: track_search(filter_query, "tab download") - lff = filter_table_data(lff, filter_query, "tab download") + lff = filter_table_data(lff, filter_query) if sort_by and len(sort_by) > 0: lff = sort_table_data(lff, sort_by) diff --git a/src/pages/titulaire.py b/src/pages/titulaire.py index 32f71d5..2a1005c 100644 --- a/src/pages/titulaire.py +++ b/src/pages/titulaire.py @@ -430,7 +430,12 @@ def download_titulaire_data( prevent_initial_call=True, ) def download_filtered_titulaire_data( - data, n_clicks, titulaire_nom, filter_query, sort_by, hidden_columns: list = None + data, + n_clicks, + titulaire_nom, + filter_query, + sort_by, + hidden_columns: list | None = None, ): lff: pl.LazyFrame = pl.LazyFrame( data @@ -442,7 +447,7 @@ def download_filtered_titulaire_data( if filter_query: track_search(filter_query, "titu download") - lff = filter_table_data(lff, filter_query, "titu download") + lff = filter_table_data(lff, filter_query) if len(sort_by) > 0: lff = sort_table_data(lff, sort_by) diff --git a/src/utils/table.py b/src/utils/table.py index 2d80dc3..53ed4bc 100644 --- a/src/utils/table.py +++ b/src/utils/table.py @@ -150,7 +150,7 @@ def dates_to_strings(lff: pl.LazyFrame, column: str) -> pl.LazyFrame: def normalize_sort_by(sort_by) -> tuple: if not sort_by: return () - return tuple(sorted((entry["column_id"], entry["direction"]) for entry in sort_by)) + return tuple((entry["column_id"], entry["direction"]) for entry in sort_by) def format_number(number) -> str: diff --git a/tests/test_table.py b/tests/test_table.py index 5aef7b1..cc89386 100644 --- a/tests/test_table.py +++ b/tests/test_table.py @@ -38,9 +38,7 @@ def test_filter_table_data_does_not_call_track_search(monkeypatch, sample_lff): calls = [] monkeypatch.setattr(table, "track_search", lambda *a, **kw: calls.append(a)) - result = table.filter_table_data( - sample_lff, "{objet} icontains travaux", "tableau" - ).collect() + result = table.filter_table_data(sample_lff, "{objet} icontains travaux").collect() assert calls == [] assert result.height == 1 diff --git a/uv.lock b/uv.lock index b2ced7c..2c14012 100644 --- a/uv.lock +++ b/uv.lock @@ -783,7 +783,7 @@ dependencies = [ { name = "xlsxwriter" }, ] -[package.optional-dependencies] +[package.dev-dependencies] dev = [ { name = "dash", extra = ["testing"] }, { name = "fastexcel" }, @@ -798,29 +798,32 @@ dev = [ requires-dist = [ { name = "dash", specifier = "==3.4.0" }, { name = "dash", extras = ["compress"] }, - { name = "dash", extras = ["testing"], marker = "extra == 'dev'" }, { name = "dash-bootstrap-components" }, { name = "dash-extensions" }, { name = "dash-leaflet" }, { name = "duckdb" }, - { name = "fastexcel", marker = "extra == 'dev'" }, { name = "flask-caching" }, { name = "gunicorn" }, { name = "httpx" }, { name = "pandas" }, { name = "plotly", extras = ["express"] }, { name = "polars" }, - { name = "pre-commit", marker = "extra == 'dev'" }, { name = "pyarrow", specifier = ">=23.0.1" }, - { name = "pytest", marker = "extra == 'dev'" }, - { name = "pytest-env", marker = "extra == 'dev'" }, { name = "python-dotenv" }, - { name = "selenium", marker = "extra == 'dev'" }, { name = "unidecode" }, - { name = "webdriver-manager", marker = "extra == 'dev'" }, { name = "xlsxwriter" }, ] -provides-extras = ["dev"] + +[package.metadata.requires-dev] +dev = [ + { name = "dash", extras = ["testing"] }, + { name = "fastexcel" }, + { name = "pre-commit" }, + { name = "pytest" }, + { name = "pytest-env" }, + { name = "selenium" }, + { name = "webdriver-manager" }, +] [[package]] name = "dill"