Merge branch 'master' into rm-remnants-of-scripts-folder

Author: vdusek

src/apify/_platform_event_manager.py

@@ -49,7 +49,7 @@ def to_crawlee_format(self) -> EventSystemInfoData:
         return EventSystemInfoData.model_validate(
             {
                 'cpu_info': {
-                    'used_ratio': self.cpu_current_usage,
+                    'used_ratio': self.cpu_current_usage / 100,
                     'created_at': self.created_at,
                 },
                 'memory_info': {

src/apify/log.py

@@ -17,7 +17,7 @@
 
 
 @ignore_docs
-class ActorLogFormatter(CrawleeLogFormatter):  # noqa: D101 Inherited from parent class
+class ActorLogFormatter(CrawleeLogFormatter):  # noqa: D101 (Inherited from parent class)
     pass
 
 

tests/unit/test_platform_event_manager.py

@@ -75,24 +75,24 @@ def event_handler(data: Any) -> None:
 
         dummy_persist_state = Mock()
 
-        # Test that they all work, and that they're called in order
+        # Test that they all work
         event_manager.emit(event=Event.PERSIST_STATE, event_data=dummy_persist_state)
         await asyncio.sleep(0.1)
-        assert event_calls[Event.PERSIST_STATE] == [
+        assert set(event_calls[Event.PERSIST_STATE]) == {
             (1, dummy_persist_state),
             (2, dummy_persist_state),
             (3, dummy_persist_state),
-        ]
+        }
         event_calls[Event.PERSIST_STATE].clear()
 
         # Test that if you remove one, the others stay
         event_manager.off(event=Event.PERSIST_STATE, listener=handler_persist_state_3)
         event_manager.emit(event=Event.PERSIST_STATE, event_data=dummy_persist_state)
         await asyncio.sleep(0.1)
-        assert event_calls[Event.PERSIST_STATE] == [
+        assert set(event_calls[Event.PERSIST_STATE]) == {
             (1, dummy_persist_state),
             (2, dummy_persist_state),
-        ]
+        }
         event_calls[Event.PERSIST_STATE].clear()
 
         # Test that removing all in bulk works
@@ -200,5 +200,5 @@ def listener(data: Any) -> None:
             await asyncio.sleep(0.1)
             assert len(event_calls) == 1
             assert event_calls[0] is not None
-            assert event_calls[0]['cpuInfo']['usedRatio'] == 8.45549815498155
+            assert event_calls[0]['cpuInfo']['usedRatio'] == 0.0845549815498155
             event_calls.clear()