Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplification des dags source et ajout du contexte #1248

Merged
merged 7 commits into from
Jan 23, 2025
Merged

Simplification des dags source et ajout du contexte #1248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dad18f5
Revert "Conserver le mode iframe durant la navigation (#1215)"
kolok Jan 21, 2025
7619c22
Simplification des dags source et ajout du contexte
kolok Jan 21, 2025
4307cc6
Ajout de la config pour toutes les sources
kolok Jan 22, 2025
1c296d6
rename actors to acteur
kolok Jan 22, 2025
089d200
check mandatory fields
kolok Jan 22, 2025
1eaaffc
use dag_config
kolok Jan 22, 2025
7c3cefb
test compute_link_tables
kolok Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions dags/sources/config/airflow_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
clean_identifiant_externe,
clean_identifiant_unique,
clean_label_codes,
clean_proposition_services,
clean_siret_and_siren,
clean_telephone,
compute_location,
Expand Down Expand Up @@ -67,6 +68,7 @@
"get_latlng_from_geopoint": get_latlng_from_geopoint,
"strip_lower_string": strip_lower_string,
"compute_location": compute_location,
"clean_proposition_services": clean_proposition_services,
}


Expand Down
5 changes: 5 additions & 0 deletions dags/sources/dags/source_aliapur.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,11 @@
"transformation": "clean_action_codes",
"destination": ["action_codes"],
},
{
"origin": ["action_codes", "souscategorie_codes"],
"transformation": "clean_proposition_services",
"destination": ["proposition_services_codes"],
},
# 5. Supression des colonnes
{"remove": "_i"},
{"remove": "_id"},
Expand Down
5 changes: 5 additions & 0 deletions dags/sources/dags/source_citeo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@
"transformation": "clean_action_codes",
"destination": ["action_codes"],
},
{
"origin": ["action_codes", "souscategorie_codes"],
"transformation": "clean_proposition_services",
"destination": ["proposition_services_codes"],
},
# 5. Supression des colonnes
{"remove": "_i"},
{"remove": "_id"},
Expand Down
5 changes: 5 additions & 0 deletions dags/sources/dags/source_corepile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,11 @@
"transformation": "clean_action_codes",
"destination": ["action_codes"],
},
{
"origin": ["action_codes", "souscategorie_codes"],
"transformation": "clean_proposition_services",
"destination": ["proposition_services_codes"],
},
# 5. Supression des colonnes
{"remove": "_i"},
{"remove": "_id"},
Expand Down
5 changes: 5 additions & 0 deletions dags/sources/dags/source_cyclevia.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,11 @@
"transformation": "clean_action_codes",
"destination": ["action_codes"],
},
{
"origin": ["action_codes", "souscategorie_codes"],
"transformation": "clean_proposition_services",
"destination": ["proposition_services_codes"],
},
# 5. Supression des colonnes
{"remove": "_i"},
{"remove": "_id"},
Expand Down
5 changes: 5 additions & 0 deletions dags/sources/dags/source_ecodds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,11 @@
"transformation": "clean_action_codes",
"destination": ["action_codes"],
},
{
"origin": ["action_codes", "souscategorie_codes"],
"transformation": "clean_proposition_services",
"destination": ["proposition_services_codes"],
},
# 5. Supression des colonnes
{"remove": "_i"},
{"remove": "_id"},
Expand Down
5 changes: 5 additions & 0 deletions dags/sources/dags/source_ecologic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@
"transformation": "clean_action_codes",
"destination": ["action_codes"],
},
{
"origin": ["action_codes", "souscategorie_codes"],
"transformation": "clean_proposition_services",
"destination": ["proposition_services_codes"],
},
# 5. Supression des colonnes
{"remove": "_i"},
{"remove": "_id"},
Expand Down
5 changes: 5 additions & 0 deletions dags/sources/dags/source_ecomaison.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,11 @@
"transformation": "clean_action_codes",
"destination": ["action_codes"],
},
{
"origin": ["action_codes", "souscategorie_codes"],
"transformation": "clean_proposition_services",
"destination": ["proposition_services_codes"],
},
# 5. Supression des colonnes
{"remove": "_i"},
{"remove": "_id"},
Expand Down
5 changes: 5 additions & 0 deletions dags/sources/dags/source_ecopae.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,11 @@
"transformation": "clean_action_codes",
"destination": ["action_codes"],
},
{
"origin": ["action_codes", "souscategorie_codes"],
"transformation": "clean_proposition_services",
"destination": ["proposition_services_codes"],
},
# 5. Supression des colonnes
{"remove": "_i"},
{"remove": "_id"},
Expand Down
5 changes: 5 additions & 0 deletions dags/sources/dags/source_ecosystem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@
"transformation": "clean_action_codes",
"destination": ["action_codes"],
},
{
"origin": ["action_codes", "souscategorie_codes"],
"transformation": "clean_proposition_services",
"destination": ["proposition_services_codes"],
},
# 5. Supression des colonnes
{"remove": "_i"},
{"remove": "_id"},
Expand Down
5 changes: 5 additions & 0 deletions dags/sources/dags/source_ocab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,11 @@
"transformation": "clean_action_codes",
"destination": ["action_codes"],
},
{
"origin": ["action_codes", "souscategorie_codes"],
"transformation": "clean_proposition_services",
"destination": ["proposition_services_codes"],
},
# 5. Supression des colonnes
{"remove": "_i"},
{"remove": "_id"},
Expand Down
5 changes: 5 additions & 0 deletions dags/sources/dags/source_ocad3e.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,11 @@
"transformation": "clean_action_codes",
"destination": ["action_codes"],
},
{
"origin": ["action_codes", "souscategorie_codes"],
"transformation": "clean_proposition_services",
"destination": ["proposition_services_codes"],
},
# 5. Supression des colonnes
{"remove": "_i"},
{"remove": "_id"},
Expand Down
5 changes: 5 additions & 0 deletions dags/sources/dags/source_pharmacies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,11 @@
"transformation": "clean_identifiant_unique",
"destination": ["identifiant_unique"],
},
{
"origin": ["action_codes", "souscategorie_codes"],
"transformation": "clean_proposition_services",
"destination": ["proposition_services_codes"],
},
# 5. Supression des colonnes
{"remove": "Téléphone"},
{"remove": "Région"},
Expand Down
5 changes: 5 additions & 0 deletions dags/sources/dags/source_pyreo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,11 @@
"transformation": "clean_action_codes",
"destination": ["action_codes"],
},
{
"origin": ["action_codes", "souscategorie_codes"],
"transformation": "clean_proposition_services",
"destination": ["proposition_services_codes"],
},
# 5. Supression des colonnes
{"remove": "_i"},
{"remove": "_id"},
Expand Down
5 changes: 5 additions & 0 deletions dags/sources/dags/source_refashion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,11 @@
"transformation": "clean_action_codes",
"destination": ["action_codes"],
},
{
"origin": ["action_codes", "souscategorie_codes"],
"transformation": "clean_proposition_services",
"destination": ["proposition_services_codes"],
},
# 5. Supression des colonnes
{"remove": "_i"},
{"remove": "_id"},
Expand Down
5 changes: 5 additions & 0 deletions dags/sources/dags/source_screlec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,11 @@
"transformation": "clean_action_codes",
"destination": ["action_codes"],
},
{
"origin": ["action_codes", "souscategorie_codes"],
"transformation": "clean_proposition_services",
"destination": ["proposition_services_codes"],
},
# 5. Supression des colonnes
{"remove": "_i"},
{"remove": "_id"},
Expand Down
5 changes: 5 additions & 0 deletions dags/sources/dags/source_sinoe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,11 @@
"transformation": "clean_identifiant_unique",
"destination": ["identifiant_unique"],
},
{
"origin": ["action_codes", "souscategorie_codes"],
"transformation": "clean_proposition_services",
"destination": ["proposition_services_codes"],
},
# 5. Supression des colonnes
{"remove": "_geopoint"},
{"remove": "_i"},
Expand Down
5 changes: 5 additions & 0 deletions dags/sources/dags/source_soren.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@
"transformation": "clean_action_codes",
"destination": ["action_codes"],
},
{
"origin": ["action_codes", "souscategorie_codes"],
"transformation": "clean_proposition_services",
"destination": ["proposition_services_codes"],
},
# 5. Supression des colonnes
{"remove": "_i"},
{"remove": "_id"},
Expand Down
5 changes: 5 additions & 0 deletions dags/sources/dags/source_valdelia.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,11 @@
"transformation": "clean_action_codes",
"destination": ["action_codes"],
},
{
"origin": ["action_codes", "souscategorie_codes"],
"transformation": "clean_proposition_services",
"destination": ["proposition_services_codes"],
},
# 5. Supression des colonnes
{"remove": "_i"},
{"remove": "_id"},
Expand Down
57 changes: 57 additions & 0 deletions dags/sources/tasks/airflow_logic/compute_link_tables_task.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
import logging

