Revert "s/temporalio.bridge.temporal_sdk_bridge/rg-replace temporal_sdk_bridge/"

This reverts commit c62cf00.

Author: dandavison

temporalio/bridge/Cargo.toml

@@ -3,6 +3,10 @@ name = "temporal-sdk-bridge"
 version = "0.1.0"
 edition = "2021"
 
+[package.metadata.maturin]
+module-name = "temporalio.bridge.temporal_sdk_bridge"
+
+
 [lib]
 name = "temporal_sdk_bridge"
 crate-type = ["cdylib"]

temporalio/bridge/client.py

@@ -10,10 +10,10 @@
 from typing import Mapping, Optional, Tuple, Type, TypeVar
 
 import google.protobuf.message
-import temporal_sdk_bridge
-from temporal_sdk_bridge import RPCError
 
 import temporalio.bridge.runtime
+import temporalio.bridge.temporal_sdk_bridge
+from temporalio.bridge.temporal_sdk_bridge import RPCError
 
 
 @dataclass
@@ -94,13 +94,15 @@ async def connect(
         """Establish connection with server."""
         return Client(
             runtime,
-            await temporal_sdk_bridge.connect_client(runtime._ref, config),
+            await temporalio.bridge.temporal_sdk_bridge.connect_client(
+                runtime._ref, config
+            ),
         )
 
     def __init__(
         self,
         runtime: temporalio.bridge.runtime.Runtime,
-        ref: temporal_sdk_bridge.ClientRef,
+        ref: temporalio.bridge.temporal_sdk_bridge.ClientRef,
     ):
         """Initialize client with underlying SDK Core reference."""
         self._runtime = runtime

temporalio/bridge/metric.py

@@ -7,9 +7,8 @@
 
 from typing import Mapping, Optional, Union
 
-import temporal_sdk_bridge
-
 import temporalio.bridge.runtime
+import temporalio.bridge.temporal_sdk_bridge
 
 
 class MetricMeter:
@@ -18,12 +17,14 @@ class MetricMeter:
     @staticmethod
     def create(runtime: temporalio.bridge.runtime.Runtime) -> Optional[MetricMeter]:
         """Create optional metric meter."""
-        ref = temporal_sdk_bridge.new_metric_meter(runtime._ref)
+        ref = temporalio.bridge.temporal_sdk_bridge.new_metric_meter(runtime._ref)
         if not ref:
             return None
         return MetricMeter(ref)
 
-    def __init__(self, ref: temporal_sdk_bridge.MetricMeterRef) -> None:
+    def __init__(
+        self, ref: temporalio.bridge.temporal_sdk_bridge.MetricMeterRef
+    ) -> None:
         """Initialize metric meter."""
         self._ref = ref
         self._default_attributes = MetricAttributes(self, ref.default_attributes)
@@ -160,7 +161,7 @@ class MetricAttributes:
     def __init__(
         self,
         meter: MetricMeter,
-        ref: temporal_sdk_bridge.MetricAttributesRef,
+        ref: temporalio.bridge.temporal_sdk_bridge.MetricAttributesRef,
     ) -> None:
         """Initialize attributes."""
         self._meter = meter

temporalio/bridge/runtime.py

@@ -8,21 +8,24 @@
 from dataclasses import dataclass
 from typing import Any, Callable, Dict, Mapping, Optional, Sequence, Type
 
-import temporal_sdk_bridge
 from typing_extensions import Protocol
 
+import temporalio.bridge.temporal_sdk_bridge
+
 
 class Runtime:
     """Runtime for SDK Core."""
 
     @staticmethod
     def _raise_in_thread(thread_id: int, exc_type: Type[BaseException]) -> bool:
         """Internal helper for raising an exception in thread."""
-        return temporal_sdk_bridge.raise_in_thread(thread_id, exc_type)
+        return temporalio.bridge.temporal_sdk_bridge.raise_in_thread(
+            thread_id, exc_type
+        )
 
     def __init__(self, *, telemetry: TelemetryConfig) -> None:
         """Create SDK Core runtime."""
-        self._ref = temporal_sdk_bridge.init_runtime(telemetry)
+        self._ref = temporalio.bridge.temporal_sdk_bridge.init_runtime(telemetry)
 
     def retrieve_buffered_metrics(self, durations_as_seconds: bool) -> Sequence[Any]:
         """Get buffered metrics."""

temporalio/bridge/testing.py

@@ -8,9 +8,8 @@
 from dataclasses import dataclass
 from typing import Optional, Sequence
 
-import temporal_sdk_bridge
-
 import temporalio.bridge.runtime
+import temporalio.bridge.temporal_sdk_bridge
 
 
 @dataclass
@@ -54,7 +53,9 @@ async def start_dev_server(
     ) -> EphemeralServer:
         """Start a dev server instance."""
         return EphemeralServer(
-            await temporal_sdk_bridge.start_dev_server(runtime._ref, config)
+            await temporalio.bridge.temporal_sdk_bridge.start_dev_server(
+                runtime._ref, config
+            )
         )
 
     @staticmethod
@@ -63,10 +64,12 @@ async def start_test_server(
     ) -> EphemeralServer:
         """Start a test server instance."""
         return EphemeralServer(
-            await temporal_sdk_bridge.start_test_server(runtime._ref, config)
+            await temporalio.bridge.temporal_sdk_bridge.start_test_server(
+                runtime._ref, config
+            )
         )
 
-    def __init__(self, ref: temporal_sdk_bridge.EphemeralServerRef):
+    def __init__(self, ref: temporalio.bridge.temporal_sdk_bridge.EphemeralServerRef):
         """Initialize an ephemeral server."""
         self._ref = ref
 

temporalio/bridge/worker.py

@@ -19,11 +19,6 @@
 )
 
 import google.protobuf.internal.containers
