From 45b8b64f48da52cf2697bacd44b13e837aee17d6 Mon Sep 17 00:00:00 2001 From: Oleksandr Halushchak Date: Mon, 8 Sep 2025 15:10:31 +0200 Subject: [PATCH 1/4] chore: SCOP-8113 updated default_pct_mobile_per_country --- defaults/docs-defaults.yaml | 227 ++++++++++---------- docs/snippets/defaults_network_traffic.mdx | 230 +++++++++++---------- 2 files changed, 231 insertions(+), 226 deletions(-) diff --git a/defaults/docs-defaults.yaml b/defaults/docs-defaults.yaml index 9b0fd8bd..1868b8a3 100644 --- a/defaults/docs-defaults.yaml +++ b/defaults/docs-defaults.yaml @@ -183,123 +183,126 @@ defaults: sri: 10.000000000 default_percent_mobile_by_country: scope3: - AD: 1.624000000 - AE: 8.167000000 - AL: 15.375000000 - AM: 8.904000000 - AO: 59.384000000 - AT: 38.885000000 - AU: 11.427000000 - AZ: 29.787000000 - BD: 34.150000000 - BE: 4.460000000 - BG: 9.644000000 - BH: 46.290000000 - BJ: 99.730000000 - BR: 11.294000000 - BS: 25.756000000 - BT: 99.456000000 - BW: 42.206000000 - BY: 22.182000000 - CA: 2.685000000 - CH: 17.121000000 - CI: 52.974000000 - CL: 16.549000000 + AD: 2.982000000 + AE: 12.538000000 + AL: 11.136000000 + AM: 12.329000000 + AO: 81.256000000 + AT: 42.451000000 + AU: 10.022000000 + AZ: 3.017000000 + BD: 47.386000000 + BE: 6.379000000 + BG: 14.554000000 + BH: 37.964000000 + BJ: 80.867000000 + BR: 14.080000000 + BS: 6.093000000 + BT: 99.203000000 + BW: 50.891000000 + BY: 18.362000000 + CA: 3.853000000 + CH: 17.137000000 + CI: 45.733000000 + CL: 16.351000000 CM: 23.455000000 - CN: 15.037000000 - CO: 55.086000000 - CR: 8.896000000 - CU: 63.572000000 - CV: 26.441000000 - CY: 7.472000000 - CZ: 6.277000000 - DE: 5.257000000 - DJ: 36.670000000 - DK: 12.428000000 - DZ: 27.683000000 - EC: 9.798000000 - EG: 14.608000000 - ES: 9.105000000 - ET: 45.337000000 - FI: 48.403000000 - FR: 10.000000000 - GB: 5.120000000 - GE: 10.404000000 - GH: 83.523000000 + CN: 13.541000000 + CO: 39.500000000 + CR: 7.691000000 + CU: 83.348000000 + CV: 23.001000000 + CY: 14.170000000 + CZ: 8.683000000 + DE: 6.048000000 + DJ: 72.578000000 + DK: 15.555000000 + DZ: 31.775000000 + EC: 13.019000000 + EG: 18.791000000 + ES: 9.643000000 + ET: 46.640000000 + FI: 40.870000000 + FR: 48.973000000 + GB: 5.660000000 + GE: 10.658000000 + GH: 85.514000000 GQ: 99.999000000 - GR: 9.203000000 - HK: 11.514000000 - HN: 51.493000000 - HR: 23.663000000 - HU: 13.125000000 - ID: 25.742000000 + GR: 13.514000000 + HK: 16.645000000 + HN: 43.333000000 + HR: 23.090000000 + HU: 13.856000000 + ID: 66.646000000 IE: 14.068000000 - IN: 70.092000000 - IQ: 1.815000000 - IR: 67.887000000 - IS: 14.286000000 - IT: 17.540000000 - JM: 2.789000000 - JO: 35.178000000 - JP: 15.825000000 - KE: 36.757000000 - KG: 74.850000000 - KM: 99.676000000 - KR: 9.753000000 - KW: 87.288000000 - KZ: 42.651000000 - LI: 1.625000000 - LK: 63.568000000 - LS: 68.523000000 - LV: 31.858000000 - MA: 36.417000000 - MC: 9.054000000 - ME: 16.701000000 - MG: 45.951000000 - MK: 9.110000000 - MN: 39.596000000 - MU: 11.724000000 - MV: 6.198000000 - MW: 98.678000000 - MX: 6.249000000 - MY: 45.208000000 - NG: 99.252000000 - NI: 48.681000000 - NZ: 3.535000000 - OM: 15.759000000 - PF: 17.987000000 - PK: 59.667000000 - PL: 11.498000000 - PT: 6.065000000 - QA: 18.195000000 - RO: 10.538000000 - RS: 16.372000000 - RU: 27.984000000 - RW: 33.068000000 - SA: 55.143000000 - SC: 22.059000000 - SI: 4.378000000 - SK: 10.929000000 + IN: 68.162000000 + IQ: 9.969000000 + IR: 75.197000000 + IS: 18.209000000 + IT: 17.130000000 + JM: 13.521000000 + JO: 32.758000000 + JP: 16.092000000 + KE: 40.356000000 + KG: 51.686000000 + KM: 99.934000000 + KR: 8.777000000 + KW: 88.149000000 + KZ: 46.552000000 + LI: 5.123000000 + LK: 69.934000000 + LS: 70.932000000 + LV: 30.723000000 + MA: 30.585000000 + MC: 7.871000000 + ME: 18.232000000 + MG: 50.644000000 + MK: 13.946000000 + MN: 36.233000000 + MU: 21.725000000 + MV: 5.177000000 + MW: 98.758000000 + MX: 11.922000000 + MY: 52.676000000 + NG: 99.451000000 + NI: 51.951000000 + NZ: 4.667000000 + OM: 10.984000000 + PF: 21.958000000 + PK: 50.498000000 + PL: 13.454000000 + PT: 8.261000000 + QA: 15.876000000 + RO: 12.554000000 + RS: 22.423000000 + RU: 23.846000000 + RW: 39.736000000 + SA: 22.528000000 + SC: 27.379000000 + SI: 14.154000000 + SK: 15.316000000 SM: 7.767000000 - SN: 61.616000000 - ST: 11.867000000 - TG: 17.266000000 - TH: 33.423000000 - TN: 15.891000000 - TR: 18.092000000 - TT: 6.831000000 - TW: 30.249000000 + SN: 45.455000000 + ST: 16.373000000 + TG: 10.455000000 + TH: 36.910000000 + TN: 15.826000000 + TR: 19.035000000 + TT: 6.732000000 + TW: 26.130000000 TZ: 98.330000000 - UG: 93.327000000 - US: 5.000000000 - UY: 13.111000000 - UZ: 32.197000000 - VE: 7.724000000 - VN: 11.054000000 - VU: 80.578000000 - YE: 11.392000000 - ZA: 30.945000000 - ZW: 33.026000000 + UG: 92.443000000 + US: 5.723000000 + UY: 14.077000000 + UZ: 59.382000000 + VE: 4.700000000 + VN: 8.577000000 + VU: 97.689000000 + YE: 16.667000000 + ZA: 35.193000000 + ZW: 22.887000000 + default_percent_mobile_by_device_type: + smart-speaker: 0.001000000 + tv: 0.001000000 default_percent_radio_distribution_method: am: 15 fm: 60 diff --git a/docs/snippets/defaults_network_traffic.mdx b/docs/snippets/defaults_network_traffic.mdx index f2a7ecb1..e09c69a0 100644 --- a/docs/snippets/defaults_network_traffic.mdx +++ b/docs/snippets/defaults_network_traffic.mdx @@ -4,122 +4,124 @@ default_percent_mobile: sri: 10.0 default_percent_mobile_by_country: scope3: - ZA: 30.945 - AO: 59.384 - AL: 15.375 - DZ: 27.683 - AD: 1.624 - AM: 8.904 - SA: 55.143 - AU: 11.427 - AT: 38.885 - AZ: 29.787 - BR: 11.294 - BS: 25.756 - BE: 4.46 - BJ: 99.73 - BD: 34.15 - BH: 46.29 - BY: 22.182 - BW: 42.206 - BT: 99.456 - BG: 9.644 - CA: 2.685 - CL: 16.549 - CN: 15.037 - CO: 55.086 - LK: 63.568 + AD: 2.982 + AE: 12.538 + AL: 11.136 + AM: 12.329 + AO: 81.256 + AT: 42.451 + AU: 10.022 + AZ: 3.017 + BD: 47.386 + BE: 6.379 + BG: 14.554 + BH: 37.964 + BJ: 80.867 + BR: 14.080 + BS: 6.093 + BT: 99.203 + BW: 50.891 + BY: 18.362 + CA: 3.853 + CH: 17.137 + CI: 45.733 + CL: 16.351 CM: 23.455 - KM: 99.676 - CV: 26.441 - CI: 52.974 - CR: 8.896 - CU: 63.572 - CY: 7.472 - DE: 5.257 - DJ: 36.67 - DK: 12.428 - ES: 9.105 - EG: 14.608 - EC: 9.798 - ET: 45.337 - FI: 48.403 - GB: 5.12 - GH: 83.523 + CN: 13.541 + CO: 39.500 + CR: 7.691 + CU: 83.348 + CV: 23.001 + CY: 14.170 + CZ: 8.683 + DE: 6.048 + DJ: 72.578 + DK: 15.555 + DZ: 31.775 + EC: 13.019 + EG: 18.791 + ES: 9.643 + ET: 46.640 + FI: 40.870 + FR: 48.973 + GB: 5.660 + GE: 10.658 + GH: 85.514 GQ: 99.999 - GR: 9.203 - HK: 11.514 - HN: 51.493 - HU: 13.125 - HR: 23.663 - IT: 17.54 - IN: 70.092 - ID: 25.742 + GR: 13.514 + HK: 16.645 + HN: 43.333 + HR: 23.090 + HU: 13.856 + ID: 66.646 IE: 14.068 - IR: 67.887 - IQ: 1.815 - IS: 14.286 - JP: 15.825 - JM: 2.789 - JO: 35.178 - KE: 36.757 - KR: 9.753 - KW: 87.288 - LI: 1.625 - LS: 68.523 - LV: 31.858 - MU: 11.724 - MC: 9.054 - MG: 45.951 - MX: 6.249 - MY: 45.208 - MV: 6.198 - MN: 39.596 - MA: 36.417 - MW: 98.678 - NI: 48.681 - NG: 99.252 - NZ: 3.535 - PF: 17.987 - OM: 15.759 - PK: 59.667 - PL: 11.498 - PT: 6.065 - QA: 18.195 - RO: 10.538 - RW: 33.068 - RU: 27.984 - SN: 61.616 - SC: 22.059 + IN: 68.162 + IQ: 9.969 + IR: 75.197 + IS: 18.209 + IT: 17.130 + JM: 13.521 + JO: 32.758 + JP: 16.092 + KE: 40.356 + KG: 51.686 + KM: 99.934 + KR: 8.777 + KW: 88.149 + KZ: 46.552 + LI: 5.123 + LK: 69.934 + LS: 70.932 + LV: 30.723 + MA: 30.585 + MC: 7.871 + ME: 18.232 + MG: 50.644 + MK: 13.946 + MN: 36.233 + MU: 21.725 + MV: 5.177 + MW: 98.758 + MX: 11.922 + MY: 52.676 + NG: 99.451 + NI: 51.951 + NZ: 4.667 + OM: 10.984 + PF: 21.958 + PK: 50.498 + PL: 13.454 + PT: 8.261 + QA: 15.876 + RO: 12.554 + RS: 22.423 + RU: 23.846 + RW: 39.736 + SA: 22.528 + SC: 27.379 + SI: 14.154 + SK: 15.316 SM: 7.767 - ST: 11.867 - CH: 17.121 - SI: 4.378 - CZ: 6.277 - TG: 17.266 - TH: 33.423 - TT: 6.831 - TN: 15.891 - TR: 18.092 - TZ: 98.33 - AE: 8.167 - UG: 93.327 - UY: 13.111 - UZ: 32.197 - VE: 7.724 - VN: 11.054 - VU: 80.578 - YE: 11.392 - RS: 16.372 - ZW: 33.026 - GE: 10.404 - KZ: 42.651 - KG: 74.85 - SK: 10.929 - MK: 9.11 - TW: 30.249 - ME: 16.701 - US: 5.0 - FR: 10.0 - + SN: 45.455 + ST: 16.373 + TG: 10.455 + TH: 36.910 + TN: 15.826 + TR: 19.035 + TT: 6.732 + TW: 26.130 + TZ: 98.330 + UG: 92.443 + US: 5.723 + UY: 14.077 + UZ: 59.382 + VE: 4.700 + VN: 8.577 + VU: 97.689 + YE: 16.667 + ZA: 35.193 + ZW: 22.887 +default_percent_mobile_by_device_type: + tv: 0.001 + smart-speaker: 0.001 ``` From b4bb23f1a22abaf2b3b3c6f8187473458c479e59 Mon Sep 17 00:00:00 2001 From: Oleksandr Halushchak Date: Mon, 8 Sep 2025 15:12:31 +0200 Subject: [PATCH 2/4] 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 23227218..ada532f0 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), 57) + self.assertEqual(len(docs_defs), 58) def test_get_all_con_networking_connection_device_fixed_defaults(self): """Test get_all_networking_connection_device_defaults returns expected output""" From 95830a480dd7e890e8b2118262d0e87acb8ca87f Mon Sep 17 00:00:00 2001 From: Oleksandr Halushchak Date: Mon, 8 Sep 2025 15:25:54 +0200 Subject: [PATCH 3/4] type --- defaults/docs-defaults.yaml | 69 +++++++++++----------- docs/snippets/defaults_network_traffic.mdx | 5 +- 2 files changed, 38 insertions(+), 36 deletions(-) diff --git a/defaults/docs-defaults.yaml b/defaults/docs-defaults.yaml index 1868b8a3..0e49d39b 100644 --- a/defaults/docs-defaults.yaml +++ b/defaults/docs-defaults.yaml @@ -42,43 +42,43 @@ defaults: mobile: 1.200000000 default_channel_by_device: pc: - - ctv-bvod - - social - - digital-audio - - web - - search - - streaming-video - - linear-tv - - traditional-radio + - ctv-bvod + - social + - digital-audio + - web + - search + - streaming-video + - linear-tv + - traditional-radio phone: - - social - - ctv-bvod - - digital-audio - - app - - web - - search - - streaming-video - - linear-tv - - traditional-radio + - social + - ctv-bvod + - digital-audio + - app + - web + - search + - streaming-video + - linear-tv + - traditional-radio radio: - - traditional-radio + - traditional-radio smart-speaker: - - digital-audio + - digital-audio tablet: - - social - - ctv-bvod - - digital-audio - - app - - web - - search - - streaming-video - - linear-tv - - traditional-radio + - social + - ctv-bvod + - digital-audio + - app + - web + - search + - streaming-video + - linear-tv + - traditional-radio tv: - - linear-tv - - ctv-bvod - - digital-audio - - traditional-radio + - linear-tv + - ctv-bvod + - digital-audio + - traditional-radio default_consumer_device_request_size_bytes: app: 1000 audio: 1000 @@ -301,8 +301,9 @@ defaults: ZA: 35.193000000 ZW: 22.887000000 default_percent_mobile_by_device_type: - smart-speaker: 0.001000000 - tv: 0.001000000 + scope3: + smart-speaker: 0.001000000 + tv: 0.001000000 default_percent_radio_distribution_method: am: 15 fm: 60 diff --git a/docs/snippets/defaults_network_traffic.mdx b/docs/snippets/defaults_network_traffic.mdx index e09c69a0..f0eca64a 100644 --- a/docs/snippets/defaults_network_traffic.mdx +++ b/docs/snippets/defaults_network_traffic.mdx @@ -122,6 +122,7 @@ default_percent_mobile_by_country: ZA: 35.193 ZW: 22.887 default_percent_mobile_by_device_type: - tv: 0.001 - smart-speaker: 0.001 + scope3: + tv: 0.001 + smart-speaker: 0.001 ``` From 8dfd15ef67fc92270981b50f11a152c93a51eb22 Mon Sep 17 00:00:00 2001 From: Oleksandr Halushchak Date: Mon, 8 Sep 2025 16:33:24 +0200 Subject: [PATCH 4/4] fmt --- defaults/docs-defaults.yaml | 64 ++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/defaults/docs-defaults.yaml b/defaults/docs-defaults.yaml index 0e49d39b..c5eb8ee5 100644 --- a/defaults/docs-defaults.yaml +++ b/defaults/docs-defaults.yaml @@ -42,43 +42,43 @@ defaults: mobile: 1.200000000 default_channel_by_device: pc: - - ctv-bvod - - social - - digital-audio - - web - - search - - streaming-video - - linear-tv - - traditional-radio + - ctv-bvod + - social + - digital-audio + - web + - search + - streaming-video + - linear-tv + - traditional-radio phone: - - social - - ctv-bvod - - digital-audio - - app - - web - - search - - streaming-video - - linear-tv - - traditional-radio + - social + - ctv-bvod + - digital-audio + - app + - web + - search + - streaming-video + - linear-tv + - traditional-radio radio: - - traditional-radio + - traditional-radio smart-speaker: - - digital-audio + - digital-audio tablet: - - social - - ctv-bvod - - digital-audio - - app - - web - - search - - streaming-video - - linear-tv - - traditional-radio + - social + - ctv-bvod + - digital-audio + - app + - web + - search + - streaming-video + - linear-tv + - traditional-radio tv: - - linear-tv - - ctv-bvod - - digital-audio - - traditional-radio + - linear-tv + - ctv-bvod + - digital-audio + - traditional-radio default_consumer_device_request_size_bytes: app: 1000 audio: 1000