apify 2.5.0b4__tar.gz → 2.5.0b6__tar.gz

{apify-2.5.0b4 → apify-2.5.0b6}/CHANGELOG.md

@@ -2,15 +2,17 @@
 
 All notable changes to this project will be documented in this file.
 
-<!-- git-cliff-unreleased-start -->
-## 2.5.0 - **not yet released**
+## [2.5.0](https://github.com/apify/apify-sdk-python/releases/tag/v2.5.0) (2025-03-27)
 
 ### 🚀 Features
 
 - Implement Scrapy HTTP cache backend  ([#403](https://github.com/apify/apify-sdk-python/pull/403)) ([137e3c8](https://github.com/apify/apify-sdk-python/commit/137e3c8d5c6b28cf6935cfb742b5f072cd2e0a02)) by [@honzajavorek](https://github.com/honzajavorek)
 
+### 🐛 Bug Fixes
+
+- Fix calculation of CPU utilization from SystemInfo events ([#447](https://github.com/apify/apify-sdk-python/pull/447)) ([eb4c8e4](https://github.com/apify/apify-sdk-python/commit/eb4c8e4e498e23f573b9e2d4c7dbd8e2ecc277d9)) by [@janbuchar](https://github.com/janbuchar)
+
 
-<!-- git-cliff-unreleased-end -->
 ## [2.4.0](https://github.com/apify/apify-sdk-python/releases/tag/v2.4.0) (2025-03-07)
 
 ### 🚀 Features

{apify-2.5.0b4 → apify-2.5.0b6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apify
-Version: 2.5.0b4
+Version: 2.5.0b6
 Summary: Apify SDK for Python
 Project-URL: Homepage, https://docs.apify.com/sdk/python/
 Project-URL: Apify homepage, https://apify.com

{apify-2.5.0b4 → apify-2.5.0b6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "apify"
-version = "2.5.0b4"
+version = "2.5.0b6"
 description = "Apify SDK for Python"
 authors = [{ name = "Apify Technologies s.r.o.", email = "support@apify.com" }]
 license = { file = "LICENSE" }
@@ -59,7 +59,7 @@ scrapy = ["scrapy>=2.11.0"]
 [dependency-groups]
 dev = [
     "build~=1.2.0",
-    "griffe~=1.6.0",
+    "griffe~=1.7.0",
     "mypy~=1.15.0",
     "pre-commit~=4.2.0",
     "pydoc-markdown~=4.8.0",

{apify-2.5.0b4 → apify-2.5.0b6}/src/apify/_configuration.py

@@ -5,8 +5,8 @@ from decimal import Decimal
 from logging import getLogger
 from typing import Annotated, Any
 
-from pydantic import AliasChoices, BeforeValidator, Field
-from typing_extensions import deprecated
+from pydantic import AliasChoices, BeforeValidator, Field, model_validator
+from typing_extensions import Self, deprecated
 
 from crawlee._utils.models import timedelta_ms
 from crawlee._utils.urls import validate_http_url
@@ -365,6 +365,19 @@ class Configuration(CrawleeConfiguration):
         ),
     ] = None
 
+    @model_validator(mode='after')
+    def disable_browser_sandbox_on_platform(self) -> Self:
+        """Disable the browser sandbox mode when running on the Apify platform.
+
+        Running in environment where `is_at_home` is True does not benefit from browser sandbox as it is already running
+        in a container. It can be on the contrary undesired as the process in the container might be running as root and
+        this will crash chromium that was started with browser sandbox mode.
+        """
+        if self.is_at_home and not self.disable_browser_sandbox:
+            self.disable_browser_sandbox = True
+            logger.warning('Actor is running on the Apify platform, `disable_browser_sandbox` was changed to True.')
+        return self
+
     @classmethod
     def get_global_configuration(cls) -> Configuration:
         """Retrieve the global instance of the configuration.

{apify-2.5.0b4 → apify-2.5.0b6}/src/apify/_platform_event_manager.py

@@ -48,11 +48,11 @@ class SystemInfoEventData(BaseModel):
     is_cpu_overloaded: Annotated[bool, Field(alias='isCpuOverloaded')]
     created_at: Annotated[datetime, Field(alias='createdAt')]
 
-    def to_crawlee_format(self) -> EventSystemInfoData:
+    def to_crawlee_format(self, dedicated_cpus: float) -> EventSystemInfoData:
         return EventSystemInfoData.model_validate(
             {
                 'cpu_info': {
-                    'used_ratio': self.cpu_current_usage / 100,
+                    'used_ratio': (self.cpu_current_usage / 100) / dedicated_cpus,
                     'created_at': self.created_at,
                 },
                 'memory_info': {
@@ -218,7 +218,7 @@ class PlatformEventManager(EventManager):
                             event=parsed_message.name,
                             event_data=parsed_message.data
                             if not isinstance(parsed_message.data, SystemInfoEventData)
-                            else parsed_message.data.to_crawlee_format(),
+                            else parsed_message.data.to_crawlee_format(self._config.dedicated_cpus or 1),
                         )
 
                         if parsed_message.name == Event.MIGRATING:

apify-2.5.0b6/tests/unit/actor/test_configuration.py

@@ -0,0 +1,21 @@
+import pytest
+
+from apify import Configuration
+
+
+@pytest.mark.parametrize(
+    ('is_at_home', 'disable_browser_sandbox_in', 'disable_browser_sandbox_out'),
+    [
+        (False, False, False),
+        (False, True, True),
+        (True, False, True),
+        (True, True, True),
+    ],
+)
+def test_disable_browser_sandbox(
+    *, is_at_home: bool, disable_browser_sandbox_in: bool, disable_browser_sandbox_out: bool
+) -> None:
+    assert (
+        Configuration(is_at_home=is_at_home, disable_browser_sandbox=disable_browser_sandbox_in).disable_browser_sandbox
+        == disable_browser_sandbox_out
+    )

{apify-2.5.0b4 → apify-2.5.0b6}/uv.lock

@@ -82,7 +82,7 @@ provides-extras = ["scrapy"]
 [package.metadata.requires-dev]
 dev = [
     { name = "build", specifier = "~=1.2.0" },
-    { name = "griffe", specifier = "~=1.6.0" },
+    { name = "griffe", specifier = "~=1.7.0" },
     { name = "mypy", specifier = "~=1.15.0" },
     { name = "pre-commit", specifier = "~=4.2.0" },
     { name = "pydoc-markdown", specifier = "~=4.8.0" },
@@ -824,14 +824,14 @@ wheels = [
 
 [[package]]
 name = "griffe"
-version = "1.6.2"
+version = "1.7.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "colorama" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/2f/f2/b00eb72b853ecb5bf31dd47857cdf6767e380ca24ec2910d43b3fa7cc500/griffe-1.6.2.tar.gz", hash = "sha256:3a46fa7bd83280909b63c12b9a975732a927dd97809efe5b7972290b606c5d91", size = 392836 }
+sdist = { url = "https://files.pythonhosted.org/packages/cc/e1/7dded768fe1adf67879bcd86cf83476e7b19f13d95e6504b6c2b91092f8c/griffe-1.7.0.tar.gz", hash = "sha256:72e9c1593c7af92a387906293fc4a318c2e8e8aef501c64678c809794b4bdca4", size = 394351 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/4e/bc/bd8b7de5e748e078b6be648e76b47189a9182b1ac1eb7791ff7969f39f27/griffe-1.6.2-py3-none-any.whl", hash = "sha256:6399f7e663150e4278a312a8e8a14d2f3d7bd86e2ef2f8056a1058e38579c2ee", size = 128638 },
+    { url = "https://files.pythonhosted.org/packages/66/b3/6201c5dc97ed76398eb419d17fe18db6b4b3ffb2baa2bae91b4c65126096/griffe-1.7.0-py3-none-any.whl", hash = "sha256:6b44efc53a3f290d42c4da521f42235177b3bd107877dd55955318a37930c572", size = 129118 },
 ]
 
 [[package]]