From 8905e8fbfef258b4bfdf97121148c6a100b083e5 Mon Sep 17 00:00:00 2001 From: Oleksandr Halushchak Date: Tue, 19 Aug 2025 14:27:54 +0200 Subject: [PATCH 1/7] chore: Creative storage defaults --- docs/calculations.mdx | 5 +++++ docs/snippets/defaults_creative_storage.mdx | 13 +++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 docs/snippets/defaults_creative_storage.mdx diff --git a/docs/calculations.mdx b/docs/calculations.mdx index 684e7b2d..d5c7a111 100644 --- a/docs/calculations.mdx +++ b/docs/calculations.mdx @@ -13,6 +13,7 @@ import AdPlatformDefaults from "/snippets/defaults_ad_platform.mdx"; 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"; # Detailed walkthrough of calculations @@ -233,6 +234,10 @@ Observations from various channels +### Creative storage defaults + + + ## Lookups from external sources ### Carbon intensity by country, region, and UTC Date/Time diff --git a/docs/snippets/defaults_creative_storage.mdx b/docs/snippets/defaults_creative_storage.mdx new file mode 100644 index 00000000..9b0137dc --- /dev/null +++ b/docs/snippets/defaults_creative_storage.mdx @@ -0,0 +1,13 @@ +``` +default_impressions_per_creative: 10000000 +default_storage_kgco2e_per_gb: + linear_tape_open: 0.00114 + hard_disk_drive: 0.16 + solid_state_drive: 0.02 + cloud_storage: 0.0253 +default_storage_usage_pct: + linear_tape_open: 10 + hard_disk_drive: 25 + solid_state_drive: 20 + cloud_storage: 45 +``` From 1b858223e9524e00998744b60f32d4fee5d4a6c4 Mon Sep 17 00:00:00 2001 From: Oleksandr Halushchak Date: Tue, 19 Aug 2025 14:32:04 +0200 Subject: [PATCH 2/7] defaults --- defaults/docs-defaults.yaml | 11 +++++++++++ docs/snippets/defaults_creative_storage.mdx | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/defaults/docs-defaults.yaml b/defaults/docs-defaults.yaml index e2995b8f..e31a9c7c 100644 --- a/defaults/docs-defaults.yaml +++ b/defaults/docs-defaults.yaml @@ -395,3 +395,14 @@ defaults: JAPAC: 0.000300000 LATAM: 0.000100000 NAMER: 0.000100000 + default_impressions_per_creative: 10000000 + default_storage_kgco2e_per_gb: + cloud_storage: 0.0253 + hard_disk_drive: 0.16 + linear_tape_open: 0.00114 + solid_state_drive: 0.02 + default_storage_usage_pct: + cloud_storage: 45 + hard_disk_drive: 25 + linear_tape_open: 10 + solid_state_drive: 20 diff --git a/docs/snippets/defaults_creative_storage.mdx b/docs/snippets/defaults_creative_storage.mdx index 9b0137dc..f7841953 100644 --- a/docs/snippets/defaults_creative_storage.mdx +++ b/docs/snippets/defaults_creative_storage.mdx @@ -1,13 +1,13 @@ ``` default_impressions_per_creative: 10000000 default_storage_kgco2e_per_gb: - linear_tape_open: 0.00114 + cloud_storage: 0.0253 hard_disk_drive: 0.16 + linear_tape_open: 0.00114 solid_state_drive: 0.02 - cloud_storage: 0.0253 default_storage_usage_pct: - linear_tape_open: 10 + cloud_storage: 45 hard_disk_drive: 25 + linear_tape_open: 10 solid_state_drive: 20 - cloud_storage: 45 ``` From 7b5991babeb996ddfff53b098ea5dcfa5c11c702 Mon Sep 17 00:00:00 2001 From: Oleksandr Halushchak Date: Tue, 19 Aug 2025 14:34:34 +0200 Subject: [PATCH 3/7] floats --- docs/snippets/defaults_creative_storage.mdx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/snippets/defaults_creative_storage.mdx b/docs/snippets/defaults_creative_storage.mdx index f7841953..950e8d00 100644 --- a/docs/snippets/defaults_creative_storage.mdx +++ b/docs/snippets/defaults_creative_storage.mdx @@ -1,10 +1,10 @@ ``` default_impressions_per_creative: 10000000 default_storage_kgco2e_per_gb: - cloud_storage: 0.0253 - hard_disk_drive: 0.16 - linear_tape_open: 0.00114 - solid_state_drive: 0.02 + cloud_storage: 0.025300000 + hard_disk_drive: 0.160000000 + linear_tape_open: 0.001140000 + solid_state_drive: 0.020000000 default_storage_usage_pct: cloud_storage: 45 hard_disk_drive: 25 From 2a1e9bc20dc37aa4a48135c80ca4e908fff6ba52 Mon Sep 17 00:00:00 2001 From: Oleksandr Halushchak Date: Tue, 19 Aug 2025 14:40:07 +0200 Subject: [PATCH 4/7] floats --- defaults/docs-defaults.yaml | 8 ++++---- docs/snippets/defaults_creative_storage.mdx | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/defaults/docs-defaults.yaml b/defaults/docs-defaults.yaml index e31a9c7c..7d1d8415 100644 --- a/defaults/docs-defaults.yaml +++ b/defaults/docs-defaults.yaml @@ -397,10 +397,10 @@ defaults: NAMER: 0.000100000 default_impressions_per_creative: 10000000 default_storage_kgco2e_per_gb: - cloud_storage: 0.0253 - hard_disk_drive: 0.16 - linear_tape_open: 0.00114 - solid_state_drive: 0.02 + cloud_storage: 0.025300000 + hard_disk_drive: 0.160000000 + linear_tape_open: 0.001140000 + solid_state_drive: 0.020000000 default_storage_usage_pct: cloud_storage: 45 hard_disk_drive: 25 diff --git a/docs/snippets/defaults_creative_storage.mdx b/docs/snippets/defaults_creative_storage.mdx index 950e8d00..f7841953 100644 --- a/docs/snippets/defaults_creative_storage.mdx +++ b/docs/snippets/defaults_creative_storage.mdx @@ -1,10 +1,10 @@ ``` default_impressions_per_creative: 10000000 default_storage_kgco2e_per_gb: - cloud_storage: 0.025300000 - hard_disk_drive: 0.160000000 - linear_tape_open: 0.001140000 - solid_state_drive: 0.020000000 + cloud_storage: 0.0253 + hard_disk_drive: 0.16 + linear_tape_open: 0.00114 + solid_state_drive: 0.02 default_storage_usage_pct: cloud_storage: 45 hard_disk_drive: 25 From d7a0097d1d5b8218ead294ace4bdca01f88848c8 Mon Sep 17 00:00:00 2001 From: Oleksandr Halushchak Date: Tue, 19 Aug 2025 15:07:58 +0200 Subject: [PATCH 5/7] gen --- defaults/docs-defaults.yaml | 76 ++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/defaults/docs-defaults.yaml b/defaults/docs-defaults.yaml index 7d1d8415..ec83d80d 100644 --- a/defaults/docs-defaults.yaml +++ b/defaults/docs-defaults.yaml @@ -25,37 +25,37 @@ defaults: mobile: 1.200000000 default_channel_by_device: pc: - - ctv-bvod - - social - - audio - - web - - search - - streaming-video - - linear-tv + - ctv-bvod + - social + - audio + - web + - search + - streaming-video + - linear-tv phone: - - social - - ctv-bvod - - audio - - app - - web - - search - - streaming-video - - linear-tv + - social + - ctv-bvod + - audio + - app + - web + - search + - streaming-video + - linear-tv smart-speaker: - - audio + - audio tablet: - - social - - ctv-bvod - - audio - - app - - web - - search - - streaming-video - - linear-tv + - social + - ctv-bvod + - audio + - app + - web + - search + - streaming-video + - linear-tv tv: - - linear-tv - - ctv-bvod - - audio + - linear-tv + - ctv-bvod + - audio default_consumer_device_request_size_bytes: app: 1000 audio: 1000 @@ -132,6 +132,7 @@ defaults: default_emissions_per_creative_request_gco2_per_imp: 0.000300000 default_emissions_per_rtdp_request_gco2_per_imp: 0.010000000 default_image_compression_ratio: 10 + default_impressions_per_creative: 10000000 default_iptv_network_distribution: fixed: 0.999000000 mobile: 0.001000000 @@ -346,6 +347,16 @@ defaults: web: 0.049000000 default_property_g_per_play_by_channel: linear-tv: 790 + default_storage_kgco2e_per_gb: + cloud_storage: 0.025300000 + hard_disk_drive: 0.160000000 + linear_tape_open: 0.001140000 + solid_state_drive: 0.020000000 + default_storage_usage_pct: + cloud_storage: 45 + hard_disk_drive: 25 + linear_tape_open: 10 + solid_state_drive: 20 default_time_in_view_seconds: 6 default_tv_home_equipment_embodied_gco2e_per_second_by_tv_distribution_method: cable: 0.005346759 @@ -395,14 +406,3 @@ defaults: JAPAC: 0.000300000 LATAM: 0.000100000 NAMER: 0.000100000 - default_impressions_per_creative: 10000000 - default_storage_kgco2e_per_gb: - cloud_storage: 0.025300000 - hard_disk_drive: 0.160000000 - linear_tape_open: 0.001140000 - solid_state_drive: 0.020000000 - default_storage_usage_pct: - cloud_storage: 45 - hard_disk_drive: 25 - linear_tape_open: 10 - solid_state_drive: 20 From 0ab2eb41e4b8524a86298209bb593937c81b985d Mon Sep 17 00:00:00 2001 From: Oleksandr Halushchak Date: Tue, 19 Aug 2025 15:12:36 +0200 Subject: [PATCH 6/7] lists --- defaults/docs-defaults.yaml | 54 ++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/defaults/docs-defaults.yaml b/defaults/docs-defaults.yaml index ec83d80d..5ca6f513 100644 --- a/defaults/docs-defaults.yaml +++ b/defaults/docs-defaults.yaml @@ -25,37 +25,37 @@ defaults: mobile: 1.200000000 default_channel_by_device: pc: - - ctv-bvod - - social - - audio - - web - - search - - streaming-video - - linear-tv + - ctv-bvod + - social + - audio + - web + - search + - streaming-video + - linear-tv phone: - - social - - ctv-bvod - - audio - - app - - web - - search - - streaming-video - - linear-tv + - social + - ctv-bvod + - audio + - app + - web + - search + - streaming-video + - linear-tv smart-speaker: - - audio + - audio tablet: - - social - - ctv-bvod - - audio - - app - - web - - search - - streaming-video - - linear-tv + - social + - ctv-bvod + - audio + - app + - web + - search + - streaming-video + - linear-tv tv: - - linear-tv - - ctv-bvod - - audio + - linear-tv + - ctv-bvod + - audio default_consumer_device_request_size_bytes: app: 1000 audio: 1000 From 6760f43e434b5fb992a2eece0116e73b0ef3634b Mon Sep 17 00:00:00 2001 From: Oleksandr Halushchak Date: Tue, 19 Aug 2025 15:15:06 +0200 Subject: [PATCH 7/7] len --- 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 5e74d5dc..1d49ff1b 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), 46) + self.assertEqual(len(docs_defs), 49) def test_get_all_con_networking_connection_device_fixed_defaults(self): """Test get_all_networking_connection_device_defaults returns expected output"""