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

apify/__init__.py

@@ -13,8 +13,8 @@ __version__ = metadata.version('apify')
 
 __all__ = [
     'Actor',
-    'Configuration',
     'Event',
+    'Configuration',
     'ProxyConfiguration',
     'ProxyInfo',
     'Request',

apify/_configuration.py

@@ -323,4 +323,4 @@ class Configuration(CrawleeConfiguration):
 
 
 # Monkey-patch the base class so that it works with the extended configuration
-CrawleeConfiguration.get_global_configuration = Configuration.get_global_configuration  # type: ignore[method-assign]
+CrawleeConfiguration.get_global_configuration = Configuration.get_global_configuration  # type: ignore

apify/_proxy_configuration.py

@@ -280,7 +280,7 @@ class ProxyConfiguration(CrawleeProxyConfiguration):
             return
 
         status = None
-        async with httpx.AsyncClient(proxy=proxy_info.url, timeout=10) as client:
+        async with httpx.AsyncClient(proxies=proxy_info.url, timeout=10) as client:
             for _ in range(2):
                 try:
                     response = await client.get(proxy_status_url)

apify/scrapy/__init__.py

@@ -3,9 +3,9 @@ from apify.scrapy.scheduler import ApifyScheduler
 from apify.scrapy.utils import get_basic_auth_header, get_running_event_loop_id
 
 __all__ = [
+    'to_apify_request',
+    'to_scrapy_request',
     'ApifyScheduler',
     'get_basic_auth_header',
     'get_running_event_loop_id',
-    'to_apify_request',
-    'to_scrapy_request',
 ]

apify/scrapy/requests.py

@@ -42,10 +42,8 @@ def to_apify_request(scrapy_request: Request, spider: Spider) -> CrawleeRequest
     Returns:
         The converted Apify request if the conversion was successful, otherwise None.
     """
-    if not isinstance(scrapy_request, Request):
-        Actor.log.warning(  # type: ignore[unreachable]
-            'Failed to convert to Apify request: Scrapy request must be a Request instance.'
-        )
+    if not isinstance(cast(Any, scrapy_request), Request):
+        Actor.log.warning('Failed to convert to Apify request: Scrapy request must be a Request instance.')
         return None
 
     call_id = crypto_random_object_id(8)
@@ -55,7 +53,7 @@ def to_apify_request(scrapy_request: Request, spider: Spider) -> CrawleeRequest
         if _is_request_produced_by_middleware(scrapy_request):
             unique_key = compute_unique_key(
                 url=scrapy_request.url,
-                method=scrapy_request.method,  # type: ignore[arg-type]  # str vs literal
+                method=scrapy_request.method,
                 payload=scrapy_request.body,
                 use_extended_unique_key=True,
             )
@@ -82,9 +80,9 @@ def to_apify_request(scrapy_request: Request, spider: Spider) -> CrawleeRequest
 
         # Convert Scrapy's headers to a HttpHeaders and store them in the apify_request
         if isinstance(scrapy_request.headers, Headers):
-            apify_request.headers = HttpHeaders(dict(scrapy_request.headers.to_unicode_dict()))
+            apify_request.headers = HttpHeaders(scrapy_request.headers.to_unicode_dict())
         else:
-            Actor.log.warning(  # type: ignore[unreachable]
+            Actor.log.warning(
                 f'Invalid scrapy_request.headers type, not scrapy.http.headers.Headers: {scrapy_request.headers}'
             )
 

apify/storages/__init__.py

@@ -2,4 +2,4 @@ from crawlee.storages import Dataset, KeyValueStore, RequestQueue
 
 from ._request_list import RequestList
 
-__all__ = ['Dataset', 'KeyValueStore', 'RequestList', 'RequestQueue']
+__all__ = ['Dataset', 'KeyValueStore', 'RequestQueue', 'RequestList']

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apify
-Version: 2.1.0
+Version: 2.1.0b2
 Summary: Apify SDK for Python
 License: Apache-2.0
 Keywords: apify,sdk,automation,chrome,crawlee,crawler,headless,scraper,scraping
@@ -21,9 +21,9 @@ 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.4.0,<0.5.0)
+Requires-Dist: crawlee (>=0.3.9)
 Requires-Dist: cryptography (>=42.0.0)
-Requires-Dist: httpx (>=0.27.0,<0.28.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)

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

@@ -1,11 +1,11 @@
-apify/__init__.py,sha256=99ynaDWBLEcCjdLq7R0Exy_iACsXiXoQ8VUZKmbzTeM,550
+apify/__init__.py,sha256=ikoi2EpDYl6y-XSVtlU8UsdQdMEyOiIJCRRAaZFDOP8,550
 apify/_actor.py,sha256=AUviY4qrX4UoN7fSZtXXSHqEk4rrQwBymMLjkgb4Mzg,41887
-apify/_configuration.py,sha256=WC9X5gQ-e5r4BGQw-Kaq77oxLlPx7vtq0M-L4VlKrIc,9633
+apify/_configuration.py,sha256=mzxBrz9eocZiGcCWuDV3YYyKGd_3-A4hMu63qRN8Ep4,9618
 apify/_consts.py,sha256=_Xq4hOfOA1iZ3n1P967YWdyncKivpbX6RTlp_qanUoE,330
 apify/_crypto.py,sha256=e0_aM3l9_5Osk-jszYOOjrAKK60OggSHbiw5c30QnsU,5638
 apify/_models.py,sha256=Btlz-23obKY5tJ75JnUwkVNC2lmU1IEBbdU3HvWaVhg,5748
 apify/_platform_event_manager.py,sha256=44xyV0Lpzf4h4VZ0rkyYg_nhbQkEONNor8_Z9gIKO40,7899
-apify/_proxy_configuration.py,sha256=vdDiE5dfyNQYEXKXnj0jcgL3rG3-qanwNSybrVl1xT8,13167
+apify/_proxy_configuration.py,sha256=-QaBrO5FmEy78Ylrry15VgBdu3Jpkz4oHAlCD5-9MBk,13169
 apify/_utils.py,sha256=CCLkpAsZKp00ykm88Z_Fbck5PNT0j6mJYOuD0RxzZUs,1620
 apify/apify_storage_client/__init__.py,sha256=-UbR68bFsDR6ln8OFs4t50eqcnY36hujO-SeOt-KmcA,114
 apify/apify_storage_client/_apify_storage_client.py,sha256=NsZBleJNHLBXVyG__bVjdCGEI30cnmVZngCbQaVekfk,2397
@@ -18,7 +18,7 @@ apify/apify_storage_client/_request_queue_collection_client.py,sha256=NnO73UJ9Zr
 apify/apify_storage_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 apify/log.py,sha256=zElFyEp2RJN0kiHEwJhcjSCAuHrba5zYiq4pK2xsL_o,1450
 apify/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apify/scrapy/__init__.py,sha256=HE5wCN7-DZKPydLCOvjNyLuL3CvN2fUFweXfrDfe1Ss,348
+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=9_-hJqTwQ4yVMjvN9zkJ_GXJADzrrYu8QoHZ6IX6fDs,5764
 apify/scrapy/middlewares/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -26,13 +26,13 @@ apify/scrapy/pipelines/__init__.py,sha256=GWPeLN_Zwj8vRBWtXW6DaxdB7mvyQ7Jw5Tz1cc
 apify/scrapy/pipelines/actor_dataset_push.py,sha256=otggoULfUdCqOPJLb9wMROZ9WylnlL-209930tMS2Rg,971
 apify/scrapy/pipelines/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 apify/scrapy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apify/scrapy/requests.py,sha256=yZ9hIsz2YyqOoOwzN9F1h76wG4qwawrI6h_6xq0I7Iw,7599
+apify/scrapy/requests.py,sha256=F4VNaX2fGqybJKbhcRcz0_m6dXse5LzKll4gtMuTRko,7480
 apify/scrapy/scheduler.py,sha256=03kZxejWWb-TofJ-vpSZuQ28rT-qNjhhpC-QeO2OzoU,5977
 apify/scrapy/utils.py,sha256=758DcHCSAgCTProY0QX74uJ1XrzVsQwvCmFanj2f_3Q,2928
-apify/storages/__init__.py,sha256=FW-z6ubuPnHGM-Wp15T8mR5q6lnpDGrCW-IkgZd5L30,177
+apify/storages/__init__.py,sha256=AE4ZJ-iAoESmQQh_RUU78fe5CxBUnu9wlEZleQc5SwA,177
 apify/storages/_request_list.py,sha256=4nrvSdMUF-kiwGVIPEfIOygLKgjUpO37Jl8Om-jRbIU,5858
 apify/storages/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apify-2.1.0.dist-info/LICENSE,sha256=AsFjHssKjj4LGd2ZCqXn6FBzMqcWdjQre1byPPSypVw,11355
-apify-2.1.0.dist-info/METADATA,sha256=9K6Q_mrUCisKOlhMQuvt74xYMcaxu6UZPLMtec_8Pnc,8678
-apify-2.1.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-apify-2.1.0.dist-info/RECORD,,
+apify-2.1.0b2.dist-info/LICENSE,sha256=AsFjHssKjj4LGd2ZCqXn6FBzMqcWdjQre1byPPSypVw,11355
+apify-2.1.0b2.dist-info/METADATA,sha256=YSc5d6kH4W49HvGyvTSalEFC6TYGqFJIwyL2oF5TV0o,8665
+apify-2.1.0b2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+apify-2.1.0b2.dist-info/RECORD,,