refactor!: Preparation for v2 release

CONTRIBUTING.md

@@ -50,7 +50,7 @@ tests with HTML coverage report execute `make unit-tests-cov`.
 
 ## Integration tests
 
-We have integration tests which build and run actors using the Python SDK on the Apify Platform. To run these tests,
+We have integration tests which build and run Actors using the Python SDK on the Apify Platform. To run these tests,
 you need to set the `APIFY_TEST_USER_API_TOKEN` environment variable to the API token of the Apify user you want to
 use for the tests, and then start them with `make integration-tests`.
 

docs/02-guides/02-beautiful-soup.mdx

@@ -36,7 +36,7 @@ async def main():
         max_depth = actor_input.get('max_depth', 1)
 
         if not start_urls:
-            Actor.log.info('No start URLs specified in actor input, exiting...')
+            Actor.log.info('No start URLs specified in Actor input, exiting...')
             await Actor.exit()
 
         # Enqueue the starting URLs in the default request queue

docs/02-guides/03-playwright.mdx

@@ -29,7 +29,7 @@ To create Actors which use Playwright, start from the [Playwright & Python](http
 On the Apify platform, the Actor will already have Playwright and the necessary browsers preinstalled in its Docker image,
 including the tools and setup necessary to run browsers in headful mode.
 
-When running the Actor locally, you'll need to finish the Playwright setup yourself before you can run the actor.
+When running the Actor locally, you'll need to finish the Playwright setup yourself before you can run the Actor.
 
 <Tabs groupId="operating-systems">
     <TabItem value="unix" label="Linux / macOS" default>
@@ -69,7 +69,7 @@ async def main():
         max_depth = actor_input.get('max_depth', 1)
 
         if not start_urls:
-            Actor.log.info('No start URLs specified in actor input, exiting...')
+            Actor.log.info('No start URLs specified in Actor input, exiting...')
             await Actor.exit()
 
         # Enqueue the starting URLs in the default request queue

docs/02-guides/04-selenium.mdx

@@ -53,7 +53,7 @@ async def main():
         max_depth = actor_input.get('max_depth', 1)
 
         if not start_urls:
-            Actor.log.info('No start URLs specified in actor input, exiting...')
+            Actor.log.info('No start URLs specified in Actor input, exiting...')
             await Actor.exit()
 
         # Enqueue the starting URLs in the default request queue

docs/02-guides/05-scrapy.mdx

@@ -87,7 +87,7 @@ class TitleSpider(scrapy.Spider):
             if link_url.startswith(('http://', 'https://')):
                 yield scrapy.Request(link_url)
 
-# Pushes the scraped items into the actor's default dataset
+# Pushes the scraped items into the Actor's default dataset
 class ActorDatasetPushPipeline:
     async def process_item(self, item, spider):
         item_dict = ItemAdapter(item).asdict()

docs/03-concepts/04-actor-events.mdx

@@ -91,7 +91,7 @@ async def main():
         # Save the state when the `PERSIST_STATE` event happens
         async def save_state(event_data):
             nonlocal processed_items
-            Actor.log.info('Saving actor state', extra=event_data)
+            Actor.log.info('Saving Actor state', extra=event_data)
             await Actor.set_value('STATE', processed_items)
 
         Actor.on(ActorEventTypes.PERSIST_STATE, save_state)

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "apify"
-version = "1.7.3"
+version = "2.0.0"
 description = "Apify SDK for Python"
 readme = "README.md"
 license = { text = "Apache Software License" }
@@ -20,7 +20,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries",
 ]
 
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 
 # We use inclusive ordered comparison clause for non-Apify packages intentionally in order to enhance the Apify SDK's
 # compatibility with a wide range of external packages. This decision was discussed in detail in the following PR:
@@ -31,13 +31,15 @@ dependencies = [
     "aiofiles >= 22.1.0",
     "aioshutil >= 1.0",
     "colorama >= 0.4.6",
+    "crawlee >= 0.3.0",
     "cryptography >= 39.0.0",
     "httpx >= 0.24.0",
     "psutil >= 5.9.0",
     "pyee >= 11.0.0",
     "sortedcollections >= 2.0.0",
     "typing-extensions >= 4.1.0",
     "websockets >= 10.1",
+    "werkzeug >= 3.0.0",
 ]
 
 [project.optional-dependencies]
@@ -90,12 +92,16 @@ line-length = 150
 [tool.ruff.lint]
 select = ["ALL"]
 ignore = [
+    "A002",    # Argument is shadowing a Python builtin
+    "ANN101",  # Missing type annotation for `self` in method
+    "ANN102",  # Missing type annotation for `cls` in method
     "ANN401",  # Dynamically typed expressions (typing.Any) are disallowed in {filename}
     "BLE001",  # Do not catch blind exception
     "C901",    # `{name}` is too complex
     "COM812",  # This rule may cause conflicts when used with the formatter
     "D100",    # Missing docstring in public module
     "D104",    # Missing docstring in public package
+    "D107",    # Missing docstring in `__init__`
     "EM",      # flake8-errmsg
     "G004",    # Logging statement uses f-string
     "ISC001",  # This rule may cause conflicts when used with the formatter
@@ -155,3 +161,29 @@ known-local-folder = ["apify"]
 
 [tool.ruff.lint.pydocstyle]
 convention = "google"
+
+[tool.basedpyright]
+typeCheckingMode = "standard"
+
+[tool.pytest.ini_options]
+asyncio_mode = "auto"
+timeout = 1200
+
+[tool.mypy]
+python_version = "3.9"
+plugins = ["pydantic.mypy"]
+files = ["scripts", "src", "tests"]
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+no_implicit_optional = true
+warn_redundant_casts = true
+warn_return_any = true
+warn_unreachable = true
+warn_unused_ignores = true
+
+[[tool.mypy.overrides]]
+module = ['scrapy', 'scrapy.*', 'sortedcollections']
+ignore_missing_imports = true

src/apify/_crypto.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
 import base64
-import secrets
 from typing import Any
 
 from apify_shared.utils import ignore_docs
+from crawlee._utils.crypto import crypto_random_object_id
 from cryptography.exceptions import InvalidTag as InvalidTagException
 from cryptography.hazmat.primitives import hashes, serialization
 from cryptography.hazmat.primitives.asymmetric import padding, rsa
@@ -125,13 +125,7 @@ def _load_public_key(public_key_file_base64: str) -> rsa.RSAPublicKey:
     return public_key
 
 
-def crypto_random_object_id(length: int = 17) -> str:
-    """Python reimplementation of cryptoRandomObjectId from `@apify/utilities`."""
-    chars = 'abcdefghijklmnopqrstuvwxyzABCEDFGHIJKLMNOPQRSTUVWXYZ0123456789'
-    return ''.join(secrets.choice(chars) for _ in range(length))
-
-
-def decrypt_input_secrets(private_key: rsa.RSAPrivateKey, input: Any) -> Any:  # noqa: A002
+def decrypt_input_secrets(private_key: rsa.RSAPrivateKey, input: Any) -> Any:
     """Decrypt input secrets."""
     if not isinstance(input, dict):
         return input