from airflow import DAG
from airflow.operators.python import PythonOperator
from sources.tasks.business_logic.compute_link_tables import compute_link_tables
from sources.tasks.transform.read_mapping_from_postgres import (
read_mapping_from_postgres,
)
from utils import logging_utils as log

logger = logging.getLogger(__name__)


def compute_link_tables_task(dag: DAG) -> PythonOperator:
return PythonOperator(
task_id="compute_link_tables",
python_callable=compute_link_tables_wrapper,
dag=dag,
)


def compute_link_tables_wrapper(**kwargs):
df_acteur = kwargs["ti"].xcom_pull(task_ids="propose_acteur_changes")["df"]
acteurservice_id_by_code = read_mapping_from_postgres(
table_name="qfdmo_acteurservice"
)
labelqualite_id_by_code = read_mapping_from_postgres(
table_name="qfdmo_labelqualite"
)
actions_id_by_code = read_mapping_from_postgres(table_name="qfdmo_action")
souscats_id_by_code = read_mapping_from_postgres(
table_name="qfdmo_souscategorieobjet"
)
source_id_by_code = read_mapping_from_postgres(table_name="qfdmo_source")
acteurtype_id_by_code = read_mapping_from_postgres(table_name="qfdmo_acteurtype")

log.preview("df_acteur", df_acteur)
log.preview("acteurservice_id_by_code", acteurservice_id_by_code)
log.preview("labelqualite_id_by_code", labelqualite_id_by_code)
log.preview("actions_id_by_code", actions_id_by_code)
log.preview("souscats_id_by_code", souscats_id_by_code)
log.preview("source_id_by_code", source_id_by_code)
log.preview("acteurtype_id_by_code", acteurtype_id_by_code)

