apify 2.0.2__py3-none-any.whl → 2.0.2b2__py3-none-any.whl

apify/_platform_event_manager.py

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

apify/apify_storage_client/_dataset_client.py

@@ -91,7 +91,7 @@ class DatasetClient(BaseDatasetClient):
         skip_empty: bool = False,
         skip_hidden: bool = False,
     ) -> AsyncIterator[dict]:
-        async for item in self._client.iterate_items(
+        return self._client.iterate_items(
             offset=offset,
             limit=limit,
             clean=clean,
@@ -101,8 +101,7 @@ class DatasetClient(BaseDatasetClient):
             unwind=unwind,
             skip_empty=skip_empty,
             skip_hidden=skip_hidden,
-        ):
-            yield item
+        )
 
     @override
     async def get_items_as_bytes(

apify/log.py

@@ -17,7 +17,7 @@ logger = logging.getLogger(logger_name)
 
 
 @ignore_docs
-class ActorLogFormatter(CrawleeLogFormatter):  # noqa: D101 (Inherited from parent class)
+class ActorLogFormatter(CrawleeLogFormatter):  # noqa: D101 Inherited from parent class
     pass
 
 

apify/scrapy/middlewares/apify_proxy.py

@@ -27,7 +27,7 @@ class ApifyHttpProxyMiddleware:
     proxy_settings = {'useApifyProxy': true, 'apifyProxyGroups': []}
     """
 
-    def __init__(self, proxy_settings: dict) -> None:
+    def __init__(self: ApifyHttpProxyMiddleware, proxy_settings: dict) -> None:
         """Create a new instance.
 
         Args:
@@ -66,7 +66,7 @@ class ApifyHttpProxyMiddleware:
 
         return cls(proxy_settings)
 
-    async def process_request(self, request: Request, spider: Spider) -> None:
+    async def process_request(self: ApifyHttpProxyMiddleware, request: Request, spider: Spider) -> None:
         """Process a Scrapy request by assigning a new proxy.
 
         Args:
@@ -89,7 +89,7 @@ class ApifyHttpProxyMiddleware:
         Actor.log.debug(f'ApifyHttpProxyMiddleware.process_request: updated request.meta={request.meta}')
 
     def process_exception(
-        self,
+        self: ApifyHttpProxyMiddleware,
         request: Request,
         exception: Exception,
         spider: Spider,
@@ -116,7 +116,7 @@ class ApifyHttpProxyMiddleware:
                 'reason="{exception}", skipping...'
             )
 
-    async def _get_new_proxy_url(self) -> ParseResult:
+    async def _get_new_proxy_url(self: ApifyHttpProxyMiddleware) -> ParseResult:
         """Get a new proxy URL.
 
         Raises:

apify/scrapy/pipelines/actor_dataset_push.py

@@ -19,7 +19,7 @@ class ActorDatasetPushPipeline:
     """
 
     async def process_item(
-        self,
+        self: ActorDatasetPushPipeline,
         item: Item,
         spider: Spider,
     ) -> Item:

apify/scrapy/scheduler.py

@@ -29,7 +29,7 @@ class ApifyScheduler(BaseScheduler):
     This scheduler requires the asyncio Twisted reactor to be installed.
     """
 
-    def __init__(self) -> None:
+    def __init__(self: ApifyScheduler) -> None:
         """Create a new instance."""
         if not is_asyncio_reactor_installed():
             raise ValueError(
@@ -40,7 +40,7 @@ class ApifyScheduler(BaseScheduler):
         self._rq: RequestQueue | None = None
         self.spider: Spider | None = None
 
-    def open(self, spider: Spider) -> None:  # this has to be named "open"
+    def open(self: ApifyScheduler, spider: Spider) -> None:  # this has to be named "open"
         """Open the scheduler.
 
         Args:
@@ -58,7 +58,7 @@ class ApifyScheduler(BaseScheduler):
             traceback.print_exc()
             raise
 
-    def has_pending_requests(self) -> bool:
+    def has_pending_requests(self: ApifyScheduler) -> bool:
         """Check if the scheduler has any pending requests.
 
         Returns:
@@ -75,7 +75,7 @@ class ApifyScheduler(BaseScheduler):
 
         return not is_finished
 
-    def enqueue_request(self, request: Request) -> bool:
+    def enqueue_request(self: ApifyScheduler, request: Request) -> bool:
         """Add a request to the scheduler.
 
         This could be called from either from a spider or a downloader middleware (e.g. redirect, retry, ...).
@@ -111,7 +111,7 @@ class ApifyScheduler(BaseScheduler):
         Actor.log.debug(f'[{call_id}]: rq.add_request.result={result}...')
         return bool(result.was_already_present)
 
-    def next_request(self) -> Request | None:
+    def next_request(self: ApifyScheduler) -> Request | None:
         """Fetch the next request from the scheduler.
 
         Returns:

{apify-2.0.2.dist-info → apify-2.0.2b2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apify
-Version: 2.0.2
+Version: 2.0.2b2
 Summary: Apify SDK for Python
 License: Apache-2.0
 Keywords: apify,sdk,automation,chrome,crawlee,crawler,headless,scraper,scraping
@@ -21,13 +21,13 @@ Classifier: Topic :: Software Development :: Libraries
 Provides-Extra: scrapy
 Requires-Dist: apify-client (>=1.8.1)
 Requires-Dist: apify-shared (>=1.1.2)
-Requires-Dist: crawlee (>=0.3.9)
+Requires-Dist: crawlee (>=0.3.8)
 Requires-Dist: cryptography (>=42.0.0)
 Requires-Dist: httpx (>=0.27.0)
 Requires-Dist: lazy-object-proxy (>=1.10.0)
 Requires-Dist: scrapy (>=2.11.0) ; extra == "scrapy"
 Requires-Dist: typing-extensions (>=4.1.0)
-Requires-Dist: websockets (>=10.0,<14.0.0)
+Requires-Dist: websockets (>=10.0)
 Project-URL: Apify Homepage, https://apify.com
 Project-URL: Changelog, https://docs.apify.com/sdk/python/docs/changelog
 Project-URL: Documentation, https://docs.apify.com/sdk/python/

{apify-2.0.2.dist-info → apify-2.0.2b2.dist-info}/RECORD

@@ -4,34 +4,34 @@ apify/_configuration.py,sha256=n67sK9g8llsG8ZqIWhi1BEHliplGs5PTB6Ig7_0PaMU,9629
 apify/_consts.py,sha256=_Xq4hOfOA1iZ3n1P967YWdyncKivpbX6RTlp_qanUoE,330
 apify/_crypto.py,sha256=e0_aM3l9_5Osk-jszYOOjrAKK60OggSHbiw5c30QnsU,5638
 apify/_models.py,sha256=oYlTEr-DyQAE-V2rrYD5PhUxTXVPdAig7QV-u6CJw3E,5571
-apify/_platform_event_manager.py,sha256=QrBfwcRUA1SKY7h6CBejBKOGa4XCBUT2DLbHKuAkftM,7577
+apify/_platform_event_manager.py,sha256=K4cHabbQ7_ex7vkX-c-VhAOp8Efw3HDn5Wp4lfA-qAU,7571
 apify/_proxy_configuration.py,sha256=2z4VV_NrnIp6pDpgQKlKpcHM2pPyXiOpFedpPWje48A,13087
 apify/_utils.py,sha256=Ghho3Gf11zYN8qhjhAkZRvQ--A9Js36GHB0YSDGUK58,694
 apify/apify_storage_client/__init__.py,sha256=-UbR68bFsDR6ln8OFs4t50eqcnY36hujO-SeOt-KmcA,114
 apify/apify_storage_client/_apify_storage_client.py,sha256=xi4OFchxhe-1-sykanH6Zcya4OcBhn2uf7OQ1pV4Ins,2338
-apify/apify_storage_client/_dataset_client.py,sha256=FfXew6tBiZRkpovyPaQ__xhtZZ-rZvjijwBIIyRahH8,5536
+apify/apify_storage_client/_dataset_client.py,sha256=j9seF2OKvbSMD9R9XF9fpa1vtr_1w4JcRV--WCmvU4E,5501
 apify/apify_storage_client/_dataset_collection_client.py,sha256=fkYvYGQCigHD2CDzpWk0swNAkfvAinAhMGpYqllle3E,1445
 apify/apify_storage_client/_key_value_store_client.py,sha256=uyeQgb75sGFsqIS4sq4hEZ3QP81COLfS3tmTqHc0tso,3340
 apify/apify_storage_client/_key_value_store_collection_client.py,sha256=vCtMTI-jx89Qp5WHILDNkCthwLuv0MAwm1J_5E4aypU,1519
 apify/apify_storage_client/_request_queue_client.py,sha256=jAiFkaJ38_myHFGTw-Rk21wmpbN0UCR2w2SFoimFGFc,5826
 apify/apify_storage_client/_request_queue_collection_client.py,sha256=NnO73UJ9ZrjV8xoudo30wfaM-SojRkG0guhxDyB-K1g,1527
 apify/apify_storage_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apify/log.py,sha256=zElFyEp2RJN0kiHEwJhcjSCAuHrba5zYiq4pK2xsL_o,1450
+apify/log.py,sha256=zIVjrqQ1DNWNQQOAmdmR9oAbf4nJH7CSMB6u4OOUf6I,1448
 apify/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 apify/scrapy/__init__.py,sha256=qDPV_zTRFaUqoFOyS5g4uBfz-UCkmWYJ82VXQ_3Cw6k,348
 apify/scrapy/middlewares/__init__.py,sha256=tfW-d3WFWLeNEjL8fTmon6NwgD-OXx1Bw2fBdU-wPy4,114
-apify/scrapy/middlewares/apify_proxy.py,sha256=7zHYe1y-MyU4n8Gmx_gP8-KJY01SqOVuqHYYzRJYnIQ,5733
+apify/scrapy/middlewares/apify_proxy.py,sha256=_1WO7NKHxIcPf8mSNjsqANTEsx7ygMTuRQW9fbwKMO8,5837
 apify/scrapy/middlewares/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 apify/scrapy/pipelines/__init__.py,sha256=GWPeLN_Zwj8vRBWtXW6DaxdB7mvyQ7Jw5Tz1ccgWlZI,119
-apify/scrapy/pipelines/actor_dataset_push.py,sha256=l8ehqoUHh-k3C6bScLXZqHaFDSvrF0aWmGgAn9nz-uQ,927
+apify/scrapy/pipelines/actor_dataset_push.py,sha256=QERmmExQOGIKQ70-p-lCj5qyE-c-fnYplEqd4mgaB1Q,953
 apify/scrapy/pipelines/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 apify/scrapy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 apify/scrapy/requests.py,sha256=F4VNaX2fGqybJKbhcRcz0_m6dXse5LzKll4gtMuTRko,7480
-apify/scrapy/scheduler.py,sha256=MdwT2Kpe26hVC78p2s1NG7B5Cd7rfGAthODSyrC5Rz0,5933
+apify/scrapy/scheduler.py,sha256=AAIKY5i1QxkC1mtmix6n3M2eQaOw-d1T56Noue9xToc,6013
 apify/scrapy/utils.py,sha256=0XdFxi1qlUa6gHXG96e1FU9gW0N5Rsu0sVZklFYfC2U,2884
 apify/storages/__init__.py,sha256=-9tEYJVabVs_eRVhUehxN58GH0UG8OfuGjGwuDieP2M,122
 apify/storages/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apify-2.0.2.dist-info/LICENSE,sha256=AsFjHssKjj4LGd2ZCqXn6FBzMqcWdjQre1byPPSypVw,11355
-apify-2.0.2.dist-info/METADATA,sha256=Q3e0Pv7BOzMZ22DbqF9eErEfwMaMVJK0RxQyOsEtfwk,8663
-apify-2.0.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-apify-2.0.2.dist-info/RECORD,,
+apify-2.0.2b2.dist-info/LICENSE,sha256=AsFjHssKjj4LGd2ZCqXn6FBzMqcWdjQre1byPPSypVw,11355
+apify-2.0.2b2.dist-info/METADATA,sha256=vlCnHQJGrmkbkTgndjVzMUTpSRG2NzJSZ70ydBBBf6E,8657
+apify-2.0.2b2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+apify-2.0.2b2.dist-info/RECORD,,