From 362596416e99e5e9b95b0542a4cb858a55a4c633 Mon Sep 17 00:00:00 2001 From: CJ Yetman Date: Thu, 15 Feb 2024 10:53:37 +0100 Subject: [PATCH 01/12] add default 2023Q4 config --- config.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/config.yml b/config.yml index d677f38..bf9a8dd 100644 --- a/config.yml +++ b/config.yml @@ -112,6 +112,26 @@ default: scenario_raw_data_to_include: ["geco_2022", "ipr_2021", "isf_2021", "weo_2022"] global_aggregate_scenario_sources_list: ["WEO2022"] + +2023Q4: + masterdata_ownership_filename: "" + masterdata_debt_filename: "" + ar_company_id__factset_entity_id_filename: "" + factset_financial_data_filename: "" + factset_entity_info_filename: "" + factset_entity_financing_data_filename: "" + factset_fund_data_filename: "" + factset_isin_to_fund_table_filename: "" + factset_iss_emissions_data_filename: "" + factset_issue_code_bridge_filename: "" + imf_quarter_timestamp: "2023-Q4" + pacta_financial_timestamp: "2023Q4" + market_share_target_reference_year: 2023 + scenario_sources_list: ["GECO2023", "ISF2023", "WEO2023"] + scenario_raw_data_to_include: ["geco_2023", "isf_2023", "weo_2023"] + global_aggregate_scenario_sources_list: ["WEO2023"] + + desktop: inherits: 2022Q4 data_prep_outputs_path: "./outputs" From de2bd6000f417d349a05da041fe2692b765b5105 Mon Sep 17 00:00:00 2001 From: CJ Yetman Date: Thu, 15 Feb 2024 11:17:44 +0100 Subject: [PATCH 02/12] add `factset_industry_map_bridge_filename` --- config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config.yml b/config.yml index d6b32e6..e1d7121 100644 --- a/config.yml +++ b/config.yml @@ -124,6 +124,7 @@ default: factset_isin_to_fund_table_filename: "" factset_iss_emissions_data_filename: "" factset_issue_code_bridge_filename: "" + factset_industry_map_bridge_filename: "" imf_quarter_timestamp: "2023-Q4" pacta_financial_timestamp: "2023Q4" market_share_target_reference_year: 2023 From 58e365c5e3569e9d9190542fd082f1158683bde4 Mon Sep 17 00:00:00 2001 From: CJ Yetman Date: Thu, 15 Feb 2024 20:33:22 +0100 Subject: [PATCH 03/12] add `factset_manual_pacta_sector_override` --- config.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config.yml b/config.yml index da9318a..5b5a353 100644 --- a/config.yml +++ b/config.yml @@ -13,6 +13,7 @@ default: factset_iss_emissions_data_filename: "" factset_issue_code_bridge_filename: "" factset_industry_map_bridge_filename: "" + factset_manual_pacta_sector_override: "" update_currencies: TRUE export_sqlite_files: TRUE imf_quarter_timestamp: "2021-Q4" @@ -43,6 +44,7 @@ default: factset_iss_emissions_data_filename: "" factset_issue_code_bridge_filename: "" factset_industry_map_bridge_filename: "" + factset_manual_pacta_sector_override: "" imf_quarter_timestamp: "2021-Q4" pacta_financial_timestamp: "2021Q4" market_share_target_reference_year: 2021 @@ -83,6 +85,7 @@ default: factset_iss_emissions_data_filename: "" factset_issue_code_bridge_filename: "" factset_industry_map_bridge_filename: "" + factset_manual_pacta_sector_override: "" imf_quarter_timestamp: "2022-Q2" pacta_financial_timestamp: "2022Q2" market_share_target_reference_year: 2022 @@ -110,6 +113,7 @@ default: factset_iss_emissions_data_filename: "timestamp-20221231T000000Z_pulled-20240207T161053Z_factset_iss_emissions.rds" factset_issue_code_bridge_filename: "test-from-fds-test-20240207-03-postgres_factset_issue_code_bridge.rds" factset_industry_map_bridge_filename: "timestamp-20230123T000000Z_pulled-20000101T000001_factset_industry_map_bridge.rds" + factset_manual_pacta_sector_override: "" imf_quarter_timestamp: "2022-Q4" pacta_financial_timestamp: "2022Q4" market_share_target_reference_year: 2022 @@ -130,6 +134,7 @@ default: factset_iss_emissions_data_filename: "" factset_issue_code_bridge_filename: "" factset_industry_map_bridge_filename: "" + factset_manual_pacta_sector_override: "" imf_quarter_timestamp: "2023-Q4" pacta_financial_timestamp: "2023Q4" market_share_target_reference_year: 2023 From 5a2ec24a858a40ca9b4f2049e56dde34413e7fd9 Mon Sep 17 00:00:00 2001 From: CJ Yetman Date: Thu, 15 Feb 2024 20:35:50 +0100 Subject: [PATCH 04/12] add `_filename` suffix --- config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config.yml b/config.yml index 5b5a353..fefa772 100644 --- a/config.yml +++ b/config.yml @@ -13,7 +13,7 @@ default: factset_iss_emissions_data_filename: "" factset_issue_code_bridge_filename: "" factset_industry_map_bridge_filename: "" - factset_manual_pacta_sector_override: "" + factset_manual_pacta_sector_override_filename: "" update_currencies: TRUE export_sqlite_files: TRUE imf_quarter_timestamp: "2021-Q4" @@ -44,7 +44,7 @@ default: factset_iss_emissions_data_filename: "" factset_issue_code_bridge_filename: "" factset_industry_map_bridge_filename: "" - factset_manual_pacta_sector_override: "" + factset_manual_pacta_sector_override_filename: "" imf_quarter_timestamp: "2021-Q4" pacta_financial_timestamp: "2021Q4" market_share_target_reference_year: 2021 @@ -85,7 +85,7 @@ default: factset_iss_emissions_data_filename: "" factset_issue_code_bridge_filename: "" factset_industry_map_bridge_filename: "" - factset_manual_pacta_sector_override: "" + factset_manual_pacta_sector_override_filename: "" imf_quarter_timestamp: "2022-Q2" pacta_financial_timestamp: "2022Q2" market_share_target_reference_year: 2022 @@ -113,7 +113,7 @@ default: factset_iss_emissions_data_filename: "timestamp-20221231T000000Z_pulled-20240207T161053Z_factset_iss_emissions.rds" factset_issue_code_bridge_filename: "test-from-fds-test-20240207-03-postgres_factset_issue_code_bridge.rds" factset_industry_map_bridge_filename: "timestamp-20230123T000000Z_pulled-20000101T000001_factset_industry_map_bridge.rds" - factset_manual_pacta_sector_override: "" + factset_manual_pacta_sector_override_filename: "" imf_quarter_timestamp: "2022-Q4" pacta_financial_timestamp: "2022Q4" market_share_target_reference_year: 2022 @@ -134,7 +134,7 @@ default: factset_iss_emissions_data_filename: "" factset_issue_code_bridge_filename: "" factset_industry_map_bridge_filename: "" - factset_manual_pacta_sector_override: "" + factset_manual_pacta_sector_override_filename: "" imf_quarter_timestamp: "2023-Q4" pacta_financial_timestamp: "2023Q4" market_share_target_reference_year: 2023 From a96f286fce743c0f651cf106d8cc3f97cd8496e3 Mon Sep 17 00:00:00 2001 From: CJ Yetman Date: Thu, 15 Feb 2024 21:19:55 +0100 Subject: [PATCH 05/12] add AI dataset filenames --- config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config.yml b/config.yml index fefa772..31eb699 100644 --- a/config.yml +++ b/config.yml @@ -123,9 +123,9 @@ default: 2023Q4: - masterdata_ownership_filename: "" - masterdata_debt_filename: "" - ar_company_id__factset_entity_id_filename: "" + masterdata_ownership_filename: "2024-02-14_AI_RMI Bespoke_Company Data Products_masterdata_ownership_2023Q4.csv" + masterdata_debt_filename: "2024-02-14_AI_RMI Bespoke_Company Data Products_masterdata_debt_2023Q4.csv" + ar_company_id__factset_entity_id_filename: "2024-02-14_AI_RMI_Bespoke_Company_Data_Products_Company_ID_List_2023Q4.csv" factset_financial_data_filename: "" factset_entity_info_filename: "" factset_entity_financing_data_filename: "" From 6e34fde39c55ac41b9d2fe88dceeebdc88884fd6 Mon Sep 17 00:00:00 2001 From: CJ Yetman Date: Thu, 15 Feb 2024 21:38:29 +0100 Subject: [PATCH 06/12] change default "desktop" config to use 2023Q4 --- config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.yml b/config.yml index 31eb699..ab4cdfa 100644 --- a/config.yml +++ b/config.yml @@ -144,7 +144,7 @@ default: desktop: - inherits: 2022Q4 + inherits: 2023Q4 data_prep_outputs_path: "./outputs" asset_impact_data_path: "./ai_inputs" factset_data_path: "./factset_inputs" From 965c2da51e25a3305e131e5ccfa9000dd01508ba Mon Sep 17 00:00:00 2001 From: CJ Yetman Date: Fri, 16 Feb 2024 07:50:21 +0100 Subject: [PATCH 07/12] Update from main --- config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.yml b/config.yml index ab4cdfa..9fdfb1e 100644 --- a/config.yml +++ b/config.yml @@ -113,7 +113,7 @@ default: factset_iss_emissions_data_filename: "timestamp-20221231T000000Z_pulled-20240207T161053Z_factset_iss_emissions.rds" factset_issue_code_bridge_filename: "test-from-fds-test-20240207-03-postgres_factset_issue_code_bridge.rds" factset_industry_map_bridge_filename: "timestamp-20230123T000000Z_pulled-20000101T000001_factset_industry_map_bridge.rds" - factset_manual_pacta_sector_override_filename: "" + factset_manual_pacta_sector_override_filename: "timestamp-20230123T000000Z_pulled-20000101T000002_factset_manual_sector_override.rds" imf_quarter_timestamp: "2022-Q4" pacta_financial_timestamp: "2022Q4" market_share_target_reference_year: 2022 From 00c26bc10f53f1f6790e9e1649564aa7ef15f7ab Mon Sep 17 00:00:00 2001 From: CJ Yetman Date: Sat, 17 Feb 2024 19:27:39 +0100 Subject: [PATCH 08/12] add more parameters to review --- config.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config.yml b/config.yml index 9fdfb1e..b82d30e 100644 --- a/config.yml +++ b/config.yml @@ -141,6 +141,13 @@ default: scenario_sources_list: ["GECO2023", "ISF2023", "WEO2023"] scenario_raw_data_to_include: ["geco_2023", "isf_2023", "weo_2023"] global_aggregate_scenario_sources_list: ["WEO2023"] + sector_list: [] + other_sector_list: [] + zero_emission_factor_techs: [] + green_techs: [] + tech_exclude: [] + scenario_geographies_list: [] + global_aggregate_sector_list: [] desktop: From 1097f531458927607f2631fc52419b654e1b205c Mon Sep 17 00:00:00 2001 From: CJ Yetman Date: Fri, 23 Feb 2024 09:28:20 +0100 Subject: [PATCH 09/12] Update config.yml --- config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config.yml b/config.yml index 1b125f5..2c42300 100644 --- a/config.yml +++ b/config.yml @@ -134,6 +134,7 @@ docker: 2023Q4: + inherits: docker masterdata_ownership_filename: "2024-02-14_AI_RMI Bespoke_Company Data Products_masterdata_ownership_2023Q4.csv" masterdata_debt_filename: "2024-02-14_AI_RMI Bespoke_Company Data Products_masterdata_debt_2023Q4.csv" ar_company_id__factset_entity_id_filename: "2024-02-14_AI_RMI_Bespoke_Company_Data_Products_Company_ID_List_2023Q4.csv" From 4b47c5fe0df47d25cb3d196e72d781493d5768b9 Mon Sep 17 00:00:00 2001 From: Alex Axthelm Date: Sat, 24 Feb 2024 12:49:02 +0100 Subject: [PATCH 10/12] feat(deploy): 144 Add 2023Q4_azure config Add config matching format in #145 --- config.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config.yml b/config.yml index bcf86dc..4df4b57 100644 --- a/config.yml +++ b/config.yml @@ -136,7 +136,6 @@ docker: 2023Q4: - inherits: docker masterdata_ownership_filename: "2024-02-14_AI_RMI Bespoke_Company Data Products_masterdata_ownership_2023Q4.csv" masterdata_debt_filename: "2024-02-14_AI_RMI Bespoke_Company Data Products_masterdata_debt_2023Q4.csv" ar_company_id__factset_entity_id_filename: "2024-02-14_AI_RMI_Bespoke_Company_Data_Products_Company_ID_List_2023Q4.csv" @@ -163,3 +162,9 @@ docker: scenario_geographies_list: ["Global", "NonOECD", "OECD"] global_aggregate_scenario_sources_list: ["WEO2023"] global_aggregate_sector_list: ["Power"] + +2023Q4_azure: + inherits: 2023Q4 + data_prep_outputs_path: "/mnt/outputs" + asset_impact_data_path: "/mnt/asset-impact" + factset_data_path: "/mnt/factset-extracted" From cea47759e35173d01fac615e51eaff1fd324286b Mon Sep 17 00:00:00 2001 From: Alex Axthelm Date: Sat, 24 Feb 2024 13:19:43 +0100 Subject: [PATCH 11/12] feat(deploy): 144 Add filepaths add filepaths to latest known working input data files Closes: 144 --- config.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/config.yml b/config.yml index 4df4b57..0d4c81f 100644 --- a/config.yml +++ b/config.yml @@ -139,15 +139,15 @@ docker: masterdata_ownership_filename: "2024-02-14_AI_RMI Bespoke_Company Data Products_masterdata_ownership_2023Q4.csv" masterdata_debt_filename: "2024-02-14_AI_RMI Bespoke_Company Data Products_masterdata_debt_2023Q4.csv" ar_company_id__factset_entity_id_filename: "2024-02-14_AI_RMI_Bespoke_Company_Data_Products_Company_ID_List_2023Q4.csv" - factset_financial_data_filename: "" - factset_entity_info_filename: "" - factset_entity_financing_data_filename: "" - factset_fund_data_filename: "" - factset_isin_to_fund_table_filename: "" - factset_iss_emissions_data_filename: "" - factset_issue_code_bridge_filename: "" - factset_industry_map_bridge_filename: "" - factset_manual_pacta_sector_override_filename: "" + factset_financial_data_filename: "timestamp-20231231T000000Z_pulled-20240217T135833Z_factset_financial_data.rds" + factset_entity_info_filename: "timestamp-20231231T000000Z_pulled-20240217T135833Z_factset_entity_info.rds" + factset_entity_financing_data_filename: "timestamp-20231231T000000Z_pulled-20240217T135833Z_factset_entity_financing_data.rds" + factset_fund_data_filename: "timestamp-20231231T000000Z_pulled-20240217T135833Z_factset_fund_data.rds" + factset_isin_to_fund_table_filename: "timestamp-20231231T000000Z_pulled-20240217T135833Z_factset_isin_to_fund_table.rds" + factset_iss_emissions_data_filename: "timestamp-20231231T000000Z_pulled-20240217T135833Z_factset_iss_emissions.rds" + factset_issue_code_bridge_filename: "timestamp-20231231T000000Z_pulled-20240217T135833Z_factset_issue_code_bridge.rds" + factset_industry_map_bridge_filename: "timestamp-20231231T000000Z_pulled-20240217T135833Z_factset_industry_map_bridge.rds" + factset_manual_pacta_sector_override_filename: "timestamp-20231231T000000Z_pulled-20240217T135833Z_factset_manual_sector_override.rds" imf_quarter_timestamp: "2023-Q4" pacta_financial_timestamp: "2023Q4" market_share_target_reference_year: 2023 @@ -166,5 +166,5 @@ docker: 2023Q4_azure: inherits: 2023Q4 data_prep_outputs_path: "/mnt/outputs" - asset_impact_data_path: "/mnt/asset-impact" - factset_data_path: "/mnt/factset-extracted" + asset_impact_data_path: "/mnt/asset-impact/2024-02-15_AI_RMI_2023Q4" + factset_data_path: "/mnt/factset-extracted/factset-pacta_timestamp-20231231T000000Z_pulled-20240217T135833Z" From 6dfc6d61c535564d67a31ab6fd3e7fa8669e5923 Mon Sep 17 00:00:00 2001 From: CJ Yetman Date: Sun, 25 Feb 2024 08:35:43 +0100 Subject: [PATCH 12/12] inherit `docker` config --- config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config.yml b/config.yml index 0d4c81f..ee1ed05 100644 --- a/config.yml +++ b/config.yml @@ -136,6 +136,7 @@ docker: 2023Q4: + inherits: docker masterdata_ownership_filename: "2024-02-14_AI_RMI Bespoke_Company Data Products_masterdata_ownership_2023Q4.csv" masterdata_debt_filename: "2024-02-14_AI_RMI Bespoke_Company Data Products_masterdata_debt_2023Q4.csv" ar_company_id__factset_entity_id_filename: "2024-02-14_AI_RMI_Bespoke_Company_Data_Products_Company_ID_List_2023Q4.csv"