-import temporal_sdk_bridge
-from temporal_sdk_bridge import (
-    CustomSlotSupplier as BridgeCustomSlotSupplier,
-)
-from temporal_sdk_bridge import PollShutdownError
 from typing_extensions import TypeAlias
 
 import temporalio.api.common.v1
@@ -34,8 +29,13 @@
 import temporalio.bridge.proto.workflow_activation
 import temporalio.bridge.proto.workflow_completion
 import temporalio.bridge.runtime
+import temporalio.bridge.temporal_sdk_bridge
 import temporalio.converter
 import temporalio.exceptions
+from temporalio.bridge.temporal_sdk_bridge import (
+    CustomSlotSupplier as BridgeCustomSlotSupplier,
+)
+from temporalio.bridge.temporal_sdk_bridge import PollShutdownError
 
 
 @dataclass
@@ -111,22 +111,26 @@ class Worker:
     def create(client: temporalio.bridge.client.Client, config: WorkerConfig) -> Worker:
         """Create a bridge worker from a bridge client."""
         return Worker(
-            temporal_sdk_bridge.new_worker(client._runtime._ref, client._ref, config)
+            temporalio.bridge.temporal_sdk_bridge.new_worker(
+                client._runtime._ref, client._ref, config
+            )
         )
 
     @staticmethod
     def for_replay(
         runtime: temporalio.bridge.runtime.Runtime,
         config: WorkerConfig,
-    ) -> Tuple[Worker, temporal_sdk_bridge.HistoryPusher]:
+    ) -> Tuple[Worker, temporalio.bridge.temporal_sdk_bridge.HistoryPusher]:
         """Create a bridge replay worker."""
         [
             replay_worker,
             pusher,
-        ] = temporal_sdk_bridge.new_replay_worker(runtime._ref, config)
+        ] = temporalio.bridge.temporal_sdk_bridge.new_replay_worker(
+            runtime._ref, config
+        )
         return Worker(replay_worker), pusher
 
-    def __init__(self, ref: temporal_sdk_bridge.WorkerRef) -> None:
+    def __init__(self, ref: temporalio.bridge.temporal_sdk_bridge.WorkerRef) -> None:
         """Create SDK core worker from a bridge worker."""
         self._ref = ref
 

temporalio/worker/workflow_sandbox/_restrictions.py

@@ -459,7 +459,7 @@ def with_child_unrestricted(self, *child_path: str) -> SandboxMatcher:
     # Must pass through the entire bridge in even the most minimum causes
     # because PyO3 does not allow re-init since 0.17. See
     # https://github.com/PyO3/pyo3/pull/2523.
-    "temporal_sdk_bridge",
+    "temporalio.bridge.temporal_sdk_bridge",
 }
 
 SandboxRestrictions.passthrough_modules_with_temporal = (