apify 2.0.0b8__tar.gz → 2.0.0b10__tar.gz

{apify-2.0.0b8 → apify-2.0.0b10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apify
-Version: 2.0.0b8
+Version: 2.0.0b10
 Summary: Apify SDK for Python
 License: Apache-2.0
 Keywords: apify,sdk,automation,chrome,crawlee,crawler,headless,scraper,scraping

{apify-2.0.0b8 → apify-2.0.0b10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "apify"
-version = "2.0.0b8"
+version = "2.0.0b10"
 description = "Apify SDK for Python"
 authors = ["Apify Technologies s.r.o. <support@apify.com>"]
 license = "Apache-2.0"

{apify-2.0.0b8 → apify-2.0.0b10}/src/apify/_platform_event_manager.py

@@ -94,6 +94,11 @@ class EventWithoutData(BaseModel):
     data: Any = None
 
 
+class DeprecatedEvent(BaseModel):
+    name: Literal['cpuInfo']
+    data: Annotated[dict[str, Any], Field(default_factory=dict)]
+
+
 class UnknownEvent(BaseModel):
     name: str
     data: Annotated[dict[str, Any], Field(default_factory=dict)]
@@ -109,12 +114,13 @@ EventMessage = Union[
 ]
 
 
-event_data_adapter: TypeAdapter[EventMessage | UnknownEvent] = TypeAdapter(
+event_data_adapter: TypeAdapter[EventMessage | DeprecatedEvent | UnknownEvent] = TypeAdapter(
     Union[
         Annotated[
             EventMessage,
             Discriminator('name'),
         ],
+        DeprecatedEvent,
         UnknownEvent,
     ]
 )
@@ -189,6 +195,9 @@ class PlatformEventManager(EventManager):
                     try:
                         parsed_message = event_data_adapter.validate_json(message)
 
+                        if isinstance(parsed_message, DeprecatedEvent):
+                            continue
+
                         if isinstance(parsed_message, UnknownEvent):
                             logger.info(
                                 f'Unknown message received: event_name={parsed_message.name}, '

{apify-2.0.0b8 → apify-2.0.0b10}/src/apify/scrapy/middlewares/apify_proxy.py

@@ -93,7 +93,7 @@ class ApifyHttpProxyMiddleware:
         request: Request,
         exception: Exception,
         spider: Spider,
-    ) -> None | Request:
+    ) -> None:
         """Process an exception that occurs during request processing.
 
         Args:
@@ -102,8 +102,9 @@ class ApifyHttpProxyMiddleware:
             spider: Scrapy Spider object.
 
         Returns:
-            If a TunnelError occurs, return the request object to halt its processing in the middleware pipeline.
-            Return None otherwise to allow the continuation of request processing.
+            Returning None, meaning Scrapy will continue processing this exception, executing any other
+            process_exception() methods of installed middleware, until no middleware is left and the default
+            exception handling kicks in.
         """
         Actor.log.debug(
             f'ApifyHttpProxyMiddleware.process_exception: request={request}, exception={exception}, spider={spider}',
@@ -114,9 +115,6 @@ class ApifyHttpProxyMiddleware:
                 f'ApifyHttpProxyMiddleware: TunnelError occurred for request="{request}", '
                 'reason="{exception}", skipping...'
             )
-            return request
-
-        return None
 
     async def _get_new_proxy_url(self: ApifyHttpProxyMiddleware) -> ParseResult:
         """Get a new proxy URL.