Skip to content

Update pyo3 to 0.25 and convert to pyo3-async-runtimes #897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 12, 2025
Merged

Update pyo3 to 0.25 and convert to pyo3-async-runtimes #897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60bea75
Update pyo3 to 0.25 and convert to pyo3-async-runtimes
tconley1428 Jun 11, 2025
690deb9
Format and clippy
tconley1428 Jun 11, 2025
6deb76e
Simplify awaitable conversion
tconley1428 Jun 11, 2025
7b7ee1f
Merge branch 'main' into pyo3_upgrade
tconley1428 Jun 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 22 additions & 29 deletions temporalio/bridge/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions temporalio/bridge/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ async-trait = "0.1"
futures = "0.3"
log = "0.4"
prost = "0.13"
pyo3 = { version = "0.20", features = ["extension-module", "abi3-py39", "anyhow"] }
pyo3-asyncio = { version = "0.20", features = ["tokio-runtime"] }
pythonize = "0.20"
pyo3 = { version = "0.25", features = ["extension-module", "abi3-py39", "anyhow"] }
pyo3-async-runtimes = { version = "0.25", features = ["tokio-runtime"] }
pythonize = "0.25"
temporal-client = { version = "0.1.0", path = "./sdk-core/client" }
temporal-sdk-core = { version = "0.1.0", path = "./sdk-core/core", features = ["ephemeral-server"] }
temporal-sdk-core-api = { version = "0.1.0", path = "./sdk-core/core-api" }
Expand Down
43 changes: 23 additions & 20 deletions temporalio/bridge/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ pub fn connect_client<'a>(
py: Python<'a>,
runtime_ref: &runtime::RuntimeRef,
config: ClientConfig,
) -> PyResult<&'a PyAny> {
) -> PyResult<Bound<'a, PyAny>> {
let opts: ClientOptions = config.try_into()?;
let runtime = runtime_ref.runtime.clone();
runtime_ref.runtime.future_into_py(py, async move {
Expand Down Expand Up @@ -126,7 +126,11 @@ impl ClientRef {
self.retry_client.get_client().set_api_key(api_key);
}

fn call_workflow_service<'p>(&self, py: Python<'p>, call: RpcCall) -> PyResult<&'p PyAny> {
fn call_workflow_service<'p>(
&self,
py: Python<'p>,
call: RpcCall,
) -> PyResult<Bound<'p, PyAny>> {
let mut retry_client = self.retry_client.clone();
self.runtime.future_into_py(py, async move {
let bytes = match call.rpc.as_str() {
Expand Down Expand Up @@ -361,12 +365,15 @@ impl ClientRef {
)))
}
}?;
let bytes: &[u8] = &bytes;
Ok(Python::with_gil(|py| bytes.into_py(py)))
Ok(bytes)
})
}

fn call_operator_service<'p>(&self, py: Python<'p>, call: RpcCall) -> PyResult<&'p PyAny> {
fn call_operator_service<'p>(
&self,
py: Python<'p>,
call: RpcCall,
) -> PyResult<Bound<'p, PyAny>> {
use temporal_client::OperatorService;

let mut retry_client = self.retry_client.clone();
Expand Down Expand Up @@ -403,12 +410,11 @@ impl ClientRef {
)))
}
}?;
let bytes: &[u8] = &bytes;
Ok(Python::with_gil(|py| bytes.into_py(py)))
Ok(bytes)
})
}

fn call_cloud_service<'p>(&self, py: Python<'p>, call: RpcCall) -> PyResult<&'p PyAny> {
fn call_cloud_service<'p>(&self, py: Python<'p>, call: RpcCall) -> PyResult<Bound<'p, PyAny>> {
use temporal_client::CloudService;

let mut retry_client = self.retry_client.clone();
Expand Down Expand Up @@ -466,12 +472,11 @@ impl ClientRef {
)))
}
}?;
let bytes: &[u8] = &bytes;
Ok(Python::with_gil(|py| bytes.into_py(py)))
Ok(bytes)
})
}

