From beff1ebc69767bccfae2b5b4d42feaf0e2861468 Mon Sep 17 00:00:00 2001 From: Antonin P Date: Tue, 25 Nov 2025 16:12:05 +0100 Subject: [PATCH] Re-use get_grist_api where it is needed. --- dags/data_utils/grist/_old_pull_ca.py | 4 ++-- dags/data_utils/grist/demo_suite_keycloak.py | 4 ++-- dags/data_utils/grist/grist_helper.py | 2 +- dags/data_utils/grist/suivi_ca.py | 4 ++-- dags/grist_marseille_eco_citoyennete.py | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dags/data_utils/grist/_old_pull_ca.py b/dags/data_utils/grist/_old_pull_ca.py index bba1c8d..3f158f7 100644 --- a/dags/data_utils/grist/_old_pull_ca.py +++ b/dags/data_utils/grist/_old_pull_ca.py @@ -3,14 +3,14 @@ get_postgres_connection, ) from airflow.models import Variable -from .grist_helper import fetch_grist_table_data, _get_grist_api +from .grist_helper import fetch_grist_table_data, get_grist_api grist_ca_doc_id = Variable.get("grist_ca_doc_id") def fetch_and_dump_data(connection_name): # Fetch data from Grist using the new utility function - api = _get_grist_api("grist_osp", grist_ca_doc_id) + api = get_grist_api("grist_osp", grist_ca_doc_id) df = fetch_grist_table_data(api, "Suivi_CA_par_clients") df["Prestations_2024"] = df["Prestations_2024"].astype(str) diff --git a/dags/data_utils/grist/demo_suite_keycloak.py b/dags/data_utils/grist/demo_suite_keycloak.py index fa0abf1..8b1f29a 100644 --- a/dags/data_utils/grist/demo_suite_keycloak.py +++ b/dags/data_utils/grist/demo_suite_keycloak.py @@ -3,7 +3,7 @@ from airflow.models import Variable import pandas as pd from types import SimpleNamespace -from .grist_helper import _get_grist_api +from .grist_helper import get_grist_api from grist_api import GristDocAPI import requests import numpy as np @@ -205,7 +205,7 @@ def fetch_existing_grist_prospects(api: GristDocAPI, table_name: str) -> pd.Data def fetch_data_from_keycloak_and_dump_to_grist(): - api = _get_grist_api("grist_osp", grist_commercial_doc_id) + api = get_grist_api("grist_osp", grist_commercial_doc_id) existing_df = fetch_existing_grist_prospects(api, grist_table_name) if keycloak_server_url is None: diff --git a/dags/data_utils/grist/grist_helper.py b/dags/data_utils/grist/grist_helper.py index 1a0d711..5a2b975 100644 --- a/dags/data_utils/grist/grist_helper.py +++ b/dags/data_utils/grist/grist_helper.py @@ -8,7 +8,7 @@ import re -def _get_grist_api(connection_name, doc_id): +def get_grist_api(connection_name, doc_id): connection = BaseHook.get_connection(connection_name) grist_api_key = connection.password grist_server = connection.host diff --git a/dags/data_utils/grist/suivi_ca.py b/dags/data_utils/grist/suivi_ca.py index be7041a..1cdf138 100644 --- a/dags/data_utils/grist/suivi_ca.py +++ b/dags/data_utils/grist/suivi_ca.py @@ -1,4 +1,4 @@ -from .grist_helper import _get_grist_api +from .grist_helper import get_grist_api import pandas as pd from ..postgres_helper import ( dump_data_to_postgres, @@ -11,7 +11,7 @@ def fetch_and_dump_data(connection_name): - api = _get_grist_api("grist_osp", grist_ca_doc_id) + api = get_grist_api("grist_osp", grist_ca_doc_id) data = api.fetch_table("SUIVI_CLIENTS") df = pd.DataFrame(data) diff --git a/dags/grist_marseille_eco_citoyennete.py b/dags/grist_marseille_eco_citoyennete.py index ba85be3..ebec5bf 100644 --- a/dags/grist_marseille_eco_citoyennete.py +++ b/dags/grist_marseille_eco_citoyennete.py @@ -4,7 +4,7 @@ from airflow.operators.python import PythonOperator from data_utils.alerting.alerting import task_failed from data_utils.grist.grist_dump_document import dump_document_to_postgres -from data_utils.grist.grist_helper import _get_grist_api +from data_utils.grist.grist_helper import get_grist_api from airflow.models import Variable connection_name="main_db_cluster_name" @@ -19,7 +19,7 @@ ) as dag: columns_to_explode = [("Mobilite", "Transport")] doc_id = Variable.get("grist_marseille_eco-citoyennete") - api = _get_grist_api("grist_marseille", doc_id) + api = get_grist_api("grist_marseille", doc_id) fetch_grist_data = PythonOperator( task_id='fetch_and_dump_grist_data', python_callable=dump_document_to_postgres,