df_acteur = compute_link_tables(
df_acteur=df_acteur,
acteurservice_id_by_code=acteurservice_id_by_code,
labelqualite_id_by_code=labelqualite_id_by_code,
actions_id_by_code=actions_id_by_code,
souscats_id_by_code=souscats_id_by_code,
source_id_by_code=source_id_by_code,
acteurtype_id_by_code=acteurtype_id_by_code,
)

log.preview("df_acteur après traitement", df_acteur)

return df_acteur
40 changes: 7 additions & 33 deletions dags/sources/tasks/airflow_logic/db_data_prepare_task.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
from airflow import DAG
from airflow.operators.python import PythonOperator
from sources.tasks.business_logic.db_data_prepare import db_data_prepare
from sources.tasks.business_logic.read_mapping_from_postgres import (
read_mapping_from_postgres,
)
from utils import logging_utils as log

logger = logging.getLogger(__name__)
Expand All @@ -20,36 +17,13 @@ def db_data_prepare_task(dag: DAG) -> PythonOperator:


def db_data_prepare_wrapper(**kwargs):
df_acteur_to_delete = kwargs["ti"].xcom_pull(task_ids="propose_acteur_to_delete")[
"df_acteur_to_delete"
]
df_actors = kwargs["ti"].xcom_pull(task_ids="propose_acteur_changes")["df"]
df_ps = kwargs["ti"].xcom_pull(task_ids="propose_services")["df"]
df_pssc = kwargs["ti"].xcom_pull(task_ids="propose_services_sous_categories")
df_labels = kwargs["ti"].xcom_pull(task_ids="propose_labels")
df_acteur_services = kwargs["ti"].xcom_pull(task_ids="propose_acteur_services")
df_acteurs_from_db = kwargs["ti"].xcom_pull(task_ids="db_read_acteur")
source_id_by_code = read_mapping_from_postgres(table_name="qfdmo_source")
acteurtype_id_by_code = read_mapping_from_postgres(table_name="qfdmo_acteurtype")

log.preview("df_acteur_to_delete", df_acteur_to_delete)
log.preview("df_actors", df_actors)
log.preview("df_ps", df_ps)
log.preview("df_pssc", df_pssc)
log.preview("df_labels", df_labels)
log.preview("df_acteur_services", df_acteur_services)
log.preview("df_acteurs_from_db", df_acteurs_from_db)
log.preview("source_id_by_code", source_id_by_code)
log.preview("acteurtype_id_by_code", acteurtype_id_by_code)
df_acteur = kwargs["ti"].xcom_pull(task_ids="compute_link_tables")
df_acteur_from_db = kwargs["ti"].xcom_pull(task_ids="db_read_acteur")

log.preview("df_acteur", df_acteur)
log.preview("df_acteur_from_db", df_acteur_from_db)

return db_data_prepare(
df_acteur_to_delete=df_acteur_to_delete,
df_acteur=df_actors,
df_ps=df_ps,
df_pssc=df_pssc,
df_labels=df_labels,
df_acteur_services=df_acteur_services,
df_acteurs_from_db=df_acteurs_from_db,
source_id_by_code=source_id_by_code,
acteurtype_id_by_code=acteurtype_id_by_code,
df_acteur=df_acteur,
df_acteur_from_db=df_acteur_from_db,
)
26 changes: 0 additions & 26 deletions dags/sources/tasks/airflow_logic/db_read_propositions_max_id_task.py
View file
Open in desktop

This file was deleted.

Loading
Loading