fn call_test_service<'p>(&self, py: Python<'p>, call: RpcCall) -> PyResult<&'p PyAny> {
fn call_test_service<'p>(&self, py: Python<'p>, call: RpcCall) -> PyResult<Bound<'p, PyAny>> {
let mut retry_client = self.retry_client.clone();
self.runtime.future_into_py(py, async move {
let bytes = match call.rpc.as_str() {
Expand All @@ -490,12 +495,11 @@ impl ClientRef {
)))
}
}?;
let bytes: &[u8] = &bytes;
Ok(Python::with_gil(|py| bytes.into_py(py)))
Ok(bytes)
})
}

fn call_health_service<'p>(&self, py: Python<'p>, call: RpcCall) -> PyResult<&'p PyAny> {
fn call_health_service<'p>(&self, py: Python<'p>, call: RpcCall) -> PyResult<Bound<'p, PyAny>> {
let mut retry_client = self.retry_client.clone();
self.runtime.future_into_py(py, async move {
let bytes = match call.rpc.as_str() {
Expand All @@ -507,8 +511,7 @@ impl ClientRef {
)))
}
}?;
let bytes: &[u8] = &bytes;
Ok(Python::with_gil(|py| bytes.into_py(py)))
Ok(bytes)
})
}
}
Expand Down Expand Up @@ -539,13 +542,13 @@ where
match res {
Ok(resp) => Ok(resp.get_ref().encode_to_vec()),
Err(err) => {
Err(Python::with_gil(move |py| {
Python::with_gil(move |py| {
// Create tuple of "status", "message", and optional "details"
let code = err.code() as u32;
let message = err.message().to_owned();
let details = err.details().into_py(py);
RPCError::new_err((code, message, details))
}))
let details = err.details().into_pyobject(py)?.unbind();
Err(RPCError::new_err((code, message, details)))
})
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions temporalio/bridge/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ mod testing;
mod worker;

#[pymodule]
fn temporal_sdk_bridge(py: Python, m: &PyModule) -> PyResult<()> {
fn temporal_sdk_bridge(py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
// Client stuff
m.add("RPCError", py.get_type::<client::RPCError>())?;
m.add_class::<client::ClientRef>()?;
Expand Down Expand Up @@ -62,7 +62,7 @@ fn connect_client<'a>(
py: Python<'a>,
runtime_ref: &runtime::RuntimeRef,
config: client::ClientConfig,
) -> PyResult<&'a PyAny> {
) -> PyResult<Bound<'a, PyAny>> {
client::connect_client(py, runtime_ref, config)
}

Expand All @@ -77,7 +77,7 @@ fn init_runtime(telemetry_config: runtime::TelemetryConfig) -> PyResult<runtime:
}

#[pyfunction]
fn raise_in_thread(py: Python, thread_id: std::os::raw::c_long, exc: &PyAny) -> bool {
fn raise_in_thread(py: Python, thread_id: std::os::raw::c_long, exc: &Bound<'_, PyAny>) -> bool {
runtime::raise_in_thread(py, thread_id, exc)
}

Expand All @@ -86,7 +86,7 @@ fn start_dev_server<'a>(
py: Python<'a>,
runtime_ref: &runtime::RuntimeRef,
config: testing::DevServerConfig,
) -> PyResult<&'a PyAny> {
) -> PyResult<Bound<'a, PyAny>> {
testing::start_dev_server(py, runtime_ref, config)
}

Expand All @@ -95,7 +95,7 @@ fn start_test_server<'a>(
py: Python<'a>,
runtime_ref: &runtime::RuntimeRef,
config: testing::TestServerConfig,
) -> PyResult<&'a PyAny> {
) -> PyResult<Bound<'a, PyAny>> {
testing::start_test_server(py, runtime_ref, config)
}

Expand All @@ -113,6 +113,6 @@ fn new_replay_worker<'a>(
py: Python<'a>,
runtime_ref: &runtime::RuntimeRef,
config: worker::WorkerConfig,
) -> PyResult<&'a PyTuple> {
) -> PyResult<Bound<'a, PyTuple>> {
worker::new_replay_worker(py, runtime_ref, config)
}
Loading