chore: rearrange bindings and entrypoints classes

packages/cli/tests/bindings-test/src/test_analytics_engine.py

@@ -1,5 +1,5 @@
 import pytest
-from workers._workers import _BindingWrapper
+from workers.rpc import _BindingWrapper
 
 
 @pytest.mark.asyncio

packages/cli/tests/bindings-test/src/test_assets.py

@@ -1,5 +1,5 @@
 import pytest
-from workers._workers import _FetcherWrapper
+from workers.rpc import _FetcherWrapper
 
 
 @pytest.mark.asyncio

packages/cli/tests/bindings-test/src/test_images.py

@@ -3,7 +3,7 @@
 import js
 import pytest
 from pyodide.ffi import create_proxy, to_js
-from workers._workers import _BindingWrapper
+from workers.rpc import _BindingWrapper
 
 PNG_1X1 = base64.b64decode(
     "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8/5+hHgAHggJ/PchI7wAAAABJRU5ErkJggg=="

packages/cli/tests/bindings-test/src/test_mtls.py

@@ -1,5 +1,5 @@
 import pytest
-from workers._workers import _FetcherWrapper
+from workers.rpc import _FetcherWrapper
 
 # cannot test mTLS locally so we just check the binding is properly wrapped
 

packages/cli/tests/bindings-test/src/test_ratelimit.py

@@ -1,5 +1,5 @@
 import pytest
-from workers._workers import _BindingWrapper
+from workers.rpc import _BindingWrapper
 
 
 @pytest.mark.asyncio

packages/cli/tests/bindings-test/src/test_vectorize.py

@@ -1,5 +1,5 @@
 import pytest
-from workers._workers import _BindingWrapper
+from workers.rpc import _BindingWrapper
 
 
 @pytest.mark.asyncio

packages/cli/tests/workerd-test/durable-object-inheritance/worker.py

@@ -3,7 +3,8 @@
 # _wrap_subclass must not double-wrap ctx and env when the hierarchy is >1 deep.
 
 from workers import DurableObject, WorkerEntrypoint
-from workers._workers import DurableObjectContext, _EnvWrapper
+from workers.entrypoints import DurableObjectContext
+from workers.rpc import _EnvWrapper
 
 
 def assert_wrapped_once(obj):

packages/cli/tests/workerd-test/sdk/tests/test_sdk.py

@@ -13,7 +13,7 @@
     env,
     fetch,
 )
-from workers._workers import _EnvWrapper
+from workers.rpc import _EnvWrapper
 
 # TODO: Right now the `fetch` that's available on a binding is the JS fetch.
 # We may wish to rewrite it to be the same as the `fetch` defined in

packages/runtime-sdk/src/workers/__init__.py

@@ -1,16 +1,15 @@
-from ._workers import (
+from .blob import Blob, BlobEnding, BlobValue, File
+from .entrypoints import (
     DurableObject,
     WorkerEntrypoint,
     WorkflowEntrypoint,
-    _EnvWrapper,
     handler,
 )
-from .blob import Blob, BlobEnding, BlobValue, File
 from .fetch import fetch
 from .formdata import FormData, FormDataValue
 from .request import Request
 from .response import FetchResponse, Response
-from .rpc import python_from_rpc, python_to_rpc
+from .rpc import _EnvWrapper, python_from_rpc, python_to_rpc
 from .types import (
     Body,
     Context,