From 67bd3d2c2e1e4985663ce8081bcab1d1a1f4ebc1 Mon Sep 17 00:00:00 2001 From: Oleksandr Halushchak Date: Tue, 9 Sep 2025 17:18:52 +0200 Subject: [PATCH 1/5] chore: SCOP-8112 conventional model defaults updates --- defaults/docs-defaults.yaml | 2 +- docs/calculations.mdx | 1 + docs/snippets/defaults_asset_size.mdx | 3 +++ docs/snippets/defaults_channel_mapping.mdx | 4 ++-- docs/snippets/defaults_conventional_model.mdx | 8 ++++---- docs/snippets/defaults_video_player.mdx | 2 +- scope3_methodology/test/test_api.py | 2 +- 7 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 docs/snippets/defaults_asset_size.mdx diff --git a/defaults/docs-defaults.yaml b/defaults/docs-defaults.yaml index e454a98c..a15f80d4 100644 --- a/defaults/docs-defaults.yaml +++ b/defaults/docs-defaults.yaml @@ -452,7 +452,7 @@ defaults: social: impression streaming-video: impression web: impression - default_video_player_size_bytes: 192205 + default_video_player_size_bytes: 350000 generic_creative_ad_server: emissions_per_creative_request_per_geo_gco2_per_imp: EMEA: 0.000100000 diff --git a/docs/calculations.mdx b/docs/calculations.mdx index 62cea672..879fe22c 100644 --- a/docs/calculations.mdx +++ b/docs/calculations.mdx @@ -14,6 +14,7 @@ import NetworkTrafficDefaults from "/snippets/defaults_network_traffic.mdx"; import ChannelMappingDefaults from "/snippets/defaults_channel_mapping.mdx"; import BroadcastingDefaults from "/snippets/defaults_broadcasting.mdx"; import CreativeStorageDefaults from "/snippets/defaults_creative_storage.mdx"; +import AssetDefaults from "/snippets/defaults_asset_size.mdx"; # Detailed walkthrough of calculations diff --git a/docs/snippets/defaults_asset_size.mdx b/docs/snippets/defaults_asset_size.mdx new file mode 100644 index 00000000..453616a4 --- /dev/null +++ b/docs/snippets/defaults_asset_size.mdx @@ -0,0 +1,3 @@ +``` +default_display_other_assets_bytes: 50000 +``` diff --git a/docs/snippets/defaults_channel_mapping.mdx b/docs/snippets/defaults_channel_mapping.mdx index 93bc2f7e..8f4a9d18 100644 --- a/docs/snippets/defaults_channel_mapping.mdx +++ b/docs/snippets/defaults_channel_mapping.mdx @@ -73,12 +73,12 @@ default_platform_ad_format_by_channel: traditional-radio: 30s Radio default_property_average_imps_per_session_by_channel: social: 24 - ctv-bvod: 8.256 + ctv-bvod: 18 streaming-video: 1 digital-audio: 4.8 app: 14 web: 32 - linear-tv: 21.5 + linear-tv: 30 search: 12 traditional-radio: 21.5 default_property_ad_funded_percentage_by_channel: diff --git a/docs/snippets/defaults_conventional_model.mdx b/docs/snippets/defaults_conventional_model.mdx index d204ea83..6754ce9a 100644 --- a/docs/snippets/defaults_conventional_model.mdx +++ b/docs/snippets/defaults_conventional_model.mdx @@ -1,15 +1,15 @@ ``` default_usage_kwh_per_gb: scope3: - fixed: 0.03 - mobile: 0.14 + fixed: 0.0165 + mobile: 0.117 sri: fixed: 0.0687 mobile: 0.236 default_network_embodied_emissions_gco2e_per_kb: scope3: - fixed: 0.00000443 - mobile: 0.00000797 + fixed: 0.00000214 + mobile: 0.00000870 sri: fixed: 0.00000443 mobile: 0.00000797 diff --git a/docs/snippets/defaults_video_player.mdx b/docs/snippets/defaults_video_player.mdx index 85871059..b05c48ea 100644 --- a/docs/snippets/defaults_video_player.mdx +++ b/docs/snippets/defaults_video_player.mdx @@ -1,5 +1,5 @@ ``` -default_video_player_size_bytes: 192205 +default_video_player_size_bytes: 350000 default_video_player_download_trigger: web: 'impression' app: 'impression' diff --git a/scope3_methodology/test/test_api.py b/scope3_methodology/test/test_api.py index ada532f0..67683624 100644 --- a/scope3_methodology/test/test_api.py +++ b/scope3_methodology/test/test_api.py @@ -240,7 +240,7 @@ def test_startup(self): ) docs_defs = docs_defaults - self.assertEqual(len(docs_defs), 58) + self.assertEqual(len(docs_defs), 59) def test_get_all_con_networking_connection_device_fixed_defaults(self): """Test get_all_networking_connection_device_defaults returns expected output""" From c76655eb6d08c30af76186540abd443e3f03d5fb Mon Sep 17 00:00:00 2001 From: Oleksandr Halushchak Date: Tue, 9 Sep 2025 17:33:36 +0200 Subject: [PATCH 2/5] chore: SCOP-8112 conventional model defaults updates --- defaults/docs-defaults.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/defaults/docs-defaults.yaml b/defaults/docs-defaults.yaml index a15f80d4..e2cbf8a5 100644 --- a/defaults/docs-defaults.yaml +++ b/defaults/docs-defaults.yaml @@ -91,6 +91,7 @@ defaults: default_count_ad_platform: dooh: 6 search: 1 + default_display_other_assets_bytes: 50000 default_device_by_channel: app: phone ctv-bvod: tv @@ -172,8 +173,8 @@ defaults: mobile: 0.001000000 default_network_embodied_emissions_gco2e_per_kb: scope3: - fixed: 0.000004430 - mobile: 0.000007970 + fixed: 0.000002140 + mobile: 0.000008700 sri: fixed: 0.000004430 mobile: 0.000007970 @@ -376,9 +377,9 @@ defaults: web: 100 default_property_average_imps_per_session_by_channel: app: 14 - ctv-bvod: 8.256000000 + ctv-bvod: 18 digital-audio: 4.800000000 - linear-tv: 21.500000000 + linear-tv: 30 search: 12 social: 24 streaming-video: 1 @@ -435,8 +436,8 @@ defaults: satellite: 3150 default_usage_kwh_per_gb: scope3: - fixed: 0.030000000 - mobile: 0.140000000 + fixed: 0.016500000 + mobile: 0.117000000 sri: fixed: 0.068700000 mobile: 0.236000000 From 2fcb60e1c47208c1cb7bc48d89a39c9b41277a87 Mon Sep 17 00:00:00 2001 From: Oleksandr Halushchak Date: Tue, 9 Sep 2025 17:35:32 +0200 Subject: [PATCH 3/5] chore: SCOP-8112 conventional model defaults updates --- defaults/docs-defaults.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/docs-defaults.yaml b/defaults/docs-defaults.yaml index e2cbf8a5..25d6de9f 100644 --- a/defaults/docs-defaults.yaml +++ b/defaults/docs-defaults.yaml @@ -91,7 +91,6 @@ defaults: default_count_ad_platform: dooh: 6 search: 1 - default_display_other_assets_bytes: 50000 default_device_by_channel: app: phone ctv-bvod: tv @@ -154,6 +153,7 @@ defaults: phone: 1080 tablet: 1536 tv: 1920 + default_display_other_assets_bytes: 50000 default_dynamic_watts_per_mbps: fixed: 0.030000000 mobile: 1.530000000 From 43d9b646e0c2ab03f3f18fad0eaf1e3333334e73 Mon Sep 17 00:00:00 2001 From: Oleksandr Halushchak Date: Wed, 10 Sep 2025 12:22:28 +0200 Subject: [PATCH 4/5] default_display_creative_overhead_factor --- defaults/docs-defaults.yaml | 1 + docs/snippets/defaults_asset_size.mdx | 1 + 2 files changed, 2 insertions(+) diff --git a/defaults/docs-defaults.yaml b/defaults/docs-defaults.yaml index 25d6de9f..46d345e9 100644 --- a/defaults/docs-defaults.yaml +++ b/defaults/docs-defaults.yaml @@ -153,6 +153,7 @@ defaults: phone: 1080 tablet: 1536 tv: 1920 + default_display_creative_overhead_factor: 0.200000000 default_display_other_assets_bytes: 50000 default_dynamic_watts_per_mbps: fixed: 0.030000000 diff --git a/docs/snippets/defaults_asset_size.mdx b/docs/snippets/defaults_asset_size.mdx index 453616a4..91307d92 100644 --- a/docs/snippets/defaults_asset_size.mdx +++ b/docs/snippets/defaults_asset_size.mdx @@ -1,3 +1,4 @@ ``` default_display_other_assets_bytes: 50000 +default_display_creative_overhead_factor: 0.2 ``` From 7a3d953695888f7bcad9a225fefdc295acbeee3b Mon Sep 17 00:00:00 2001 From: Oleksandr Halushchak Date: Wed, 10 Sep 2025 12:26:14 +0200 Subject: [PATCH 5/5] test --- scope3_methodology/test/test_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scope3_methodology/test/test_api.py b/scope3_methodology/test/test_api.py index 67683624..67af7336 100644 --- a/scope3_methodology/test/test_api.py +++ b/scope3_methodology/test/test_api.py @@ -240,7 +240,7 @@ def test_startup(self): ) docs_defs = docs_defaults - self.assertEqual(len(docs_defs), 59) + self.assertEqual(len(docs_defs), 60) def test_get_all_con_networking_connection_device_fixed_defaults(self): """Test get_all_networking_connection_device_defaults returns expected output"""