Replace Werkzeug to save some disk space

Author: janbuchar

pyproject.toml

@@ -34,12 +34,12 @@ dependencies = [
     "crawlee >= 0.3.0",
     "cryptography >= 39.0.0",
     "httpx >= 0.24.0",
+    "lazy-object-proxy >= 1.10.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]
@@ -185,5 +185,5 @@ warn_unreachable = true
 warn_unused_ignores = true
 
 [[tool.mypy.overrides]]
-module = ['scrapy', 'scrapy.*', 'sortedcollections']
+module = ['scrapy', 'scrapy.*', 'sortedcollections', 'lazy_object_proxy']
 ignore_missing_imports = true

src/apify/actor.py

@@ -6,9 +6,9 @@
 from datetime import timedelta
 from typing import TYPE_CHECKING, Any, Callable, TypeVar, cast
 
+from lazy_object_proxy import Proxy
 from pydantic import AliasChoices
 from typing_extensions import Self
-from werkzeug.local import LocalProxy
 
 from apify._crypto import decrypt_input_secrets, load_private_key
 from apify._utils import get_system_info, is_running_in_ipython
@@ -103,7 +103,7 @@ async def __aexit__(
                 await self.exit()
 
     def __repr__(self) -> str:
-        if self is _default_instance:
+        if self is cast(Proxy, Actor).__wrapped__:
             return '<apify.Actor>'
 
         return super().__repr__()
@@ -933,17 +933,5 @@ async def create_proxy_configuration(
         return proxy_configuration
 
 
-_default_instance: _ActorType | None = None
-
-
-def _get_default_instance() -> _ActorType:
-    global _default_instance  # noqa: PLW0603
-
-    if not _default_instance:
-        _default_instance = _ActorType()
-
-    return _default_instance
-
-
-Actor = cast(_ActorType, LocalProxy(_get_default_instance))
+Actor = cast(_ActorType, Proxy(_ActorType))
 """The entry point of the SDK, through which all the Actor operations should be done."""

tests/integration/conftest.py

@@ -35,7 +35,7 @@ def _reset_and_patch_default_instances() -> None:
     from crawlee import service_container
 
     cast(dict, service_container._services).clear()
-    apify.actor._default_instance = None
+    delattr(apify.actor.Actor, '__wrapped__')
 
     # TODO: StorageClientManager local storage client purge  # noqa: TD003
 

tests/integration/test_actor_lifecycle.py

@@ -45,8 +45,8 @@ async def main() -> None:
             import apify.actor
 
             async with Actor:
-                assert apify.actor._get_default_instance()._is_initialized
-            assert apify.actor._get_default_instance()._is_initialized is False
+                assert apify.actor.Actor._is_initialized
+            assert apify.actor.Actor._is_initialized is False
 
         actor = await make_actor('with-actor-init', main_func=main)
 

tests/unit/actor/test_actor_lifecycle.py

@@ -3,10 +3,11 @@
 import asyncio
 import contextlib
 import json
-from typing import Any, Callable
+from typing import Any, Callable, cast
 
 import pytest
 import websockets.server
+from lazy_object_proxy import Proxy
 
 import apify.actor
 from apify.actor import Actor, _ActorType
@@ -17,9 +18,9 @@
 class TestActorInit:
     async def test_async_with_actor_properly_initialize(self: TestActorInit) -> None:
         async with Actor:
-            assert apify.actor._default_instance is not None
-            assert apify.actor._default_instance._is_initialized
-        assert not apify.actor._default_instance._is_initialized
+            assert cast(Proxy, apify.actor.Actor).__wrapped__ is not None
+            assert cast(Proxy, apify.actor.Actor).__wrapped__._is_initialized
+        assert not cast(Proxy, apify.actor.Actor).__wrapped__._is_initialized
 
     async def test_actor_init(self: TestActorInit) -> None:
         my_actor = _ActorType()

tests/unit/conftest.py

@@ -41,7 +41,7 @@ def reset() -> None:
 
         cast(dict, service_container._services).clear()
 
-        apify.actor._default_instance = None
+        delattr(apify.actor.Actor, '__wrapped__')
         # TODO: local storage client purge  # noqa: TD003
 
     return reset