apify 2.0.2__tar.gz → 2.0.2b1__tar.gz

{apify-2.0.2 → apify-2.0.2b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apify
-Version: 2.0.2
+Version: 2.0.2b1
 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 → apify-2.0.2b1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "apify"
-version = "2.0.2"
+version = "2.0.2b1"
 description = "Apify SDK for Python"
 authors = ["Apify Technologies s.r.o. <support@apify.com>"]
 license = "Apache-2.0"
@@ -48,20 +48,20 @@ keywords = [
 python = "^3.9"
 apify-client = ">=1.8.1"
 apify-shared = ">=1.1.2"
-crawlee = ">=0.3.9"
+crawlee = ">=0.3.8"
 cryptography = ">=42.0.0"
 httpx = ">=0.27.0"
 lazy-object-proxy = ">=1.10.0"
 scrapy = { version = ">=2.11.0", optional = true }
 typing-extensions = ">=4.1.0"
-websockets = ">=10.0 <14.0.0"
+websockets = ">=10.0"
 
 [tool.poetry.group.dev.dependencies]
 build = "~1.2.0"
 filelock = "~3.16.0"
 griffe = "~1.5.0"
-mypy = "~1.13.0"
-pre-commit = "~4.0.0"
+mypy = "~1.11.0"
+pre-commit = "~3.8.0"
 pydoc-markdown = "~4.8.0"
 pytest = "~8.3.0"
 pytest-asyncio = "~0.24.0"
@@ -70,8 +70,8 @@ pytest-only = "~2.1.0"
 pytest-timeout = "~2.3.0"
 pytest-xdist = "~3.6.0"
 respx = "~0.21.0"
-ruff = "~0.7.0"
-setuptools = "~75.0.0"     # setuptools are used by pytest but not explicitly required
+ruff = "~0.6.0"
+setuptools = "~74.0.0"     # setuptools are used by pytest but not explicitly required
 
 [tool.poetry.extras]
 scrapy = ["scrapy"]
@@ -121,6 +121,12 @@ indent-style = "space"
 "**/__init__.py" = [
     "F401", # Unused imports
 ]
+"**/{scripts}/*" = [
+    "D",       # Everything from the pydocstyle
+    "INP001",  # File {filename} is part of an implicit namespace package, add an __init__.py
+    "PLR2004", # Magic value used in comparison, consider replacing {value} with a constant variable
+    "T20",     # flake8-print
+]
 "**/{tests}/*" = [
     "D",       # Everything from the pydocstyle
     "INP001",  # File {filename} is part of an implicit namespace package, add an __init__.py
@@ -163,7 +169,7 @@ timeout = 1200
 [tool.mypy]
 python_version = "3.9"
 plugins = ["pydantic.mypy"]
-files = ["src", "tests"]
+files = ["scripts", "src", "tests"]
 check_untyped_defs = true
 disallow_incomplete_defs = true
 disallow_untyped_calls = true

{apify-2.0.2 → apify-2.0.2b1}/src/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-2.0.2 → apify-2.0.2b1}/src/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-2.0.2 → apify-2.0.2b1}/src/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-2.0.2 → apify-2.0.2b1}/src/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-2.0.2 → apify-2.0.2b1}/src/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-2.0.2 → apify-2.0.2b1}/src/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: